ui: freeze blacklist/whitelist list order during selection, only re-sort on next entry

This commit is contained in:
LZX committed 2026-10-20 20:11:34 +08:00
1 parent 02a206d384
commit ee7b7d3666
1 file changed
+13 -4
@@ -146,15 +146,24 @@ fun AppSelectionScreen(
}
}
// 关联当前名单选中的包名集合
// 关联当前名单选中的包名集合(用于实时响应勾选状态与计数展示)
val selectedPackages = if (mode == AppMockMode.BLACKLIST) {
AppPreferences.blacklistApps
} else {
AppPreferences.whitelistApps
}
// 根据搜索词、系统应用开关以及是否已选中进行过滤和排序(已选中的应用排在最上方)
val filteredApps = remember(installedApps, searchQuery, showSystemApps, selectedPackages) {
// 记录进入页面时的初始选中集合:排序仅基于此快照,选中/取消不立即触发重排,只有用户下一次进入页面时才重新排序
val initialSelectedPackages = remember {
if (mode == AppMockMode.BLACKLIST) {
AppPreferences.blacklistApps
} else {
AppPreferences.whitelistApps
}
}
// 根据搜索词、系统应用开关过滤,基于进入页面时的 initialSelectedPackages 稳定排序
val filteredApps = remember(installedApps, searchQuery, showSystemApps, initialSelectedPackages) {
installedApps
.filter { app ->
(showSystemApps || !app.isSystemApp) &&
@@ -163,7 +172,7 @@ fun AppSelectionScreen(
app.packageName.contains(searchQuery, ignoreCase = true))
}
.sortedWith(
compareByDescending<InstalledAppItem> { selectedPackages.contains(it.packageName) }
compareByDescending<InstalledAppItem> { initialSelectedPackages.contains(it.packageName) }
.thenBy { it.isSystemApp }
.thenBy { it.appName.lowercase(Locale.ROOT) }
)