From 018c137d854a5340dc78eb2220f1d2fc501219aa Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Mon, 28 Feb 2022 22:07:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B7=B1=E8=89=B2=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=20Android=2012=20=E9=80=9A=E7=9F=A5=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                               |  2 +-
 .../fankes/coloros/notify/hook/HookEntry.kt    | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 570d2c8..2c7d9bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
index 1079d3f..d1016f5 100644
--- a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
@@ -230,18 +230,24 @@ class HookEntry : YukiHookXposedInitProxy {
                     val oldStyle = (if (context.isSystemInDarkMode) 0xffdcdcdc else 0xff707173).toInt()
 
                     /** 新版风格 */
-                    val newStyle = (if (context.isSystemInDarkMode) 0xff2d2d2d else Color.WHITE).toInt()
+                    val newStyle = (if (context.isSystemInDarkMode) 0xffdcdcdc else Color.WHITE).toInt()
 
-                    /** 图标着色 */
-                    val applyColor = customPair.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: oldStyle
+                    /** 优化风格 */
+                    val fixStyle = (if (context.isSystemInDarkMode) 0xff707173 else oldStyle).toInt()
+
+                    /** 旧版图标着色 */
+                    val oldApplyColor = customPair.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: oldStyle
+
+                    /** 新版图标着色 */
+                    val newApplyColor = customPair.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: fixStyle
                     /** 判断风格并开始 Hook */
                     if (isA12Style) {
-                        background = DrawableBuilder().rounded().solidColor(applyColor).build()
-                        setColorFilter(if (isA12Style) newStyle else oldStyle)
+                        background = DrawableBuilder().rounded().solidColor(newApplyColor).build()
+                        setColorFilter(newStyle)
                         setPadding(2.dp(context), 2.dp(context), 2.dp(context), 2.dp(context))
                     } else {
                         background = null
-                        setColorFilter(applyColor)
+                        setColorFilter(oldApplyColor)
                         setPadding(0, 0, 0, 0)
                     }
                 }