feat: hide empty groups app (#919)

Author: lisonge

app/src/main/kotlin/li/songe/gkd/ui/SubsAppListVm.kt

@@ -1,20 +1,18 @@
 package li.songe.gkd.ui
 
 import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.ramcosta.composedestinations.generated.destinations.SubsAppListPageDestination
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
 import li.songe.gkd.data.AppConfig
 import li.songe.gkd.data.RawSubscription
 import li.songe.gkd.db.DbSet
 import li.songe.gkd.util.LinkLoad
 import li.songe.gkd.util.SortTypeOption
+import li.songe.gkd.util.ViewModelExt
 import li.songe.gkd.util.appInfoCacheFlow
 import li.songe.gkd.util.collator
 import li.songe.gkd.util.findOption
@@ -23,22 +21,19 @@ import li.songe.gkd.util.map
 import li.songe.gkd.util.storeFlow
 import li.songe.gkd.util.subsIdToRawFlow
 
-class SubsAppListVm(stateHandle: SavedStateHandle) : ViewModel() {
+class SubsAppListVm(stateHandle: SavedStateHandle) : ViewModelExt() {
     private val args = SubsAppListPageDestination.argsFrom(stateHandle)
     val linkLoad = LinkLoad(viewModelScope)
     val subsRawFlow = subsIdToRawFlow.map(viewModelScope) { s -> s[args.subsItemId] }
 
     private val appConfigsFlow = DbSet.appConfigDao.queryAppTypeConfig(args.subsItemId)
-        .let(linkLoad::invoke)
-        .stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
+        .let(linkLoad::invoke).stateInit(emptyList())
 
     private val groupSubsConfigsFlow = DbSet.subsConfigDao.querySubsGroupTypeConfig(args.subsItemId)
-        .let(linkLoad::invoke)
-        .stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
+        .let(linkLoad::invoke).stateInit(emptyList())
 
     private val categoryConfigsFlow = DbSet.categoryConfigDao.queryConfig(args.subsItemId)
-        .let(linkLoad::invoke)
-        .stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
+        .let(linkLoad::invoke).stateInit(emptyList())
 
     private val appIdToOrderFlow =
         DbSet.actionLogDao.queryLatestUniqueAppIds(args.subsItemId).let(linkLoad::invoke)
@@ -49,46 +44,56 @@ class SubsAppListVm(stateHandle: SavedStateHandle) : ViewModel() {
         storeFlow.map(viewModelScope) { SortTypeOption.allSubObject.findOption(it.subsAppSortType) }
 
     val showUninstallAppFlow = storeFlow.map(viewModelScope) { it.subsAppShowUninstallApp }
-    private val sortAppsFlow =
-        combine(
-            combine((subsRawFlow.combine(appInfoCacheFlow) { subs, appInfoCache ->
-            (subs?.apps ?: emptyList()).sortedWith { a, b ->
-                // 顺序: 已安装(有名字->无名字)->未安装(有名字(来自订阅)->无名字)
-                collator.compare(appInfoCache[a.id]?.name ?: a.name?.let { "\uFFFF" + it }
-                ?: ("\uFFFF\uFFFF" + a.id),
-                    appInfoCache[b.id]?.name ?: b.name?.let { "\uFFFF" + it }
-                    ?: ("\uFFFF\uFFFF" + b.id))
-            }
-        }), appInfoCacheFlow, showUninstallAppFlow) { apps, appInfoCache, showUninstallApp ->
-            if (showUninstallApp) {
-                apps
+    private val temp0ListFlow = combine(subsRawFlow, appInfoCacheFlow) { subs, appInfoCache ->
+        (subs?.apps ?: emptyList()).run {
+            if (any { it.groups.isEmpty() }) {
+                filterNot { it.groups.isEmpty() }
             } else {
-                apps.filter { a -> appInfoCache.containsKey(a.id) }
+                this
+            }
+        }.sortedWith { a, b ->
+            // 顺序: 已安装(有名字->无名字)->未安装(有名字(来自订阅)->无名字)
+            collator.compare(appInfoCache[a.id]?.name ?: a.name?.let { "\uFFFF" + it }
+            ?: ("\uFFFF\uFFFF" + a.id),
+                appInfoCache[b.id]?.name ?: b.name?.let { "\uFFFF" + it }
+                ?: ("\uFFFF\uFFFF" + b.id))
+        }
+    }
+    private val temp1ListFlow = combine(
+        temp0ListFlow,
+        appInfoCacheFlow,
+        showUninstallAppFlow
+    ) { apps, appInfoCache, showUninstallApp ->
+        if (showUninstallApp) {
+            apps
+        } else {
+            apps.filter { a -> appInfoCache.containsKey(a.id) }
+        }
+    }
+    private val sortAppsFlow = combine(
+        temp1ListFlow,
+        appInfoCacheFlow,
+        appIdToOrderFlow,
+        sortTypeFlow
+    ) { apps, appInfoCache, appIdToOrder, sortType ->
+        when (sortType) {
+            SortTypeOption.SortByAppMtime -> {
+                apps.sortedBy { a -> -(appInfoCache[a.id]?.mtime ?: 0) }
             }
-        },
-            appInfoCacheFlow,
-            appIdToOrderFlow,
-            sortTypeFlow
-        ) { apps, appInfoCache, appIdToOrder, sortType ->
-            when (sortType) {
-                SortTypeOption.SortByAppMtime -> {
-                    apps.sortedBy { a -> -(appInfoCache[a.id]?.mtime ?: 0) }
-                }
 
-                SortTypeOption.SortByTriggerTime -> {
-                    apps.sortedBy { a -> appIdToOrder[a.id] ?: Int.MAX_VALUE }
-                }
+            SortTypeOption.SortByTriggerTime -> {
+                apps.sortedBy { a -> appIdToOrder[a.id] ?: Int.MAX_VALUE }
+            }
 
-                SortTypeOption.SortByName -> {
-                    apps
-                }
+            SortTypeOption.SortByName -> {
+                apps
             }
-        }.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
+        }
+    }.stateInit(emptyList())
 
     val searchStrFlow = MutableStateFlow("")
 
-    private val debounceSearchStr = searchStrFlow.debounce(200)
-        .stateIn(viewModelScope, SharingStarted.Eagerly, searchStrFlow.value)
+    private val debounceSearchStr = searchStrFlow.debounce(200).stateInit(searchStrFlow.value)
 
 
     private val appAndConfigsFlow = combine(
@@ -111,7 +116,7 @@ class SubsAppListVm(stateHandle: SavedStateHandle) : ViewModel() {
             }
             Triple(app, appSubsConfigs.find { s -> s.appId == app.id }, enableSize)
         }
-    }.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
+    }.stateInit(emptyList())
 
     val filterAppAndConfigsFlow = combine(
         appAndConfigsFlow, debounceSearchStr, appInfoCacheFlow
@@ -149,6 +154,6 @@ class SubsAppListVm(stateHandle: SavedStateHandle) : ViewModel() {
             }
             results
         }
-    }.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
+    }.stateInit(emptyList())
 
 }