From e082dd5fdcb184e35aa8049adfe00b553a220ec3 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Tue, 9 Jan 2024 15:15:38 +0900 Subject: [PATCH] =?UTF-8?q?[FEATURE]=20#93=20:=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=83=AD=EC=97=90=EC=84=9C=20=EC=84=A4=EB=AC=B8=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=EC=8B=9C=20/=20=EC=9E=91=EC=84=B1=EB=90=9C=20?= =?UTF-8?q?=EC=84=A4=EB=AC=B8=20->=20=EC=84=A4=EB=AC=B8=ED=98=95=EC=8B=9D?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/wap/wapp/navigation/WappNavHost.kt | 12 ++++++------ .../wap/wapp/feature/management/ManagementScreen.kt | 8 ++++---- .../management/navigation/ManagementNavigation.kt | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt index 85b3f29f..9d172494 100644 --- a/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt +++ b/app/src/main/java/com/wap/wapp/navigation/WappNavHost.kt @@ -18,8 +18,9 @@ import com.wap.wapp.feature.management.navigation.managementScreen import com.wap.wapp.feature.management.navigation.navigateToManagement import com.wap.wapp.feature.management.registration.event.navigation.eventRegistrationScreen import com.wap.wapp.feature.management.registration.event.navigation.navigateToEventRegistration -import com.wap.wapp.feature.management.survey.registration.navigation.navigateToSurveyRegistration -import com.wap.wapp.feature.management.survey.registration.navigation.surveyRegistrationScreen +import com.wap.wapp.feature.management.survey.navigation.navigateToSurveyFormEdit +import com.wap.wapp.feature.management.survey.navigation.navigateToSurveyFormRegistration +import com.wap.wapp.feature.management.survey.navigation.managementSurveyNavGraph import com.wap.wapp.feature.notice.navigation.navigateToNotice import com.wap.wapp.feature.notice.navigation.noticeScreen import com.wap.wapp.feature.profile.navigation.navigateToProfile @@ -30,7 +31,6 @@ import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavi import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingScreen import com.wap.wapp.feature.splash.navigation.splashNavigationRoute import com.wap.wapp.feature.splash.navigation.splashScreen -import com.wap.wapp.feature.survey.check.navigation.navigateToSurveyCheck import com.wap.wapp.feature.survey.check.navigation.surveyCheckScreen import com.wap.wapp.feature.survey.navigation.navigateToSurvey import com.wap.wapp.feature.survey.navigation.navigateToSurveyAnswer @@ -75,7 +75,7 @@ fun WappNavHost( surveyCheckScreen( navigateToManagement = navController::navigateToManagement, ) - surveyRegistrationScreen( + managementSurveyNavGraph( navigateToManagement = navController::navigateToManagement, ) eventRegistrationScreen( @@ -104,10 +104,10 @@ fun WappNavHost( }, ) managementScreen( - navigateToSurveyRegistration = navController::navigateToSurveyRegistration, + navigateToSurveyRegistration = navController::navigateToSurveyFormRegistration, navigateToEventRegistration = navController::navigateToEventRegistration, navigateToEventEdit = navController::navigateToEventEdit, - navigateToSurveyCheck = navController::navigateToSurveyCheck, + navigateToSurveyFormEdit = navController::navigateToSurveyFormEdit, ) } } diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt index 07e97f45..97d2b8c9 100644 --- a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt +++ b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementScreen.kt @@ -32,7 +32,7 @@ internal fun ManagementRoute( navigateToEventEdit: (String, String) -> Unit, navigateToEventRegistration: () -> Unit, navigateToSurveyRegistration: () -> Unit, - navigateToSurveyCheck: (String) -> Unit, + navigateToSurveyFormEdit: (String) -> Unit, viewModel: ManagementViewModel = hiltViewModel(), ) { var isShowDialog by rememberSaveable { mutableStateOf(false) } @@ -65,7 +65,7 @@ internal fun ManagementRoute( eventsState = eventsState, navigateToEventRegistration = navigateToEventRegistration, navigateToSurveyRegistration = navigateToSurveyRegistration, - navigateToSurveyCheck = navigateToSurveyCheck, + navigateToSurveyFormEdit = navigateToSurveyFormEdit, navigateToEventEdit = navigateToEventEdit, ) @@ -87,7 +87,7 @@ internal fun ManagementScreen( navigateToEventEdit: (String, String) -> Unit, navigateToEventRegistration: () -> Unit, navigateToSurveyRegistration: () -> Unit, - navigateToSurveyCheck: (String) -> Unit, + navigateToSurveyFormEdit: (String) -> Unit, ) { Scaffold( containerColor = WappTheme.colors.backgroundBlack, @@ -109,7 +109,7 @@ internal fun ManagementScreen( ManagementSurveyCard( surveyFormsState = surveyFormsState, - onCardClicked = navigateToSurveyCheck, + onCardClicked = navigateToSurveyFormEdit, onAddSurveyButtonClicked = navigateToSurveyRegistration, ) } diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/navigation/ManagementNavigation.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/navigation/ManagementNavigation.kt index 8ec0eda4..ed948b97 100644 --- a/feature/management/src/main/java/com/wap/wapp/feature/management/navigation/ManagementNavigation.kt +++ b/feature/management/src/main/java/com/wap/wapp/feature/management/navigation/ManagementNavigation.kt @@ -17,14 +17,14 @@ fun NavGraphBuilder.managementScreen( navigateToEventEdit: (String, String) -> Unit, navigateToEventRegistration: () -> Unit, navigateToSurveyRegistration: () -> Unit, - navigateToSurveyCheck: (String) -> Unit, + navigateToSurveyFormEdit: (String) -> Unit, ) { composable(route = managementNavigationRoute) { ManagementRoute( navigateToEventEdit = navigateToEventEdit, navigateToEventRegistration = navigateToEventRegistration, navigateToSurveyRegistration = navigateToSurveyRegistration, - navigateToSurveyCheck = navigateToSurveyCheck, + navigateToSurveyFormEdit = navigateToSurveyFormEdit, ) } }