fix: 네비게이션 그래프가 정상적이지 않은 문제가 수정됩니다

sejun2 · sejun2 · commit 47f248977f6c · 2025-03-03T17:01:03.000+09:00
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/core/navigation/src/main/java/com/lanpet/core/navigation/AppNavigation.kt b/core/navigation/src/main/java/com/lanpet/core/navigation/AppNavigation.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
-import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.NavHost
@@ -156,11 +155,7 @@ fun AppNavigation(
                     onNavigateToHumanAge = { navController.navigateToProfileCreateHumanAge() },
                     onNavigateToDone = { navController.navigateToProfileCreateDone() },
                     onNavigateToPreferPet = { navController.navigateToProfileCreatePreferPet() },
-                    onNavigateToMain = {
-                        navController.navigateToMainScreen(
-                            idRes = navController.graph.findStartDestination().id,
-                        )
-                    },
+                    onNavigateToMain = { navController.navigateToMainScreen() },
                     navController = navController,
                 )
 
diff --git a/core/navigation/src/main/java/com/lanpet/core/navigation/MainNavigation.kt b/core/navigation/src/main/java/com/lanpet/core/navigation/MainNavigation.kt
@@ -1,18 +1,29 @@
 package com.lanpet.core.navigation
 
+import android.annotation.SuppressLint
 import androidx.navigation.NavController
 import com.lanpet.core.common.widget.BottomNavItem
 import com.lanpet.free.navigation.FreeBoardBaseRoute
 import com.lanpet.myprofile.navigation.MyProfileBaseRoute
 import com.lanpet.wiki.navigation.WikiBaseRoute
 import kotlinx.serialization.Serializable
+import timber.log.Timber
 
+@SuppressLint("RestrictedApi")
 fun NavController.navigateToMainScreen(
-    idRes: Int,
     bottomNavItem: BottomNavItem = BottomNavItem.MyPage,
 ) {
+    val startDestinationId =
+        this.currentBackStack.value
+            .first()
+            .destination.id
+    Timber.i("navigateToMainScreen :: idRes = $startDestinationId, bottomNavItem = $bottomNavItem")
+    Timber.i("navigateToMainScreen :: currentDestination = ${currentDestination?.route}")
+    Timber.i("navigateToMainScreen :: currentBackStackEntry = ${currentBackStackEntry?.destination?.route}")
+    Timber.i("navigateToMainScreen :: currentBackStackEntryId = ${currentBackStackEntry?.destination?.id}")
+
     navigate(getBottomNavItemRoute(bottomNavItem)) {
-        popUpTo(idRes) {
+        popUpTo(startDestinationId) {
             inclusive = true
             saveState = true
         }
diff --git a/core/navigation/src/main/java/com/lanpet/core/navigation/NavigationHandler.kt b/core/navigation/src/main/java/com/lanpet/core/navigation/NavigationHandler.kt
@@ -40,7 +40,6 @@ class NavigationHandler(
                     navController.navigateToProfileCreateHasPet()
                 } else {
                     navController.navigateToMainScreen(
-                        idRes = navController.graph.startDestinationId,
                         bottomNavItem = BottomNavItem.MyPage,
                     )
                 }
diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts
@@ -14,10 +14,11 @@ android {
         compose = true
     }
 
-    dependencies {
-        implementation(projects.domain.model)
-        implementation(projects.domain.usecase)
-        implementation(projects.core.auth)
-        implementation(libs.androidx.lifecycle.viewmodel.android)
-    }
+}
+
+dependencies {
+    implementation(projects.domain.model)
+    implementation(projects.domain.usecase)
+    implementation(projects.core.auth)
+    implementation(libs.androidx.lifecycle.viewmodel.android)
 }
diff --git a/feature/auth/src/main/java/com/lanpet/feature/auth/navigation/AuthNavGraph.kt b/feature/auth/src/main/java/com/lanpet/feature/auth/navigation/AuthNavGraph.kt
@@ -1,30 +1,37 @@
 package com.lanpet.feature.auth.navigation
 
+import android.annotation.SuppressLint
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import androidx.navigation.navOptions
 import com.lanpet.feature.auth.LoginScreen
 import kotlinx.serialization.Serializable
+import timber.log.Timber
 
 fun NavGraphBuilder.authNavGraph() {
     composable<Login> {
         LoginScreen()
     }
 }
 
+@SuppressLint("RestrictedApi")
 fun NavController.navigateToLoginScreen() {
-    this.navigate(
+    val startDestinationId = this.currentBackStack.value.first().destination.id
+
+    navigate(
         Login,
-        navOptions {
-            popUpTo(0) {
-                // 0은 시작 destination 을 의미
-                inclusive = true // true: 시작 destination 도 제거, false: 시작 destination 유지
-            }
-            launchSingleTop = true // 중복 destination 방지
-        },
+        navOptions =
+            navOptions {
+                popUpTo(startDestinationId) {
+                    inclusive = true
+                    saveState = true
+                }
+                launchSingleTop = true
+                restoreState = true
+            },
     )
 }
 
 @Serializable
-object Login
+data object Login
diff --git a/feature/free/src/main/java/com/lanpet/free/navigation/FreeNavGraph.kt b/feature/free/src/main/java/com/lanpet/free/navigation/FreeNavGraph.kt
@@ -11,15 +11,13 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navOptions
 import androidx.navigation.navigation
 import com.lanpet.domain.model.free.FreeBoardComment
 import com.lanpet.free.screen.FreeBoardCommentDetailScreen
 import com.lanpet.free.screen.FreeBoardDetailScreen
 import com.lanpet.free.screen.FreeBoardScreen
 import com.lanpet.free.screen.FreeBoardWriteScreen
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlin.reflect.typeOf
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-agp = "8.7.2"
+agp = "8.7.3"
 amplifyAuthenticator = "1.4.0"
 coreSplashscreen = "1.0.1"
 datastorePreferences = "1.1.3"
-kotlinTestJunit5 = "2.0.20"
+kotlinTestJunit5 = "2.1.10"
 ktlint = "12.1.2"
 amplifyCore = "2.24.0"
 androidJunit5Version = "1.9.3.0"
@@ -13,43 +13,43 @@ browser = "1.8.0"
 coilCompose = "2.7.0"
 coilNetworkOkhttp = "3.0.3"
 coilSvg = "3.0.3"
-comGoogleDevtoolsKspGradlePlugin = "2.0.21-1.0.25"
+comGoogleDevtoolsKspGradlePlugin = "2.1.10-1.0.30"
 converterGson = "2.11.0"
 credentialsPlayServicesAuth = "1.3.0"
 credentials = "1.3.0"
 desugar_jdk_libs = "2.1.3"
 googleid = "1.1.1"
 gradle = "8.1.4"
-hiltAndroid = "2.52"
+hiltAndroid = "2.55"
 junitBom = "5.11.2"
 junitJupiterApi = "5.11.2"
 junitJupiterEngine = "5.11.2"
 junitJupiterParams = "5.11.2"
-kotlin = "2.0.21"
+kotlin = "2.1.10"
 coreKtx = "1.15.0"
 espressoCore = "3.6.1"
 kotlinGradlePlugin = "1.9.0"
 kotlinxCoroutinesTest = "1.7.3"
 lifecycleRuntimeKtx = "2.8.7"
-activityCompose = "1.9.3"
-composeBom = "2024.11.00"
+activityCompose = "1.10.1"
+composeBom = "2025.02.00"
 appcompat = "1.7.0"
 material = "1.12.0"
-jetbrainsKotlinJvm = "2.0.21"
-jetbrainsKotlinSerialization = "2.0.21"
-constraintlayout = "2.2.0"
+jetbrainsKotlinJvm = "2.1.10"
+jetbrainsKotlinSerialization = "2.1.10"
+constraintlayout = "2.2.1"
 mockkAndroid = "1.13.13"
-navigationFragmentKtx = "2.8.4"
-navigationUiKtx = "2.8.4"
+navigationFragmentKtx = "2.8.8"
+navigationUiKtx = "2.8.8"
 androidxLifecycle = "2.8.7"
-androidxNavigation = "2.8.4"
+androidxNavigation = "2.8.8"
 androidxHiltNavigationCompose = "1.2.0"
 lifecycleViewmodelAndroid = "2.8.7"
 kotlinxSerialization = "1.7.3"
 awsCore = "2.24.0"
-activity = "1.9.3"
+activity = "1.10.1"
 retrofit = "2.11.0"
-animationCore = "1.7.5"
+animationCore = "1.7.8"
 composeMaterial = "1.4.0"
 junitJupiter = "5.11.2"
 androidJunit5 = "1.11.2.0"

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ class NavigationHandler(`
`40`	`40`	`navController.navigateToProfileCreateHasPet()`
`41`	`41`	`} else {`
`42`	`42`	`navController.navigateToMainScreen(`
`43`		`- idRes = navController.graph.startDestinationId,`
`44`	`43`	`bottomNavItem = BottomNavItem.MyPage,`
`45`	`44`	`)`
`46`	`45`	`}`