Update README.md

.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.66-green)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v1.71-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.66-green)</a>
+<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.71-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>
 
 - 此模块仅支持 LSPosed(作用域“系统界面”)、~~EdXposed(随时停止支持)~~、不支持太极无极
 - 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
+- 建议最低从 MIUI 12.5 `2021-5-18` 开发版以后开始使用模块，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块的问题
 - 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题
 
 # 请勿用于非法用途
@@ -34,6 +35,10 @@ Fix the native notification bar icon function abandoned by the MIUI development
 
 - [CONTRIBUTING](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/CONTRIBUTING.md)
 
+# 通知测试
+
+你可以 [点击这里下载](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/tool/NotifyTester.apk) 工具测试通知图标是否生效。
+
 # 历史背景
 
 这个模块诞生来源于 MIUI 的乱改和不规范，本来 MIUI 9 之后，官方给出了原生通知图标样式，后面由于用户反应通知栏经常出现黑白块。<br/><br/>

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
@@ -51,6 +52,7 @@ import com.highcapable.yukihookapi.hook.log.loggerD
 import com.highcapable.yukihookapi.hook.log.loggerW
 import com.highcapable.yukihookapi.hook.param.PackageParam
 import com.highcapable.yukihookapi.hook.type.android.ContextClass
+import com.highcapable.yukihookapi.hook.type.android.DrawableClass
 import com.highcapable.yukihookapi.hook.type.android.ImageViewClass
 import com.highcapable.yukihookapi.hook.type.java.IntType
 import com.highcapable.yukihookapi.hook.xposed.proxy.YukiHookXposedInitProxy
@@ -78,6 +80,9 @@ class HookEntry : YukiHookXposedInitProxy {
         /** 未确定是否只有旧版本存在的类 */
         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",
@@ -94,11 +99,23 @@ class HookEntry : YukiHookXposedInitProxy {
     /**
      * - 这个是修复彩色图标的关键核心代码判断
      *
-     * 判断是否为灰度图标 - [isXmsf] 直接标记为非灰度图标防止 💩 MIUI 乱改
+     * 判断是否为灰度图标 - 反射执行系统方法
+     * @param context 实例
      * @param drawable 要判断的图标
      * @return [Boolean]
      */
-    private fun StatusBarNotification.isGrayscaleIcon(drawable: Drawable) = !isXmsf && BitmapCompatTool.isGrayscaleDrawable(drawable)
+    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 方案
@@ -107,15 +124,18 @@ class HookEntry : YukiHookXposedInitProxy {
      * @return [Boolean]
      */
     private val PackageParam.hasIgnoreStatusBarIconColor
-        get() = NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
+        get() = safeOfFalse {
+            NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
+        }
 
     /**
      * 获取当前通知栏的样式
      * @return [Boolean]
      */
-    private fun PackageParam.isShowMiuiStyle() = safeOfFalse {
-        NotificationUtilClass.clazz.method { name = "showMiuiStyle" }.get().invoke() ?: false
-    }
+    private val PackageParam.isShowMiuiStyle
+        get() = safeOfFalse {
+            NotificationUtilClass.clazz.method { name = "showMiuiStyle" }.get().invoke() ?: false
+        }
 
     /**
      * 获取 [ExpandedNotificationClass] 的应用名称
@@ -209,7 +229,7 @@ class HookEntry : YukiHookXposedInitProxy {
         /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
         expandedNf?.also { notifyInstance ->
             /** 判断是否不是灰度图标 */
-            val isNotGrayscaleIcon = !notifyInstance.isGrayscaleIcon(iconDrawable)
+            val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
 
             /** 目标彩色通知 APP 图标 */
             var customIcon: Bitmap? = null
@@ -233,7 +253,7 @@ class HookEntry : YukiHookXposedInitProxy {
                 /** 处理自定义通知图标优化 */
                 customIcon != null -> it(customIcon!!)
                 /** 若不是灰度图标自动处理为圆角 */
-                isNotGrayscaleIcon -> it(notifyInstance.compatNotifyIcon(context, iconDrawable).toBitmap().round(15.dp(context)))
+                isNotGrayscaleIcon -> it(notifyInstance.compatNotifyIcon(context, iconDrawable).toBitmap())
             }
         }
     }
@@ -280,7 +300,7 @@ class HookEntry : YukiHookXposedInitProxy {
                 val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
 
                 /** 判断图标风格 */
-                val isGrayscaleIcon = notifyInstance.isGrayscaleIcon(iconDrawable)
+                val isGrayscaleIcon = !notifyInstance.isXmsf && isGrayscaleIcon(context, iconDrawable)
 
                 /** 自定义默认小图标 */
                 var customIcon: Bitmap? = null
@@ -363,7 +383,7 @@ class HookEntry : YukiHookXposedInitProxy {
                     notifyInstance.notification.smallIcon.loadDrawable(context)
 
                 /** 判断是否不是灰度图标 */
-                val isNotGrayscaleIcon = !notifyInstance.isGrayscaleIcon(iconDrawable)
+                val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
 
                 /** 获取目标修复彩色图标的 APP */
                 var isTargetFixApp = false
@@ -416,7 +436,7 @@ class HookEntry : YukiHookXposedInitProxy {
                              * 因为之前的 MIUI 版本的状态栏图标颜色会全部设置为白色的 - 找不到修复的地方就直接判断版本了
                              * 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook
                              */
-                            replaceAny { if (hasIgnoreStatusBarIconColor) false else isShowMiuiStyle() }
+                            replaceAny { if (hasIgnoreStatusBarIconColor) false else isShowMiuiStyle }
                         }
                         if (hasIgnoreStatusBarIconColor)
                             injectMember {
@@ -449,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,
@@ -507,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

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

@@ -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
@@ -23,7 +23,10 @@
 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
@@ -49,14 +52,21 @@ object BitmapCompatTool {
      * @param drawable 要判断的 [Drawable]
      * @return [Boolean] 是否灰度
      */
-    fun isGrayscaleDrawable(drawable: Drawable) = safeOfFalse { isGrayscale(drawable.toBitmap()) }
+    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 isGrayscale(bitmap: Bitmap) =
+    private fun isGrayscaleBitmap(bitmap: Bitmap) =
         cachedBitmapGrayscales[bitmap.generationId] ?: let {
             var height = bitmap.height
             var width = bitmap.width
@@ -77,7 +87,7 @@ object BitmapCompatTool {
             ensureBufferSize(size)
             tempCompactBitmap?.getPixels(tempBuffer, 0, width, 0, 0, width, height)
             for (i in 0 until size)
-                if (!isGrayscale(tempBuffer[i])) {
+                if (!isGrayscaleColor(tempBuffer[i])) {
                     cachedBitmapGrayscales[bitmap.generationId] = false
                     return@let false
                 }
@@ -90,7 +100,7 @@ object BitmapCompatTool {
      * @param color 颜色
      * @return [Boolean] 是否灰度
      */
-    private fun isGrayscale(color: Int): 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

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
@@ -29,8 +29,9 @@ import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
-import android.graphics.*
-import android.graphics.Bitmap.createBitmap
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.os.Build
 import android.provider.Settings
 import android.util.Base64
@@ -214,25 +215,6 @@ val ByteArray.bitmap: Bitmap get() = BitmapFactory.decodeByteArray(this, 0, size
  */
 val String.bitmap: Bitmap get() = unbase64.bitmap
 
-/**
- * 圆角图片
- * @param radius 圆角度
- * @return [Bitmap] 圆角后的位图 - 失败会返回处理之前的位图
- */
-fun Bitmap.round(radius: Float): Bitmap =
-    createBitmap(width, height, Bitmap.Config.ARGB_8888).also { out ->
-        Canvas(out).also { canvas ->
-            Paint().also { paint ->
-                paint.isAntiAlias = true
-                canvas.drawARGB(0, 0, 0, 0)
-                paint.color = Color.WHITE
-                canvas.drawRoundRect(RectF(Rect(0, 0, width, height)), radius, radius, paint)
-                paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN)
-                canvas.drawBitmap(this, Rect(0, 0, width, height), Rect(0, 0, width, height), paint)
-            }
-        }
-    }
-
 /**
  * 获取系统 Prop 值
  * @param key Key

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.66"
-    appVersionCode = 13
+    appVersionName = "1.71"
+    appVersionCode = 16
 }
 
 task clean(type: Delete) {