[FEATURE] #63 : 더 보기 화면에서 뒤로가기 로직 추가

pknu-wap · Dec 27, 2023 · e0fcaab · e0fcaab
1 parent eefc03e
commit e0fcaab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 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
@@ -22,9 +22,11 @@ import com.wap.wapp.feature.management.registration.survey.navigation.navigateTo
 import com.wap.wapp.feature.management.registration.survey.navigation.surveyRegistrationScreen
 import com.wap.wapp.feature.notice.navigation.navigateToNotice
 import com.wap.wapp.feature.notice.navigation.noticeScreen
+import com.wap.wapp.feature.profile.navigation.navigateToProfile
 import com.wap.wapp.feature.profile.navigation.profileNavigationRoute
 import com.wap.wapp.feature.profile.navigation.profileScreen
 import com.wap.wapp.feature.profile.profilesetting.navigation.navigateToProfileSetting
+import com.wap.wapp.feature.profile.profilesetting.navigation.profileSettingNavigationRoute
 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
@@ -86,7 +88,15 @@ fun WappNavHost(
                 )
             },
         )
-        profileSettingScreen()
+        profileSettingScreen(
+            navigateToProfile = {
+                navController.navigateToProfile(
+                    navOptions {
+                        popUpTo(profileSettingNavigationRoute) { inclusive = true }
+                    },
+                )
+            },
+        )
         managementScreen(
             navigateToSurveyRegistration = navController::navigateToSurveyRegistration,
             navigateToEventRegistration = navController::navigateToEventRegistration,

diff --git a/...profile/src/main/java/com/wap/wapp/feature/profile/profilesetting/ProfileSettingScreen.kt b/...profile/src/main/java/com/wap/wapp/feature/profile/profilesetting/ProfileSettingScreen.kt
@@ -24,13 +24,15 @@ import com.wap.wapp.feature.profile.R.string
 
 @Composable
 internal fun ProfileSettingRoute(
+    navigateToProfile: () -> Unit,
     viewModel: ProfileSettingViewModel = hiltViewModel(),
 ) {
-    ProfileSettingScreen()
+    ProfileSettingScreen(navigateToProfile)
 }
 
 @Composable
 internal fun ProfileSettingScreen(
+    navigateToProfile: () -> Unit,
     onClickedAlarmSetting: () -> Unit = {},
     onClickedSignout: () -> Unit = {},
     onClickedWithdrawal: () -> Unit = {},
@@ -50,7 +52,7 @@ internal fun ProfileSettingScreen(
         WappTopBar(
             titleRes = string.more,
             showLeftButton = true,
-            onClickLeftButton = {},
+            onClickLeftButton = navigateToProfile,
             modifier = Modifier.padding(top = 20.dp),
         )
 
@@ -159,5 +161,5 @@ internal fun ProfileSettingScreen(
 @Preview
 @Composable
 fun PreviewProfileMoreScreen() {
-    ProfileSettingScreen()
+    ProfileSettingScreen(navigateToProfile = {})
 }
diff --git a/...n/java/com/wap/wapp/feature/profile/profilesetting/navigation/ProfileSettingNavigation.kt b/...n/java/com/wap/wapp/feature/profile/profilesetting/navigation/ProfileSettingNavigation.kt
@@ -13,8 +13,8 @@ fun NavController.navigateToProfileSetting(navOptions: NavOptions? = navOptions
     this.navigate(profileSettingNavigationRoute, navOptions)
 }
 
-fun NavGraphBuilder.profileSettingScreen() {
+fun NavGraphBuilder.profileSettingScreen(navigateToProfile: () -> Unit) {
     composable(route = profileSettingNavigationRoute) {
-        ProfileSettingRoute()
+        ProfileSettingRoute(navigateToProfile)
     }
 }