From 39ec0e8ef7cc01f2b5ff264c625341e8d0997fca Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Mon, 17 Apr 2023 05:59:55 +0800
Subject: [PATCH] Modify change need restart dialog to prompt in
 ConfigActivity, activity_config

---
 .../ui/activity/parasitic/ConfigActivity.kt   | 39 +++++++++++--------
 app/src/main/res/layout/activity_config.xml   | 15 +++++++
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt
index 1f87802..b42afcd 100644
--- a/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/parasitic/ConfigActivity.kt
@@ -79,6 +79,22 @@ class ConfigActivity : BaseActivity<ActivityConfigBinding>() {
         binding.inactiveModeIcon.isGone = HookEntry.isHookClientSupport
         binding.unsupportItem.isGone = HookEntry.isHookClientSupport
         binding.executorInfoText.text = "${YukiHookAPI.Status.Executor.name} API ${YukiHookAPI.Status.Executor.apiLevel}"
+        binding.needRestartTipText.replaceToAppName()
+        binding.needRestartTipText.setOnClickListener {
+            showDialog {
+                title = "需要重新启动"
+                msg = "你必须重新启动${appName}才能使当前更改生效，现在重新启动吗？"
+                confirmButton {
+                    cancel()
+                    finish()
+                    exitProcess(status = 0)
+                }
+                cancelButton(text = "稍后再说") {
+                    cancel()
+                    it.isVisible = false
+                }
+            }
+        }
         /** 刷新当前模式文本 */
         fun refreshCurrentModeText() {
             binding.currentModeText.text = when {
@@ -96,24 +112,15 @@ class ConfigActivity : BaseActivity<ActivityConfigBinding>() {
         refreshConfigItems()
         binding.infoTipText.replaceToAppName()
         binding.qqTimProtectTipText.replaceToAppName()
-        binding.disableAllHookSwitch.bind(ConfigData.DISABLE_ALL_HOOK) { refreshConfigItems(); refreshCurrentModeText(); showRestartDialog() }
-        binding.qqTimProtectModeSwitch.bind(ConfigData.ENABLE_QQ_TIM_PROTECT_MODE) { refreshCurrentModeText(); showRestartDialog() }
-        binding.qqTimCoreServiceSwitch.bind(ConfigData.ENABLE_KILL_QQ_TIM_CORESERVICE) { showRestartDialog() }
-        binding.qqTimCoreServiceChildSwitch.bind(ConfigData.ENABLE_KILLE_QQ_TIM_CORESERVICE_CHILD) { showRestartDialog() }
+        binding.disableAllHookSwitch.bind(ConfigData.DISABLE_ALL_HOOK) { refreshConfigItems(); refreshCurrentModeText(); showNeedRestartTip() }
+        binding.qqTimProtectModeSwitch.bind(ConfigData.ENABLE_QQ_TIM_PROTECT_MODE) { refreshCurrentModeText(); showNeedRestartTip() }
+        binding.qqTimCoreServiceSwitch.bind(ConfigData.ENABLE_KILL_QQ_TIM_CORESERVICE) { showNeedRestartTip() }
+        binding.qqTimCoreServiceChildSwitch.bind(ConfigData.ENABLE_KILLE_QQ_TIM_CORESERVICE_CHILD) { showNeedRestartTip() }
     }
 
-    /** 显示重新启动对话框 */
-    private fun showRestartDialog() {
-        showDialog {
-            title = "需要重新启动"
-            msg = "你必须重新启动${appName}才能使当前更改生效，现在重新启动吗？"
-            confirmButton {
-                cancel()
-                finish()
-                exitProcess(status = 0)
-            }
-            cancelButton(text = "稍后再说")
-        }
+    /** 显示需要重新启动提示 */
+    private fun showNeedRestartTip() {
+        binding.needRestartTipText.isVisible = true
     }
 
     /** 替换占位符到当前 APP 名称 */
diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml
index f15b21f..e031c56 100644
--- a/app/src/main/res/layout/activity_config.xml
+++ b/app/src/main/res/layout/activity_config.xml
@@ -83,6 +83,21 @@
                 android:textSize="13sp"
                 android:visibility="gone" />
 
+            <TextView
+                android:id="@+id/need_restart_tip_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="5dp"
+                android:background="@drawable/bg_orange_round"
+                android:gravity="center"
+                android:padding="5dp"
+                android:text="新的设置需要重新启动{APP_NAME}才能生效"
+                android:textColor="@color/white"
+                android:textSize="13sp"
+                android:visibility="gone" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"