Skip to content

Fix MainBottomNavigation layout #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuni-ju merged 1 commit into from
Jun 2, 2025
Merged

Fix MainBottomNavigation layout #669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions presentation/src/main/java/daily/dayo/presentation/screen/main/MainScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ import androidx.compose.animation.ExperimentalSharedTransitionApi
import androidx.compose.animation.SharedTransitionLayout
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.BottomNavigation
import androidx.compose.material.BottomNavigationItem
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.Icon
import androidx.compose.material.Scaffold
import androidx.compose.material.Text
Expand All @@ -29,21 +27,22 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavController
import androidx.navigation.NavDestination.Companion.hierarchy
import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import daily.dayo.presentation.R
import daily.dayo.presentation.screen.feed.FeedRoute
import daily.dayo.presentation.screen.feed.feedNavGraph
import daily.dayo.presentation.screen.home.HomeRoute
import daily.dayo.presentation.screen.home.homeNavGraph
import daily.dayo.presentation.screen.mypage.MyPageRoute
import daily.dayo.presentation.screen.mypage.myPageNavGraph
import daily.dayo.presentation.screen.mypage.navigateBackToFolder
import daily.dayo.presentation.screen.notice.noticeNavGraph
import daily.dayo.presentation.screen.notification.NotificationRoute
import daily.dayo.presentation.screen.notification.notificationNavGraph
Expand All @@ -61,7 +60,7 @@ import daily.dayo.presentation.view.dialog.getBottomSheetDialogState
import daily.dayo.presentation.viewmodel.NoticeViewModel
import daily.dayo.presentation.viewmodel.ProfileViewModel

@OptIn(ExperimentalMaterialApi::class, ExperimentalSharedTransitionApi::class)
@OptIn(ExperimentalSharedTransitionApi::class)
@SuppressLint("UnusedMaterialScaffoldPaddingParameter")
@Composable
internal fun MainScreen(
Expand Down Expand Up @@ -270,8 +269,7 @@ fun MainBottomNavigation(
if (visible) {
BottomNavigation(
backgroundColor = White_FFFFFF,
contentColor = Gray2_767B83,
modifier = Modifier.height(73.dp)
contentColor = Gray2_767B83
) {
items.forEach { screen ->
val selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true
Expand All @@ -283,15 +281,15 @@ fun MainBottomNavigation(
Icon(
imageVector = ImageVector.vectorResource(id = if (selected) screen.selectedIcon else screen.defaultIcon),
contentDescription = stringResource(id = screen.resourceId),
modifier = Modifier
.size(if (screen.route != Screen.Write.route) 24.dp else 36.dp)
modifier = Modifier.size(if (screen.route != Screen.Write.route) 24.dp else 36.dp)
)

if (screen.route != Screen.Write.route) {
Text(text = stringResource(screen.resourceId), style = DayoTheme.typography.caption5)
}
}
},
modifier = Modifier.padding(top = 12.dp, bottom = 16.dp),
selected = selected,
selectedContentColor = Dark,
onClick = {
Expand Down Expand Up @@ -325,3 +323,12 @@ sealed class Screen(val route: String, @StringRes val resourceId: Int, @Drawable
}
}
}

@Preview
@Composable
private fun PreviewMainBottomNavigation() {
MainBottomNavigation(
visible = true,
navController = rememberNavController()
)
}