yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix settings screen crashing when saving state

Browse Source
This commit is contained in:
arkon 2023-12-10 17:29:02 -05:00
parent cc56fde9fe
commit 0d09039e5f
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsScreen.kt
View File

@ -24,19 +24,21 @@ import eu.kanade.presentation.util.isTabletUi
import tachiyomi.presentation.core.components.TwoPanelBox
class SettingsScreen(
private val destination: Destination = Destination.Main,
private val destination: Int? = null,
) : Screen() {
constructor(destination: Destination) : this(destination.id)
@Composable
override fun Content() {
val parentNavigator = LocalNavigator.currentOrThrow
if (!isTabletUi()) {
Navigator(
screen = when (destination) {
Destination.Main -> SettingsMainScreen
Destination.About -> AboutScreen
Destination.DataAndStorage -> SettingsDataScreen
Destination.Tracking -> SettingsTrackingScreen
Destination.About.id -> AboutScreen
Destination.DataAndStorage.id -> SettingsDataScreen
Destination.Tracking.id -> SettingsTrackingScreen
else -> SettingsMainScreen
},
content = {
val pop: () -> Unit = {
@ -54,10 +56,10 @@ class SettingsScreen(
} else {
Navigator(
screen = when (destination) {
Destination.Main -> SettingsAppearanceScreen
Destination.About -> AboutScreen
Destination.DataAndStorage -> SettingsDataScreen
Destination.Tracking -> SettingsTrackingScreen
Destination.About.id -> AboutScreen
Destination.DataAndStorage.id -> SettingsDataScreen
Destination.Tracking.id -> SettingsTrackingScreen
else -> SettingsAppearanceScreen
},
) {
val insets = WindowInsets.systemBars.only(WindowInsetsSides.Horizontal)
@ -76,10 +78,9 @@ class SettingsScreen(
}
}
sealed interface Destination {
data object Main : Destination
data object About : Destination
data object DataAndStorage : Destination
data object Tracking : Destination
sealed class Destination(val id: Int) {
data object About : Destination(0)
data object DataAndStorage : Destination(1)
data object Tracking : Destination(2)
}
}