From 740a250a59a60d5eb99f33d6a54a886027920c99 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Thu, 17 Mar 2022 03:35:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=B8=8D=E6=98=AF=E7=BA=AF=E9=BB=91=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                            | 2 +-
 app/build.gradle                                          | 2 +-
 .../main/java/com/fankes/miui/notify/hook/HookEntry.kt    | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 246015b..1f82598 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -23,7 +23,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index a51980f..71ccb2f 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/miui/notify/hook/HookEntry.kt b/app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt
index 5c4cd83..c6af25b 100644
--- a/app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt
@@ -79,6 +79,9 @@ class HookEntry : YukiHookXposedInitProxy {
         /** 原生存在的类 */
         private const val StatusBarIconViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.StatusBarIconView"
 
+        /** 原生存在的类 */
+        private const val NotificationIconContainerClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.phone.NotificationIconContainer"
+
         /** 根据多个版本存在不同的包名相同的类 */
         private val ExpandableNotificationRowClass = VariousClass(
             "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.ExpandableNotificationRow",
@@ -532,7 +535,10 @@ class HookEntry : YukiHookXposedInitProxy {
                                 instance<ImageView>().also {
                                     if (hasIgnoreStatusBarIconColor(it.context, field { name = "mNotification" }
                                             .of<StatusBarNotification>(instance))) it.colorFilter = null
-                                    else it.setColorFilter(field { name = "mCurrentSetColor" }.of<Int>(instance) ?: 0)
+                                    /** 防止图标不是纯黑的问题 */
+                                    else it.setColorFilter(
+                                        field { name = "mCurrentSetColor" }.of<Int>(instance)
+                                            ?.let { color -> if (color == -419430401) color else Color.BLACK } ?: 0)
                                 }
                             }
                         }