feat:TOP-107 shakingCard 애니메이션 적용

Author: cwj-c

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

@@ -47,6 +47,7 @@ fun ToHotCard(
     isHoldCard: Boolean,
     isShakingCard: Boolean,
     onFallingAnimationFinish: () -> Unit = { },
+    onTicChanged: (Float) -> Unit = { },
     onTimerEnd: () -> Unit = { },
     userCardClick: () -> Unit = { },
     onLikeClick: () -> Unit = { },
@@ -106,6 +107,7 @@ fun ToHotCard(
                     duration = remember(timer) {
                         timer.duration.toLong(DurationUnit.MILLISECONDS)
                     },
+                    onTicChanged = onTicChanged,
                     onEnd = onTimerEnd
                 )
             }

feature/tohot/src/main/java/tht/feature/tohot/component/progress/ToHotAnimateTimeProgressContainer.kt

@@ -32,6 +32,7 @@ fun ToHotAnimateTimeProgressContainer(
     duration: Long,
     enable: Boolean,
     onEnd: () -> Unit,
+    onTicChanged: (Float) -> Unit,
     modifier: Modifier = Modifier,
     initialDelay: Long = 0L,
     completionDelay: Long = 0L
@@ -56,12 +57,14 @@ fun ToHotAnimateTimeProgressContainer(
             duration = duration,
             onTicChanged = {
                 coroutineScope.launch {
-                    if (completionDelay > 0) {
-                        progressState = false
-                    }
-                    delay(completionDelay)
                     if (it <= destinationSec) {
+                        if (completionDelay > 0) {
+                            progressState = false
+                        }
+                        delay(completionDelay)
                         onEnd()
+                    } else {
+                        onTicChanged(it)
                     }
                 }
             }
@@ -84,14 +87,15 @@ private fun ToHotAnimateTimeProgressContainerInternal(
         Color(0xFFF93A2E)
     ),
     progressBackgroundColor: Color = colorResource(id = tht.core.ui.R.color.black_353535),
-    onTicChanged: (Float) -> Unit = { },
-    completionDelayMillis: Long = 0L
+    onTicChanged: (Float) -> Unit = { }
 ) {
+    val progressAnimatable = remember { Animatable(1f) }
     var currentSec by remember { mutableIntStateOf(maxTimeSec) }
     val destinationProgress = destinationSec / maxTimeSec.toFloat()
     var color by remember(progressColor) {
         mutableStateOf(progressColor.firstOrNull() ?: Color.Yellow)
     }
+
     LaunchedEffect(currentSec) {
         for (i in progressColor.indices) {
             // currentSec로 하면 색상 변경이 좀 늦어져서, 1초 뒤 변경될 progress 기준으로 계산
@@ -109,8 +113,8 @@ private fun ToHotAnimateTimeProgressContainerInternal(
         label = "animateProgressColor"
     )
 
-    val progressAnimatable = remember { Animatable(1f) }
     LaunchedEffect(key1 = destinationSec, key2 = enable) {
+        var prevTic = 0
         if (enable) {
             // 현재 progressValue -> 0.0 까지 필요한 destination 계산
             val progressDuration = duration * (progressAnimatable.value / 1f)
@@ -122,9 +126,11 @@ private fun ToHotAnimateTimeProgressContainerInternal(
                 )
             ) {
                 currentSec = ceil((this.value * maxTimeSec)).toInt()
+                if (prevTic != currentSec) {
+                    prevTic = currentSec
+                    onTicChanged(prevTic.toFloat())
+                }
             }
-            delay(completionDelayMillis)
-            onTicChanged((progressAnimatable.value * maxTimeSec))
         }
     }
 
@@ -160,6 +166,7 @@ private fun ToHotAnimateTimeProgressContainerPreview() {
         enable = true,
         onEnd = {},
         duration = 1000,
-        maxTimer = 5
+        maxTimer = 5,
+        onTicChanged = {}
     )
 }

feature/tohot/src/main/java/tht/feature/tohot/tohot/route/ToHotRoute.kt

@@ -225,6 +225,7 @@ internal fun ToHotRoute(
                         alarmClickListener = toHotViewModel::alarmClickEvent,
                         pageChanged = toHotViewModel::userChangeEvent,
                         onTimerEnd = toHotViewModel::onTimerEnd,
+                        onTicChanged = toHotViewModel::onTicChanged,
                         loadFinishListener = toHotViewModel::userCardLoadFinishEvent,
                         onLikeClick = toHotViewModel::userHeartEvent,
                         onUnLikeClick = toHotViewModel::userDislikeEvent,

feature/tohot/src/main/java/tht/feature/tohot/tohot/screen/ToHotScreen.kt

@@ -51,6 +51,7 @@ internal fun ToHotScreen(
     alarmClickListener: () -> Unit = { },
     pageChanged: (Int) -> Unit,
     onTimerEnd: (Int) -> Unit,
+    onTicChanged: (Float, Int) -> Unit,
     onLikeClick: (Int) -> Unit = { },
     onUnLikeClick: (Int) -> Unit = { },
     onReportMenuClick: () -> Unit = { },
@@ -117,6 +118,7 @@ internal fun ToHotScreen(
                         onFallingAnimationFinish = { onFallingAnimationFinish(idx) },
                         userCardClick = { },
                         onReportMenuClick = onReportMenuClick,
+                        onTicChanged = { onTicChanged(it, idx) },
                         onTimerEnd = { onTimerEnd(idx) },
                         onLikeClick = { onLikeClick(idx) },
                         onUnLikeClick = { onUnLikeClick(idx) },
@@ -178,6 +180,7 @@ fun ToHotScreenPreview() {
         alarmClickListener = { },
         pageChanged = { },
         onTimerEnd = { },
+        onTicChanged = { _, _ -> },
         loadFinishListener = { _, _, _ -> },
         onLikeClick = { },
         onUnLikeClick = { },

feature/tohot/src/main/java/tht/feature/tohot/tohot/viewmodel/ToHotViewModel.kt

@@ -487,24 +487,19 @@ class ToHotViewModel @Inject constructor(
         tryScrollToNext(userIdx)
     }
 
-    /**
-     * timer tic 이 변경될 때 호출
-     * - timer 가 0이면 다음 유저 스크롤
-     * - timer 가 0이 아니면 timer 를 1 감소
-     */
-    fun ticChangeEvent(tic: Float, userIdx: Int) = with(store.state.value) {
+    fun onTicChanged(tic: Float, userIdx: Int) = with(store.state.value) {
         Log.d("Timer", "ticChangeEvent => $tic from $userIdx => enableTimerIdx[$enableTimerIdx]")
-        if (userIdx != enableTimerIdx) return@with
+        if (userIdx != enableTimerIdx) return
+        if (userIdx !in userList.list.indices) return
         if (tic <= 0) {
-            tryScrollToNext(userIdx)
+            onTimerEnd(userIdx)
             return
         }
-        if (userIdx !in userList.list.indices) return
-        intent {
-            reduce {
-                it.copy(
-                    shakingCard = tic <= SHAKING_ANIMATION_START_TIC
-                )
+        if (tic <= SHAKING_ANIMATION_START_TIC) {
+            intent {
+                reduce {
+                    it.copy(shakingCard = true)
+                }
             }
         }
     }