[FEAT/#162] 네비게이션 구현

SOPT-all · Jan 23, 2025 · 8deaf56 · 8deaf56
1 parent 6a1c7ed
commit 8deaf56
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/app/src/main/java/com/spoony/spoony/presentation/main/MainScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/main/MainScreen.kt
@@ -131,7 +131,8 @@ fun MainScreen(
                 )
 
                 mapSearchNavGraph(
-                    paddingValues = paddingValues
+                    paddingValues = paddingValues,
+                    navigateUp = navigator::navigateUp
                 )
             }
         }

diff --git a/app/src/main/java/com/spoony/spoony/presentation/map/search/MapSearchScreen.kt b/app/src/main/java/com/spoony/spoony/presentation/map/search/MapSearchScreen.kt
@@ -28,6 +28,7 @@ import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun MapSearchRoute(
+    navigateUp: () -> Unit,
     viewModel: MapSearchViewModel = hiltViewModel()
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
@@ -40,6 +41,7 @@ fun MapSearchRoute(
         onSearchButtonClick = viewModel::searchLocation,
         onDeleteButtonClick = {},
         onResultItemClick = {},
+        onBackButtonClick = navigateUp,
         onDeleteAllButtonClick = viewModel::initRecentSearch
     )
 }
@@ -50,6 +52,7 @@ private fun MapSearchScreen(
     recentSearchList: ImmutableList<String>,
     locationModelList: UiState<ImmutableList<LocationModel>>,
     onSearchKeywordChanged: (String) -> Unit,
+    onBackButtonClick: () -> Unit,
     onSearchButtonClick: () -> Unit,
     onDeleteButtonClick: () -> Unit,
     onResultItemClick: (Int) -> Unit,
@@ -59,7 +62,8 @@ private fun MapSearchScreen(
         MapSearchTopAppBar(
             value = searchKeyword,
             onValueChanged = onSearchKeywordChanged,
-            onSearchAction = onSearchButtonClick
+            onSearchAction = onSearchButtonClick,
+            onBackButtonClick = onBackButtonClick
         )
 
         when {

diff --git a/app/src/main/java/com/spoony/spoony/presentation/map/search/component/MapSearchTopAppBar.kt b/app/src/main/java/com/spoony/spoony/presentation/map/search/component/MapSearchTopAppBar.kt
@@ -13,11 +13,13 @@ import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme
 fun MapSearchTopAppBar(
     value: String,
     onValueChanged: (String) -> Unit,
+    onBackButtonClick: () -> Unit,
     modifier: Modifier = Modifier,
     onSearchAction: () -> Unit
 ) {
     SpoonyBasicTopAppBar(
         showBackButton = true,
+        onBackButtonClick = onBackButtonClick,
         modifier = modifier
             .background(SpoonyAndroidTheme.colors.white)
     ) {

diff --git a/...src/main/java/com/spoony/spoony/presentation/map/search/navigation/MapSearchNavigation.kt b/...src/main/java/com/spoony/spoony/presentation/map/search/navigation/MapSearchNavigation.kt
@@ -16,10 +16,13 @@ fun NavController.navigateToMapSearch(
 }
 
 fun NavGraphBuilder.mapSearchNavGraph(
-    paddingValues: PaddingValues
+    paddingValues: PaddingValues,
+    navigateUp: () -> Unit
 ) {
     composable<MapSearch> {
-        MapSearchRoute()
+        MapSearchRoute(
+            navigateUp = navigateUp
+        )
     }
 }