[MERGE] #161 -> develop

[FIX/#161] Home 화면에서 종료 구현
teamterning · Jul 19, 2024 · f3e092a · f3e092a
2 parents 0e3366c + fc3a500
commit f3e092a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/feature/src/main/java/com/terning/feature/onboarding/splash/SplashScreen.kt b/feature/src/main/java/com/terning/feature/onboarding/splash/SplashScreen.kt
@@ -11,12 +11,14 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.flowWithLifecycle
 import androidx.navigation.NavController
+import androidx.navigation.NavOptions
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.terning.core.designsystem.component.image.TerningImage
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.feature.R
 import com.terning.feature.home.home.navigation.navigateHome
 import com.terning.feature.onboarding.signin.navigation.navigateSignIn
+import com.terning.feature.onboarding.splash.navigation.Splash
 
 @Composable
 fun SplashScreen(
@@ -45,12 +47,17 @@ fun SplashScreen(
             .collect { sideEffect ->
                 when (sideEffect) {
                     is SplashState.GetHasAccessToken -> {
-                        if (sideEffect.hasAccessToken) navController.navigateHome()
+                        if (sideEffect.hasAccessToken) navController.navigateHome(
+                            navOptions = NavOptions.Builder().setPopUpTo(
+                                 route = Splash,
+                                inclusive = true
+                            ).build()
+                        )
                         else navController.navigateSignIn()
                     }
-
                 }
             }
+
     }
 
     Column(