[FEAT/#31] BackButton Navigation 구현

teamterning · Jul 10, 2024 · db3154b · db3154b
1 parent 35e4462
commit db3154b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 25 deletions.
diff --git a/feature/src/main/java/com/terning/feature/main/MainNavigator.kt b/feature/src/main/java/com/terning/feature/main/MainNavigator.kt
@@ -12,7 +12,7 @@ import androidx.navigation.navOptions
 import com.terning.feature.calendar.navigation.navigateCalendar
 import com.terning.feature.home.navigation.navigateHome
 import com.terning.feature.mypage.navigation.navigateMyPage
-import com.terning.feature.search.navigation.Search
+import com.terning.feature.onboarding.signin.navigation.SignIn
 import com.terning.feature.search.navigation.navigateSearch
 
 class MainNavigator(
@@ -22,7 +22,7 @@ class MainNavigator(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
 
-    val startDestination = Search
+    val startDestination = SignIn
 
     val currentTab: MainTab?
         @Composable get() = MainTab.find { tab ->

diff --git a/feature/src/main/java/com/terning/feature/main/MainScreen.kt b/feature/src/main/java/com/terning/feature/main/MainScreen.kt
@@ -16,13 +16,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.compose.NavHost
-import com.terning.core.designsystem.component.topappbar.LogoTopAppBar
-import com.terning.core.designsystem.component.topappbar.MyPageTopAppBar
-import com.terning.core.designsystem.component.topappbar.TerningBasicTopAppBar
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.White
-import com.terning.core.navigation.MainTabRoute
 import com.terning.core.util.NoRippleInteractionSource
 import com.terning.feature.calendar.navigation.calendarNavGraph
 import com.terning.feature.home.navigation.homeNavGraph
@@ -61,7 +57,7 @@ fun MainScreen(
                 myPageNavGraph()
                 signInNavGraph(navHostController = navigator.navController)
                 signUpNavGraph()
-                searchProcessNavGraph()
+                searchProcessNavGraph(navHostController = navigator.navController)
             }
         }
     }

diff --git a/feature/src/main/java/com/terning/feature/searchprocess/SearchProcessRoute.kt b/feature/src/main/java/com/terning/feature/searchprocess/SearchProcessRoute.kt
@@ -16,25 +16,31 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
 import com.terning.core.designsystem.component.textfield.SearchTextField
 import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar
-import com.terning.core.designsystem.theme.Grey500
-import com.terning.core.designsystem.theme.TerningPointTheme
+import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.extension.addFocusCleaner
 import com.terning.feature.R
 
 @Composable
-fun SearchProcessRoute() {
-    SearchProcessScreen()
+fun SearchProcessRoute(
+    navController: NavHostController,
+) {
+    SearchProcessScreen(
+        navController = navController
+
+    )
 }
 
 @Composable
 fun SearchProcessScreen(
     modifier: Modifier = Modifier,
-) {
+    navController: NavHostController,
+
+    ) {
     var text by remember { mutableStateOf("") }
 
     val focusRequester = remember { FocusRequester() }
@@ -49,7 +55,7 @@ fun SearchProcessScreen(
         topBar = {
             BackButtonTopAppBar(
                 title = stringResource(id = R.string.search_process_top_bar_title),
-                onBackButtonClick = { },
+                onBackButtonClick = { navController.popBackStack() },
                 modifier = Modifier
             )
         }
@@ -64,7 +70,7 @@ fun SearchProcessScreen(
             Text(
                 text = stringResource(id = R.string.search_process_question_text),
                 style = TerningTheme.typography.heading2,
-                color = Grey500,
+                color = TerningMain,
                 modifier = Modifier.padding(
                     vertical = 16.dp
                 )
@@ -84,11 +90,3 @@ fun SearchProcessScreen(
         }
     }
 }
-
-@Preview(showBackground = true)
-@Composable
-fun SearchProcessScreenPreview() {
-    TerningPointTheme {
-        SearchProcessScreen()
-    }
-}
diff --git a/...ure/src/main/java/com/terning/feature/searchprocess/navigation/SearchProcessNavigation.kt b/...ure/src/main/java/com/terning/feature/searchprocess/navigation/SearchProcessNavigation.kt
@@ -2,6 +2,7 @@ package com.terning.feature.searchprocess.navigation
 
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 import com.terning.core.navigation.MainTabRoute
@@ -15,9 +16,13 @@ fun NavController.navigateSearchProcess(navOptions: NavOptions? = null) {
     )
 }
 
-fun NavGraphBuilder.searchProcessNavGraph() {
+fun NavGraphBuilder.searchProcessNavGraph(
+    navHostController: NavHostController
+) {
     composable<SearchProcess> {
-        SearchProcessRoute()
+        SearchProcessRoute(
+            navController = navHostController
+        )
     }
 }