Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wrapped routes into NavRoutes object.

Browse Source
This commit is contained in:
Sad Ellie 2022-07-18 21:14:35 +03:00
parent 15829ed4b8
commit b0fa313ac1
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/sadellie/unitto/MainActivity.kt
View File

@ -27,11 +27,11 @@ import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import com.sadellie.unitto.data.ABOUT_SCREEN import com.sadellie.unitto.data.NavRoutes.ABOUT_SCREEN
import com.sadellie.unitto.data.LEFT_LIST_SCREEN import com.sadellie.unitto.data.NavRoutes.LEFT_LIST_SCREEN
import com.sadellie.unitto.data.MAIN_SCREEN import com.sadellie.unitto.data.NavRoutes.MAIN_SCREEN
import com.sadellie.unitto.data.RIGHT_LIST_SCREEN import com.sadellie.unitto.data.NavRoutes.RIGHT_LIST_SCREEN
import com.sadellie.unitto.data.SETTINGS_SCREEN import com.sadellie.unitto.data.NavRoutes.SETTINGS_SCREEN
import com.sadellie.unitto.data.preferences.AppTheme import com.sadellie.unitto.data.preferences.AppTheme
import com.sadellie.unitto.screens.MainViewModel import com.sadellie.unitto.screens.MainViewModel
import com.sadellie.unitto.screens.about.AboutScreen import com.sadellie.unitto.screens.about.AboutScreen

15
app/src/main/java/com/sadellie/unitto/data/NavRoutes.kt
View File

@ -18,10 +18,15 @@
package com.sadellie.unitto.data 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 LEFT_LIST_SCREEN = "LeftScreen"
const val RIGHT_LIST_SCREEN = "RightScreen" const val RIGHT_LIST_SCREEN = "RightScreen"
const val SETTINGS_SCREEN = "SettingsScreen" const val SETTINGS_SCREEN = "SettingsScreen"
const val ABOUT_SCREEN = "AboutScreen" const val ABOUT_SCREEN = "AboutScreen"
}

2
app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
View File

@ -44,7 +44,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import com.sadellie.unitto.R 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.data.units.AbstractUnit
import com.sadellie.unitto.screens.MainScreenUIState import com.sadellie.unitto.screens.MainScreenUIState
import com.sadellie.unitto.screens.MainViewModel import com.sadellie.unitto.screens.MainViewModel

4
app/src/main/java/com/sadellie/unitto/screens/main/components/TopScreen.kt
View File

@ -32,8 +32,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.sadellie.unitto.R import com.sadellie.unitto.R
import com.sadellie.unitto.data.LEFT_LIST_SCREEN import com.sadellie.unitto.data.NavRoutes.LEFT_LIST_SCREEN
import com.sadellie.unitto.data.RIGHT_LIST_SCREEN import com.sadellie.unitto.data.NavRoutes.RIGHT_LIST_SCREEN
import com.sadellie.unitto.data.units.AbstractUnit import com.sadellie.unitto.data.units.AbstractUnit
/** /**

2
app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
View File

@ -41,7 +41,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.sadellie.unitto.BuildConfig import com.sadellie.unitto.BuildConfig
import com.sadellie.unitto.R 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.APP_THEMES
import com.sadellie.unitto.data.preferences.OUTPUT_FORMAT import com.sadellie.unitto.data.preferences.OUTPUT_FORMAT
import com.sadellie.unitto.data.preferences.PRECISIONS import com.sadellie.unitto.data.preferences.PRECISIONS