[CAT-297] 온보딩 RIVE 애니메이션 적용 액션 변경 / RIVE Version Upgrade

app/src/main/java/com/pomonyang/mohanyang/MainActivity.kt

@@ -47,6 +47,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 
 @OptIn(DelicateCoroutinesApi::class)
@@ -95,7 +96,7 @@ class MainActivity : ComponentActivity() {
                 getTokenByDeviceIdUseCase()
                     .onSuccess {
                         userRepository.fetchMyInfo().onSuccess {
-                            if (it.cat.no == -1) isNewUser = true
+                            isNewUser = it.cat.no == -1
                         }
                         pomodoroSettingRepository.fetchPomodoroSettingList()
                         showDialog = false
@@ -104,7 +105,14 @@ class MainActivity : ComponentActivity() {
                     }
             }
 
-            runBlocking { initializeInfo() }
+            runBlocking {
+                try {
+                    withTimeout(SPLASH_DELAY) {
+                        initializeInfo()
+                    }
+                } catch (ignored: Exception) {
+                }
+            }
 
             MnTheme {
                 val mohaNyangAppState = rememberMohaNyangAppState(

gradle/libs.versions.toml

@@ -44,7 +44,7 @@ google-services = "4.4.2"
 permission = "0.35.1-alpha"
 startup = "1.1.1"
 lottie = "6.0.0"
-rive = "8.7.0"
+rive = "9.6.4"
 
 [libraries]
 # Compose

presentation/src/main/java/com/pomonyang/mohanyang/presentation/component/CatRive.kt

@@ -25,7 +25,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.zIndex
 import app.rive.runtime.kotlin.RiveAnimationView
-import app.rive.runtime.kotlin.core.ExperimentalAssetLoader
 import com.pomonyang.mohanyang.presentation.designsystem.token.MnSpacing
 import com.pomonyang.mohanyang.presentation.designsystem.tooltip.MnTooltipDefaults
 import com.pomonyang.mohanyang.presentation.designsystem.tooltip.TooltipAnchor
@@ -35,7 +34,6 @@ import com.pomonyang.mohanyang.presentation.util.clickableSingle
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.delay
 
-@OptIn(ExperimentalAssetLoader::class)
 @Composable
 fun CatRive(
     @RawRes riveResource: Int,
@@ -45,6 +43,7 @@ fun CatRive(
     riveAnimationName: String? = null,
     stateMachineName: String? = null,
     stateMachineInput: String? = null,
+    fireState: String? = null,
     onRiveClick: (RiveAnimationView) -> Unit = {}
 ) {
     val catRiveModifier = if (tooltipMessage != null) {
@@ -58,25 +57,25 @@ fun CatRive(
         RiveAnimationView(context)
     }
 
-    LaunchedEffect(stateMachineInput, riveAnimationName) {
-        if (stateMachineName != null
-        ) {
+    LaunchedEffect(riveAnimationName) {
+        riveView.setRiveResource(
+            resId = riveResource,
+            stateMachineName = stateMachineName,
+            autoplay = isAutoPlay,
+            animationName = riveAnimationName
+        )
+    }
+
+    LaunchedEffect(stateMachineInput) {
+        if (stateMachineName != null && stateMachineInput != null) {
             riveView.reset()
-            riveView.apply {
-                setRiveResource(
-                    resId = riveResource,
-                    stateMachineName = stateMachineName,
-                    autoplay = isAutoPlay,
-                    animationName = riveAnimationName
-                )
-            }
-            if (stateMachineInput != null) riveView.setBooleanState(stateMachineName, stateMachineInput, true)
+            riveView.setBooleanState(stateMachineName, stateMachineInput, true)
+        }
+    }
 
-            if (riveAnimationName != null) {
-                riveView.play(riveAnimationName)
-            } else {
-                riveView.play()
-            }
+    LaunchedEffect(fireState) {
+        if (stateMachineName != null && fireState != null) {
+            riveView.fireState(stateMachineName, fireState)
         }
     }
 

presentation/src/main/java/com/pomonyang/mohanyang/presentation/model/cat/CatType.kt

@@ -12,7 +12,6 @@ enum class CatType(
     val restEndPushContent: Int,
     val backgroundPushContent: Int,
     val messages: List<String>,
-    val onBoardingRiveCat: String,
     val pomodoroRiveCat: String,
     val catFireInput: String
 ) {
@@ -22,7 +21,6 @@ enum class CatType(
         timerEndPushContent = R.string.cat_cheese_timer_end_push,
         restEndPushContent = R.string.cat_cheese_rest_end_push,
         backgroundPushContent = R.string.cat_cheese_background_push,
-        onBoardingRiveCat = "stretch_Cheese Cat",
         pomodoroRiveCat = "cheeseCat",
         messages = listOf(
             "나랑 함께할 시간이다냥!",
@@ -37,7 +35,6 @@ enum class CatType(
         timerEndPushContent = R.string.cat_black_timer_end_push,
         restEndPushContent = R.string.cat_black_rest_end_push,
         backgroundPushContent = R.string.cat_black_background_push,
-        onBoardingRiveCat = "stretch_Black Cat",
         pomodoroRiveCat = "blackCat",
         messages = listOf(
             "나랑 함께할 시간이다냥!",
@@ -52,7 +49,6 @@ enum class CatType(
         timerEndPushContent = R.string.cat_three_timer_end_push,
         restEndPushContent = R.string.cat_cheese_rest_end_push,
         backgroundPushContent = R.string.cat_three_background_push,
-        onBoardingRiveCat = "stretch_Calico Cat",
         pomodoroRiveCat = "calicoCat",
         messages = listOf(
             "“시간이 없어서\"는 변명이다냥",

presentation/src/main/java/com/pomonyang/mohanyang/presentation/screen/mypage/profile/CatProfileScreen.kt

@@ -13,14 +13,12 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import app.rive.runtime.kotlin.core.ExperimentalAssetLoader
 import com.mohanyang.presentation.R
 import com.pomonyang.mohanyang.presentation.component.CatRive
 import com.pomonyang.mohanyang.presentation.designsystem.button.box.MnBoxButton
@@ -68,7 +66,6 @@ internal fun CatProfileRoute(
     )
 }
 
-@OptIn(ExperimentalAssetLoader::class)
 @Composable
 private fun CatProfileScreen(
     state: CatProfileState,
@@ -112,14 +109,9 @@ private fun CatProfileScreen(
                 isAutoPlay = false,
                 modifier = Modifier.fillMaxWidth(),
                 tooltipMessage = stringResource(id = R.string.cat_profile_tooltip),
-                riveResource = R.raw.cat_rest,
-                stateMachineName = "State Machine_Home",
-                stateMachineInput = state.catType.pomodoroRiveCat,
-                onRiveClick = remember {
-                    {
-                        it.fireState("State Machine_Home", state.catType.catFireInput)
-                    }
-                }
+                riveResource = R.raw.cat_rename_2,
+                stateMachineName = "State Machine_Rename",
+                stateMachineInput = state.catType.pomodoroRiveCat
             )
 
             Row(

presentation/src/main/java/com/pomonyang/mohanyang/presentation/screen/onboarding/naming/OnboardingNamingCatScreen.kt

@@ -101,12 +101,14 @@ fun OnboardingNamingCatScreen(
             .imePadding()
 
     ) {
-        MnTopAppBar(navigationIcon = {
-            MnIconButton(
-                onClick = onBackClick,
-                iconResourceId = R.drawable.ic_chevron_left
-            )
-        })
+        MnTopAppBar(
+            navigationIcon = {
+                MnIconButton(
+                    onClick = onBackClick,
+                    iconResourceId = R.drawable.ic_chevron_left
+                )
+            }
+        )
 
         LazyColumn(
             state = listState,
@@ -120,15 +122,10 @@ fun OnboardingNamingCatScreen(
                         .padding(top = 130.dp)
                         .fillMaxWidth(),
                     isAutoPlay = false,
-                    riveAnimationName = catType.onBoardingRiveCat,
-                    stateMachineName = "State Machine_selectCat",
-                    riveResource = R.raw.cat_select,
-                    tooltipMessage = stringResource(id = R.string.naming_cat_tooltip),
-                    onRiveClick = remember {
-                        {
-                            it.fireState("State Machine_Home", catType.catFireInput)
-                        }
-                    }
+                    stateMachineInput = catType.pomodoroRiveCat,
+                    stateMachineName = "State Machine_Rename",
+                    riveResource = R.raw.cat_rename_2,
+                    tooltipMessage = stringResource(id = R.string.naming_cat_tooltip)
                 )
                 Text(
                     modifier = Modifier.padding(
@@ -146,7 +143,7 @@ fun OnboardingNamingCatScreen(
                     errorMessage = nameValidationResult.message,
                     backgroundColor = MnColor.White,
                     onValueChange = { value -> name = value },
-                    hint = catName ?: ""
+                    hint = catName
                 )
             }
         }

presentation/src/main/java/com/pomonyang/mohanyang/presentation/screen/onboarding/select/OnboardingSelectCatScreen.kt

@@ -18,7 +18,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -152,16 +151,9 @@ fun OnboardingSelectCatScreen(
                         bottom = 42.dp
                     )
                     .fillMaxWidth(),
-                riveResource = R.raw.cat_select,
-                riveAnimationName = state.selectedType?.onBoardingRiveCat,
+                riveResource = R.raw.cat_select_2,
                 stateMachineName = "State Machine_selectCat",
-                onRiveClick = remember {
-                    { view ->
-                        state.selectedType?.let {
-                            view.fireState("State Machine_selectCat", it.catFireInput)
-                        }
-                    }
-                }
+                fireState = state.selectedType?.catFireInput
             )
 
             CatCategory(

presentation/src/main/java/com/pomonyang/mohanyang/presentation/screen/pomodoro/PomodoroTimerScreen.kt

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalAssetLoader::class)
-
 package com.pomonyang.mohanyang.presentation.screen.pomodoro
 
 import androidx.activity.compose.BackHandler
@@ -24,7 +22,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.LifecycleEventEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import app.rive.runtime.kotlin.core.ExperimentalAssetLoader
 import com.mohanyang.presentation.R
 import com.pomonyang.mohanyang.presentation.component.CatRive
 import com.pomonyang.mohanyang.presentation.component.CategoryBox

presentation/src/main/java/com/pomonyang/mohanyang/presentation/screen/pomodoro/rest/PomodoroRestScreen.kt

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalAssetLoader::class)
-
 package com.pomonyang.mohanyang.presentation.screen.pomodoro.rest
 
 import androidx.activity.compose.BackHandler
@@ -23,7 +21,6 @@ import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import app.rive.runtime.kotlin.core.ExperimentalAssetLoader
 import com.mohanyang.presentation.R
 import com.pomonyang.mohanyang.presentation.component.CatRive
 import com.pomonyang.mohanyang.presentation.component.CategoryBox

presentation/src/main/java/com/pomonyang/mohanyang/presentation/screen/pomodoro/setting/PomodoroSettingScreen.kt

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalAssetLoader::class)
-
 package com.pomonyang.mohanyang.presentation.screen.pomodoro.setting
 
 import android.annotation.SuppressLint
@@ -39,7 +37,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import app.rive.runtime.kotlin.core.ExperimentalAssetLoader
 import com.mohanyang.presentation.R
 import com.pomonyang.mohanyang.presentation.component.CatRive
 import com.pomonyang.mohanyang.presentation.component.CategoryBox