Skip to content

Commit e4a13b4

Browse files
committed
[refactor]: menu info화면 scaffold로 수정 (#65)
1 parent 9da28ab commit e4a13b4

1 file changed

Lines changed: 47 additions & 39 deletions

File tree

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

Lines changed: 47 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.padding
88
import androidx.compose.foundation.pager.rememberPagerState
99
import androidx.compose.material3.HorizontalDivider
10+
import androidx.compose.material3.Scaffold
1011
import androidx.compose.runtime.Composable
1112
import androidx.compose.runtime.LaunchedEffect
1213
import androidx.compose.runtime.getValue
@@ -16,15 +17,16 @@ import androidx.compose.ui.tooling.preview.Preview
1617
import androidx.compose.ui.unit.dp
1718
import androidx.hilt.navigation.compose.hiltViewModel
1819
import androidx.lifecycle.compose.collectAsStateWithLifecycle
20+
import com.kuit.ourmenu.ui.common.topappbar.BackButtonTopAppBar
1921
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoAdditionalContent
2022
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoChipContent
2123
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoContent
2224
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoImagePager
2325
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoMapButton
24-
import com.kuit.ourmenu.ui.menuinfo.component.info.MenuInfoTopIcons
2526
import com.kuit.ourmenu.ui.menuinfo.dummy.MenuInfoDummyData
2627
import com.kuit.ourmenu.ui.menuinfo.viewmodel.MenuInfoViewModel
2728
import com.kuit.ourmenu.ui.theme.Neutral300
29+
import com.kuit.ourmenu.ui.theme.NeutralWhite
2830

2931
@Composable
3032
fun MenuInfoDefaultScreen(
@@ -42,50 +44,56 @@ fun MenuInfoDefaultScreen(
4244
pageCount = { menuInfo.menuImgUrls.size.coerceAtLeast(1) } // 최소 1
4345
)
4446

45-
Box {
46-
Column(
47-
modifier = Modifier
48-
.fillMaxSize()
49-
) {
47+
Scaffold(
48+
topBar = {},
49+
content = { innerPadding ->
5050
Box {
51-
MenuInfoImagePager(
52-
pagerState = pagerState,
53-
imgUrls = menuInfo.menuImgUrls
54-
)
55-
MenuInfoTopIcons(
56-
onBackClick = { },
57-
onVertClick = { }
58-
)
59-
}
51+
Column(
52+
modifier = Modifier
53+
.padding(innerPadding)
54+
.fillMaxSize()
55+
) {
56+
Box {
57+
MenuInfoImagePager(
58+
pagerState = pagerState,
59+
imgUrls = menuInfo.menuImgUrls
60+
)
61+
}
62+
63+
MenuInfoContent(
64+
menuInfoData = menuInfo
65+
)
6066

61-
MenuInfoContent(
62-
menuInfoData = menuInfo
63-
)
67+
HorizontalDivider(
68+
modifier = Modifier
69+
.fillMaxWidth()
70+
.padding(vertical = 16.dp),
71+
color = Neutral300
72+
)
6473

65-
HorizontalDivider(
66-
modifier = Modifier
67-
.fillMaxWidth()
68-
.padding(vertical = 16.dp),
69-
color = Neutral300
70-
)
74+
MenuInfoChipContent(
75+
menuInfoData = menuInfo
76+
)
7177

72-
MenuInfoChipContent(
73-
menuInfoData = menuInfo
74-
)
78+
MenuInfoAdditionalContent(
79+
address = menuInfo.storeAddress,
80+
// TODO: 메뉴 정보에 따라 변경 필요
81+
memoTitle = MenuInfoDummyData.dummyData.memoTitle,
82+
memoContent = MenuInfoDummyData.dummyData.memoContent
83+
)
84+
}
85+
MenuInfoMapButton(
86+
modifier = Modifier
87+
.align(Alignment.BottomEnd)
88+
.padding(end = 20.dp, bottom = 28.dp),
89+
) { }
90+
}
7591

76-
MenuInfoAdditionalContent(
77-
address = menuInfo.storeAddress,
78-
// TODO: 메뉴 정보에 따라 변경 필요
79-
memoTitle = MenuInfoDummyData.dummyData.memoTitle,
80-
memoContent = MenuInfoDummyData.dummyData.memoContent
81-
)
92+
BackButtonTopAppBar(NeutralWhite, true) {
93+
onNavigateBack()
94+
}
8295
}
83-
MenuInfoMapButton(
84-
modifier = Modifier
85-
.align(Alignment.BottomEnd)
86-
.padding(end = 20.dp, bottom = 28.dp),
87-
) { }
88-
}
96+
)
8997
}
9098

9199

0 commit comments

Comments
 (0)