[TOP-107] 메인화면 타이머 개선

core/compose-ui/src/main/java/com/example/compose_ui/common/LogComposition.kt

@@ -0,0 +1,25 @@
+package com.example.compose_ui.common
+
+import android.util.Log
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.remember
+
+class RecompositionCounter(var value: Int)
+
+@Composable
+inline fun LogComposition(
+    tag: String,
+    msg: String = "",
+) {
+    DisposableEffect(Unit) {
+        onDispose {
+            Log.d(tag, "Dispose: $msg")
+        }
+    }
+    val recompositionCounter = remember { RecompositionCounter(0) }
+    SideEffect { recompositionCounter.value++ }
+    Log.d(tag, "Composition: $msg ${recompositionCounter.value}")
+}
+

feature/tohot/build.gradle.kts

@@ -76,4 +76,5 @@ dependencies {
     implementation(libs.lottie.compose)
 
     implementation(libs.renderscript.intrinsics.replacement.toolkit)
+    implementation(libs.kotlin.collections.immutable)
 }

feature/tohot/src/main/java/tht/feature/tohot/component/card/ToHotCard.kt

@@ -2,7 +2,6 @@ package tht.feature.tohot.component.card
 
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.tween
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -29,28 +28,27 @@ import tht.feature.tohot.component.progress.ToHotHeartTimeProgressContainer
 import tht.feature.tohot.component.userinfo.ToHotUserInfoCard
 import tht.feature.tohot.model.CardTimerUiModel
 import tht.feature.tohot.model.ImmutableListWrapper
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ToHotCard(
     modifier: Modifier = Modifier,
+    timer: CardTimerUiModel?,
     imageUrls: ImmutableListWrapper<String>,
     name: String,
     age: Int,
     address: String,
     interests: ImmutableListWrapper<InterestModel>,
     idealTypes: ImmutableListWrapper<IdealTypeModel>,
     introduce: String,
-    timer: CardTimerUiModel.ToHotTimer,
-    maxTimeSec: Int,
-    currentSec: Float,
-    destinationSec: Float,
     enable: Boolean,
     fallingAnimationEnable: Boolean = false,
     isHoldCard: Boolean,
     isShakingCard: Boolean,
     onFallingAnimationFinish: () -> Unit = { },
-    ticChanged: (Float) -> Unit = { },
+    onTicChanged: (Float) -> Unit = { },
+    onTimerEnd: () -> Unit = { },
     userCardClick: () -> Unit = { },
     onLikeClick: () -> Unit = { },
     onUnLikeClick: () -> Unit = { },
@@ -92,15 +90,25 @@ fun ToHotCard(
         val timerModifier = Modifier
             .align(Alignment.TopCenter)
             .padding(horizontal = 13.dp, vertical = 12.dp)
-        when (timer) {
+        when (timer?.timerType) {
             CardTimerUiModel.ToHotTimer.Timer -> {
                 ToHotAnimateTimeProgressContainer(
                     modifier = timerModifier,
+                    maxTimer = remember(timer) {
+                        timer.maxTimer.toLong(DurationUnit.SECONDS).toInt()
+                    },
+                    initialDelay = remember(timer) {
+                        timer.initialDelay.toLong(DurationUnit.MILLISECONDS)
+                    },
+                    completionDelay = remember(timer) {
+                        timer.completionDelay.toLong(DurationUnit.MILLISECONDS)
+                    },
                     enable = enable && !isHoldCard,
-                    maxTimeSec = maxTimeSec,
-                    currentSec = currentSec,
-                    ticChanged = ticChanged,
-                    destinationSec = destinationSec
+                    duration = remember(timer) {
+                        timer.duration.toLong(DurationUnit.MILLISECONDS)
+                    },
+                    onTicChanged = onTicChanged,
+                    onEnd = onTimerEnd
                 )
             }
 
@@ -115,6 +123,12 @@ fun ToHotCard(
                     modifier = timerModifier
                 )
             }
+
+            null -> {
+                ToHotEmptyTimeProgressContainer(
+                    modifier = timerModifier
+                )
+            }
         }
 
         if (isHoldCard) return@FallingCard
@@ -170,10 +184,13 @@ private fun ToHotCardPreview() {
         interests = ImmutableListWrapper(emptyList()),
         idealTypes = ImmutableListWrapper(emptyList()),
         introduce = "introduce",
-        timer = CardTimerUiModel.ToHotTimer.Timer,
-        maxTimeSec = 5,
-        currentSec = 5f,
-        destinationSec = 4f,
+        timer = CardTimerUiModel(
+            maxTimer = 5.toDuration(DurationUnit.NANOSECONDS),
+            initialDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            completionDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            duration = 6.toDuration(DurationUnit.NANOSECONDS),
+            startAble = true
+        ),
         enable = true,
         isHoldCard = false,
         isShakingCard = false
@@ -198,10 +215,13 @@ private fun ToHotCardHoldCardPreview() {
         interests = ImmutableListWrapper(emptyList()),
         idealTypes = ImmutableListWrapper(emptyList()),
         introduce = "introduce",
-        timer = CardTimerUiModel.ToHotTimer.Timer,
-        maxTimeSec = 5,
-        currentSec = 5f,
-        destinationSec = 4f,
+        timer = CardTimerUiModel(
+            maxTimer = 5.toDuration(DurationUnit.NANOSECONDS),
+            initialDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            completionDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            duration = 6.toDuration(DurationUnit.NANOSECONDS),
+            startAble = true
+        ),
         enable = true,
         isHoldCard = true,
         isShakingCard = false
@@ -226,10 +246,14 @@ private fun ToHotHeartCardPreview() {
         interests = ImmutableListWrapper(emptyList()),
         idealTypes = ImmutableListWrapper(emptyList()),
         introduce = "introduce",
-        timer = CardTimerUiModel.ToHotTimer.Heart,
-        maxTimeSec = 5,
-        currentSec = 5f,
-        destinationSec = 4f,
+        timer = CardTimerUiModel(
+            maxTimer = 5.toDuration(DurationUnit.NANOSECONDS),
+            initialDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            completionDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            duration = 6.toDuration(DurationUnit.NANOSECONDS),
+            startAble = true,
+            timerType = CardTimerUiModel.ToHotTimer.Heart
+        ),
         enable = true,
         isHoldCard = false,
         isShakingCard = false
@@ -254,10 +278,14 @@ private fun ToHotDislikeCardPreview() {
         interests = ImmutableListWrapper(emptyList()),
         idealTypes = ImmutableListWrapper(emptyList()),
         introduce = "introduce",
-        timer = CardTimerUiModel.ToHotTimer.Dislike,
-        maxTimeSec = 5,
-        currentSec = 5f,
-        destinationSec = 4f,
+        timer = CardTimerUiModel(
+            maxTimer = 5.toDuration(DurationUnit.NANOSECONDS),
+            initialDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            completionDelay = 1.toDuration(DurationUnit.NANOSECONDS),
+            duration = 6.toDuration(DurationUnit.NANOSECONDS),
+            startAble = true,
+            timerType = CardTimerUiModel.ToHotTimer.Dislike
+        ),
         enable = true,
         isHoldCard = false,
         isShakingCard = false