perf: home page scrollKey

lisonge · lisonge · commit e3c94bcf14ea · 2026-03-16T22:11:10.000+08:00
diff --git a/app/src/main/kotlin/li/songe/gkd/MainViewModel.kt b/app/src/main/kotlin/li/songe/gkd/MainViewModel.kt
@@ -10,6 +10,7 @@ import androidx.navigation3.runtime.NavKey
 import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsText
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.map
@@ -23,7 +24,6 @@ import li.songe.gkd.data.SubsItem
 import li.songe.gkd.data.importData
 import li.songe.gkd.db.DbSet
 import li.songe.gkd.permission.AuthReason
-import li.songe.gkd.permission.canQueryPkgState
 import li.songe.gkd.permission.shizukuGrantedState
 import li.songe.gkd.service.A11yService
 import li.songe.gkd.shizuku.shizukuContextFlow
@@ -192,18 +192,17 @@ class MainViewModel : BaseViewModel(), OnSimpleLife {
         }
     }
 
-    val appListKeyFlow = MutableStateFlow(0)
     val tabFlow = MutableStateFlow(BottomNavItem.Control.key)
+    val resetPageScrollEvent = MutableSharedFlow<BottomNavItem>()
     private var lastClickTabTime = 0L
-    fun updateTab(navItem: BottomNavItem) {
-        if (navItem == BottomNavItem.AppList && navItem.key == tabFlow.value) {
-            // double click
-            if (System.currentTimeMillis() - lastClickTabTime < 500) {
-                appListKeyFlow.update { it + 1 }
-            }
+    fun handleClickTab(navItem: BottomNavItem) {
+        val t = System.currentTimeMillis()
+        // double click
+        if (navItem.key == tabFlow.value && t - lastClickTabTime < 500) {
+            viewModelScope.launch { resetPageScrollEvent.emit(navItem) }
         }
         tabFlow.value = navItem.key
-        lastClickTabTime = System.currentTimeMillis()
+        lastClickTabTime = t
     }
 
     fun handleGkdUri(uri: Uri) {
@@ -362,12 +361,9 @@ class MainViewModel : BaseViewModel(), OnSimpleLife {
             githubCookieFlow.value
         }
 
-        canQueryPkgState.stateFlow.launchOnChange {
-            appListKeyFlow.update { it + 1 }
-        }
-
         // for OnSimpleLife
         onCreated()
         addCloseable { onDestroyed() }
+        toast("MainViewModel:init")
     }
 }
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/component/Hooks.kt b/app/src/main/kotlin/li/songe/gkd/ui/component/Hooks.kt
@@ -1,10 +1,12 @@
 package li.songe.gkd.ui.component
 
 import androidx.compose.animation.core.AnimationConstants.DefaultDurationMillis
+import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
@@ -73,6 +75,7 @@ private fun getCompatStateValue(v: Any?): Any? = when (v) {
 }
 
 // key 函数的依赖变化时, compose 将重置 key 函数那行代码之后所有代码的状态, 因此需要需要将 key 作用域限定在 Composable fun 内
+// 所有的 key 参数必须使用 rememberSaveable 或者 viewModel 来保存状态, 以保证正确的 restore 顺序，否则触发 ClassCastException
 @Composable
 fun useListScrollState(
     v1: Any?,
@@ -83,12 +86,22 @@ fun useListScrollState(
     return key(
         getCompatStateValue(v1),
         getCompatStateValue(v2),
-        getCompatStateValue(v3)
+        getCompatStateValue(v3),
     ) {
         TopAppBarDefaults.enterAlwaysScrollBehavior(canScroll = canScroll) to rememberLazyListState()
     }
 }
 
+@Composable
+fun usePinnedScrollBehaviorState(v1: Any?): Pair<TopAppBarScrollBehavior, LazyListState> {
+    return key(getCompatStateValue(v1)) { TopAppBarDefaults.pinnedScrollBehavior() to rememberLazyListState() }
+}
+
+@Composable
+fun useScrollBehaviorState(v1: Any?): Pair<TopAppBarScrollBehavior, ScrollState> {
+    return key(getCompatStateValue(v1)) { TopAppBarDefaults.enterAlwaysScrollBehavior() to rememberScrollState() }
+}
+
 @Composable
 fun LazyListState.isAtBottom(): androidx.compose.runtime.State<Boolean> = remember(this) {
     derivedStateOf {
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
@@ -27,10 +27,14 @@ import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.LocalSaveableStateRegistry
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -42,7 +46,9 @@ import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import li.songe.gkd.MainActivity
 import li.songe.gkd.R
 import li.songe.gkd.data.AppInfo
@@ -75,6 +81,7 @@ import li.songe.gkd.ui.style.EmptyHeight
 import li.songe.gkd.ui.style.appItemPadding
 import li.songe.gkd.util.AppGroupOption
 import li.songe.gkd.util.AppSortOption
+import li.songe.gkd.util.LogUtils
 import li.songe.gkd.util.appListAuthAbnormalFlow
 import li.songe.gkd.util.getUpDownTransform
 import li.songe.gkd.util.ruleSummaryFlow
@@ -98,12 +105,33 @@ fun useAppListPage(): ScaffoldExt {
     } else {
         null
     }
-    val appListKey by mainVm.appListKeyFlow.collectAsState()
     val showSearchBar by vm.showSearchBarFlow.collectAsState()
-    val (scrollBehavior, listState) = useListScrollState(appListKey)
     val refreshing by updateAppMutex.state.collectAsState()
     val pullToRefreshState = rememberPullToRefreshState()
     val editWhiteListMode by vm.editWhiteListModeFlow.collectAsState()
+    val savedStateRegistry = LocalSaveableStateRegistry.current
+    if (savedStateRegistry != null) {
+        LogUtils.d(savedStateRegistry.performSave())
+    }
+    val scrollKey = rememberSaveable { mutableIntStateOf(0) }
+    val (scrollBehavior, listState) = useListScrollState(scrollKey)
+    LaunchedEffect(null) {
+        listOf(
+            canQueryPkgState.stateFlow,
+            vm.appInfosFlow,
+        ).forEach {
+            launch {
+                it.drop(1).collect {
+                    scrollKey.intValue++
+                }
+            }
+        }
+        mainVm.resetPageScrollEvent.collect {
+            if (it == BottomNavItem.AppList) {
+                scrollKey.intValue++
+            }
+        }
+    }
     return ScaffoldExt(
         navItem = BottomNavItem.AppList,
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
@@ -134,7 +162,7 @@ fun useAppListPage(): ScaffoldExt {
                     val titleModifier = Modifier
                         .noRippleClickable(
                             onClick = throttle {
-                                mainVm.appListKeyFlow.update { it + 1 }
+                                scrollKey.intValue++
                             }
                         )
                     if (editWhiteListMode) {
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/ControlPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/ControlPage.kt
@@ -13,18 +13,19 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -63,6 +64,7 @@ import li.songe.gkd.ui.component.PerfIconButton
 import li.songe.gkd.ui.component.PerfSwitch
 import li.songe.gkd.ui.component.PerfTopAppBar
 import li.songe.gkd.ui.component.textSize
+import li.songe.gkd.ui.component.useScrollBehaviorState
 import li.songe.gkd.ui.share.LocalMainViewModel
 import li.songe.gkd.ui.style.EmptyHeight
 import li.songe.gkd.ui.style.itemHorizontalPadding
@@ -80,8 +82,15 @@ fun useControlPage(): ScaffoldExt {
     val context = LocalActivity.current as MainActivity
     val mainVm = LocalMainViewModel.current
     val vm = viewModel<HomeVm>()
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
-    val scrollState = rememberScrollState()
+    val scrollKey = rememberSaveable { mutableIntStateOf(0) }
+    val (scrollBehavior, scrollState) = useScrollBehaviorState(scrollKey)
+    LaunchedEffect(null) {
+        mainVm.resetPageScrollEvent.collect {
+            if (it == BottomNavItem.Control) {
+                scrollKey.intValue++
+            }
+        }
+    }
     return ScaffoldExt(
         navItem = BottomNavItem.Control,
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/HomePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/HomePage.kt
@@ -70,9 +70,7 @@ fun HomePage() {
                     NavigationBarItem(
                         selected = page.navItem.key == tab,
                         modifier = Modifier,
-                        onClick = {
-                            mainVm.updateTab(page.navItem)
-                        },
+                        onClick = { mainVm.handleClickTab(page.navItem) },
                         icon = {
                             PerfIcon(
                                 imageVector = page.navItem.icon,
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/HomeVm.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/HomeVm.kt
@@ -2,7 +2,6 @@ package li.songe.gkd.ui.home
 
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
-import li.songe.gkd.MainViewModel
 import li.songe.gkd.store.actionCountFlow
 import li.songe.gkd.store.blockMatchAppListFlow
 import li.songe.gkd.store.storeFlow
@@ -69,11 +68,7 @@ class HomeVm : BaseViewModel() {
             }
         }
     }
-    val appInfosFlow = appFilter.appListFlow.apply {
-        launchOnChange {
-            MainViewModel.instance.appListKeyFlow.value++
-        }
-    }
+    val appInfosFlow = appFilter.appListFlow
 
     val showToastInputDlgFlow = MutableStateFlow(false)
     val showNotifTextInputDlgFlow = MutableStateFlow(false)
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/SettingsPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/SettingsPage.kt
@@ -27,14 +27,16 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -78,6 +80,7 @@ import li.songe.gkd.ui.component.TextMenu
 import li.songe.gkd.ui.component.TextSwitch
 import li.songe.gkd.ui.component.autoFocus
 import li.songe.gkd.ui.component.updateDialogOptions
+import li.songe.gkd.ui.component.useScrollBehaviorState
 import li.songe.gkd.ui.component.waitResult
 import li.songe.gkd.ui.share.LocalMainViewModel
 import li.songe.gkd.ui.share.asMutableState
@@ -335,8 +338,15 @@ fun useSettingsPage(): ScaffoldExt {
         BlockA11yDialog(onDismissRequest = { showA11yBlockDlg = false })
     }
 
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
-    val scrollState = rememberScrollState()
+    val scrollKey = rememberSaveable { mutableIntStateOf(0) }
+    val (scrollBehavior, scrollState) = useScrollBehaviorState(scrollKey)
+    LaunchedEffect(null) {
+        mainVm.resetPageScrollEvent.collect {
+            if (it == BottomNavItem.Settings) {
+                scrollKey.intValue++
+            }
+        }
+    }
     return ScaffoldExt(
         navItem = BottomNavItem.Settings,
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/SubsManagePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/SubsManagePage.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CheckboxDefaults
@@ -31,17 +30,18 @@ import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -72,6 +72,7 @@ import li.songe.gkd.ui.component.PerfIconButton
 import li.songe.gkd.ui.component.PerfTopAppBar
 import li.songe.gkd.ui.component.SubsItemCard
 import li.songe.gkd.ui.component.TextMenu
+import li.songe.gkd.ui.component.usePinnedScrollBehaviorState
 import li.songe.gkd.ui.component.waitResult
 import li.songe.gkd.ui.share.ListPlaceholder
 import li.songe.gkd.ui.share.LocalMainViewModel
@@ -192,7 +193,15 @@ fun useSubsManagePage(): ScaffoldExt {
         )
     }
 
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+    val scrollKey = rememberSaveable { mutableIntStateOf(0) }
+    val (scrollBehavior, lazyListState) = usePinnedScrollBehaviorState(scrollKey)
+    LaunchedEffect(null) {
+        mainVm.resetPageScrollEvent.collect {
+            if (it == BottomNavItem.SubsManage) {
+                scrollKey.intValue++
+            }
+        }
+    }
     return ScaffoldExt(
         navItem = BottomNavItem.SubsManage,
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
@@ -413,7 +422,6 @@ fun useSubsManagePage(): ScaffoldExt {
             )
         },
     ) { contentPadding ->
-        val lazyListState = rememberLazyListState()
         val reorderableLazyColumnState =
             rememberReorderableLazyListState(lazyListState) { from, to ->
                 orderSubItems = orderSubItems.toMutableList().apply {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package li.songe.gkd.ui.home`
`2`	`2`
`3`	`3`	`import kotlinx.coroutines.flow.MutableStateFlow`
`4`	`4`	`import kotlinx.coroutines.flow.combine`
`5`		`-import li.songe.gkd.MainViewModel`
`6`	`5`	`import li.songe.gkd.store.actionCountFlow`
`7`	`6`	`import li.songe.gkd.store.blockMatchAppListFlow`
`8`	`7`	`import li.songe.gkd.store.storeFlow`
`@@ -69,11 +68,7 @@ class HomeVm : BaseViewModel() {`
`69`	`68`	`}`
`70`	`69`	`}`
`71`	`70`	`}`
`72`		`- val appInfosFlow = appFilter.appListFlow.apply {`
`73`		`- launchOnChange {`
`74`		`- MainViewModel.instance.appListKeyFlow.value++`
`75`		`- }`
`76`		`- }`
	`71`	`+ val appInfosFlow = appFilter.appListFlow`
`77`	`72`
`78`	`73`	`val showToastInputDlgFlow = MutableStateFlow(false)`
`79`	`74`	`val showNotifTextInputDlgFlow = MutableStateFlow(false)`