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