Skip to content

Commit 9b6e984

Browse files
committed
[feature/bottom] BottomNavigation 아이콘 위치 조정 및 Preview추가 (#33)
1 parent 07556f7 commit 9b6e984

File tree

6 files changed

+58
-16
lines changed

6 files changed

+58
-16
lines changed

presentation/src/main/java/com/everymeal/presentation/ui/bottom/BottomNavigationScreen.kt

+23-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.everymeal.presentation.ui.bottom
22

33
import androidx.compose.foundation.layout.fillMaxWidth
44
import androidx.compose.foundation.layout.height
5-
import androidx.compose.foundation.layout.padding
65
import androidx.compose.material3.Icon
76
import androidx.compose.material3.NavigationBar
87
import androidx.compose.material3.NavigationBarItem
@@ -14,6 +13,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
1413
import androidx.compose.ui.res.stringResource
1514
import androidx.compose.ui.res.vectorResource
1615
import androidx.compose.ui.text.TextStyle
16+
import androidx.compose.ui.tooling.preview.Preview
1717
import androidx.compose.ui.unit.dp
1818
import androidx.compose.ui.unit.sp
1919
import androidx.navigation.NavDestination
@@ -23,19 +23,6 @@ import com.everymeal.presentation.ui.theme.Gray500
2323
import com.everymeal.presentation.ui.theme.Main100
2424
import com.everymeal.presentation.ui.theme.Paddings
2525

26-
fun navigateBottomNavigationScreen(
27-
navController: NavHostController,
28-
navigationItem: BottomNavigation,
29-
) {
30-
navController.navigate(navigationItem.route) {
31-
popUpTo(navController.graph.findStartDestination().id) {
32-
saveState = true
33-
}
34-
launchSingleTop = true
35-
restoreState = true
36-
}
37-
}
38-
3926
@Composable
4027
fun EveryMealBottomNavigation(
4128
currentDestination: NavDestination?,
@@ -50,10 +37,8 @@ fun EveryMealBottomNavigation(
5037
) {
5138
BottomNavigation.values().forEach { bottomItem ->
5239
NavigationBarItem(
53-
modifier = Modifier.padding(8.dp),
5440
icon = {
5541
Icon(
56-
modifier = Modifier.padding(4.dp),
5742
imageVector = ImageVector.vectorResource(bottomItem.icon),
5843
contentDescription = bottomItem.route,
5944
tint = if (currentDestination?.route == bottomItem.route) {
@@ -81,4 +66,26 @@ fun EveryMealBottomNavigation(
8166
)
8267
}
8368
}
69+
}
70+
71+
fun navigateBottomNavigationScreen(
72+
navController: NavHostController,
73+
navigationItem: BottomNavigation,
74+
) {
75+
navController.navigate(navigationItem.route) {
76+
popUpTo(navController.graph.findStartDestination().id) {
77+
saveState = true
78+
}
79+
launchSingleTop = true
80+
restoreState = true
81+
}
82+
}
83+
84+
@Preview
85+
@Composable
86+
fun PreviewEveryMealBottomNavigation() {
87+
EveryMealBottomNavigation(
88+
currentDestination = null,
89+
navigateToScreen = {}
90+
)
8491
}

presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.everymeal.presentation.ui.home
22

33
import androidx.compose.material3.Text
44
import androidx.compose.runtime.Composable
5+
import androidx.compose.ui.tooling.preview.Preview
56

67

78
@Composable
@@ -11,4 +12,10 @@ fun HomeScreen(
1112
Text(
1213
text = "HomeScreen",
1314
)
15+
}
16+
17+
@Preview
18+
@Composable
19+
fun HomeScreenPreview() {
20+
HomeScreen()
1421
}

presentation/src/main/java/com/everymeal/presentation/ui/main/MainScreen.kt

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.compose.material3.Scaffold
55
import androidx.compose.runtime.Composable
66
import androidx.compose.runtime.getValue
77
import androidx.compose.ui.Modifier
8+
import androidx.compose.ui.tooling.preview.Preview
89
import androidx.navigation.NavHostController
910
import androidx.navigation.compose.NavHost
1011
import androidx.navigation.compose.composable
@@ -57,4 +58,10 @@ fun MainScreen(
5758
}
5859
}
5960
}
61+
}
62+
63+
@Preview
64+
@Composable
65+
fun MainScreenPreview() {
66+
MainScreen()
6067
}

presentation/src/main/java/com/everymeal/presentation/ui/mypage/MyPageScreen.kt

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.everymeal.presentation.ui.mypage
22

33
import androidx.compose.material3.Text
44
import androidx.compose.runtime.Composable
5+
import androidx.compose.ui.tooling.preview.Preview
56

67

78
@Composable
@@ -11,4 +12,10 @@ fun MyPageScreen(
1112
Text(
1213
text = "MyPageScreen",
1314
)
15+
}
16+
17+
@Preview
18+
@Composable
19+
fun MyPageScreenPreview() {
20+
MyPageScreen()
1421
}

presentation/src/main/java/com/everymeal/presentation/ui/univfood/UnivFoodScreen.kt

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.everymeal.presentation.ui.univfood
22

33
import androidx.compose.material3.Text
44
import androidx.compose.runtime.Composable
5+
import androidx.compose.ui.tooling.preview.Preview
56

67
@Composable
78
fun UnivFoodScreen(
@@ -10,4 +11,10 @@ fun UnivFoodScreen(
1011
Text(
1112
text = "UnivFoodScreen",
1213
)
14+
}
15+
16+
@Preview
17+
@Composable
18+
fun UnivFoodScreenPreview() {
19+
UnivFoodScreen()
1320
}

presentation/src/main/java/com/everymeal/presentation/ui/whatfood/WhatFoodScreen.kt

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.everymeal.presentation.ui.whatfood
22

33
import androidx.compose.material3.Text
44
import androidx.compose.runtime.Composable
5+
import androidx.compose.ui.tooling.preview.Preview
56

67
@Composable
78
fun WhatFoodScreen(
@@ -10,4 +11,10 @@ fun WhatFoodScreen(
1011
Text(
1112
text = "WhatFoodScreen",
1213
)
14+
}
15+
16+
@Preview
17+
@Composable
18+
fun WhatFoodScreenPreview() {
19+
WhatFoodScreen()
1320
}

0 commit comments

Comments
 (0)