fix : 약속 거절화면으로 이동 경로 수정 및 백스택 관리

YAPP-Github · Jul 31, 2022 · 2a0f56b · 2a0f56b
1 parent b56095a
commit 2a0f56b
Showing 1 changed file with 66 additions and 62 deletions.
diff --git a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
@@ -190,7 +190,11 @@ fun PlanzScreen(
  }
  },
  navigateToSendRejectedScreen = {
- navController.navigate(PlanzScreenRoute.RESPOND_PLAN_REJECT.route.plus("/{$KEY_PLAN_ID}"))
+ navController.navigate(PlanzScreenRoute.RESPOND_PLAN_REJECT.route) {
+ popUpTo(PlanzScreenRoute.RESPOND_PLAN.route.plus("/{$KEY_PLAN_ID}")) {
+ inclusive = true
+ }
+ }
  }
  )
  }
@@ -204,79 +208,79 @@ fun PlanzScreen(
  )
  }
 
- composable(route = PlanzScreenRoute.RESPOND_PLAN_COMPLETE.route) {
- RespondPlanCompleteScreen(
- navigateToPreviousScreen = { navController.popBackStack() },
- )
- }
+  composable(route = PlanzScreenRoute.RESPOND_PLAN_COMPLETE.route) {
+  RespondPlanCompleteScreen(
+  navigateToPreviousScreen = { navController.popBackStack() },
+  )
+  }
 
- composable(route = PlanzScreenRoute.RESPOND_PLAN_REJECT.route) {
- RespondPlanRejectScreen(
- userName = viewModel.getUserName(),
- navigateToPreviousScreen = { navController.popBackStack() },
- )
- }
+  composable(route = PlanzScreenRoute.RESPOND_PLAN_REJECT.route) {
+  RespondPlanRejectScreen(
+  userName = viewModel.getUserName(),
+  navigateToPreviousScreen = { navController.popBackStack() },
+  )
+  }
 
- composable(route = PlanzScreenRoute.ALREADY_CONFIRM_PLAN.route) {
- AlreadyConfirmPlanScreen(
- navigateToPreviousScreen = { navController.popBackStack() },
- )
- }
+  composable(route = PlanzScreenRoute.ALREADY_CONFIRM_PLAN.route) {
+  AlreadyConfirmPlanScreen(
+  navigateToPreviousScreen = { navController.popBackStack() },
+  )
+  }
 
- composable(route = PlanzScreenRoute.FULLED_PLAN.route) {
- FulledPlanScreen(
- navigateToPreviousScreen = { navController.popBackStack() },
- )
- }
+  composable(route = PlanzScreenRoute.FULLED_PLAN.route) {
+  FulledPlanScreen(
+  navigateToPreviousScreen = { navController.popBackStack() },
+  )
+  }
 
- composable(route = PlanzScreenRoute.CONFIRM_PLAN.route.plus("/{$KEY_PLAN_ID}"),
- arguments = listOf(
- navArgument(KEY_PLAN_ID) { type = NavType.LongType }
- )) {
- FixPlanScreen(
- navigateToPreviousScreen = { navController.popBackStack() },
- navigateToNextScreen = { planId ->
- navController.navigate(PlanzScreenRoute.DETAIL_PLAN.route.plus("/${planId}")) {
- popUpTo(PlanzScreenRoute.CONFIRM_PLAN.route.plus("/{$KEY_PLAN_ID}")) {
- inclusive = true
+ composable(route = PlanzScreenRoute.CONFIRM_PLAN.route.plus("/{$KEY_PLAN_ID}"),
+ arguments = listOf(
+ navArgument(KEY_PLAN_ID) { type = NavType.LongType }
+ )) {
+ FixPlanScreen(
+ navigateToPreviousScreen = { navController.popBackStack() },
+ navigateToNextScreen = { planId ->
+ navController.navigate(PlanzScreenRoute.DETAIL_PLAN.route.plus("/${planId}")) {
+ popUpTo(PlanzScreenRoute.CONFIRM_PLAN.route.plus("/{$KEY_PLAN_ID}")) {
+ inclusive = true
+ }
  }
- }
- },
- )
- }
+ },
+ )
+ }
 
- composable(route = PlanzScreenRoute.MY_PAGE.route) {
- MyPageScreen(
- exitMyPageScreen = { navController.popBackStack() },
- navigateToPolicyScreen = { navController.navigate(PlanzScreenRoute.PRIVACY_POLICY.route) },
- navigateToTermsScreen = { navController.navigate(PlanzScreenRoute.TERMS.route) },
- )
- }
+  composable(route = PlanzScreenRoute.MY_PAGE.route) {
+  MyPageScreen(
+  exitMyPageScreen = { navController.popBackStack() },
+  navigateToPolicyScreen = { navController.navigate(PlanzScreenRoute.PRIVACY_POLICY.route) },
+  navigateToTermsScreen = { navController.navigate(PlanzScreenRoute.TERMS.route) },
+  )
+  }
 
- composable(route = PlanzScreenRoute.PRIVACY_POLICY.route) {
- PrivacyPolicyScreen(
- exitPrivacyPolicyScreen = { navController.popBackStack() }
- )
- }
+  composable(route = PlanzScreenRoute.PRIVACY_POLICY.route) {
+  PrivacyPolicyScreen(
+  exitPrivacyPolicyScreen = { navController.popBackStack() }
+  )
+  }
 
- composable(route = PlanzScreenRoute.TERMS.route) {
- TermsScreen(
- exitTermsScreen = { navController.popBackStack() }
- )
- }
+  composable(route = PlanzScreenRoute.TERMS.route) {
+  TermsScreen(
+  exitTermsScreen = { navController.popBackStack() }
+  )
+  }
 
- composable(
- route = PlanzScreenRoute.DETAIL_PLAN.route
- .plus("/{$KEY_PLAN_ID}"),
- arguments = listOf(
- navArgument(KEY_PLAN_ID) { type = NavType.LongType }
- )
- ) {
- DetailPlanScreen(exitDetailPlanScreen = { navController.popBackStack() })
+ composable(
+ route = PlanzScreenRoute.DETAIL_PLAN.route
+ .plus("/{$KEY_PLAN_ID}"),
+ arguments = listOf(
+ navArgument(KEY_PLAN_ID) { type = NavType.LongType }
+ )
+ ) {
+ DetailPlanScreen(exitDetailPlanScreen = { navController.popBackStack() })
+ }
  }
  }
  }
-}
 
 
  bottomBarState = when (currentDestination?.route) {