Merge pull request #130 from M00NJ/start-on-alarms

Start on alarm tab (closes #128)
you-apps · Aug 16, 2023 · 3bd8b04 · 3bd8b04
2 parents 7e199ee + e14d1b3
commit 3bd8b04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/java/com/bnyro/clock/ui/nav/NavContainer.kt b/app/src/main/java/com/bnyro/clock/ui/nav/NavContainer.kt
@@ -36,8 +36,8 @@ fun NavContainer(
     val clockModel: ClockModel = viewModel()
     val navController = rememberNavController()
     val bottomNavItems = listOf(
-        NavRoutes.Clock,
         NavRoutes.Alarm,
+        NavRoutes.Clock,
         NavRoutes.Timer,
         NavRoutes.Stopwatch
     )

diff --git a/app/src/main/java/com/bnyro/clock/ui/nav/NavHost.kt b/app/src/main/java/com/bnyro/clock/ui/nav/NavHost.kt
@@ -26,13 +26,13 @@ fun AppNavHost(
     val timerModel: TimerModel = viewModel()
     val stopwatchModel: StopwatchModel = viewModel()
 
-    NavHost(navController, startDestination = NavRoutes.Clock.route) {
-        composable(NavRoutes.Clock.route) {
-            ClockScreen(clockModel)
-        }
+    NavHost(navController, startDestination = NavRoutes.Alarm.route) {
         composable(NavRoutes.Alarm.route) {
             AlarmScreen(alarmModel)
         }
+        composable(NavRoutes.Clock.route) {
+            ClockScreen(clockModel)
+        }
         composable(NavRoutes.Timer.route) {
             TimerScreen(timerModel)
         }

diff --git a/app/src/main/java/com/bnyro/clock/ui/nav/NavRoutes.kt b/app/src/main/java/com/bnyro/clock/ui/nav/NavRoutes.kt
@@ -15,8 +15,8 @@ sealed class NavRoutes(
     @StringRes val stringRes: Int,
     val icon: ImageVector
 ) {
-    object Clock : NavRoutes("clock", R.string.clock, Icons.Default.Schedule)
     object Alarm : NavRoutes("alarm", R.string.alarm, Icons.Default.Alarm)
+    object Clock : NavRoutes("clock", R.string.clock, Icons.Default.Schedule)
     object Timer : NavRoutes("timer", R.string.timer, Icons.Default.AvTimer)
     object Stopwatch : NavRoutes("stopwatch", R.string.stopwatch, Icons.Outlined.Timer)
     object Settings : NavRoutes("settings", R.string.settings, Icons.Default.Settings)