feat: 支持显示 exampleUrls + 状态栏优化

gkd-kit · Nov 8, 2023 · 7357897 · 7357897
1 parent 05ddbb2
commit 7357897
Show file tree

Hide file tree

Showing 17 changed files with 529 additions and 361 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -184,4 +184,7 @@ dependencies {
     implementation(libs.others.reorderable)
 
     implementation(libs.androidx.splashscreen)
+
+    implementation(libs.coil.compose)
+    implementation(libs.coil.gif)
 }
diff --git a/app/src/main/java/li/songe/gkd/MainActivity.kt b/app/src/main/java/li/songe/gkd/MainActivity.kt
@@ -5,7 +5,6 @@ import android.content.Context
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.rememberNavController
 import com.dylanc.activityresult.launcher.PickContentLauncher
@@ -29,7 +28,6 @@ import li.songe.gkd.util.storeFlow
 
 @AndroidEntryPoint
 class MainActivity : CompositionActivity({
-    installSplashScreen()
     useLifeCycleLog()
 
     val launcher = StartActivityLauncher(this)
@@ -47,7 +45,8 @@ class MainActivity : CompositionActivity({
     }
 
     setContent {
-        val navController = rememberNavController()
+
+    val navController = rememberNavController()
         AppTheme {
             UpgradeDialog()
             CompositionLocalProvider(

diff --git a/app/src/main/java/li/songe/gkd/composition/CompositionActivity.kt b/app/src/main/java/li/songe/gkd/composition/CompositionActivity.kt
@@ -3,6 +3,8 @@ package li.songe.gkd.composition
 import android.content.res.Configuration
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.enableEdgeToEdge
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 
 open class CompositionActivity(
     private val block: CompositionActivity.(Bundle?) -> Unit,
@@ -26,6 +28,8 @@ open class CompositionActivity(
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         block(savedInstanceState)
     }

diff --git a/app/src/main/java/li/songe/gkd/data/SubscriptionRaw.kt b/app/src/main/java/li/songe/gkd/data/SubscriptionRaw.kt
@@ -82,6 +82,20 @@ data class SubscriptionRaw(
                 }
             }
         }
+
+        @IgnoredOnParcel
+        val allExampleUrls by lazy {
+            mutableListOf<String>().apply {
+                if (exampleUrls != null) {
+                    addAll(exampleUrls)
+                }
+                rules.forEach { r ->
+                    if (r.exampleUrls != null) {
+                        addAll(r.exampleUrls)
+                    }
+                }
+            }
+        }
     }
 
     @Serializable

diff --git a/app/src/main/java/li/songe/gkd/ui/AppItemPage.kt b/app/src/main/java/li/songe/gkd/ui/AppItemPage.kt
@@ -58,6 +58,7 @@ import kotlinx.serialization.encodeToString
 import li.songe.gkd.data.SubsConfig
 import li.songe.gkd.data.SubscriptionRaw
 import li.songe.gkd.db.DbSet
+import li.songe.gkd.ui.destinations.GroupItemPageDestination
 import li.songe.gkd.util.LocalNavController
 import li.songe.gkd.util.ProfileTransitions
 import li.songe.gkd.util.Singleton
@@ -66,6 +67,7 @@ import li.songe.gkd.util.launchAsFn
 import li.songe.gkd.util.launchTry
 import li.songe.gkd.util.storeFlow
 import li.songe.gkd.util.subsIdToRawFlow
+import li.songe.gkd.util.navigate
 
 @RootNavGraph
 @Destination(style = ProfileTransitions::class)
@@ -238,16 +240,32 @@ fun AppItemPage(
                 }
             },
             confirmButton = {
-                TextButton(onClick = {
-                    val groupAppText = Singleton.json.encodeToString(
-                        appRaw?.copy(
-                            groups = listOf(showGroupItemVal)
+                Row {
+                    if (showGroupItemVal.allExampleUrls.isNotEmpty()) {
+                        TextButton(onClick = {
+                            setShowGroupItem(null)
+                            navController.navigate(
+                                GroupItemPageDestination(
+                                    subsInt = subsItemId,
+                                    appId = appId,
+                                    groupKey = showGroupItemVal.key
+                                )
+                            )
+                        }) {
+                            Text(text = "查看图片")
+                        }
+                    }
+                    TextButton(onClick = {
+                        val groupAppText = Singleton.json.encodeToString(
+                            appRaw?.copy(
+                                groups = listOf(showGroupItemVal)
+                            )
                         )
-                    )
-                    ClipboardUtils.copyText(groupAppText)
-                    ToastUtils.showShort("复制成功")
-                }) {
-                    Text(text = "复制规则组")
+                        ClipboardUtils.copyText(groupAppText)
+                        ToastUtils.showShort("复制成功")
+                    }) {
+                        Text(text = "复制规则组")
+                    }
                 }
             })
     }

diff --git a/app/src/main/java/li/songe/gkd/ui/ControlPage.kt b/app/src/main/java/li/songe/gkd/ui/ControlPage.kt
@@ -15,11 +15,8 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.KeyboardArrowRight
 import androidx.compose.material3.Divider
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -48,7 +45,6 @@ import li.songe.gkd.util.usePollState
 
 val controlNav = BottomNavItem(label = "主页", icon = SafeR.ic_home, route = "settings")
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ControlPage() {
     val context = LocalContext.current as MainActivity
@@ -64,116 +60,103 @@ fun ControlPage() {
     }
     val canDrawOverlays by usePollState { Settings.canDrawOverlays(context) }
 
-    Scaffold(
-        topBar = {
-            TopAppBar(title = {
-                Text(
-                    text = "GKD"
-                )
+
+    Column(
+        modifier = Modifier.verticalScroll(
+            state = rememberScrollState()
+        )
+    ) {
+        if (!notifEnabled) {
+            AuthCard(title = "通知权限", desc = "用于启动后台服务,展示服务运行状态", onAuthClick = {
+                val intent = Intent()
+                intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
+                intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+                intent.putExtra(Settings.EXTRA_CHANNEL_ID, context.applicationInfo.uid)
+                context.startActivity(intent)
             })
-        },
-    ) { padding ->
-        Column(
-            modifier = Modifier
-                .verticalScroll(
-                    state = rememberScrollState()
-                )
-                .padding(padding)
-        ) {
-            if (!notifEnabled) {
-                AuthCard(title = "通知权限",
-                    desc = "用于启动后台服务,展示服务运行状态",
-                    onAuthClick = {
-                        val intent = Intent()
-                        intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
-                        intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
-                        intent.putExtra(Settings.EXTRA_CHANNEL_ID, context.applicationInfo.uid)
-                        context.startActivity(intent)
-                    })
-                Divider()
-            }
+            Divider()
+        }
 
-            if (!gkdAccessRunning) {
-                AuthCard(title = "无障碍权限",
-                    desc = "用于获取屏幕信息,点击屏幕上的控件",
-                    onAuthClick = {
-                        if (notifEnabled) {
-                            appScope.launchTry(Dispatchers.IO) {
-                                val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
-                                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                                // android.content.ActivityNotFoundException
-                                // https://bugly.qq.com/v2/crash-reporting/crashes/d0ce46b353/113010?pid=1
-                                context.startActivity(intent)
-                            }
-                        } else {
-                            ToastUtils.showShort("必须先开启[通知权限]")
+        if (!gkdAccessRunning) {
+            AuthCard(title = "无障碍权限",
+                desc = "用于获取屏幕信息,点击屏幕上的控件",
+                onAuthClick = {
+                    if (notifEnabled) {
+                        appScope.launchTry(Dispatchers.IO) {
+                            val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
+                            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                            // android.content.ActivityNotFoundException
+                            // https://bugly.qq.com/v2/crash-reporting/crashes/d0ce46b353/113010?pid=1
+                            context.startActivity(intent)
                         }
-                    })
-                Divider()
-            }
+                    } else {
+                        ToastUtils.showShort("必须先开启[通知权限]")
+                    }
+                })
+            Divider()
+        }
 
-            if (!canDrawOverlays) {
-                AuthCard(title = "悬浮窗权限",
-                    desc = "用于后台提示,显示保存快照按钮等功能",
-                    onAuthClick = {
-                        val intent = Intent(
-                            Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
-                        )
-                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                        context.startActivity(intent)
-                    })
-                Divider()
-            }
+        if (!canDrawOverlays) {
+            AuthCard(title = "悬浮窗权限",
+                desc = "用于后台提示,显示保存快照按钮等功能",
+                onAuthClick = {
+                    val intent = Intent(
+                        Settings.ACTION_MANAGE_OVERLAY_PERMISSION,
+                    )
+                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    context.startActivity(intent)
+                })
+            Divider()
+        }
 
-            if (gkdAccessRunning) {
-                TextSwitch(name = "服务开启",
-                    desc = "保持服务开启,根据订阅规则匹配屏幕目标节点",
-                    checked = store.enableService,
-                    onCheckedChange = {
-                        updateStorage(
-                            storeFlow, store.copy(
-                                enableService = it
-                            )
+        if (gkdAccessRunning) {
+            TextSwitch(name = "服务开启",
+                desc = "保持服务开启,根据订阅规则匹配屏幕目标节点",
+                checked = store.enableService,
+                onCheckedChange = {
+                    updateStorage(
+                        storeFlow, store.copy(
+                            enableService = it
                         )
-                    })
-                Divider()
-            }
-
-            Row(
-                horizontalArrangement = Arrangement.SpaceBetween,
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier
-                    .clickable {
-                        navController.navigate(ClickLogPageDestination)
-                    }
-                    .padding(10.dp, 5.dp),
-            ) {
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = "点击记录", fontSize = 18.sp
-                    )
-                    Spacer(modifier = Modifier.height(2.dp))
-                    Text(
-                        text = "如误触可在此快速定位关闭规则", fontSize = 14.sp
                     )
-                }
-                Icon(imageVector = Icons.Default.KeyboardArrowRight, contentDescription = null)
-            }
+                })
             Divider()
+        }
 
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(10.dp, 5.dp)
-            ) {
-                Text(text = subsStatus, fontSize = 18.sp)
-                if (latestRecordDesc != null) {
-                    Text(
-                        text = "最近点击: $latestRecordDesc", fontSize = 14.sp
-                    )
+        Row(
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .clickable {
+                    navController.navigate(ClickLogPageDestination)
                 }
+                .padding(10.dp, 5.dp),
+        ) {
+            Column(modifier = Modifier.weight(1f)) {
+                Text(
+                    text = "点击记录", fontSize = 18.sp
+                )
+                Spacer(modifier = Modifier.height(2.dp))
+                Text(
+                    text = "如误触可在此快速定位关闭规则", fontSize = 14.sp
+                )
             }
+            Icon(imageVector = Icons.Default.KeyboardArrowRight, contentDescription = null)
+        }
+        Divider()
 
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(10.dp, 5.dp)
+        ) {
+            Text(text = subsStatus, fontSize = 18.sp)
+            if (latestRecordDesc != null) {
+                Text(
+                    text = "最近点击: $latestRecordDesc", fontSize = 14.sp
+                )
+            }
         }
+
     }
 }