setup some basic retrofit stuff

app/build.gradle

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

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/PokemonApi.kt

@@ -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>
+
+}

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/PokemonService.kt

@@ -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)
+    }
+
+}

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/Berry.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class Berry(
     @SerializedName("firmness") val firmness: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/BerryFirmness.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class BerryFirmness(
     @SerializedName("berries") val berries: List<NameAndUrl>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/BerryFlavor.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class BerryFlavor(
     @SerializedName("berries") val berries: List<FlavorBerries>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/Flavor.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class Flavor(
     @SerializedName("potency") val potency: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/berry/FlavorBerries.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class FlavorBerries(
     @SerializedName("potency") val potency: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/contest/ContestEffect.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.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.EffectEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
 
 class ContestEffect(
     @SerializedName("appeal") val appeal: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/contest/ContestType.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class ContestType(
     @SerializedName("berry_flavor") val berryFlavor: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/contest/SuperContestEffect.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
 
 class SuperContestEffect(
     @SerializedName("appeal") val appeal: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterCondition.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EncounterCondition(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterConditionValue.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EncounterConditionValue(
     @SerializedName("condition") val condition: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterDetails.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EncounterDetails(
     @SerializedName("chance") val chance: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/EncounterMethod.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
 
 class EncounterMethod(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/encounter/PokemonEncounter.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.game.VersionDetails
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.game.VersionDetails
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokemonEncounter(
     @SerializedName("pokemon") val pokemon: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/ChainLink.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class ChainLink(
     @SerializedName("is_baby") val isBaby: Boolean,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/EvolutionChain.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EvolutionChain(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/EvolutionDetails.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EvolutionDetails(
     @SerializedName("item") val item: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/evolution/EvolutionTrigger.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EvolutionTrigger(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/Generation.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class Generation(
     @SerializedName("abilities") val abilities: List<NameAndUrl>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/Pokedex.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class Pokedex(
     @SerializedName("descriptions") val descriptions: List<Description>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/PokedexNumber.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokedexNumber(
     @SerializedName("entry_number") val entryNumber: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/PokemonEntry.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokemonEntry(
     @SerializedName("entry_number") val entryNumber: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/Version.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class Version(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/VersionDetails.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.encounter.EncounterDetails
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.encounter.EncounterDetails
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class VersionDetails(
     @SerializedName("encounter_details") val encounterDetails: List<EncounterDetails>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/game/VersionGroup.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class VersionGroup(
     @SerializedName("generation") val generation: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/Item.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.machine.MachineDetails
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.PokemonGameIndex
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectEntry
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.sprite.ItemSprites
+import com.owenlejeune.mydex.api.pokeapi.v2.model.machine.MachineDetails
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.PokemonGameIndex
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite.ItemSprites
 
 class Item(
     @SerializedName("attributes") val attributes: List<NameAndUrl>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemAttribute.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class ItemAttribute(
     @SerializedName("descriptions") val descriptions: List<Description>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemCategory.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class ItemCategory(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemFlingEffect.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectEntry
 
 class ItemFlingEffect(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemHolderPokemon.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class ItemHolderPokemon(
     @SerializedName("rarity") val rarity: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/items/ItemPocket.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class ItemPocket(
     @SerializedName("categories") val categories: List<NameAndUrl>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/Location.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.PokemonGameIndex
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.PokemonGameIndex
 
 class Location(
     @SerializedName("areas") val areas: List<NameAndUrl>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/LocationArea.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.encounter.PokemonEncounter
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.encounter.PokemonEncounter
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class LocationArea(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/PalParkArea.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PalParkArea(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/PalParkEncounter.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PalParkEncounter(
     @SerializedName("rate") val rate: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/PalParkEncounterPokemon.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PalParkEncounterPokemon(
     @SerializedName("rate") val rate: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/location/Region.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class Region(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/machine/Machine.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class Machine(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/machine/MachineDetails.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MachineDetails(
     @SerializedName("machine.url") val machineUrl: String,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/AwesomeName.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/DamageRelations.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Description.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Genus.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Language.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/NameAndLanguage.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/NameAndUrl.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/PaginatedResponse.kt

@@ -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>
+)

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/PastDamageRelation.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Stat.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Type.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/TypePokemon.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/misc/Variety.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/ContestCombo.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class ContestCombo(
     @SerializedName("use_after") val useAfter: List<NameAndUrl>?,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/ContestCombos.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/Move.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.machine.MachineDetails
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectChange
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.EffectEntry
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.machine.MachineDetails
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectChange
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.EffectEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
 
 class Move (
     @SerializedName("accuracy") val accuracy: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveAilment.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MoveAilment(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveBattleStyle.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
 
 class MoveBattleStyle(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveCategory.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MoveCategory(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveDamageClass.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MoveDamageClass(
     @SerializedName("descriptions") val descriptions: List<Description>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveLearnMethod.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MoveLearnMethod(
     @SerializedName("descriptions") val descriptions: List<Description>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveMeta.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MoveMeta(
     @SerializedName("ailment") val ailment: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/move/MoveTarget.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MoveTarget(
     @SerializedName("descriptions") val descriptions: List<Description>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/Pokemon.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Stat
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Type
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.sprite.Sprites
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Stat
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Type
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite.Sprites
 
 class Pokemon(
     @SerializedName("name") val name: String,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonAbility.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonColor.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokemonColor(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonForm.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.Type
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.pokemon.sprite.Sprites
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Type
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.sprite.Sprites
 
 class PokemonForm(
     @SerializedName("form_name") val formName: String,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonGameIndex.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokemonGameIndex(
     @SerializedName("game_index") val gameIndex: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonHabitat.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokemonHabitat(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonMove.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.move.MoveVersionGroupDetails
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.move.MoveVersionGroupDetails
 
 class PokemonMove(
     @SerializedName("move.name") val name: String,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonShape.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.AwesomeName
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.AwesomeName
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokemonShape(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonSpecies.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.game.PokedexNumber
-import com.owenlejeune.mydex.api.pokeapi.v3.model.location.PalParkEncounter
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.ability.FlavorTextEntry
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.*
+import com.owenlejeune.mydex.api.pokeapi.v2.model.game.PokedexNumber
+import com.owenlejeune.mydex.api.pokeapi.v2.model.location.PalParkEncounter
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.ability.FlavorTextEntry
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.*
 
 class PokemonSpecies(
     @SerializedName("base_happiness") val baseHappiness: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonSpeciesDetails.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokemonSpeciesDetails(
     @SerializedName("rate") val rate: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonStat.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature.StatAffectingNatures
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.move.StatAffectingMoves
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature.StatAffectingNatures
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.move.StatAffectingMoves
 
 class PokemonStat(
     @SerializedName("affecting_natures") val affectingNatures: StatAffectingNatures,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/PokemonType.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.*
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.*
 
 class PokemonType(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/Ability.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
 
 class Ability(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/AbilityGeneration.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/AbilityPokemon.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/EffectChange.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EffectChange(
     @SerializedName("version_group") val version: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/EffectEntry.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EffectEntry(
     @SerializedName("language") val language: NameAndUrl,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/ability/FlavorTextEntry.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class FlavorTextEntry(
     @SerializedName("flavor_text", alternate = ["text"]) val flavorText: String,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/characteristic/Characteristic.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
 
 class Characteristic(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/egggroup/EggGroup.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class EggGroup(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/gender/Gender.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.PokemonSpeciesDetails
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.PokemonSpeciesDetails
 
 class Gender(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/growthrate/GrowthRate.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.Description
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.Description
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class GrowthRate(
     @SerializedName("descriptions") val descriptions: List<Description>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/growthrate/GrowthRateLevel.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/move/MoveVersionGroupDetails.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/move/StatAffectingMove.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class StatAffectingMove(
     @SerializedName("change") val change: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/move/StatAffectingMoves.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/AffectingNature.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class AffectingNature(
     @SerializedName("max_change") val maxChange: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/AffectingNatures.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/MoveBattleStylePreference.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class MoveBattleStylePreference(
     @SerializedName("high_hp_preference") val highHpPreference: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/Nature.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.pokeathalon.PokeathalonStatChange
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.pokeathalon.PokeathalonStatChange
 
 class Nature(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/nature/StatAffectingNatures.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class StatAffectingNatures(
     @SerializedName("decrease") val decrease: List<NameAndUrl>,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/pokeathalon/PokeathalonStat.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndLanguage
-import com.owenlejeune.mydex.api.pokeapi.v3.model.pokemon.nature.AffectingNatures
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndLanguage
+import com.owenlejeune.mydex.api.pokeapi.v2.model.pokemon.nature.AffectingNatures
 
 class PokeathalonStat(
     @SerializedName("id") val id: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/pokeathalon/PokeathalonStatChange.kt

@@ -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.owenlejeune.mydex.api.pokeapi.v3.model.misc.NameAndUrl
+import com.owenlejeune.mydex.api.pokeapi.v2.model.misc.NameAndUrl
 
 class PokeathalonStatChange(
     @SerializedName("max_change") val maxChange: Int,

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/sprite/ItemSprites.kt

@@ -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
 

app/src/main/java/com/owenlejeune/mydex/api/pokeapi/v2/model/pokemon/sprite/Sprites.kt

@@ -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
 

app/src/main/res/values/themes.xml

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