owen/MYDex
1
0
Fork 0
mirror of https://github.com/owenlejeune/MYDex.git synced 2026-02-21 04:16:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

setup some basic retrofit stuff

Browse Source
This commit is contained in:
Owen LeJeune
2022-09-14 20:17:49 -04:00
parent 2b3fd54ac7
commit f30e4b1120
100 changed files with 289 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@@ -59,6 +59,7 @@ dependencies {
// android x // android x
def androidx = "1.0.0" def androidx = "1.0.0"
implementation "androidx.window:window:$androidx" implementation "androidx.window:window:$androidx"
implementation "androidx.palette:palette:$androidx"
// material // material
def material = "1.6.1" def material = "1.6.1"

18
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/PokemonApi.kt Normal file
View File

@@ -0,0 +1,18 @@
package com.owenlejeune.mydex.api.pokeapi.v2
import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.PaginatedResponse
import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.Pokemon
import retrofit2.Response
import retrofit2.http.GET
import retrofit2.http.Path
import retrofit2.http.Query
interface PokemonApi {
@GET("pokemon/{id}")
suspend fun getPokemon(@Path("id") id: Int): Response<Pokemon>
@GET("pokemon/")
suspend fun getPaginatedPokemon(@Query("offset") offset: Int, @Query("limit") limit: Int): Response<PaginatedResponse>
}

28
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/PokemonService.kt Normal file
View File

@@ -0,0 +1,28 @@
package com.owenlejeune.mydex.api.pokeapi.v2
import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.PaginatedResponse
import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.Pokemon
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import retrofit2.Response
class PokemonService: KoinComponent {
companion object {
private const val DEFAULT_LIMIT = 20
}
private val service: PokemonApi by inject()
suspend fun getPokemon(id: Int): Response<Pokemon> {
return service.getPokemon(id)
}
suspend fun getPaginatedPokemon(page: Int = 1): Response<PaginatedResponse> {
val limit = DEFAULT_LIMIT
val offset = DEFAULT_LIMIT * page
return service.getPaginatedPokemon(offset = offset, limit = limit)
}
}

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/berry/Berry.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/Berry.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.berry package com.owenlejeune.mydex.api.pokeapi.v2.model.berry
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class Berry( class Berry(
@SerializedName("firmness") val firmness: NameAndUrl, @SerializedName("firmness") val firmness: NameAndUrl,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/berry/BerryFirmness.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/BerryFirmness.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.berry package com.owenlejeune.mydex.api.pokeapi.v2.model.berry
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class BerryFirmness( class BerryFirmness(
@SerializedName("berries") val berries: List<NameAndUrl>, @SerializedName("berries") val berries: List<NameAndUrl>,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/berry/BerryFlavor.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/BerryFlavor.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.berry package com.owenlejeune.mydex.api.pokeapi.v2.model.berry
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class BerryFlavor( class BerryFlavor(
@SerializedName("berries") val berries: List<FlavorBerries>, @SerializedName("berries") val berries: List<FlavorBerries>,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/berry/Flavor.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/Flavor.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.berry package com.owenlejeune.mydex.api.pokeapi.v2.model.berry
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class Flavor( class Flavor(
@SerializedName("potency") val potency: Int, @SerializedName("potency") val potency: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/berry/FlavorBerries.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/FlavorBerries.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.berry package com.owenlejeune.mydex.api.pokeapi.v2.model.berry
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class FlavorBerries( class FlavorBerries(
@SerializedName("potency") val potency: Int, @SerializedName("potency") val potency: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/contest/ContestEffect.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/contest/ContestEffect.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.contest package com.owenlejeune.mydex.api.pokeapi.v2.model.contest
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectEntry
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
class ContestEffect( class ContestEffect(
@SerializedName("appeal") val appeal: Int, @SerializedName("appeal") val appeal: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/contest/ContestType.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/contest/ContestType.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.contest package com.owenlejeune.mydex.api.pokeapi.v2.model.contest
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class ContestType( class ContestType(
@SerializedName("berry_flavor") val berryFlavor: NameAndUrl, @SerializedName("berry_flavor") val berryFlavor: NameAndUrl,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/contest/SuperContestEffect.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/contest/SuperContestEffect.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.contest package com.owenlejeune.mydex.api.pokeapi.v2.model.contest
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
class SuperContestEffect( class SuperContestEffect(
@SerializedName("appeal") val appeal: Int, @SerializedName("appeal") val appeal: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/encounter/EncounterCondition.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterCondition.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.encounter package com.owenlejeune.mydex.api.pokeapi.v2.model.encounter
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EncounterCondition( class EncounterCondition(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/encounter/EncounterConditionValue.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterConditionValue.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.encounter package com.owenlejeune.mydex.api.pokeapi.v2.model.encounter
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EncounterConditionValue( class EncounterConditionValue(
@SerializedName("condition") val condition: NameAndUrl, @SerializedName("condition") val condition: NameAndUrl,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/encounter/EncounterDetails.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterDetails.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.encounter package com.owenlejeune.mydex.api.pokeapi.v2.model.encounter
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EncounterDetails( class EncounterDetails(
@SerializedName("chance") val chance: Int, @SerializedName("chance") val chance: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/encounter/EncounterMethod.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterMethod.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.encounter package com.owenlejeune.mydex.api.pokeapi.v2.model.encounter
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
class EncounterMethod( class EncounterMethod(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/encounter/PokemonEncounter.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/PokemonEncounter.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.encounter package com.owenlejeune.mydex.api.pokeapi.v2.model.encounter
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.game.VersionDetails import com.owenlejeune.mydex.api.pokeapi.v2.model.game.VersionDetails
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokemonEncounter( class PokemonEncounter(
@SerializedName("pokemon") val pokemon: NameAndUrl, @SerializedName("pokemon") val pokemon: NameAndUrl,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/evolution/ChainLink.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/ChainLink.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.evolution package com.owenlejeune.mydex.api.pokeapi.v2.model.evolution
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class ChainLink( class ChainLink(
@SerializedName("is_baby") val isBaby: Boolean, @SerializedName("is_baby") val isBaby: Boolean,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/evolution/EvolutionChain.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/EvolutionChain.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.evolution package com.owenlejeune.mydex.api.pokeapi.v2.model.evolution
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EvolutionChain( class EvolutionChain(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/evolution/EvolutionDetails.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/EvolutionDetails.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.evolution package com.owenlejeune.mydex.api.pokeapi.v2.model.evolution
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EvolutionDetails( class EvolutionDetails(
@SerializedName("item") val item: NameAndUrl, @SerializedName("item") val item: NameAndUrl,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/evolution/EvolutionTrigger.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/EvolutionTrigger.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.evolution package com.owenlejeune.mydex.api.pokeapi.v2.model.evolution
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EvolutionTrigger( class EvolutionTrigger(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/game/Generation.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/Generation.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.game package com.owenlejeune.mydex.api.pokeapi.v2.model.game
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class Generation( class Generation(
@SerializedName("abilities") val abilities: List<NameAndUrl>, @SerializedName("abilities") val abilities: List<NameAndUrl>,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/game/Pokedex.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/Pokedex.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.game package com.owenlejeune.mydex.api.pokeapi.v2.model.game
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class Pokedex( class Pokedex(
@SerializedName("descriptions") val descriptions: List<Description>, @SerializedName("descriptions") val descriptions: List<Description>,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/game/PokedexNumber.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/PokedexNumber.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.game package com.owenlejeune.mydex.api.pokeapi.v2.model.game
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokedexNumber( class PokedexNumber(
@SerializedName("entry_number") val entryNumber: Int, @SerializedName("entry_number") val entryNumber: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/game/PokemonEntry.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/PokemonEntry.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.game package com.owenlejeune.mydex.api.pokeapi.v2.model.game
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokemonEntry( class PokemonEntry(
@SerializedName("entry_number") val entryNumber: Int, @SerializedName("entry_number") val entryNumber: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/game/Version.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/Version.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.game package com.owenlejeune.mydex.api.pokeapi.v2.model.game
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class Version( class Version(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/game/VersionDetails.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/VersionDetails.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.game package com.owenlejeune.mydex.api.pokeapi.v2.model.game
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.encounter.EncounterDetails import com.owenlejeune.mydex.api.pokeapi.v2.model.encounter.EncounterDetails
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class VersionDetails( class VersionDetails(
@SerializedName("encounter_details") val encounterDetails: List<EncounterDetails>, @SerializedName("encounter_details") val encounterDetails: List<EncounterDetails>,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/game/VersionGroup.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/VersionGroup.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.game package com.owenlejeune.mydex.api.pokeapi.v2.model.game
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class VersionGroup( class VersionGroup(
@SerializedName("generation") val generation: NameAndUrl, @SerializedName("generation") val generation: NameAndUrl,

14
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/items/Item.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/Item.kt
View File

@@ -1,12 +1,12 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.items package com.owenlejeune.mydex.api.pokeapi.v2.model.items
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.machine.MachineDetails import com.owenlejeune.mydex.api.pokeapi.v2.model.machine.MachineDetails
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.PokemonGameIndex import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.PokemonGameIndex
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectEntry
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.sprite.ItemSprites import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite.ItemSprites
class Item( class Item(
@SerializedName("attributes") val attributes: List<NameAndUrl>, @SerializedName("attributes") val attributes: List<NameAndUrl>,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/items/ItemAttribute.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemAttribute.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.items package com.owenlejeune.mydex.api.pokeapi.v2.model.items
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class ItemAttribute( class ItemAttribute(
@SerializedName("descriptions") val descriptions: List<Description>, @SerializedName("descriptions") val descriptions: List<Description>,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/items/ItemCategory.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemCategory.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.items package com.owenlejeune.mydex.api.pokeapi.v2.model.items
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class ItemCategory( class ItemCategory(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/items/ItemFlingEffect.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemFlingEffect.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.items package com.owenlejeune.mydex.api.pokeapi.v2.model.items
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectEntry
class ItemFlingEffect( class ItemFlingEffect(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/items/ItemHolderPokemon.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemHolderPokemon.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.items package com.owenlejeune.mydex.api.pokeapi.v2.model.items
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class ItemHolderPokemon( class ItemHolderPokemon(
@SerializedName("rarity") val rarity: Int, @SerializedName("rarity") val rarity: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/items/ItemPocket.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemPocket.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.items package com.owenlejeune.mydex.api.pokeapi.v2.model.items
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class ItemPocket( class ItemPocket(
@SerializedName("categories") val categories: List<NameAndUrl>, @SerializedName("categories") val categories: List<NameAndUrl>,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/location/Location.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/Location.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.location package com.owenlejeune.mydex.api.pokeapi.v2.model.location
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.PokemonGameIndex import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.PokemonGameIndex
class Location( class Location(
@SerializedName("areas") val areas: List<NameAndUrl>, @SerializedName("areas") val areas: List<NameAndUrl>,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/location/LocationArea.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/LocationArea.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.location package com.owenlejeune.mydex.api.pokeapi.v2.model.location
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.encounter.PokemonEncounter import com.owenlejeune.mydex.api.pokeapi.v2.model.encounter.PokemonEncounter
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class LocationArea( class LocationArea(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/location/PalParkArea.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/PalParkArea.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.location package com.owenlejeune.mydex.api.pokeapi.v2.model.location
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PalParkArea( class PalParkArea(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/location/PalParkEncounter.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/PalParkEncounter.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.location package com.owenlejeune.mydex.api.pokeapi.v2.model.location
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PalParkEncounter( class PalParkEncounter(
@SerializedName("rate") val rate: Int, @SerializedName("rate") val rate: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/location/PalParkEncounterPokemon.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/PalParkEncounterPokemon.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.location package com.owenlejeune.mydex.api.pokeapi.v2.model.location
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PalParkEncounterPokemon( class PalParkEncounterPokemon(
@SerializedName("rate") val rate: Int, @SerializedName("rate") val rate: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/location/Region.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/Region.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.location package com.owenlejeune.mydex.api.pokeapi.v2.model.location
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class Region( class Region(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/machine/Machine.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/machine/Machine.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.machine package com.owenlejeune.mydex.api.pokeapi.v2.model.machine
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class Machine( class Machine(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/machine/MachineDetails.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/machine/MachineDetails.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.machine package com.owenlejeune.mydex.api.pokeapi.v2.model.machine
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MachineDetails( class MachineDetails(
@SerializedName("machine.url") val machineUrl: String, @SerializedName("machine.url") val machineUrl: String,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/AwesomeName.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/AwesomeName.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/DamageRelations.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/DamageRelations.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/Description.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Description.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/Genus.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Genus.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/Language.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Language.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/NameAndLanguage.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/NameAndLanguage.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/NameAndUrl.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/NameAndUrl.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

10
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/PaginatedResponse.kt Normal file
View File

@@ -0,0 +1,10 @@
package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName
class PaginatedResponse(
@SerializedName("count") val count: Int,
@SerializedName("next") val next: String?,
@SerializedName("previous") val previous: String?,
@SerializedName("results") val results: List<NameAndUrl>
)

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/PastDamageRelation.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/PastDamageRelation.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/Stat.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Stat.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/Type.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Type.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/TypePokemon.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/TypePokemon.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/misc/Variety.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Variety.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.misc package com.owenlejeune.mydex.api.pokeapi.v2.model.misc
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/ContestCombo.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/ContestCombo.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class ContestCombo( class ContestCombo(
@SerializedName("use_after") val useAfter: List<NameAndUrl>?, @SerializedName("use_after") val useAfter: List<NameAndUrl>?,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/ContestCombos.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/ContestCombos.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

12
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/Move.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/Move.kt
View File

@@ -1,11 +1,11 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.machine.MachineDetails import com.owenlejeune.mydex.api.pokeapi.v2.model.machine.MachineDetails
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectChange import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectChange
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectEntry
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
class Move ( class Move (
@SerializedName("accuracy") val accuracy: Int, @SerializedName("accuracy") val accuracy: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/MoveAilment.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveAilment.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MoveAilment( class MoveAilment(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/MoveBattleStyle.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveBattleStyle.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
class MoveBattleStyle( class MoveBattleStyle(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/MoveCategory.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveCategory.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MoveCategory( class MoveCategory(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/MoveDamageClass.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveDamageClass.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MoveDamageClass( class MoveDamageClass(
@SerializedName("descriptions") val descriptions: List<Description>, @SerializedName("descriptions") val descriptions: List<Description>,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/MoveLearnMethod.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveLearnMethod.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MoveLearnMethod( class MoveLearnMethod(
@SerializedName("descriptions") val descriptions: List<Description>, @SerializedName("descriptions") val descriptions: List<Description>,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/MoveMeta.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveMeta.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MoveMeta( class MoveMeta(
@SerializedName("ailment") val ailment: NameAndUrl, @SerializedName("ailment") val ailment: NameAndUrl,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/move/MoveTarget.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveTarget.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.move package com.owenlejeune.mydex.api.pokeapi.v2.model.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MoveTarget( class MoveTarget(
@SerializedName("descriptions") val descriptions: List<Description>, @SerializedName("descriptions") val descriptions: List<Description>,

10
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/Pokemon.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/Pokemon.kt
View File

@@ -1,10 +1,10 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Stat import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Stat
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Type import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Type
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.sprite.Sprites import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite.Sprites
class Pokemon( class Pokemon(
@SerializedName("name") val name: String, @SerializedName("name") val name: String,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonAbility.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonAbility.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonColor.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonColor.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokemonColor( class PokemonColor(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

10
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonForm.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonForm.kt
View File

@@ -1,10 +1,10 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Type import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Type
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.pokemon.sprite.Sprites import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite.Sprites
class PokemonForm( class PokemonForm(
@SerializedName("form_name") val formName: String, @SerializedName("form_name") val formName: String,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonGameIndex.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonGameIndex.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokemonGameIndex( class PokemonGameIndex(
@SerializedName("game_index") val gameIndex: Int, @SerializedName("game_index") val gameIndex: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonHabitat.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonHabitat.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokemonHabitat( class PokemonHabitat(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonMove.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonMove.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.move.MoveVersionGroupDetails import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.move.MoveVersionGroupDetails
class PokemonMove( class PokemonMove(
@SerializedName("move.name") val name: String, @SerializedName("move.name") val name: String,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonShape.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonShape.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.AwesomeName import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.AwesomeName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokemonShape( class PokemonShape(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

10
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonSpecies.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonSpecies.kt
View File

@@ -1,10 +1,10 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.game.PokedexNumber import com.owenlejeune.mydex.api.pokeapi.v2.model.game.PokedexNumber
import com.owenlejeune.mydex.api.pokeapi.v3.model.location.PalParkEncounter import com.owenlejeune.mydex.api.pokeapi.v2.model.location.PalParkEncounter
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.* import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.*
class PokemonSpecies( class PokemonSpecies(
@SerializedName("base_happiness") val baseHappiness: Int, @SerializedName("base_happiness") val baseHappiness: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonSpeciesDetails.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonSpeciesDetails.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokemonSpeciesDetails( class PokemonSpeciesDetails(
@SerializedName("rate") val rate: Int, @SerializedName("rate") val rate: Int,

10
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonStat.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonStat.kt
View File

@@ -1,10 +1,10 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature.StatAffectingNatures import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature.StatAffectingNatures
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.move.StatAffectingMoves import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.move.StatAffectingMoves
class PokemonStat( class PokemonStat(
@SerializedName("affecting_natures") val affectingNatures: StatAffectingNatures, @SerializedName("affecting_natures") val affectingNatures: StatAffectingNatures,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/PokemonType.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonType.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.* import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.*
class PokemonType( class PokemonType(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/ability/Ability.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/Ability.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
class Ability( class Ability(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/ability/AbilityGeneration.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/AbilityGeneration.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/ability/AbilityPokemon.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/AbilityPokemon.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/ability/EffectChange.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/EffectChange.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EffectChange( class EffectChange(
@SerializedName("version_group") val version: NameAndUrl, @SerializedName("version_group") val version: NameAndUrl,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/ability/EffectEntry.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/EffectEntry.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EffectEntry( class EffectEntry(
@SerializedName("language") val language: NameAndUrl, @SerializedName("language") val language: NameAndUrl,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/ability/FlavorTextEntry.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/FlavorTextEntry.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class FlavorTextEntry( class FlavorTextEntry(
@SerializedName("flavor_text", alternate = ["text"]) val flavorText: String, @SerializedName("flavor_text", alternate = ["text"]) val flavorText: String,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/characteristic/Characteristic.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/characteristic/Characteristic.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.characteristic package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.characteristic
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
class Characteristic( class Characteristic(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/egggroup/EggGroup.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/egggroup/EggGroup.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.egggroup package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.egggroup
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class EggGroup( class EggGroup(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/gender/Gender.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/gender/Gender.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.gender package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.gender
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.PokemonSpeciesDetails import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.PokemonSpeciesDetails
class Gender( class Gender(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/growthrate/GrowthRate.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/growthrate/GrowthRate.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.growthrate package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.growthrate
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class GrowthRate( class GrowthRate(
@SerializedName("descriptions") val descriptions: List<Description>, @SerializedName("descriptions") val descriptions: List<Description>,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/growthrate/GrowthRateLevel.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/growthrate/GrowthRateLevel.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.growthrate package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.growthrate
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/move/MoveVersionGroupDetails.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/move/MoveVersionGroupDetails.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.move package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/move/StatAffectingMove.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/move/StatAffectingMove.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.move package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class StatAffectingMove( class StatAffectingMove(
@SerializedName("change") val change: Int, @SerializedName("change") val change: Int,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/move/StatAffectingMoves.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/move/StatAffectingMoves.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.move package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.move
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/nature/AffectingNature.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/AffectingNature.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class AffectingNature( class AffectingNature(
@SerializedName("max_change") val maxChange: Int, @SerializedName("max_change") val maxChange: Int,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/nature/AffectingNatures.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/AffectingNatures.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/nature/MoveBattleStylePreference.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/MoveBattleStylePreference.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class MoveBattleStylePreference( class MoveBattleStylePreference(
@SerializedName("high_hp_preference") val highHpPreference: Int, @SerializedName("high_hp_preference") val highHpPreference: Int,

8
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/nature/Nature.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/Nature.kt
View File

@@ -1,9 +1,9 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.pokeathalon.PokeathalonStatChange import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.pokeathalon.PokeathalonStatChange
class Nature( class Nature(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/nature/StatAffectingNatures.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/StatAffectingNatures.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class StatAffectingNatures( class StatAffectingNatures(
@SerializedName("decrease") val decrease: List<NameAndUrl>, @SerializedName("decrease") val decrease: List<NameAndUrl>,

6
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/pokeathalon/PokeathalonStat.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/pokeathalon/PokeathalonStat.kt
View File

@@ -1,8 +1,8 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.pokeathalon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.pokeathalon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature.AffectingNatures import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature.AffectingNatures
class PokeathalonStat( class PokeathalonStat(
@SerializedName("id") val id: Int, @SerializedName("id") val id: Int,

4
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/pokeathalon/PokeathalonStatChange.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/pokeathalon/PokeathalonStatChange.kt
View File

@@ -1,7 +1,7 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.pokeathalon package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.pokeathalon
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName
import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
class PokeathalonStatChange( class PokeathalonStatChange(
@SerializedName("max_change") val maxChange: Int, @SerializedName("max_change") val maxChange: Int,

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/sprite/ItemSprites.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/sprite/ItemSprites.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.sprite package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

2
app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v3/model/pokemon/sprite/Sprites.kt → app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/sprite/Sprites.kt
View File

@@ -1,4 +1,4 @@
package com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.sprite package com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

3
app/src/main/res/values/themes.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.MYDex" parent="android:Theme.Material.Light.NoActionBar"> <style name="Theme.MYDex" parent="Theme.AppCompat.NoActionBar">
<item name="android:statusBarColor">@color/purple_700</item>
</style> </style>
</resources> </resources>