Fix 设置页切换 tab 后需要按多次返回才能返回 #927

open-ani · Oct 19, 2024 · c9f061e · c9f061e
1 parent b581f19
commit c9f061e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/SettingsPage.kt b/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/SettingsPage.kt
@@ -90,6 +90,7 @@ import me.him188.ani.app.ui.settings.tabs.media.source.MediaSourceSubscriptionGr
 import me.him188.ani.app.ui.settings.tabs.network.DanmakuGroup
 import me.him188.ani.app.ui.settings.tabs.network.GlobalProxyGroup
 import me.him188.ani.utils.platform.hasScrollingBug
+import me.him188.ani.utils.platform.isMobile
 
 /**
  * @see renderPreferenceTab 查看名称
@@ -227,8 +228,11 @@ internal fun SettingsPageLayout(
  }
  }
 
- val topAppBarScrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
-
+ val topAppBarScrollBehavior = if (LocalPlatform.current.isMobile()) {
+ TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
+ } else {
+ null
+ }
 
  AniListDetailPaneScaffold(
  navigator,
@@ -251,7 +255,7 @@ internal fun SettingsPageLayout(
  .consumeWindowInsets(windowInsets.only(WindowInsetsSides.Top))
  .fillMaxWidth()
  .ifThen(!LocalPlatform.current.hasScrollingBug()) {
- nestedScroll(topAppBarScrollBehavior.nestedScrollConnection)
+ topAppBarScrollBehavior?.let { nestedScroll(it.nestedScrollConnection) }
  }
  .verticalScroll(rememberScrollState()),
  drawerContainerColor = Color.Unspecified,