From b0fa313ac18b0128e95635a5c2d29b7d62f33ea5 Mon Sep 17 00:00:00 2001
From: Sad Ellie <openthiswhitedoor@gmail.com>
Date: Mon, 18 Jul 2022 21:14:35 +0300
Subject: [PATCH] Wrapped routes into NavRoutes object.

---
 .../main/java/com/sadellie/unitto/MainActivity.kt | 10 +++++-----
 .../java/com/sadellie/unitto/data/NavRoutes.kt    | 15 ++++++++++-----
 .../sadellie/unitto/screens/main/MainScreen.kt    |  2 +-
 .../unitto/screens/main/components/TopScreen.kt   |  4 ++--
 .../unitto/screens/setttings/SettingsScreen.kt    |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/sadellie/unitto/MainActivity.kt b/app/src/main/java/com/sadellie/unitto/MainActivity.kt
index 33855faf..44254f8f 100644
--- a/app/src/main/java/com/sadellie/unitto/MainActivity.kt
+++ b/app/src/main/java/com/sadellie/unitto/MainActivity.kt
@@ -27,11 +27,11 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.sadellie.unitto.data.ABOUT_SCREEN
-import com.sadellie.unitto.data.LEFT_LIST_SCREEN
-import com.sadellie.unitto.data.MAIN_SCREEN
-import com.sadellie.unitto.data.RIGHT_LIST_SCREEN
-import com.sadellie.unitto.data.SETTINGS_SCREEN
+import com.sadellie.unitto.data.NavRoutes.ABOUT_SCREEN
+import com.sadellie.unitto.data.NavRoutes.LEFT_LIST_SCREEN
+import com.sadellie.unitto.data.NavRoutes.MAIN_SCREEN
+import com.sadellie.unitto.data.NavRoutes.RIGHT_LIST_SCREEN
+import com.sadellie.unitto.data.NavRoutes.SETTINGS_SCREEN
 import com.sadellie.unitto.data.preferences.AppTheme
 import com.sadellie.unitto.screens.MainViewModel
 import com.sadellie.unitto.screens.about.AboutScreen
diff --git a/app/src/main/java/com/sadellie/unitto/data/NavRoutes.kt b/app/src/main/java/com/sadellie/unitto/data/NavRoutes.kt
index 65c1e595..b62e2fe7 100644
--- a/app/src/main/java/com/sadellie/unitto/data/NavRoutes.kt
+++ b/app/src/main/java/com/sadellie/unitto/data/NavRoutes.kt
@@ -18,10 +18,15 @@
 
 package com.sadellie.unitto.data
 
-const val MAIN_SCREEN = "MainScreen"
+/**
+ * Object that contains all routes to screen in the app
+ */
+object NavRoutes {
+    const val MAIN_SCREEN = "MainScreen"
 
-const val LEFT_LIST_SCREEN = "LeftScreen"
-const val RIGHT_LIST_SCREEN = "RightScreen"
+    const val LEFT_LIST_SCREEN = "LeftScreen"
+    const val RIGHT_LIST_SCREEN = "RightScreen"
 
-const val SETTINGS_SCREEN = "SettingsScreen"
-const val ABOUT_SCREEN = "AboutScreen"
+    const val SETTINGS_SCREEN = "SettingsScreen"
+    const val ABOUT_SCREEN = "AboutScreen"
+}
diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
index ce940ca1..3a9120dc 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
@@ -44,7 +44,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.sadellie.unitto.R
-import com.sadellie.unitto.data.SETTINGS_SCREEN
+import com.sadellie.unitto.data.NavRoutes.SETTINGS_SCREEN
 import com.sadellie.unitto.data.units.AbstractUnit
 import com.sadellie.unitto.screens.MainScreenUIState
 import com.sadellie.unitto.screens.MainViewModel
diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt
index be44626b..7f993cfb 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt
@@ -32,8 +32,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.sadellie.unitto.R
-import com.sadellie.unitto.data.LEFT_LIST_SCREEN
-import com.sadellie.unitto.data.RIGHT_LIST_SCREEN
+import com.sadellie.unitto.data.NavRoutes.LEFT_LIST_SCREEN
+import com.sadellie.unitto.data.NavRoutes.RIGHT_LIST_SCREEN
 import com.sadellie.unitto.data.units.AbstractUnit
 
 /**
diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
index 81b64358..0d37875d 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
@@ -41,7 +41,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import com.sadellie.unitto.BuildConfig
 import com.sadellie.unitto.R
-import com.sadellie.unitto.data.ABOUT_SCREEN
+import com.sadellie.unitto.data.NavRoutes.ABOUT_SCREEN
 import com.sadellie.unitto.data.preferences.APP_THEMES
 import com.sadellie.unitto.data.preferences.OUTPUT_FORMAT
 import com.sadellie.unitto.data.preferences.PRECISIONS