File tree Expand file tree Collapse file tree
app/src/main/java/com/kuit/ourmenu Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ class MenuFolderRepository @Inject constructor(
1414 }
1515
1616 suspend fun getMenuFolderDetail (
17- menuFolderId : Int ,
17+ menuFolderId : Long ,
1818 sortOrder : String ,
1919 ) = runCatching {
2020 menuFolderService.getMenuFolderDetails(
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ interface MenuFolderService {
1414
1515 @GET(" api/menu-folders/{menuFolderId}/menus" )
1616 suspend fun getMenuFolderDetails (
17- @Path(" menuFolderId" ) menuFolderId : Int ,
17+ @Path(" menuFolderId" ) menuFolderId : Long ,
1818 @Query(" sortOrder" ) sortOrder : String ,
1919 ): BaseResponse <MenuFolderDetailResponse >
2020
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ fun NavController.navigateToMenuFolder(navOptions: NavOptions) {
1616}
1717
1818// 이동 이벤트 (menuFolderId 전달)
19- fun NavController.navigateToMenuFolderDetail (menuFolderId : Int ) {
19+ fun NavController.navigateToMenuFolderDetail (menuFolderId : Long ) {
2020 navigate(Routes .MenuFolderDetail (menuFolderId))
2121}
2222
@@ -28,7 +28,7 @@ fun NavController.navigateToAddMenu() {
2828 navigate(Routes .AddMenu )
2929}
3030
31- fun NavController.navigateToMenuInfo (menuId : Int ) {
31+ fun NavController.navigateToMenuInfo (menuId : Long ) {
3232 navigate(Routes .MenuInfo (menuId))
3333}
3434
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ import com.kuit.ourmenu.ui.theme.ourMenuTypography
4545
4646@Composable
4747fun MenuFolderDetailScreen (
48- menuFolderId : Int ,
48+ menuFolderId : Long ,
4949 onNavigateToMenuInfo : (Int ) -> Unit ,
5050// onNavigateToMap: () -> Unit, // TODO: Map으로 화면 이동 구현
5151 onNavigateToAddMenu : () -> Unit ,
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ class MenuFolderDetailViewModel @Inject constructor(
1818 private val _menuFolderDetail = MutableStateFlow (MenuFolderDetailResponse ())
1919 val menuFolderDetail = _menuFolderDetail .asStateFlow()
2020
21- private val _menuFolderId = MutableStateFlow (0 )
21+ private val _menuFolderId = MutableStateFlow < Long > (0 )
2222 val menuFolderId = _menuFolderId .asStateFlow()
2323
2424 private val _sortOrder = MutableStateFlow (SortOrderType .TITLE_ASC )
@@ -31,7 +31,7 @@ class MenuFolderDetailViewModel @Inject constructor(
3131 val isLoading = _isLoading .asStateFlow()
3232
3333 fun getMenuFolderDetail (
34- menuFolderId : Int ,
34+ menuFolderId : Long ,
3535 sortOrder : SortOrderType = _sortOrder .value
3636 ) {
3737 _menuFolderId .value = menuFolderId
@@ -57,7 +57,7 @@ class MenuFolderDetailViewModel @Inject constructor(
5757 }
5858 }
5959
60- fun updateSortOrder (sortOrderType : SortOrderType , menuFolderId : Int ) {
60+ fun updateSortOrder (sortOrderType : SortOrderType , menuFolderId : Long ) {
6161 if (_sortOrder .value != sortOrderType) {
6262 _sortOrder .value = sortOrderType
6363 getMenuFolderDetail(menuFolderId, sortOrderType)
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ class MainNavController(
9595 }
9696
9797 // Menu Folder
98- fun navigateToMenuFolderDetail (menuFolderId : Int ) {
98+ fun navigateToMenuFolderDetail (menuFolderId : Long ) {
9999 navController.navigateToMenuFolderDetail(menuFolderId)
100100 }
101101
Original file line number Diff line number Diff line change @@ -8,13 +8,13 @@ sealed interface Routes{
88 @Serializable
99 data object MenuFolder : Routes
1010 @Serializable
11- data class MenuFolderDetail (val menuFolderId : Int ): Routes
11+ data class MenuFolderDetail (val menuFolderId : Long ): Routes
1212 @Serializable
1313 data object MenuFolderAllMenu : Routes
1414
1515 // 메뉴
1616 @Serializable
17- data class MenuInfo (val menuId : Int ): Routes
17+ data class MenuInfo (val menuId : Long ): Routes
1818 @Serializable
1919 data object MenuInfoMap : Routes
2020
You can’t perform that action at this time.
0 commit comments