From 2a0f56bb495a2339fa2b5fc0d15ff76274595560 Mon Sep 17 00:00:00 2001 From: KwonDae Date: Sun, 31 Jul 2022 14:05:34 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=95=BD=EC=86=8D=20=EA=B1=B0?= =?UTF-8?q?=EC=A0=88=ED=99=94=EB=A9=B4=EC=9C=BC=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=EB=B0=B1=EC=8A=A4=ED=83=9D=20=EA=B4=80=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/main/PlanzScreen.kt | 128 +++++++++--------- 1 file changed, 66 insertions(+), 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 index 494ed8ea..df87da74 100644 --- 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) {