From 08b7feeede6734eb0d7b97314f96b537cde89d08 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Thu, 5 May 2022 15:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E7=9F=A5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E8=83=8C=E6=99=AF=E9=80=8F=E6=98=8E=E5=BA=A6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=9E=E9=AA=8C=E6=80=A7=E6=96=87=E6=A1=88=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notify/ui/activity/MainActivity.kt        |  8 +--
 app/src/main/res/layout/activity_main.xml     | 54 +++++++++++++++----
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt
index d108e61..5a32436 100644
--- a/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt
@@ -126,7 +126,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         binding.notifyIconAutoSyncItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
         binding.notifyIconAutoSyncChildItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX_AUTO)
         binding.notifyPanelConfigSeekbar.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_PANEL_ALPHA)
-        binding.notifyPanelConfigText.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_PANEL_ALPHA)
+        binding.notifyPanelConfigTextPanel.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_PANEL_ALPHA)
         binding.devNotifyConfigSwitch.isChecked = modulePrefs.get(DataConst.REMOVE_DEV_NOTIFY)
         binding.crcpNotifyConfigSwitch.isChecked = modulePrefs.get(DataConst.REMOVE_CHANGECP_NOTIFY)
         binding.dndNotifyConfigSwitch.isChecked = modulePrefs.get(DataConst.REMOVE_DNDALERT_NOTIFY)
@@ -139,7 +139,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         binding.notifyIconAutoSyncSwitch.isChecked = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX_AUTO)
         binding.notifyPanelConfigSwitch.isChecked = modulePrefs.get(DataConst.ENABLE_NOTIFY_PANEL_ALPHA)
         binding.notifyPanelConfigSeekbar.progress = modulePrefs.get(DataConst.NOTIFY_PANEL_ALPHA)
-        binding.notifyPanelConfigText.text = "当前值 - ${modulePrefs.get(DataConst.NOTIFY_PANEL_ALPHA)}"
+        binding.notifyPanelConfigText.text = modulePrefs.get(DataConst.NOTIFY_PANEL_ALPHA).toString()
         binding.notifyIconAutoSyncText.text = notifyIconAutoSyncTime
         binding.moduleEnableSwitch.setOnCheckedChangeListener { btn, b ->
             if (btn.isPressed.not()) return@setOnCheckedChangeListener
@@ -200,7 +200,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         binding.notifyPanelConfigSwitch.setOnCheckedChangeListener { btn, b ->
             if (btn.isPressed.not()) return@setOnCheckedChangeListener
             modulePrefs.put(DataConst.ENABLE_NOTIFY_PANEL_ALPHA, b)
-            binding.notifyPanelConfigText.isVisible = b
+            binding.notifyPanelConfigTextPanel.isVisible = b
             binding.notifyPanelConfigSeekbar.isVisible = b
             SystemUITool.refreshSystemUI(context = this)
         }
@@ -212,7 +212,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         }
         binding.notifyPanelConfigSeekbar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                binding.notifyPanelConfigText.text = "当前值 - $progress"
+                binding.notifyPanelConfigText.text = progress.toString()
             }
 
             override fun onStopTrackingTouch(seekBar: SeekBar) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0b50191..84d9d75 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -443,19 +443,41 @@
                     android:max="255"
                     android:min="0" />
 
-                <TextView
-                    android:id="@+id/notify_panel_config_text"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/notify_panel_config_text_panel"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:ellipsize="end"
                     android:gravity="center"
-                    android:maxWidth="100dp"
+                    android:orientation="horizontal"
                     android:paddingTop="5dp"
-                    android:paddingBottom="15dp"
-                    android:singleLine="true"
-                    android:text="当前值 - %1"
-                    android:textColor="@color/colorTextGray"
-                    android:textSize="14sp" />
+                    android:paddingBottom="15dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="5dp"
+                        android:alpha="0.75"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxWidth="100dp"
+                        android:singleLine="true"
+                        android:text="当前值"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="13.5sp" />
+
+                    <TextView
+                        android:id="@+id/notify_panel_config_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxWidth="100dp"
+                        android:singleLine="true"
+                        android:text="%1"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="15sp"
+                        android:textStyle="bold" />
+                </LinearLayout>
 
                 <TextView
                     android:layout_width="match_parent"
@@ -468,6 +490,18 @@
                     android:text="开启自定义功能后，你可以拖拽滑动条来调整通知面板的透明度，0 为全透明，255 为不透明。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:alpha="0.6"
+                    android:lineSpacingExtra="6dp"
+                    android:paddingLeft="15dp"
+                    android:paddingRight="15dp"
+                    android:text="此功能为实验性功能，后期不一定继续维护，且仅在 ColorOS 12~12.1 测试正常，不能保证可以和各种通知栏主题模块配合使用，如有冲突请关闭此功能或禁用相关重复功能的主题模块。"
+                    android:textColor="@color/colorTextDark"
+                    android:textSize="12sp" />
             </LinearLayout>
 
             <LinearLayout