Fix: DefaultTab Pref

This commit is contained in:
machiav3lli 2022-09-17 21:14:45 +02:00
parent 7729f1caa7
commit 372fe8bb07
2 changed files with 6 additions and 4 deletions

View File

@ -7,6 +7,7 @@ import com.machiav3lli.fdroid.PREFS_LANGUAGE
import com.machiav3lli.fdroid.PREFS_LANGUAGE_DEFAULT import com.machiav3lli.fdroid.PREFS_LANGUAGE_DEFAULT
import com.machiav3lli.fdroid.R import com.machiav3lli.fdroid.R
import com.machiav3lli.fdroid.entity.Order import com.machiav3lli.fdroid.entity.Order
import com.machiav3lli.fdroid.ui.navigation.NavItem
import com.machiav3lli.fdroid.utility.extension.android.Android import com.machiav3lli.fdroid.utility.extension.android.Android
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -273,15 +274,15 @@ object Preferences {
abstract fun getResId(configuration: Configuration): Int 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 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 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 override fun getResId(configuration: Configuration): Int = R.id.installedTab
} }
} }

View File

@ -15,6 +15,7 @@ import androidx.navigation.NavHostController
import androidx.navigation.activity import androidx.navigation.activity
import com.google.accompanist.navigation.animation.AnimatedNavHost import com.google.accompanist.navigation.animation.AnimatedNavHost
import com.google.accompanist.navigation.animation.composable import com.google.accompanist.navigation.animation.composable
import com.machiav3lli.fdroid.content.Preferences
import com.machiav3lli.fdroid.database.DatabaseX import com.machiav3lli.fdroid.database.DatabaseX
import com.machiav3lli.fdroid.ui.activities.PrefsActivityX import com.machiav3lli.fdroid.ui.activities.PrefsActivityX
import com.machiav3lli.fdroid.ui.fragments.Source import com.machiav3lli.fdroid.ui.fragments.Source
@ -37,7 +38,7 @@ fun MainNavHost(
AnimatedNavHost( AnimatedNavHost(
modifier = modifier, modifier = modifier,
navController = navController, navController = navController,
startDestination = NavItem.Explore.destination startDestination = Preferences[Preferences.Key.DefaultTab].valueString
) { ) {
slideDownComposable(NavItem.Explore.destination) { slideDownComposable(NavItem.Explore.destination) {
val viewModel = viewModel<MainNavFragmentViewModelX>( val viewModel = viewModel<MainNavFragmentViewModelX>(