prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reformat

Browse source
This commit is contained in:
Stefano Sansone 2024-04-08 11:39:22 +02:00
parent 962c049cf3
commit d3784e97fe
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/root/RootView.kt
View file

@ -62,18 +62,18 @@ fun RootView(
val snackbarHostState = remember { SnackbarHostState() }
val navController = rememberNavController()
Scaffold(
snackbarHost = { SnackbarHost(snackbarHostState) },
bottomBar = {
if (navController.currentBackStackEntryAsState().value?.destination?.route in TopLevelDestination.entries.map { it.route }) {
OmnivoreBottomBar(
navController,
TopLevelDestination.entries,
navController.currentBackStackEntryAsState().value?.destination
)
}
Scaffold(snackbarHost = { SnackbarHost(snackbarHostState) }, bottomBar = {
if (
navController.currentBackStackEntryAsState().value?.destination?.route in
TopLevelDestination.entries.map { it.route }
) {
OmnivoreBottomBar(
navController,
TopLevelDestination.entries,
navController.currentBackStackEntryAsState().value?.destination
)
}
) { padding ->
}) { padding ->
Box(
modifier = if (!hasAuthToken) Modifier.background(Color(0xFFFCEBA8)) else Modifier
.fillMaxSize()
@ -84,7 +84,7 @@ fun RootView(
WindowInsetsSides.Horizontal,
),
)
){
) {
if (hasAuthToken) {
PrimaryNavigator(
navController = navController,
@ -122,8 +122,7 @@ fun PrimaryNavigator(
) {
NavHost(
navController = navController,
startDestination = Routes.Inbox.route
navController = navController, startDestination = Routes.Inbox.route
) {
composable(Routes.Inbox.route) {
LibraryView(
@ -151,8 +150,7 @@ fun PrimaryNavigator(
composable(Routes.Settings.route) {
SettingsScreen(
loginViewModel = loginViewModel,
navController = navController
loginViewModel = loginViewModel, navController = navController
)
}
@ -190,7 +188,7 @@ private fun OmnivoreBottomBar(
currentDestination: NavDestination?
) {
NavigationBar (
NavigationBar(
containerColor = MaterialTheme.colorScheme.background
) {
destinations.forEach { screen ->
@ -199,8 +197,12 @@ private fun OmnivoreBottomBar(
} else {
ImageVector.vectorResource(id = screen.unselectedIcon)
}
NavigationBarItem(
icon = { Icon(icon, contentDescription = stringResource(id = screen.iconTextId)) },
NavigationBarItem(icon = {
Icon(
icon,
contentDescription = stringResource(id = screen.iconTextId)
)
},
selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
onClick = {
navController.navigate(screen.route) {
@ -216,8 +218,7 @@ private fun OmnivoreBottomBar(
// Restore state when reselecting a previously selected item
restoreState = true
}
}
)
})
}
}
}