Finish old activity (#1205)

Signed-off-by: NextAlone <[email protected]>
Xposed-Modules-Repo · Dec 26, 2021 · a567068 · a567068
1 parent 413f072
commit a567068
Showing 1 changed file with 11 additions and 26 deletions.
diff --git a/app/src/main/java/me/singleneuron/qn_kernel/tlb/ActivityRouter.kt b/app/src/main/java/me/singleneuron/qn_kernel/tlb/ActivityRouter.kt
@@ -39,6 +39,12 @@ import nil.nadph.qnotified.R
 import org.ferredoxin.ferredoxinui.common.base.UiChangeableItemFactory
 
 object ActivityRouter : UiChangeableItemFactory<String>() {
+    private val activityMap = mapOf<String, Class<*>>(
+        "QQ主题" to NewSettingsActivity::class.java,
+        "关怀模式" to SettingActivity::class.java,
+        "Android Classic" to MaterialActivity::class.java,
+        "Material You" to Material3Activity::class.java,
+    )
     override var title: String = "设置界面样式"
     val configData = ConfigData<String>(title)
     override val value: MutableStateFlow<String?> by lazy {
@@ -53,38 +59,17 @@ object ActivityRouter : UiChangeableItemFactory<String>() {
     override var onClickListener: (Activity) -> Boolean = {
         MaterialAlertDialogBuilder(it, R.style.MaterialDialog)
             .setTitle("选择设置界面样式")
-            .setItems(arrayOf("QQ主题", "关怀模式", "Android Classic", "Material You")) { _: DialogInterface, i: Int ->
-                when (i) {
-                    0 -> {
-                        value.value = "QQ主题"
-                        it.startActivity(Intent(it, NewSettingsActivity::class.java))
-                    }
-                    1 -> {
-                        value.value = "关怀模式"
-                        it.startActivity(Intent(it, SettingActivity::class.java))
-                    }
-                    2 -> {
-                        value.value = "Android Classic"
-                        it.startActivity(Intent(it, MaterialActivity::class.java))
-                    }
-                    3 -> {
-                        value.value = "Material You"
-                        it.startActivity(Intent(it, Material3Activity::class.java))
-                    }
-                }
+            .setItems(activityMap.keys.toTypedArray()) { _: DialogInterface, i: Int ->
+                value.value = activityMap.keys.toTypedArray()[i]
+                it.startActivity(Intent(it, activityMap[activityMap.keys.toTypedArray()[i]]))
+                it.finish()
             }
             .create()
             .show()
         true
     }
 
     fun getActivityClass(): Class<*> {
-        return when (value.value) {
-            "QQ主题" -> NewSettingsActivity::class.java
-            "关怀模式" -> SettingActivity::class.java
-            "Android Classic" -> MaterialActivity::class.java
-            "Material You" -> Material3Activity::class.java
-            else -> NewSettingsActivity::class.java
-        }
+        return activityMap[value.value] ?: NewSettingsActivity::class.java
     }
 }