Skip to content

Commit eaffbe6

Browse files
committed
[FEAT]: 메뉴 상세정보 화면에서 데이터 값 ui에 반영, 네비게이션 인자 전달
1 parent 561bb69 commit eaffbe6

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

app/src/main/java/com/kuit/ourmenu/ui/menuinfo/screen/MenuInfoDefaultScreen.kt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,15 @@ import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoChipContent
2323
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoContent
2424
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoImagePager
2525
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoMapButton
26-
import com.kuit.ourmenu.ui.menuinfo.dummy.MenuInfoDummyData
2726
import com.kuit.ourmenu.ui.menuinfo.viewmodel.MenuInfoViewModel
2827
import com.kuit.ourmenu.ui.theme.Neutral300
2928
import com.kuit.ourmenu.ui.theme.NeutralWhite
3029

3130
@Composable
3231
fun MenuInfoDefaultScreen(
33-
menuId: Int,
32+
menuId: Long,
3433
onNavigateBack: () -> Unit,
35-
onNavigateToMenuFolderDetail: (Int) -> Unit,
34+
onNavigateToMenuFolderDetail: (Long) -> Unit,
3635
// onNavigateToMap: () -> Unit,
3736
viewModel: MenuInfoViewModel = hiltViewModel()
3837
) {
@@ -73,15 +72,15 @@ fun MenuInfoDefaultScreen(
7372
)
7473

7574
MenuInfoChipContent(
76-
onNavigateToMenuFolderDetail = onNavigateToMenuFolderDetail,
75+
// TODO: 메뉴 폴더 정보에 따라 변경 필요, 여러개인 경우 각 폴더에 대한 이동 구현
76+
// onNavigateToMenuFolderDetail = onNavigateToMenuFolderDetail(menuInfo.menuFolders.),
7777
menuInfoData = menuInfo
7878
)
7979

8080
MenuInfoAdditionalContent(
8181
address = menuInfo.storeAddress,
82-
// TODO: 메뉴 정보에 따라 변경 필요
83-
memoTitle = MenuInfoDummyData.dummyData.memoTitle,
84-
memoContent = MenuInfoDummyData.dummyData.memoContent
82+
memoTitle = menuInfo.menuMemoTitle,
83+
memoContent = menuInfo.menuMemoContent
8584
)
8685
}
8786
MenuInfoMapButton(
@@ -105,4 +104,11 @@ private fun MenuInfoDefaultPreview() {
105104
// val navController = rememberNavController()
106105
//
107106
// MenuInfoDefaultScreen(navController)
107+
val viewModel: MenuInfoViewModel = hiltViewModel()
108+
MenuInfoDefaultScreen(
109+
menuId = 1,
110+
onNavigateBack = {},
111+
onNavigateToMenuFolderDetail = {},
112+
viewModel = viewModel
113+
)
108114
}

0 commit comments

Comments
 (0)