feat: priority rule

gkd-kit · Oct 16, 2024 · 1825b00 · 1825b00
1 parent 4fc031a
commit 1825b00
Show file tree

Hide file tree

Showing 23 changed files with 904 additions and 976 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/MainActivity.kt b/app/src/main/kotlin/li/songe/gkd/MainActivity.kt
@@ -208,11 +208,11 @@ private fun Activity.fixTopPadding() {
 
 @Composable
 private fun ShizukuErrorDialog(stateFlow: MutableStateFlow<Boolean>) {
-    val state = stateFlow.collectAsState()
-    if (state.value) {
+    val state = stateFlow.collectAsState().value
+    if (state) {
         val appId = "moe.shizuku.privileged.api"
-        val appInfoCache = appInfoCacheFlow.collectAsState()
-        val installed = appInfoCache.value.contains(appId)
+        val appInfoCache = appInfoCacheFlow.collectAsState().value
+        val installed = appInfoCache.contains(appId)
         AlertDialog(
             onDismissRequest = { stateFlow.value = false },
             title = { Text(text = "授权错误") },

diff --git a/app/src/main/kotlin/li/songe/gkd/data/AppRule.kt b/app/src/main/kotlin/li/songe/gkd/data/AppRule.kt
@@ -1,7 +1,5 @@
 package li.songe.gkd.data
 
-import li.songe.gkd.util.ResolvedAppGroup
-
 class AppRule(
     rule: RawSubscription.RawAppRule,
     g: ResolvedAppGroup,

diff --git a/app/src/main/kotlin/li/songe/gkd/data/ComplexSnapshot.kt b/app/src/main/kotlin/li/songe/gkd/data/ComplexSnapshot.kt
@@ -48,7 +48,7 @@ fun createComplexSnapshot(): ComplexSnapshot {
         screenWidth = ScreenUtils.getScreenWidth(),
         isLandscape = ScreenUtils.isLandscape(),
 
-        nodes = NodeInfo.info2nodeList(currentAbNode)
+        nodes = info2nodeList(currentAbNode)
     )
 }
 

diff --git a/app/src/main/kotlin/li/songe/gkd/data/GlobalRule.kt b/app/src/main/kotlin/li/songe/gkd/data/GlobalRule.kt
@@ -1,7 +1,6 @@
 package li.songe.gkd.data
 
 import li.songe.gkd.service.launcherAppId
-import li.songe.gkd.util.ResolvedGlobalGroup
 import li.songe.gkd.util.systemAppsFlow
 
 data class GlobalApp(