[1.2.0/AN-FEAT, AN-UI] 포켓몬 스탯 프로그레스 바에 애니메이션 적용

android/app/src/main/java/poke/rogue/helper/presentation/dex/detail/stat/PokemonStatAdapter.kt

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import poke.rogue.helper.databinding.ItemStatBinding
 import poke.rogue.helper.presentation.dex.model.StatUiModel
 import poke.rogue.helper.presentation.util.view.ItemDiffCallback
+import poke.rogue.helper.presentation.util.view.animation
 
 class PokemonStatAdapter :
     ListAdapter<StatUiModel, PokemonStatAdapter.PokemonStatViewHolder>(statComparator) {
@@ -33,6 +34,17 @@ class PokemonStatAdapter :
         ViewHolder(binding.root) {
         fun bind(stat: StatUiModel) {
             binding.stat = stat
+            binding.progressBarStat.apply {
+                startAnimation(
+                    animation(from = 0f, to = stat.amount.toFloat()).apply {
+                        duration = ANIMATION_DURATION
+                    },
+                )
+            }
+        }
+
+        companion object {
+            private const val ANIMATION_DURATION: Long = 800
         }
     }
 

android/app/src/main/java/poke/rogue/helper/presentation/dex/model/StatUiModel.kt → android/app/src/main/java/poke/rogue/helper/presentation/dex/model/StatUiModel2.kt

@@ -1,11 +1,12 @@
 package poke.rogue.helper.presentation.dex.model
 
 import androidx.annotation.ColorRes
+import androidx.annotation.StringRes
 import poke.rogue.helper.R
 import poke.rogue.helper.data.model.Stat
 
 data class StatUiModel(
-    val name: String,
+    @StringRes val name: Int,
     val amount: Int,
     val limit: Int,
     @ColorRes val color: Int = 0,
@@ -14,59 +15,59 @@ data class StatUiModel(
         get() = amount * 100 / limit
 }
 
-fun Stat.toUi() =
+fun Stat.toUi(): StatUiModel =
     when (name) {
         "hp" ->
             StatUiModel(
-                name = "HP",
+                name = R.string.pokemon_stat_hp,
                 amount = amount,
                 limit = MAX_HP_LIMIT,
                 color = R.color.stat_hp,
             )
 
         "attack" ->
             StatUiModel(
-                name = "공격",
+                name = R.string.pokemon_stat_attack,
                 amount = amount,
                 limit = MAX_ATTACK_LIMIT,
                 color = R.color.stat_attack,
             )
 
         "defense" ->
             StatUiModel(
-                name = "방어",
+                name = R.string.pokemon_stat_defense,
                 amount = amount,
                 limit = MAX_DEFENSE_LIMIT,
                 color = R.color.stat_defense,
             )
 
         "specialAttack" ->
             StatUiModel(
-                name = "특수공격",
+                name = R.string.pokemon_stat_special_attack,
                 amount = amount,
                 limit = MAX_SPECIAL_ATTACK_LIMIT,
                 color = R.color.stat_special_attack,
             )
 
         "specialDefense" ->
             StatUiModel(
-                name = "특수방어",
+                name = R.string.pokemon_stat_special_defense,
                 amount = amount,
                 limit = MAX_SPECIAL_DEFENSE_LIMIT,
                 color = R.color.stat_special_defense,
             )
 
         "speed" ->
             StatUiModel(
-                name = "스피드",
+                name = R.string.pokemon_stat_speed,
                 amount = amount,
                 limit = MAX_SPEED_LIMIT,
                 color = R.color.stat_speed,
             )
 
         "total" ->
             StatUiModel(
-                name = "종족값",
+                name = R.string.pokemon_stat_base_stat,
                 amount = amount,
                 limit = MAX_TOTAL_LIMIT,
                 color = R.color.stat_total,

android/app/src/main/java/poke/rogue/helper/presentation/util/view/ProgressBarAnimation.kt

@@ -0,0 +1,25 @@
+package poke.rogue.helper.presentation.util.view
+
+import android.view.animation.Animation
+import android.view.animation.Transformation
+import android.widget.ProgressBar
+
+class ProgressBarAnimation(
+    private val progressBar: ProgressBar,
+    private val from: Float,
+    private val to: Float,
+) : Animation() {
+    override fun applyTransformation(
+        interpolatedTime: Float,
+        t: Transformation?,
+    ) {
+        super.applyTransformation(interpolatedTime, t)
+        val value = from + to * interpolatedTime
+        progressBar.progress = value.toInt()
+    }
+}
+
+fun ProgressBar.animation(
+    from: Float,
+    to: Float,
+): ProgressBarAnimation = ProgressBarAnimation(this, from, to)

android/app/src/main/res/layout/item_stat.xml

@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="20dp"
         android:foregroundGravity="center"
-        android:gravity="start"
+        android:gravity="center"
         android:orientation="horizontal"
         android:paddingHorizontal="4dp"
         android:paddingVertical="4dp">
@@ -28,7 +28,7 @@
             android:text="@{stat.name}"
             android:textSize="@dimen/pokemon_stat_text_size"
             tools:ignore="SpUsage"
-            tools:text="HPD" />
+            tools:text="Base stat sdf" />
 
         <Space
             android:layout_width="12dp"
@@ -50,9 +50,9 @@
             style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             progressColor="@{stat.color}"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="16dp"
+            android:max="@{stat.limit}"
             android:paddingHorizontal="4dp"
-            android:max="100"
             android:progress="@{stat.progress}"
             tools:progress="70"
             tools:progressDrawable="@drawable/progress_dex_stat" />

android/app/src/main/res/layout/item_type_result.xml

@@ -17,7 +17,7 @@
         <TextView
             android:id="@+id/tv_my_type_result"
             style="@style/TextAppearance.Poke.Title"
-            visible="@{typeResult.isMyType}"
+            invisible="@{!typeResult.isMyType}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"

android/app/src/main/res/values-ko-rKR/strings.xml

@@ -96,6 +96,15 @@
     <string name="pokemon_detail_to_battle_with_enemy_pop_up_descriptions">상대 포켓몬으로</string>
     <string name="pokemon_detail_to_battle_with_mine_pop_up_descriptions">내 포켓몬으로</string>
 
+    <!--    pokemon stat-->
+    <string name="pokemon_stat_hp">HP</string>
+    <string name="pokemon_stat_attack">공격</string>
+    <string name="pokemon_stat_defense">방어</string>
+    <string name="pokemon_stat_special_attack">특수공격</string>
+    <string name="pokemon_stat_special_defense">특수방어</string>
+    <string name="pokemon_stat_speed">스피드</string>
+    <string name="pokemon_stat_base_stat">종족값</string>
+
     <!--    pokemon detail skills-->
     <string name="pokemon_detail_skill_level">레벨</string>
     <string name="pokemon_detail_skill_name">기술명</string>

android/app/src/main/res/values/strings.xml

@@ -83,7 +83,6 @@
     <string name="by_special_defense">By Special Defense</string>
     <string name="by_hp">By HP</string>
 
-
     <!--    pokemon detail-->
     <string name="dex_detail_pokemon_stats_title">Base Stats</string>
 
@@ -97,6 +96,15 @@
     <string name="pokemon_detail_to_battle_with_enemy_pop_up_descriptions">As Opponent Pokémon</string>
     <string name="pokemon_detail_to_battle_with_mine_pop_up_descriptions">As My Pokémon</string>
 
+    <!--    pokemon stat-->
+    <string name="pokemon_stat_hp">Max.HP</string>
+    <string name="pokemon_stat_attack">Attack</string>
+    <string name="pokemon_stat_defense">Defense</string>
+    <string name="pokemon_stat_special_attack">Sp.Atk</string>
+    <string name="pokemon_stat_special_defense">Sp.Def</string>
+    <string name="pokemon_stat_speed">Speed</string>
+    <string name="pokemon_stat_base_stat">Base Stat</string>
+
     <!--    pokemon detail skills-->
     <string name="pokemon_detail_skill_level">Level</string>
     <string name="pokemon_detail_skill_name">Move</string>

android/app/src/test/java/poke/rogue/helper/presentation/dex/detail/PokemonDetailViewModelTest.kt

@@ -76,13 +76,13 @@ class PokemonDetailViewModelTest : KoinTest {
                         ),
                     stats =
                         listOf(
-                            StatUiModel("HP", 45, 255, R.color.stat_hp),
-                            StatUiModel("공격", 49, 190, R.color.stat_attack),
-                            StatUiModel("방어", 49, 250, R.color.stat_defense),
-                            StatUiModel("특수공격", 65, 194, R.color.stat_special_attack),
-                            StatUiModel("특수방어", 65, 250, R.color.stat_special_defense),
-                            StatUiModel("스피드", 45, 200, R.color.stat_speed),
-                            StatUiModel("종족값", 318, 800, R.color.stat_total),
+                            StatUiModel(R.string.pokemon_stat_hp, 45, 255, R.color.stat_hp),
+                            StatUiModel(R.string.pokemon_stat_attack, 49, 190, R.color.stat_attack),
+                            StatUiModel(R.string.pokemon_stat_defense, 49, 250, R.color.stat_defense),
+                            StatUiModel(R.string.pokemon_stat_special_attack, 65, 194, R.color.stat_special_attack),
+                            StatUiModel(R.string.pokemon_stat_special_defense, 65, 250, R.color.stat_special_defense),
+                            StatUiModel(R.string.pokemon_stat_speed, 45, 200, R.color.stat_speed),
+                            StatUiModel(R.string.pokemon_stat_base_stat, 318, 800, R.color.stat_total),
                         ),
                     abilities =
                         listOf(