Skip to content

Commit 561bb69

Browse files
committed
[REFACTOR]: id값 Int -> Long으로 수정
1 parent f6b6225 commit 561bb69

11 files changed

Lines changed: 15 additions & 13 deletions

File tree

app/src/main/java/com/kuit/ourmenu/data/model/map/response/MapDetailResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
66
@Serializable
77
data class MapDetailResponse(
88
@SerialName("menuId")
9-
val menuId: Int,
9+
val menuId: Long,
1010
@SerialName("menuTitle")
1111
val menuTitle: String,
1212
@SerialName("menuPrice")

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderAllResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import kotlinx.serialization.Serializable
44

55
@Serializable
66
data class MenuFolderAllResponse(
7-
override val menuId: Int,
7+
override val menuId: Long,
88
override val menuTitle: String,
99
override val storeTitle: String,
1010
override val storeAddress: String,

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderDetailResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ data class MenuFolderDetailResponse(
1313

1414
@Serializable
1515
data class MenuFolderDetailMenus(
16-
override val menuId: Int = 0,
16+
override val menuId: Long = 0,
1717
override val menuTitle: String = "",
1818
override val storeTitle: String = "",
1919
override val storeAddress: String = "",

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderMenuItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.kuit.ourmenu.data.model.menuFolder.response
22

33
interface MenuFolderMenuItem {
4-
val menuId: Int
4+
val menuId: Long
55
val menuTitle: String
66
val storeTitle: String
77
val storeAddress: String

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ data class MenuFolderResponse(
1010

1111
@Serializable
1212
data class MenuFolderList(
13-
val menuFolderId: Int,
13+
val menuFolderId: Long,
1414
val menuFolderTitle: String,
1515
val menuFolderImgUrl: String,
1616
val menuFolderIconImgUrl: String,

app/src/main/java/com/kuit/ourmenu/data/model/menuinfo/response/MenuInfoResponse.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ import kotlinx.serialization.Serializable
44

55
@Serializable
66
data class MenuInfoResponse(
7-
val menuId: Int = 0,
7+
val menuId: Long = 0,
88
val menuTitle: String = "",
99
val menuPrice: Int = 0,
1010
val menuPinImgUrl: String = "",
11+
val menuMemoTitle: String = "",
12+
val menuMemoContent: String = "",
1113
val storeTitle: String = "",
1214
val storeAddress: String = "",
1315
val tagImgUrls: List<String> = emptyList(),

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
@@ -34,9 +34,9 @@ fun NavController.navigateToMenuInfo(menuId: Long) {
3434

3535
fun NavGraphBuilder.menuFolderNavGraph(
3636
navigateBack: () -> Unit,
37-
navigateToMenuFolderDetail: (Int) -> Unit,
37+
navigateToMenuFolderDetail: (Long) -> Unit,
3838
navigateToMenuFolderAllMenu: () -> Unit,
39-
navigateToMenuInfo: (Int) -> Unit,
39+
navigateToMenuInfo: (Long) -> Unit,
4040
navigateToAddMenu: () -> Unit,
4141
) {
4242
composable<MainTabRoute.MenuFolder> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import com.kuit.ourmenu.ui.theme.ourMenuTypography
4646
@Composable
4747
fun MenuFolderDetailScreen(
4848
menuFolderId: Long,
49-
onNavigateToMenuInfo: (Int) -> Unit,
49+
onNavigateToMenuInfo: (Long) -> Unit,
5050
// onNavigateToMap: () -> Unit, // TODO: Map으로 화면 이동 구현
5151
onNavigateToAddMenu: () -> Unit,
5252
onNavigateBack: () -> Unit,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import com.kuit.ourmenu.ui.theme.ourMenuTypography
3737

3838
@Composable
3939
fun MenuFolderScreen(
40-
onNavigateToDetail: (Int) -> Unit,
40+
onNavigateToDetail: (Long) -> Unit,
4141
onNavigateToAllMenu: () -> Unit,
4242
onNavigateToAddMenu: () -> Unit,
4343
viewModel: MenuFolderViewModel = hiltViewModel()

app/src/main/java/com/kuit/ourmenu/ui/menuinfo/navigation/MenuInfoNavigation.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import androidx.navigation.toRoute
77
import com.kuit.ourmenu.ui.menuinfo.screen.MenuInfoDefaultScreen
88
import com.kuit.ourmenu.ui.navigator.Routes
99

10-
fun NavController.navigateToMenuInfo(menuId: Int) {
10+
fun NavController.navigateToMenuInfo(menuId: Long) {
1111
navigate(Routes.MenuInfo(menuId))
1212
}
1313

1414
fun NavGraphBuilder.menuInfoNavGraph(
1515
navigateBack: () -> Unit,
16-
navigateToMenuFolderDetail: (Int) -> Unit,
16+
navigateToMenuFolderDetail: (Long) -> Unit,
1717
navigateToMenuInfoMap: () -> Unit
1818
) {
1919
composable<Routes.MenuInfo> {

0 commit comments

Comments
 (0)