diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0ad17cbd..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyBottomAppBar.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyBottomAppBar.kt index 517a13a3..ffb84ac7 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyBottomAppBar.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/MyBottomAppBar.kt @@ -29,12 +29,6 @@ fun MyBottomAppBar( currentDestination: String? ){ val navigationItems = listOf( - NavigationItem( - label = stringResource(id = R.string.about_this_app), - route = Screen.AboutScreen.route, - selectedIcon = Icons.Filled.Info, - unselectedIcon = Icons.Outlined.Info - ), NavigationItem( label = stringResource(id = R.string.list), route = Screen.MainScreen.route, @@ -46,13 +40,19 @@ fun MyBottomAppBar( route = Screen.SettingsScreen.route, selectedIcon = Icons.Filled.Settings, unselectedIcon = Icons.Outlined.Settings - ) + ), + NavigationItem( + label = stringResource(id = R.string.about_this_app), + route = Screen.AboutScreen.route, + selectedIcon = Icons.Filled.Info, + unselectedIcon = Icons.Outlined.Info + ) ) NavigationBar { var selectedItem = when (currentDestination) { - Screen.AboutScreen.route -> 0 - Screen.SettingsScreen.route -> 2 - else -> 1 + Screen.AboutScreen.route -> 2 + Screen.SettingsScreen.route -> 1 + else -> 0 } navigationItems.forEachIndexed { index, item -> NavigationBarItem(