From 372fe8bb07b70bc61cf0dad5aa5730f34188c8ac Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Sat, 17 Sep 2022 21:14:45 +0200 Subject: [PATCH] Fix: DefaultTab Pref --- .../kotlin/com/machiav3lli/fdroid/content/Preferences.kt | 7 ++++--- .../kotlin/com/machiav3lli/fdroid/ui/navigation/NavHost.kt | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt b/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt index 1a1eb585..716899fb 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt @@ -7,6 +7,7 @@ import com.machiav3lli.fdroid.PREFS_LANGUAGE import com.machiav3lli.fdroid.PREFS_LANGUAGE_DEFAULT import com.machiav3lli.fdroid.R import com.machiav3lli.fdroid.entity.Order +import com.machiav3lli.fdroid.ui.navigation.NavItem import com.machiav3lli.fdroid.utility.extension.android.Android import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -273,15 +274,15 @@ object Preferences { abstract fun getResId(configuration: Configuration): Int - object Explore : DefaultTab("explore") { + object Explore : DefaultTab(NavItem.Explore.destination) { override fun getResId(configuration: Configuration): Int = R.id.exploreTab } - object Latest : DefaultTab("latest") { + object Latest : DefaultTab(NavItem.Latest.destination) { override fun getResId(configuration: Configuration): Int = R.id.latestTab } - object Installed : DefaultTab("installed") { + object Installed : DefaultTab(NavItem.Installed.destination) { override fun getResId(configuration: Configuration): Int = R.id.installedTab } } diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/navigation/NavHost.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/navigation/NavHost.kt index 1f2d9661..669048d7 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/navigation/NavHost.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/navigation/NavHost.kt @@ -15,6 +15,7 @@ import androidx.navigation.NavHostController import androidx.navigation.activity import com.google.accompanist.navigation.animation.AnimatedNavHost import com.google.accompanist.navigation.animation.composable +import com.machiav3lli.fdroid.content.Preferences import com.machiav3lli.fdroid.database.DatabaseX import com.machiav3lli.fdroid.ui.activities.PrefsActivityX import com.machiav3lli.fdroid.ui.fragments.Source @@ -37,7 +38,7 @@ fun MainNavHost( AnimatedNavHost( modifier = modifier, navController = navController, - startDestination = NavItem.Explore.destination + startDestination = Preferences[Preferences.Key.DefaultTab].valueString ) { slideDownComposable(NavItem.Explore.destination) { val viewModel = viewModel(