Skip to content

Commit 9da28ab

Browse files
committed
[feat]: menu folder all 화면 이동 구현 (#65)
1 parent 3bb6d56 commit 9da28ab

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

app/src/main/java/com/kuit/ourmenu/ui/menuFolder/navigation/MenuFolderNavigation.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ fun NavGraphBuilder.menuFolderNavGraph(
5959
composable<Routes.MenuFolderAllMenu> {
6060
MenuFolderAllMenuScreen(
6161
onNavigateBack = navigateBack,
62-
// onNavigateToMenuInfo = navigateToMenuFolderDetail, // TODO: Menu Info로 화면 이동 구현
62+
onNavigateToMenuInfo = navigateToMenuFolderDetail,
6363
// onNavigateToMenuInfoMap = navigateToMenuFolderDetail, // TODO: Map으로 화면 이동 구현
64-
// onNavigateToAddMenu = {}, // TODO: AddMenu로 화면 이동 구현
64+
onNavigateToAddMenu = navigateToAddMenu,
6565
)
6666
}
6767
}

app/src/main/java/com/kuit/ourmenu/ui/menuFolder/screen/MenuFolderAllMenuScreen.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ import kotlinx.coroutines.launch
5656
@Composable
5757
fun MenuFolderAllMenuScreen(
5858
onNavigateBack: () -> Unit,
59+
onNavigateToMenuInfo: (Int) -> Unit,
60+
// onNavigateToMap: () -> Unit, // TODO: Map으로 화면 이동 구현
61+
onNavigateToAddMenu: () -> Unit,
5962
viewModel: MenuFolderAllViewModel = hiltViewModel()
6063
) {
6164
val menus by viewModel.menuFolderAll.collectAsStateWithLifecycle()
@@ -101,7 +104,8 @@ fun MenuFolderAllMenuScreen(
101104
coroutineScope.launch {
102105
val tagFilterCount = selectedTags.size
103106

104-
val isPriceChanged = minPrice != null && minPrice != 0L || maxPrice != null && maxPrice != 50000L
107+
val isPriceChanged =
108+
minPrice != null && minPrice != 0L || maxPrice != null && maxPrice != 50000L
105109
val priceFilterCount = if (isPriceChanged) 1 else 0
106110

107111
filterCount = tagFilterCount + priceFilterCount
@@ -193,10 +197,10 @@ fun MenuFolderAllMenuScreen(
193197
MenuFolderMenuButton(
194198
menuFolderDetail = menus[index],
195199
onMenuClick = {
196-
// navController.navigate(route = Routes.MenuInfo)
200+
onNavigateToMenuInfo(menus[index].menuId)
197201
},
198202
onMapClick = {
199-
// navController.navigate(route = Routes.MenuInfoMap)
203+
// onNavigateToMap()
200204
}
201205
)
202206
}
@@ -206,7 +210,7 @@ fun MenuFolderAllMenuScreen(
206210
stringResource(R.string.add_menu),
207211
modifier = Modifier.padding(start = 20.dp, end = 20.dp, top = 20.dp)
208212
) {
209-
// navController.navigate(route = Routes.AddMenu)
213+
onNavigateToAddMenu()
210214
}
211215
}
212216
}

app/src/main/java/com/kuit/ourmenu/ui/navigator/MainNavHost.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ fun MainNavHost(
9090
composable<Routes.MenuFolderAllMenu> {
9191
MenuFolderAllMenuScreen(
9292
onNavigateBack = navController::navigateUp,
93-
// TODO: 나머지 navigate 작성
93+
onNavigateToMenuInfo = navController::navigateToMenuInfo,
94+
// onNavigateToMap = navController::navigateToMenuInfoMap,
95+
onNavigateToAddMenu = navController::navigateToAddMenu
9496
)
9597
}
9698

0 commit comments

Comments
 (0)