Skip to content

Commit 4d81242

Browse files
committed
[FEAT]: 검색된 메뉴 클릭시 메뉴 상세정보 화면으로의 네비게이션 구현
1 parent eaffbe6 commit 4d81242

6 files changed

Lines changed: 36 additions & 12 deletions

File tree

app/src/main/java/com/kuit/ourmenu/ui/common/bottomsheet/MenuInfoBottomSheetContent.kt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.kuit.ourmenu.ui.common.bottomsheet
22

3+
import android.util.Log
34
import androidx.compose.foundation.Image
5+
import androidx.compose.foundation.clickable
46
import androidx.compose.foundation.layout.Arrangement
57
import androidx.compose.foundation.layout.Box
68
import androidx.compose.foundation.layout.Column
@@ -38,12 +40,17 @@ import com.kuit.ourmenu.utils.ExtensionUtil.toWon
3840
@Composable
3941
fun MenuInfoBottomSheetContent(
4042
modifier: Modifier = Modifier,
41-
menuInfoData: MapDetailResponse
43+
menuInfoData: MapDetailResponse,
44+
onClick: (Long) -> Unit
4245
) {
4346
Column(
4447
modifier = modifier
4548
.fillMaxWidth()
4649
.padding(horizontal = 20.dp)
50+
.clickable {
51+
Log.d("MenuInfoBottomSheetContent", "Menu ID: ${menuInfoData.menuId}")
52+
onClick(menuInfoData.menuId)
53+
}
4754
) {
4855
MenuInfoContent(
4956
modifier = Modifier
@@ -201,5 +208,7 @@ private fun MenuInfoBottomSheetContentPreview() {
201208
mapX = 127.0,
202209
mapY = 37.0
203210
)
204-
)
211+
){
212+
// 클릭시 동작
213+
}
205214
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import kotlinx.coroutines.launch
5656
@Composable
5757
fun MenuFolderAllMenuScreen(
5858
onNavigateBack: () -> Unit,
59-
onNavigateToMenuInfo: (Int) -> Unit,
59+
onNavigateToMenuInfo: (Long) -> Unit,
6060
// onNavigateToMap: () -> Unit, // TODO: Map으로 화면 이동 구현
6161
onNavigateToAddMenu: () -> Unit,
6262
viewModel: MenuFolderAllViewModel = hiltViewModel()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fun MainNavHost(
7373
)
7474

7575
searchMenuNavGraph(
76-
padding = padding,
76+
navigateToMenuDetail = navController::navigateToMenuInfo,
7777
)
7878

7979
myNavGraph(

app/src/main/java/com/kuit/ourmenu/ui/searchmenu/component/SearchBottomSheetContent.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,19 @@ import com.kuit.ourmenu.ui.common.bottomsheet.MenuInfoBottomSheetContent
1414
@Composable
1515
fun SearchBottomSheetContent(
1616
modifier: Modifier = Modifier,
17-
dataList: List<MapDetailResponse>
17+
dataList: List<MapDetailResponse>,
18+
onItemClick: (Long) -> Unit
1819
) {
1920
LazyColumn(
2021
modifier = modifier
2122
) {
2223
items(dataList.size) { index ->
2324
MenuInfoBottomSheetContent(
2425
modifier = Modifier.padding(vertical = 20.dp),
25-
menuInfoData = dataList[index]
26+
menuInfoData = dataList[index],
27+
onClick = { menuId ->
28+
onItemClick(menuId)
29+
}
2630
)
2731
if (index != dataList.size - 1) {
2832
HorizontalDivider()
@@ -54,5 +58,7 @@ private fun SearchBottomSheetContentPreview() {
5458
mapY = 37.0
5559
)
5660
)
57-
)
61+
){
62+
63+
}
5864
}

app/src/main/java/com/kuit/ourmenu/ui/searchmenu/navigation/SearchMenuNavigation.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.kuit.ourmenu.ui.searchmenu.navigation
22

3-
import androidx.compose.foundation.layout.PaddingValues
43
import androidx.navigation.NavController
54
import androidx.navigation.NavGraphBuilder
65
import androidx.navigation.NavOptions
@@ -13,10 +12,12 @@ fun NavController.navigateToSearchMenu(navOptions: NavOptions) {
1312
}
1413

1514
fun NavGraphBuilder.searchMenuNavGraph(
16-
padding: PaddingValues,
1715
// navigate 이벤트
16+
navigateToMenuDetail: (Long) -> Unit,
1817
) {
1918
composable<MainTabRoute.Map> {
20-
SearchMenuScreen()
19+
SearchMenuScreen(
20+
onNavigateToMenuDetail = navigateToMenuDetail
21+
)
2122
}
2223
}

app/src/main/java/com/kuit/ourmenu/ui/searchmenu/screen/SearchMenuScreen.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import kotlinx.coroutines.launch
5252
fun SearchMenuScreen(
5353
modifier: Modifier = Modifier,
5454
viewModel: SearchMenuViewModel = hiltViewModel(),
55+
onNavigateToMenuDetail: (Long) -> Unit
5556
) {
5657

5758
val scaffoldState = rememberBottomSheetScaffoldState()
@@ -143,7 +144,11 @@ fun SearchMenuScreen(
143144
sheetContent = {
144145
SearchBottomSheetContent(
145146
modifier = Modifier.fillMaxWidth(),
146-
dataList = menusOnPin ?: emptyList()
147+
dataList = menusOnPin ?: emptyList(),
148+
onItemClick = { menuId ->
149+
Log.d("SearchMenuScreen", "바텀 시트 메뉴 아이템 클릭: $menuId")
150+
onNavigateToMenuDetail(menuId)
151+
}
147152
)
148153
},
149154
sheetContainerColor = NeutralWhite,
@@ -246,5 +251,8 @@ fun SearchMenuScreen(
246251
@Preview(showBackground = true)
247252
@Composable
248253
private fun SearchMenuScreenPreview() {
249-
SearchMenuScreen()
254+
SearchMenuScreen(
255+
){
256+
257+
}
250258
}

0 commit comments

Comments
 (0)