diff --git a/android/app/src/main/java/poke/rogue/helper/presentation/biome/model/BiomePokemonUiModel.kt b/android/app/src/main/java/poke/rogue/helper/presentation/biome/model/BiomePokemonUiModel.kt index 3208add4..7ea3e20c 100644 --- a/android/app/src/main/java/poke/rogue/helper/presentation/biome/model/BiomePokemonUiModel.kt +++ b/android/app/src/main/java/poke/rogue/helper/presentation/biome/model/BiomePokemonUiModel.kt @@ -20,9 +20,10 @@ fun WildPokemon.toUi(): BiomePokemonUiModel = grade = tier, gymLeaderUrl = null, type = null, - pokemons = pokemons.mapIndexed { index, biomePokemon -> - biomePokemon.toPokemonUiModel(index) - } + pokemons = + pokemons.mapIndexed { index, biomePokemon -> + biomePokemon.toPokemonUiModel(index) + }, ) fun BossPokemon.toUi(): BiomePokemonUiModel = @@ -30,9 +31,10 @@ fun BossPokemon.toUi(): BiomePokemonUiModel = grade = tier, gymLeaderUrl = null, type = null, - pokemons = pokemons.mapIndexed { index, biomePokemon -> - biomePokemon.toPokemonUiModel(index) - }, + pokemons = + pokemons.mapIndexed { index, biomePokemon -> + biomePokemon.toPokemonUiModel(index) + }, ) fun GymPokemon.toUi(): BiomePokemonUiModel = @@ -40,9 +42,10 @@ fun GymPokemon.toUi(): BiomePokemonUiModel = grade = gymLeaderName, gymLeaderUrl = gymLeaderImage, type = gymLeaderTypeLogos.firstOrNull()?.toUi(), - pokemons = pokemons.mapIndexed { index, biomePokemon -> - biomePokemon.toPokemonUiModel(index) - }, + pokemons = + pokemons.mapIndexed { index, biomePokemon -> + biomePokemon.toPokemonUiModel(index) + }, ) fun BiomePokemon.toPokemonUiModel(hashId: Int): PokemonUiModel = diff --git a/android/data/src/main/java/poke/rogue/helper/data/model/Pokemon.kt b/android/data/src/main/java/poke/rogue/helper/data/model/Pokemon.kt index 332515aa..867eba6e 100644 --- a/android/data/src/main/java/poke/rogue/helper/data/model/Pokemon.kt +++ b/android/data/src/main/java/poke/rogue/helper/data/model/Pokemon.kt @@ -55,13 +55,14 @@ fun PokemonResponse.toData(): Pokemon = fun PokemonResponse2.toData(): Pokemon { // TODO : 지금 포켓몬 이름을 보여주는거 모든 곳에서 통일이 안됨.. val pureName = name.substringBefore("_") - val pascalCaseFormName = formName.split("_").joinToString("") { original -> - if (original.isBlank()) { - original - } else { - original.replaceFirstChar { it.uppercase() } + val pascalCaseFormName = + formName.split("_").joinToString("") { original -> + if (original.isBlank()) { + original + } else { + original.replaceFirstChar { it.uppercase() } + } } - } val formattedName = if (formName.isBlank() || formName.trim().lowercase() == "normal") { diff --git a/android/data/src/main/java/poke/rogue/helper/data/model/biome/BossPokemon.kt b/android/data/src/main/java/poke/rogue/helper/data/model/biome/BossPokemon.kt index 6aecada7..ea9c9e62 100644 --- a/android/data/src/main/java/poke/rogue/helper/data/model/biome/BossPokemon.kt +++ b/android/data/src/main/java/poke/rogue/helper/data/model/biome/BossPokemon.kt @@ -13,6 +13,7 @@ fun BossPokemonResponse.toData(): BossPokemon = pokemons = pokemons.toData(), ) -fun List.toData(): List = filter { - it.pokemons.isNotEmpty() -}.map(BossPokemonResponse::toData) +fun List.toData(): List = + filter { + it.pokemons.isNotEmpty() + }.map(BossPokemonResponse::toData) diff --git a/android/data/src/main/java/poke/rogue/helper/data/model/biome/WildPokemon.kt b/android/data/src/main/java/poke/rogue/helper/data/model/biome/WildPokemon.kt index 70c17b73..36e108f6 100644 --- a/android/data/src/main/java/poke/rogue/helper/data/model/biome/WildPokemon.kt +++ b/android/data/src/main/java/poke/rogue/helper/data/model/biome/WildPokemon.kt @@ -13,5 +13,4 @@ fun WildPokemonResponse.toData(): WildPokemon = pokemons = pokemons.toData(), ) -fun List.toData(): List = - filter { it.pokemons.isNotEmpty() }.map (WildPokemonResponse::toData) +fun List.toData(): List = filter { it.pokemons.isNotEmpty() }.map(WildPokemonResponse::toData)