[REFACTOR/#212] Onboarding 단계 이동 시 currentRoute 파싱 대신 명시적 currentStep 인자로 대체

Author: DongChyeon

core/common/src/main/java/com/yapp/common/navigation/OrbitNavigator.kt

@@ -5,7 +5,6 @@ import androidx.compose.runtime.remember
 import androidx.navigation.NavHostController
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.rememberNavController
-import com.yapp.common.navigation.extensions.toRoute
 import com.yapp.common.navigation.route.AlarmInteractionDestination
 import com.yapp.common.navigation.route.FortuneBaseRoute
 import com.yapp.common.navigation.route.FortuneDestination
@@ -28,13 +27,13 @@ class OrbitNavigator(
         navController.navigate(OnboardingBaseRoute, navOptions)
     }
 
-    fun navigateToOnboardingNextStep(navOptions: NavOptions? = null) {
-        val currentRoute = navController.currentBackStackEntry?.destination?.route ?: return
+    fun navigateToOnboardingNextStep(currentStep: Int, navOptions: NavOptions? = null) {
+        val nextRouteClass = OnboardingDestination.nextRoute(currentStep + 1) ?: return
 
-        val currentIndex = OnboardingDestination.routes.indexOfFirst { it.toRoute() == currentRoute }
-        val nextRouteClass = OnboardingDestination.nextRoute(currentIndex + 1) ?: return
+        val nextRouteInstance = nextRouteClass.objectInstance
+            ?: error("Cannot get object instance of route class: $nextRouteClass")
 
-        navController.navigate(nextRouteClass, navOptions)
+        navController.navigate(nextRouteInstance, navOptions)
     }
 
     fun navigateToAddAlarm(navOptions: NavOptions? = null) {

core/common/src/main/java/com/yapp/common/navigation/route/OnboardingRoute.kt

@@ -6,33 +6,33 @@ import kotlin.reflect.KClass
 @Serializable
 data object OnboardingBaseRoute
 
-sealed interface OnboardingDestination {
+sealed class OnboardingDestination {
     @Serializable
-    data object Explain : OnboardingDestination
+    data object Explain : OnboardingDestination()
 
     @Serializable
-    data object AlarmTimeSelection : OnboardingDestination
+    data object AlarmTimeSelection : OnboardingDestination()
 
     @Serializable
-    data object Birthday : OnboardingDestination
+    data object Birthday : OnboardingDestination()
 
     @Serializable
-    data object TimeOfBirth : OnboardingDestination
+    data object TimeOfBirth : OnboardingDestination()
 
     @Serializable
-    data object Name : OnboardingDestination
+    data object Name : OnboardingDestination()
 
     @Serializable
-    data object Gender : OnboardingDestination
+    data object Gender : OnboardingDestination()
 
     @Serializable
-    data object Access : OnboardingDestination
+    data object Access : OnboardingDestination()
 
     @Serializable
-    data object Complete1 : OnboardingDestination
+    data object Complete1 : OnboardingDestination()
 
     @Serializable
-    data object Complete2 : OnboardingDestination
+    data object Complete2 : OnboardingDestination()
 
     companion object {
         val routes: List<KClass<out OnboardingDestination>> = listOf(

feature/navigator/build.gradle.kts

@@ -14,6 +14,7 @@ dependencies {
     implementation(libs.orbit.core)
     implementation(libs.orbit.compose)
     implementation(libs.orbit.viewmodel)
+    implementation(libs.kotlin.reflect)
     implementation(projects.feature.home)
     implementation(projects.feature.alarmInteraction)
     implementation(projects.feature.onboarding)

feature/onboarding/src/main/java/com/yapp/onboarding/OnboardingContract.kt

@@ -72,7 +72,7 @@ sealed class OnboardingContract {
     }
 
     sealed class SideEffect : com.yapp.ui.base.SideEffect {
-        data object NavigateToNextStep : SideEffect()
+        data class NavigateToNextStep(val currentStep: Int) : SideEffect()
 
         data object NavigateBack : SideEffect()
 

feature/onboarding/src/main/java/com/yapp/onboarding/OnboardingNavGraph.kt

@@ -114,8 +114,8 @@ private fun handleSideEffect(
     viewModel: OnboardingViewModel,
 ) {
     when (sideEffect) {
-        OnboardingContract.SideEffect.NavigateToNextStep -> {
-            navigator.navigateToOnboardingNextStep()
+        is OnboardingContract.SideEffect.NavigateToNextStep -> {
+            navigator.navigateToOnboardingNextStep(sideEffect.currentStep)
         }
 
         OnboardingContract.SideEffect.NavigateBack -> {

feature/onboarding/src/main/java/com/yapp/onboarding/OnboardingViewModel.kt

@@ -104,7 +104,7 @@ class OnboardingViewModel @Inject constructor(
         if (nextRoute != null) {
             savedStateHandle["currentStep"] = nextStep
             updateState { copy(currentStep = nextStep) }
-            emitSideEffect(OnboardingContract.SideEffect.NavigateToNextStep)
+            emitSideEffect(OnboardingContract.SideEffect.NavigateToNextStep(currentStep))
         } else {
             emitSideEffect(OnboardingContract.SideEffect.OnboardingCompleted)
         }

gradle/libs.versions.toml

@@ -182,6 +182,8 @@ amplitude-analytics = { group = "com.amplitude", name = "analytics-android", ver
 
 play-services-ads = { group = "com.google.android.gms", name = "play-services-ads", version.ref = "playServicesAd" }
 
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+
 [plugins]
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }