diff --git a/presentation/src/main/java/com/sopt/presentation/auth/login/navigation/LoginNavigation.kt b/presentation/src/main/java/com/sopt/presentation/auth/login/navigation/LoginNavigation.kt index 9fe0f61b..88d371bf 100644 --- a/presentation/src/main/java/com/sopt/presentation/auth/login/navigation/LoginNavigation.kt +++ b/presentation/src/main/java/com/sopt/presentation/auth/login/navigation/LoginNavigation.kt @@ -49,6 +49,7 @@ fun NavGraphBuilder.loginNavGraph( OnboardingRoute( authId = args.authId, navigateToSignUp = { authId -> + navHostController.popBackStack() navHostController.navigateSignUp(authId) } ) diff --git a/presentation/src/main/java/com/sopt/presentation/auth/signup/checkInvite/navigation/CheckInviteNavigation.kt b/presentation/src/main/java/com/sopt/presentation/auth/signup/checkInvite/navigation/CheckInviteNavigation.kt index 7ae6e68a..e2f0a90e 100644 --- a/presentation/src/main/java/com/sopt/presentation/auth/signup/checkInvite/navigation/CheckInviteNavigation.kt +++ b/presentation/src/main/java/com/sopt/presentation/auth/signup/checkInvite/navigation/CheckInviteNavigation.kt @@ -31,8 +31,14 @@ fun NavGraphBuilder.checkInviteNavGraph( val args = it.toRoute() CheckInviteRoute( name = args.name, - navigateToGroup = { navHostController.navigateGroup() }, - navigateToInputGroupCode = { navHostController.navigateInputGroupCode() } + navigateToGroup = { + navHostController.popBackStack() + navHostController.navigateGroup() + }, + navigateToInputGroupCode = { + navHostController.popBackStack() + navHostController.navigateInputGroupCode() + } ) } } diff --git a/presentation/src/main/java/com/sopt/presentation/auth/signup/inputGroupCode/navigation/InputGroupCodeNavigation.kt b/presentation/src/main/java/com/sopt/presentation/auth/signup/inputGroupCode/navigation/InputGroupCodeNavigation.kt index 9452ba03..3c60c97c 100644 --- a/presentation/src/main/java/com/sopt/presentation/auth/signup/inputGroupCode/navigation/InputGroupCodeNavigation.kt +++ b/presentation/src/main/java/com/sopt/presentation/auth/signup/inputGroupCode/navigation/InputGroupCodeNavigation.kt @@ -5,6 +5,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable import com.sopt.core.navigation.Route +import com.sopt.presentation.auth.login.navigation.Login import com.sopt.presentation.auth.signup.inputGroupCode.InputGroupCodeRoute import com.sopt.presentation.group.navigation.navigateGroup import kotlinx.serialization.Serializable @@ -14,7 +15,9 @@ fun NavController.navigateInputGroupCode( ) { navigate( route = InputGroupCode, - navOptions = navOptions + navOptions = navOptions ?: NavOptions.Builder() + .setPopUpTo(Login, inclusive = false) + .build() ) } @@ -24,7 +27,10 @@ fun NavGraphBuilder.inputGroupCodeNavGraph( composable { InputGroupCodeRoute( navigateUp = { navHostController.navigateUp() }, - navigateToGroup = { navHostController.navigateGroup() } + navigateToGroup = { + navHostController.popBackStack() + navHostController.navigateGroup() + } ) } } diff --git a/presentation/src/main/java/com/sopt/presentation/auth/signup/navigation/SignUpNavigation.kt b/presentation/src/main/java/com/sopt/presentation/auth/signup/navigation/SignUpNavigation.kt index 534e9939..c93bec21 100644 --- a/presentation/src/main/java/com/sopt/presentation/auth/signup/navigation/SignUpNavigation.kt +++ b/presentation/src/main/java/com/sopt/presentation/auth/signup/navigation/SignUpNavigation.kt @@ -28,6 +28,7 @@ fun NavGraphBuilder.signUpNavGraph( SignUpRoute( authId = args.authId, navigateToCheckInvite = { name -> + navHostController.popBackStack() navHostController.navigateCheckInvite(name) } )