github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-21 20:47:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix appbar back button in Settings screen (#8674)

Browse source
This commit is contained in:
Ivan Iskandar 2022-12-04 22:27:14 +07:00 committed by GitHub
parent 47f079891f
commit be854b3e90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsScreen.kt
View file

@ -23,7 +23,7 @@ class SettingsScreen private constructor(
@Composable @Composable
override fun Content() { override fun Content() {
val navigator = LocalNavigator.currentOrThrow val parentNavigator = LocalNavigator.currentOrThrow
if (!isTabletUi()) { if (!isTabletUi()) {
Navigator( Navigator(
screen = if (toBackup) { screen = if (toBackup) {
@ -34,7 +34,14 @@ class SettingsScreen private constructor(
SettingsMainScreen SettingsMainScreen
}, },
content = { content = {
CompositionLocalProvider(LocalBackPress provides navigator::pop) { val pop: () -> Unit = {
if (it.canPop) {
it.pop()
} else {
parentNavigator.pop()
}
}
CompositionLocalProvider(LocalBackPress provides pop) {
ScreenTransition( ScreenTransition(
navigator = it, navigator = it,
transition = { Transition.OneWayFade }, transition = { Transition.OneWayFade },
@ -54,7 +61,7 @@ class SettingsScreen private constructor(
) { ) {
TwoPanelBox( TwoPanelBox(
startContent = { startContent = {
CompositionLocalProvider(LocalBackPress provides navigator::pop) { CompositionLocalProvider(LocalBackPress provides parentNavigator::pop) {
SettingsMainScreen.Content(twoPane = true) SettingsMainScreen.Content(twoPane = true)
} }
}, },