Update version to 1.7,fix more bugs

.github/ISSUE_TEMPLATE/----------.md

@@ -23,6 +23,7 @@ assignees: ''
 
 * (若直接在附件提交这里可不填)
 
-<!--- 提交时请将示例内容全部删除 --->
+<!--- 提交时请将括号内容包括括号全部删除，填入你自己的内容 --->
+<!--- 请保留模板原始标题 --->
 <!--- 不按规定提交的 issues 将直接被关闭 --->
 <!--- Create by Template --->

.github/ISSUE_TEMPLATE/----bug---.md

@@ -46,6 +46,7 @@ assignees: fankes
 
 </code></pre></details>
 
-<!--- 提交时请将示例内容全部删除 --->
+<!--- 提交时请将括号内容包括括号全部删除，填入你自己的内容 --->
+<!--- 请保留模板原始标题 --->
 <!--- 不按规定提交的 issues 将直接被关闭 --->
 <!--- Create by Template --->

.idea/misc.xml

@@ -10,7 +10,7 @@
         <entry key="app/src/main/res/drawable/white_round.xml" value="0.256" />
         <entry key="app/src/main/res/layout/activity_config.xml" value="0.42168674698795183" />
         <entry key="app/src/main/res/layout/activity_login.xml" value="0.4375" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.37516748548459133" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.36160137752905724" />
         <entry key="app/src/main/res/layout/adapter_config.xml" value="0.4375" />
         <entry key="app/src/main/res/layout/dia_icon_search.xml" value="0.4307692307692308" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.44871794871794873" />

README.md

@@ -2,7 +2,7 @@
 
 ![Eclipse Marketplace](https://img.shields.io/badge/build-passing-brightgreen)
 ![Eclipse Marketplace](https://img.shields.io/badge/license-AGPL3.0-blue)
-![Eclipse Marketplace](https://img.shields.io/badge/version-v1.65-green)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v1.7-green)
 <br/><br/>
 <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/app/src/main/ic_launcher-playstore.png" width = "100" height = "100"/>
 <br/>
@@ -12,12 +12,13 @@ Fix the native notification bar icon function abandoned by the MIUI development
 # 开始使用
 
 点击下载最新版本
-<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.65-green)</a>
+<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.7-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>
 
 - 此模块仅支持 LSPosed(作用域“系统界面”)、~~EdXposed(随时停止支持)~~、不支持太极无极
 - 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
+- 建议最低从 MIUI 12.5 `2021-5-18` 开发版以后开始使用模块，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块的问题
 - 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题
 
 # 请勿用于非法用途

app/build.gradle

@@ -51,9 +51,13 @@ android {
 tasks.whenTaskAdded {
     task -> if (task.name == "lintVitalRelease") task.enabled = false
 }
+
+/** 移除无效耗时 lint Task */
 tasks.whenTaskAdded {
     task -> if (task.name == "lintVitalAnalyzeRelease") task.enabled = false
 }
+
+/** 移除无效耗时 lint Task */
 tasks.whenTaskAdded {
     task -> if (task.name == "lintVitalReportRelease") task.enabled = false
 }

app/src/main/java/com/fankes/miui/notify/application/MNNApplication.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/bean/IconDataBean.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/hook/HookConst.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,6 +30,7 @@ object HookConst {
     const val ENABLE_MODULE_LOG = "_enable_module_log"
     const val ENABLE_HIDE_ICON = "_hide_icon"
     const val ENABLE_COLOR_ICON_HOOK = "_color_icon_hook"
+    const val ENABLE_COLOR_ICON_COMPAT = "_color_icon_compat"
     const val ENABLE_NOTIFY_ICON_FIX = "_notify_icon_fix"
 
     const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui"

app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,6 +34,7 @@ import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
+import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_COMPAT
 import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_HOOK
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE_LOG
@@ -76,12 +77,12 @@ class HookEntry : YukiHookXposedInitProxy {
         private const val NotificationViewWrapperClass =
             "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
 
-        /** 原生存在的类 */
-        private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
-
         /** 未确定是否只有旧版本存在的类 */
         private const val ExpandableNotificationRowClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
 
+        /** 原生存在的类 */
+        private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
+
         /** 根据多个版本存在不同的包名相同的类 */
         private val NotificationUtilClass = VariousClass(
             "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtil",
@@ -103,25 +104,18 @@ class HookEntry : YukiHookXposedInitProxy {
      * @param drawable 要判断的图标
      * @return [Boolean]
      */
-    private fun PackageParam.isGrayscaleIcon(context: Context, drawable: Drawable) = safeOfFalse {
-        ContrastColorUtilClass.clazz.let {
-            it.method {
-                name = "isGrayscaleIcon"
-                param(DrawableClass)
-            }.get(it.method {
-                name = "getInstance"
-                param(ContextClass)
-            }.get().invoke(context)).invoke<Boolean>(drawable) ?: false
-        }
-    }
-
-    /**
-     * 获取当前通知栏的样式
-     * @return [Boolean]
-     */
-    private fun PackageParam.isShowMiuiStyle() = safeOfFalse {
-        NotificationUtilClass.clazz.method { name = "showMiuiStyle" }.get().invoke() ?: false
-    }
+    private fun PackageParam.isGrayscaleIcon(context: Context, drawable: Drawable) =
+        if (!prefs.getBoolean(ENABLE_COLOR_ICON_COMPAT)) safeOfFalse {
+            ContrastColorUtilClass.clazz.let {
+                it.method {
+                    name = "isGrayscaleIcon"
+                    param(DrawableClass)
+                }.get(it.method {
+                    name = "getInstance"
+                    param(ContextClass)
+                }.get().invoke(context)).invoke<Boolean>(drawable) ?: false
+            }
+        } else BitmapCompatTool.isGrayscaleDrawable(drawable)
 
     /**
      * 是否为新版本 MIUI 方案
@@ -129,9 +123,19 @@ class HookEntry : YukiHookXposedInitProxy {
      * 拥有状态栏图标颜色检查功能
      * @return [Boolean]
      */
-    private fun PackageParam.hasIgnoreStatusBarIconColor() = safeOfFalse {
-        NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
-    }
+    private val PackageParam.hasIgnoreStatusBarIconColor
+        get() = safeOfFalse {
+            NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
+        }
+
+    /**
+     * 获取当前通知栏的样式
+     * @return [Boolean]
+     */
+    private val PackageParam.isShowMiuiStyle
+        get() = safeOfFalse {
+            NotificationUtilClass.clazz.method { name = "showMiuiStyle" }.get().invoke() ?: false
+        }
 
     /**
      * 获取 [ExpandedNotificationClass] 的应用名称
@@ -222,10 +226,11 @@ class HookEntry : YukiHookXposedInitProxy {
         if (iconDrawable == null) return@safeRun
         /** 如果没开启修复 APP 的彩色图标 */
         if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
-        /** 判断是否不是灰度图标 */
-        val isNotGrayscaleIcon = !isGrayscaleIcon(context, iconDrawable)
         /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
         expandedNf?.also { notifyInstance ->
+            /** 判断是否不是灰度图标 */
+            val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
+
             /** 目标彩色通知 APP 图标 */
             var customIcon: Bitmap? = null
             if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
@@ -243,12 +248,12 @@ class HookEntry : YukiHookXposedInitProxy {
                 }
             /** 打印日志 */
             if (prefs.getBoolean(ENABLE_MODULE_LOG))
-                loggerD(msg = "hook Icon [${findAppName(notifyInstance)}][${notifyInstance.opPkgName}] custom [${customIcon != null}] grayscale [${!isNotGrayscaleIcon}]")
+                loggerD(msg = "Icon --> [${findAppName(notifyInstance)}][${notifyInstance.opPkgName}] custom [${customIcon != null}] grayscale [${!isNotGrayscaleIcon}] xmsf [${notifyInstance.isXmsf}]")
             when {
                 /** 处理自定义通知图标优化 */
                 customIcon != null -> it(customIcon!!)
                 /** 若不是灰度图标自动处理为圆角 */
-                isNotGrayscaleIcon -> it(expandedNf.compatNotifyIcon(context, iconDrawable).toBitmap().round(15.dp(context)))
+                isNotGrayscaleIcon -> it(notifyInstance.compatNotifyIcon(context, iconDrawable).toBitmap().round(15.dp(context)))
             }
         }
     }
@@ -295,7 +300,7 @@ class HookEntry : YukiHookXposedInitProxy {
                 val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
 
                 /** 判断图标风格 */
-                val isGrayscaleIcon = isGrayscaleIcon(context, iconDrawable)
+                val isGrayscaleIcon = !notifyInstance.isXmsf && isGrayscaleIcon(context, iconDrawable)
 
                 /** 自定义默认小图标 */
                 var customIcon: Bitmap? = null
@@ -340,7 +345,7 @@ class HookEntry : YukiHookXposedInitProxy {
                             background = DrawableBuilder().rounded().solidColor(iconColor).build()
                     } else iconImageView.apply {
                         /** 重新设置图标 */
-                        setImageDrawable(expandedNf.compatNotifyIcon(context, iconDrawable))
+                        setImageDrawable(notifyInstance.compatNotifyIcon(context, iconDrawable))
                         /** 设置裁切到边界 */
                         clipToOutline = true
                         /** 设置一个圆角轮廓裁切 */
@@ -378,7 +383,7 @@ class HookEntry : YukiHookXposedInitProxy {
                     notifyInstance.notification.smallIcon.loadDrawable(context)
 
                 /** 判断是否不是灰度图标 */
-                val isNotGrayscaleIcon = !isGrayscaleIcon(context, iconDrawable)
+                val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
 
                 /** 获取目标修复彩色图标的 APP */
                 var isTargetFixApp = false
@@ -431,9 +436,9 @@ class HookEntry : YukiHookXposedInitProxy {
                              * 因为之前的 MIUI 版本的状态栏图标颜色会全部设置为白色的 - 找不到修复的地方就直接判断版本了
                              * 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook
                              */
-                            replaceAny { if (hasIgnoreStatusBarIconColor()) false else isShowMiuiStyle() }
+                            replaceAny { if (hasIgnoreStatusBarIconColor) false else isShowMiuiStyle }
                         }
-                        if (hasIgnoreStatusBarIconColor())
+                        if (hasIgnoreStatusBarIconColor)
                             injectMember {
                                 method {
                                     name = "ignoreStatusBarIconColor"
@@ -464,7 +469,7 @@ class HookEntry : YukiHookXposedInitProxy {
                             }
                             afterHook {
                                 /** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
-                                if (hasIgnoreStatusBarIconColor() || !isShowMiuiStyle())
+                                if (hasIgnoreStatusBarIconColor || !isShowMiuiStyle)
                                     (globalContext ?: args[0] as Context).also { context ->
                                         hookSmallIconOnSet(
                                             context = context,
@@ -522,7 +527,7 @@ class HookEntry : YukiHookXposedInitProxy {
                                 method { name = "handleHeaderViews" }
                                 afterHook {
                                     /** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
-                                    if (!hasIgnoreStatusBarIconColor() && isShowMiuiStyle()) return@afterHook
+                                    if (!hasIgnoreStatusBarIconColor && isShowMiuiStyle) return@afterHook
 
                                     /** 获取小图标 */
                                     val iconImageView =

app/src/main/java/com/fankes/miui/notify/hook/factory/DataFactory.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -3438,6 +3438,57 @@ object IconPackParams {
                 iconColor = 0xff4679e9.toInt(),
                 contributorName = "fankes"
             ),
+            IconDataBean(
+                isEnabled = true,
+                isEnabledAll = false,
+                appName = "QQ阅读",
+                packageName = "com.qq.reader",
+                iconBitmap = ("iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARzQklUCAgI\n" +
+                        "CHwIZIgAAAMRSURBVGiB7ZhNSFVBGIbfCVIuBG4UMgiSgihq5dZqY5ERSOSunRtXgYs2tW3TImjh\n" +
+                        "tkWbqHDRIrAfI7CltErIwMJIJfuRDOEKGjwtZvTe5J6fb+7Rg+ADlwv3fjPzvjNz5nzfSHvs0RSu\n" +
+                        "yM6AbklXJJ2RdExSh6S/kpYkTUl6I+mJc26uyHGbBugFJsnPI6CrbN0CKsB9g/B6qsBQmeLbjbOe\n" +
+                        "xEgZ4isFiS/HBDBSoPgNru2U+O5tEA+wDHRa9eyL8HA7ok0e2iTdsjYyvQeAw5K+WgcxsCqp0zn3\n" +
+                        "J28D6wr0G+OtVCRdtTSwGjhnjI/hrCXYauC4MT6Gk5Zgq4GDxvgYTCeR1UCLMT6GVktwzDG63eQ+\n" +
+                        "gSS7gZ/G+Bi+W4KtBiYkrRvbWPgo6XEhPVHL8R8Ag4T8HZ/I9QJ3gZkm04c1YAwY2kgj8FluP3AH\n" +
+                        "GA9jDMYYmGsw4Bw+/+8HKiGuG5/c/TAIfw8MA+2hj54geDohfiXGQJagKvAUGMCvSgvQh5/RRqzh\n" +
+                        "K7Hu0P/RILrRRG1lOcbAeI6ONwfAr0xPnbgRYCUYHaG2BQeACUPfAGMxBvqNg2wwDdwEOoG28GkH\n" +
+                        "bgCzkX32JelsmI1SKy46JN0zu68xL38rcaSJPq5LWpTU6px7mKsFfm/PACfCzJXFcNAwA4zmtkyt\n" +
+                        "3q3i9/NCCeJngS78cwQw2Uhr0ovsV/iuSOqV9CG3++J4J+mCpANbNP1HkoH6p35/gaKs1I+d/yTC\n" +
+                        "n+mjYeuUvYUWgpa4TBh/JJbFcJa+xKIenyp8knQoynlxzEs6lVTop95KAFX5B7lM1p1zidsnK51e\n" +
+                        "KFhMDKn1QZaB3wUKieVb2p+7YQVSS8wsA0sFCokldRKzDCwWKCSWhm/gDXaDgVQNWQY+Fygkli9p\n" +
+                        "f2beTuOrrMuSLkk6XZCoLKYkvZL0wjn3Oi0w5nr9vKQ+SRdVyxSbZVXSS0nPJD13zqUenYWAL+QH\n" +
+                        "8IX6SnI6k8gK/spm84ajNOrMjOKLoCSqIWagdNFJ4Iv4QeBtnfCJ8Ftb2fpMBDO7S/RO8w+xh352\n" +
+                        "EqfboQAAAABJRU5ErkJggg==").bitmap,
+                iconColor = 0xff45afff.toInt(),
+                contributorName = "fankes"
+            ),
+            IconDataBean(
+                isEnabled = true,
+                isEnabledAll = false,
+                appName = "QQ浏览器",
+                packageName = "com.tencent.mtt",
+                iconBitmap = ("iVBORw0KGgoAAAANSUhEUgAAADUAAAAyCAYAAAD845PIAAAAAXNSR0IArs4c6QAAAARzQklUCAgI\n" +
+                        "CHwIZIgAAAPhSURBVGiB5ZpLiB1FFIb/I4nR8REw0UkGE9zERyIDxriIbgYXQTKuXKhBERcujAYf\n" +
+                        "oAshiwEloLgQNA+UoKCiC40YRBEXCYoIEiE4YzJxQPJkzEtEGXQw8LmovtjpdPf0qep7r+gPDUPX\n" +
+                        "qXPOV9W3q+r0SP9BWTecAssl5a/fJB3PrmNmdrobcVsVsBzYCHxCM50CtgKjwEC/8z9PwDpgd0OQ\n" +
+                        "OsDtwM39hlkLvJMIU9QM8CLh0e050JaWYYqaBh7tFcwA8H6XgfLa3m2gNT2EyeuzbgEN9wmoo21t\n" +
+                        "Ay0FzvYZCtr6jQHzga/6TZPTA21APd9vioKmafi6v6gCaIWkx5NHRpqV9J2koy34WqKUnIBXEkZ0\n" +
+                        "J/AwcGvB5yBhB/IMcDzS9wwxOw9gNXAuMug9DWMMArsiY/jXL+C5iEDfAAsiYq2LiHUWuMwbaI8z\n" +
+                        "yF9emEK8FRFg99b5PO9FASyTNOLMa5MXJC8zm5L0tLPbaGNL4DHniO1wJlMX+wtH3DN1voqv9Ouc\n" +
+                        "ubS56fzYYbsIuLqqsQh1pcPxjKQfHPZzadJpv6yqIQXqgJmdcyZSp/1O+2urGopQCx1O25wlmdkZ\n" +
+                        "+XYejaHmOZxOO2y74bNyAopQPzucLnXYNtUqh+2JqoYUqCGH7ZwCrpJ0uaNLJVTxcfNM/wiwwMxm\n" +
+                        "HX0ELFFYOi6RJDPbmzXdqFDsrPytFFQJVQx4v3Pxva+Bz4XAZmAf8EuJj6PAy8BdwLzMdrZB7Cua\n" +
+                        "Qo04ob4GKh8ZYBMw6fC3M+t3C3Cyxm6iEVAukXEnWOmuAnjX6aej01n/0RqbMS/UxohExgo+tkbh\n" +
+                        "/KMvMz9PVLSv9EINEndIHMv6vxBLUtBLmb/rgQ3ANuBXGjx6F9QozOykpLdcIxE0AAyqndqGJD0L\n" +
+                        "HJH0mqTbJX0kaY2kD6K8AesjRvY24JGWZqlKrxLOfHHKHDTVt1mf1M86TbQPuDQF7OAcASaAp4DF\n" +
+                        "hM8wvdIbKVAraxxPZO3rqV9TuqUNVXmXFjM7MrMDkp4saZqV9JDCNut1SddEj1y87kzqzYU7jS3Z\n" +
+                        "/bf7MEMd/ZQ8LIRPOp3y2U3E1ezaVunxp/bxy8vMvpf0oKRdZnZQ0nDySKXrhrKbjaEkycxOKIBJ\n" +
+                        "0h2pGbWgQ2U3XVCSZGZ/ZH+eSkonXXvNrPT854bKaTyhbxvaXdWQAlU69T3Spwp7wvYF7Pg3vfXa\n" +
+                        "BPuwhzAzwNquAuXA7gamSpL4E3gT+HyOZPcQzkx1h8v3mubT2r/GEWoVw9k1X9IxSfvN7HDWfrHC\n" +
+                        "Z6IhhZrh7wrVq3Ez+zHnZ7XC+jOkUK+flDSVLSf/X/0N9IzKpFVJbfwAAAAASUVORK5CYII=").bitmap,
+                iconColor = 0xff6593f1.toInt(),
+                contributorName = "fankes"
+            ),
             // TODO 可继续在这里添加更多 APP
         )
     }

app/src/main/java/com/fankes/miui/notify/ui/ConfigureActivity.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/ui/MainActivity.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37,6 +37,7 @@ import androidx.constraintlayout.utils.widget.ImageFilterView
 import androidx.core.view.isVisible
 import com.fankes.miui.notify.BuildConfig
 import com.fankes.miui.notify.R
+import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_COMPAT
 import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_HOOK
 import com.fankes.miui.notify.hook.HookConst.ENABLE_HIDE_ICON
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
@@ -115,10 +116,14 @@ class MainActivity : BaseActivity() {
         val notifyIconConfigItem = findViewById<View>(R.id.config_item_notify)
         val hideIconInLauncherSwitch = findViewById<SwitchCompat>(R.id.hide_icon_in_launcher_switch)
         val colorIconHookSwitch = findViewById<SwitchCompat>(R.id.color_icon_fix_switch)
+        val colorIconCompatSwitch = findViewById<SwitchCompat>(R.id.color_icon_compat_switch)
+        val colorIconCompatText = findViewById<View>(R.id.color_icon_compat_text)
         val notifyIconFixSwitch = findViewById<SwitchCompat>(R.id.notify_icon_fix_switch)
         val notifyIconFixButton = findViewById<View>(R.id.config_notify_app_button)
         /** 获取 Sp 存储的信息 */
         colorIconHookItem.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
+        colorIconCompatSwitch.isVisible = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
+        colorIconCompatText.isVisible = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
         notifyIconConfigItem.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true) &&
                 modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
         moduleEnableLogSwitch.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
@@ -127,6 +132,7 @@ class MainActivity : BaseActivity() {
         moduleEnableLogSwitch.isChecked = modulePrefs.getBoolean(ENABLE_MODULE_LOG, default = false)
         hideIconInLauncherSwitch.isChecked = modulePrefs.getBoolean(ENABLE_HIDE_ICON)
         colorIconHookSwitch.isChecked = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
+        colorIconCompatSwitch.isChecked = modulePrefs.getBoolean(ENABLE_COLOR_ICON_COMPAT)
         notifyIconFixSwitch.isChecked = modulePrefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true)
         moduleEnableSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
@@ -154,6 +160,13 @@ class MainActivity : BaseActivity() {
             if (!btn.isPressed) return@setOnCheckedChangeListener
             modulePrefs.putBoolean(ENABLE_COLOR_ICON_HOOK, b)
             notifyIconConfigItem.isVisible = b
+            colorIconCompatSwitch.isVisible = b
+            colorIconCompatText.isVisible = b
+            SystemUITool.showNeedRestartSnake(context = this)
+        }
+        colorIconCompatSwitch.setOnCheckedChangeListener { btn, b ->
+            if (!btn.isPressed) return@setOnCheckedChangeListener
+            modulePrefs.putBoolean(ENABLE_COLOR_ICON_COMPAT, b)
             SystemUITool.showNeedRestartSnake(context = this)
         }
         notifyIconFixSwitch.setOnCheckedChangeListener { btn, b ->

app/src/main/java/com/fankes/miui/notify/ui/base/BaseActivity.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/BitmapCompatTool.kt

@@ -0,0 +1,118 @@
+/*
+ * MIUINativeNotifyIcon - Fix the native notification bar icon function abandoned by the MIUI development team.
+ * Copyright (C) 2019-2022 Fankes Studio(qzmmcn@163.com)
+ * https://github.com/fankes/MIUINativeNotifyIcon
+ *
+ * This software is non-free but opensource software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ * <p>
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * and eula along with this software.  If not, see
+ * <https://www.gnu.org/licenses/>
+ *
+ * This file is Created by fankes on 2022/2/19.
+ */
+package com.fankes.miui.notify.utils
+
+import android.graphics.*
+import android.graphics.drawable.AnimationDrawable
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.VectorDrawable
+import android.util.ArrayMap
+import androidx.core.graphics.drawable.toBitmap
+import kotlin.math.abs
+
+/**
+ * 这是一个从 AOSP 源码中分离出来的功能
+ *
+ * 主要作用于兼容部分 MIUI 魔改颜色判断代码造成判断位图灰度功能失效
+ */
+object BitmapCompatTool {
+
+    /** 缓存已判断的结果防止卡顿 */
+    private var cachedBitmapGrayscales = ArrayMap<Int, Boolean>()
+
+    private var tempBuffer = intArrayOf(0)
+    private var tempCompactBitmap: Bitmap? = null
+    private var tempCompactBitmapCanvas: Canvas? = null
+    private var tempCompactBitmapPaint: Paint? = null
+    private val tempMatrix = Matrix()
+
+    /**
+     * 判断 [Drawable] 是否为灰度位图
+     * @param drawable 要判断的 [Drawable]
+     * @return [Boolean] 是否灰度
+     */
+    fun isGrayscaleDrawable(drawable: Drawable) = safeOfFalse {
+        when (drawable) {
+            is BitmapDrawable -> isGrayscaleBitmap(drawable.bitmap)
+            is AnimationDrawable -> !(drawable.numberOfFrames <= 0 || !isGrayscaleBitmap(drawable.getFrame(0).toBitmap()))
+            is VectorDrawable -> true
+            else -> isGrayscaleBitmap(drawable.toBitmap())
+        }
+    }
+
+    /**
+     * 判断 [Bitmap] 是否为灰度位图
+     * @param bitmap 要判断的位图
+     * @return [Boolean] 是否灰度
+     */
+    private fun isGrayscaleBitmap(bitmap: Bitmap) =
+        cachedBitmapGrayscales[bitmap.generationId] ?: let {
+            var height = bitmap.height
+            var width = bitmap.width
+            if (height > 64 || width > 64) {
+                if (tempCompactBitmap == null) {
+                    tempCompactBitmap = Bitmap.createBitmap(64, 64, Bitmap.Config.ARGB_8888)
+                        .also { tempCompactBitmapCanvas = Canvas(it) }
+                    tempCompactBitmapPaint = Paint(Paint.FILTER_BITMAP_FLAG).apply { isFilterBitmap = true }
+                }
+                tempMatrix.reset()
+                tempMatrix.setScale(64f / width, 64f / height, 0f, 0f)
+                tempCompactBitmapCanvas?.drawColor(0, PorterDuff.Mode.SRC)
+                tempCompactBitmapCanvas?.drawBitmap(bitmap, tempMatrix, tempCompactBitmapPaint)
+                height = 64
+                width = 64
+            }
+            val size = height * width
+            ensureBufferSize(size)
+            tempCompactBitmap?.getPixels(tempBuffer, 0, width, 0, 0, width, height)
+            for (i in 0 until size)
+                if (!isGrayscaleColor(tempBuffer[i])) {
+                    cachedBitmapGrayscales[bitmap.generationId] = false
+                    return@let false
+                }
+            cachedBitmapGrayscales[bitmap.generationId] = true
+            true
+        }
+
+    /**
+     * 提纯 [Bitmap] 颜色判断灰度
+     * @param color 颜色
+     * @return [Boolean] 是否灰度
+     */
+    private fun isGrayscaleColor(color: Int): Boolean {
+        if (color shr 24 and 255 < 50) return true
+        val r = color shr 16 and 255
+        val g = color shr 8 and 255
+        val b = color and 255
+        return !(abs(r - g) >= 20 || abs(r - b) >= 20 || abs(g - b) >= 20)
+    }
+
+    /**
+     * 计算字节数组
+     * @param size 大小
+     */
+    private fun ensureBufferSize(size: Int) {
+        if (tempBuffer.size < size) tempBuffer = IntArray(size)
+    }
+}

app/src/main/java/com/fankes/miui/notify/utils/DialogBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/SystemUITool.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/Utils.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/Compatible.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/Constants.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/DrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/DrawableProperties.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/DrawableWrapperBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/FlipDrawable.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/FlipDrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/LayerDrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/PathShapeDrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/RippleDrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/RotateDrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/ScaleDrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/utils/drawable/drawabletoolbox/StateListDrawableBuilder.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/java/com/fankes/miui/notify/view/MaterialSwitch.kt

@@ -6,8 +6,8 @@
  * This software is non-free but opensource software: you can redistribute it
  * and/or modify it under the terms of the GNU Affero General Public License
  * as published by the Free Software Foundation; either
- * version 3 of the License, or any later version and our eula as published
- * by ferredoxin.
+ * version 3 of the License, or any later version.
+ * <p>
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

app/src/main/res/layout/activity_main.xml

@@ -220,6 +220,26 @@
                     android:text="此选项默认开启，开启后将自动对 APP 通知图标进行判断，保持高版本 API 的 APP 不规范的彩色图标不被着色为白、黑色块并对图标进行圆角优化，关闭后将按照 Android API 规范对 APP 通知进行图标着色，可能会出现着色为黑白、色块情况。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
+
+                <com.fankes.miui.notify.view.MaterialSwitch
+                    android:id="@+id/color_icon_compat_switch"
+                    android:layout_width="match_parent"
+                    android:layout_height="35dp"
+                    android:layout_marginBottom="5dp"
+                    android:text="启用兼容模式"
+                    android:textColor="@color/colorTextGray"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:id="@+id/color_icon_compat_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:alpha="0.6"
+                    android:lineSpacingExtra="6dp"
+                    android:text="如果发现通知图标颜色判定不正常可启用兼容模式，一般情况下不建议启用兼容模式，发生问题请关闭兼容模式。"
+                    android:textColor="@color/colorTextDark"
+                    android:textSize="12sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -367,7 +387,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.8"
                     android:lineSpacingExtra="6dp"
-                    android:text="Q.哪些是已知问题？\nA.以下是问题描述列表：\n(1) 动态小图标可能会在高版本系统中闪烁，这是 MIUI 自身就存在的问题，后期只能等官方修复。\n(2) 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题。"
+                    android:text="Q.哪些是已知问题？\nA.以下是问题描述列表：\n(1) 动态小图标可能会在高版本系统中闪烁，这是 MIUI 自身就存在的问题，后期只能等官方修复。\n(2) 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题。\n(3) 建议最低从 MIUI 12.5 “2021-5-18” 开发版以后开始使用，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块问题，若你的系统不存在原生图标问题不建议使用模块。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "1.65"
-    appVersionCode = 12
+    appVersionName = "1.7"
+    appVersionCode = 15
 }
 
 task clean(type: Delete) {