diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/activity/MainScreen.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/activity/MainScreen.kt index 1a6b773..5cc7161 100644 --- a/app/src/main/kotlin/com/sanmer/geomag/ui/activity/MainScreen.kt +++ b/app/src/main/kotlin/com/sanmer/geomag/ui/activity/MainScreen.kt @@ -8,7 +8,6 @@ import androidx.compose.ui.Modifier import androidx.navigation.compose.NavHost import androidx.navigation.compose.rememberNavController import com.sanmer.geomag.ui.navigation.MainScreen -import com.sanmer.geomag.ui.navigation.graphs.customizeScreen import com.sanmer.geomag.ui.navigation.graphs.homeScreen import com.sanmer.geomag.ui.navigation.graphs.recordsScreen import com.sanmer.geomag.ui.navigation.graphs.settingsScreen @@ -28,9 +27,6 @@ fun MainScreen() { homeScreen( navController = navController ) - customizeScreen( - navController = navController - ) recordsScreen( navController = navController ) diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/Main.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/Main.kt index b87ac88..3642b82 100644 --- a/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/Main.kt +++ b/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/Main.kt @@ -5,11 +5,9 @@ import com.sanmer.geomag.ui.utils.navigatePopUpTo enum class MainScreen(val route: String) { Home("HomeScreen"), - Calculate("CalculateScreen"), Records("RecordsScreen"), Settings("SettingsScreen") } -fun NavController.navigateToCalculate() = navigatePopUpTo(MainScreen.Calculate.route) fun NavController.navigateToRecords() = navigatePopUpTo(MainScreen.Records.route) fun NavController.navigateToSettings() = navigatePopUpTo(MainScreen.Settings.route) \ No newline at end of file diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Customize.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Customize.kt deleted file mode 100644 index fb1cc3c..0000000 --- a/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Customize.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.sanmer.geomag.ui.navigation.graphs - -import androidx.compose.animation.fadeIn -import androidx.compose.animation.fadeOut -import androidx.navigation.NavController -import androidx.navigation.NavGraphBuilder -import androidx.navigation.compose.composable -import androidx.navigation.navigation -import com.sanmer.geomag.ui.animate.slideInRightToLeft -import com.sanmer.geomag.ui.animate.slideOutLeftToRight -import com.sanmer.geomag.ui.navigation.MainScreen -import com.sanmer.geomag.ui.screens.customize.CustomizeScreen - -enum class CustomizeScreen(val route: String) { - Home("Customize") -} - -fun NavGraphBuilder.customizeScreen( - navController: NavController -) = navigation( - startDestination = CustomizeScreen.Home.route, - route = MainScreen.Calculate.route -) { - composable( - route = CustomizeScreen.Home.route, - enterTransition = { slideInRightToLeft() + fadeIn() }, - exitTransition = { slideOutLeftToRight() + fadeOut() } - ) { - CustomizeScreen( - navController = navController - ) - } -} \ No newline at end of file diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Home.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Home.kt index 6a49b78..6ace5a2 100644 --- a/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Home.kt +++ b/app/src/main/kotlin/com/sanmer/geomag/ui/navigation/graphs/Home.kt @@ -6,11 +6,15 @@ import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable import androidx.navigation.navigation +import com.sanmer.geomag.ui.animate.slideInRightToLeft +import com.sanmer.geomag.ui.animate.slideOutLeftToRight import com.sanmer.geomag.ui.navigation.MainScreen +import com.sanmer.geomag.ui.screens.customize.CustomizeScreen import com.sanmer.geomag.ui.screens.home.HomeScreen enum class HomeScreen(val route: String) { - Home("Home") + Home("Home"), + Customize("Customize") } fun NavGraphBuilder.homeScreen( @@ -28,4 +32,14 @@ fun NavGraphBuilder.homeScreen( navController = navController ) } + + composable( + route = HomeScreen.Customize.route, + enterTransition = { slideInRightToLeft() + fadeIn() }, + exitTransition = { slideOutLeftToRight() + fadeOut() } + ) { + CustomizeScreen( + navController = navController + ) + } } \ No newline at end of file diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/items/CalculationItem.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/items/CalculationItem.kt index e6e66d2..89b3061 100644 --- a/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/items/CalculationItem.kt +++ b/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/items/CalculationItem.kt @@ -32,7 +32,8 @@ import com.sanmer.geomag.R import com.sanmer.geomag.ui.component.DropdownMenu import com.sanmer.geomag.ui.component.OverviewButton import com.sanmer.geomag.ui.component.OverviewCard -import com.sanmer.geomag.ui.navigation.navigateToCalculate +import com.sanmer.geomag.ui.navigation.graphs.HomeScreen +import com.sanmer.geomag.ui.utils.navigateSingleTopTo @Composable fun CalculationItem( @@ -62,7 +63,7 @@ fun CalculationItem( ) OverviewButton( - onClick = { navController.navigateToCalculate() }, + onClick = { navController.navigateSingleTopTo(HomeScreen.Customize.route) }, icon = R.drawable.variable_plus, text = stringResource(id = R.string.overview_customized), enabled = BuildConfig.DEBUG