Update version to 1.85,fix more bugs.

适配 航班管家 图标 #36

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

@@ -0,0 +1,29 @@
+---
+name: 通知优化图标适配反馈
+about: 提交通知图标优化适配必须使用此模板提交
+title: "[通知优化图标适配反馈]"
+labels: To be adapted
+assignees: ''
+
+---
+
+**需要适配的 APP 名称/包名/通知图标颜色 (必填)**
+
+* (示例：小米音乐/com.miui.player/#fff16033)
+
+* 
+
+**提供相关 APP 的下载渠道截图以及简要说明用途 (必填)**
+
+* 
+
+**提供相关 APP 的通知单色图标适配素材 大小 50x50 (选填)**
+
+* (可填写资源下载地址或直接添加附件提交，不接受百度网盘、天翼云盘以及各种快传、私有云盘)
+
+* (若直接在附件提交这里可不填)
+
+<!--- 提交时请将括号内容包括括号全部删除，填入你自己的内容 --->
+<!--- 请保留模板原始标题 --->
+<!--- 不按规定提交的 issues 将直接被关闭 --->
+<!--- Create by Template --->

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

@@ -0,0 +1,54 @@
+---
+name: 问题与 BUG 反馈
+about: 问题反馈必须使用此模板进行提交
+title: "[问题与 BUG 反馈] *简要描述问题原因*"
+labels: bug
+assignees: fankes
+
+---
+
+**MIUI 版本(必填)**
+
+* 
+
+**MIUI 版本类型(请保留一个)**
+
+* 公测版/内测版/稳定版
+
+**Android 版本(必填)**
+
+* 
+
+**模块版本(必填)**
+
+* 
+
+**使用的 Xposed 框架名称与框架版本(必填)**
+
+* (例如：LSPosed Zygisk/Riru 版本号)
+
+**同时使用的带有系统界面作用域的 Xposed 模块(选填)**
+
+* (没有可空)
+
+**问题的具体描述**
+
+*  (复现步骤、前提以及详细截图和录屏演示)
+
+
+**提供模块问题 Log 或必要 Log**
+
+* (LSPosed 可在日志管理中查看并筛选包含 `MIUINativeNotifyIcon` 的日志)
+
+<details><summary>展开查看</summary><pre><code>
+
+（此处粘贴问题Log）
+
+</code></pre></details>
+
+<!--- 注意：只接受 MIUI 正规官方版本系统，如果你正在使用 MIUI 官改(第三方改版)请不要提交任何 BUG 与问题，开发者无义务解决 --->
+
+<!--- 提交时请将括号内容包括括号全部删除，填入你自己的内容 --->
+<!--- 请保留模板原始标题 --->
+<!--- 不按规定提交的 issues 将直接被关闭 --->
+<!--- Create by Template --->

.idea/misc.xml

@@ -6,11 +6,13 @@
         <entry key="app/src/main/res/drawable-night/dark_round.xml" value="0.256" />
         <entry key="app/src/main/res/drawable-night/permotion_round.xml" value="0.256" />
         <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.44871794871794873" />
+        <entry key="app/src/main/res/drawable/bg_green_round.xml" value="0.255" />
+        <entry key="app/src/main/res/drawable/bg_yellow_round.xml" value="0.255" />
         <entry key="app/src/main/res/drawable/permotion_round.xml" value="0.256" />
         <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" />

CONTRIBUTING.md

@@ -1,43 +0,0 @@
-# 开始贡献
-
-欢迎为通知图标优化名单贡献宝贵资源！<br/>
-
-## 分支规定
-
-不管是直接 Push 代码还是提交 Pull Request，都必须使 commit 指向 master 分支。
-
-## 代码格式规范
-
-- 1.全部提交代码必须使用 IDE(Android Studio 或 IDEA) 进行格式化，未经格式化的代码将拒绝合并提交请求
-- 2.代码必须使用 4 spaces 缩进格式化
-
-## 贡献方法
-
-- 在下方的类中添加新的 APP 通知图标适配条目
-- [IconPackParams.kt](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt)
-- 使用灰度位图转 Base64 来得到 Base64 的位图数据字符串
-- [BitmapToBase64](https://github.com/fankes/BitmapToBase64)
-- 新增条目的模板如下所示
-
-```kotlin
-IconDataBean(
-    isEnabled = true, // 是否默认启用替换彩色图标 - 关闭后将全部停止替换
-    isEnabledAll = false, // 是否默认启用替换全部图标
-    appName = "", // APP 名称
-    packageName = "", // APP 包名
-    iconBitmap = ("").bitmap, // 位图数据 Base64
-    iconColor = 0, // 通知栏中显示的图标颜色 - 设置为 0 使用系统默认颜色 (不设置颜色可不写)
-    contributorName = "" // 贡献者昵称
-)
-```
-
-- 提交时请将后方的注释删除，否则不予合并代码
-
-## 其它要求
-
-- 1.调试性质或大批量注释代码，禁止提交
-- 2.类名和方法名仅能由开发者进行修改和提交，禁止随意修改项目名称、方法名称以及类名
-- 3.禁止随意更新项目依赖以及增加新的依赖，有问题请提前提交到 issues 进行说明
-- 4.禁止更新项目版本号，版本号交由开发者合并代码并发布 release 版本
-- 5.代码语言要求，请统一使用 Kotlin，除特殊情况外，不接受其他语言的提交
-- 6.以上

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.51-green)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v1.85-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,14 @@ 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.51-green)</a>
+<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.85-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>
 
 - 此模块仅支持 LSPosed(作用域“系统界面”)、~~EdXposed(随时停止支持)~~、不支持太极无极
+- 请确保你使用的是 MIUI 官方版本，任何第三方官改包发生的问题，开发者没有义务去解决和修复，请自求多福
 - 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
+- 建议最低从 MIUI 12.5 `2021-5-18` 开发版以后开始使用模块，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块的问题
 - 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题
 
 # 请勿用于非法用途
@@ -27,12 +29,11 @@ Fix the native notification bar icon function abandoned by the MIUI development
   [Release](https://github.com/fankes/MIUINativeNotifyIcon/releases)
   及[蓝奏云](https://fankes.lanzouy.com/b030o2e8h)，从其他非正规渠道下载到的版本或对您造成任何影响均与我们无关。
 
-# 开始贡献
+# 贡献通知图标优化名单
 
-由于国内厂商 APP 的不规范彩色图标影响整体图标的美观，现在开放第三方 APP 的通知图标适配。<br/>
-欢迎为通知图标优化名单贡献宝贵资源！<br/>
+此项目是 `AndroidNotifyIconAdapt` 项目的一部分，详情请参考下方。<br/>
 
-- [CONTRIBUTING](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/CONTRIBUTING.md)
+- [Android 通知图标规范适配](https://github.com/fankes/AndroidNotifyIconAdapt)
 
 # 历史背景
 

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
 }
@@ -64,10 +68,11 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     compileOnly 'de.robv.android.xposed:api:82'
-    implementation 'com.highcapable.yukihookapi:api:1.0.1'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.1'
+    implementation 'com.highcapable.yukihookapi:api:1.0.2'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.2'
     implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
     implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'

app/src/main/AndroidManifest.xml

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.fankes.miui.notify">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".application.MNNApplication"
         android:allowBackup="true"
@@ -18,7 +20,7 @@
             android:value="true" />
         <meta-data
             android:name="xposeddescription"
-            android:value="MIUI 状态栏原生图标，修复 12.5、13 后期被破坏的彩色图标。\n开发者：酷安 @星夜不荟" />
+            android:value="MIUI 原生通知图标，修复 12.5、13 后期被破坏的彩色图标。\n开发者：酷安 @星夜不荟" />
         <meta-data
             android:name="xposedminversion"
             android:value="93" />
@@ -53,5 +55,4 @@
             android:exported="false"
             android:screenOrientation="behind" />
     </application>
-
 </manifest>

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
@@ -28,7 +28,7 @@ import java.io.Serializable
 
 /**
  * 通知栏小图标 bean
- * @param appName APP 名称 - 仅限默认语言区域
+ * @param appName APP 名称
  * @param packageName 包名
  * @param iconBitmap 图标位图
  * @param iconColor 通知栏中显示的图标颜色 - 设置为 0 使用系统默认颜色

app/src/main/java/com/fankes/miui/notify/data/LoginDataSource.kt

@@ -1,24 +0,0 @@
-package com.fankes.miui.notify.data
-
-import com.fankes.miui.notify.data.model.LoggedInUser
-import java.io.IOException
-
-/**
- * Class that handles authentication w/ login credentials and retrieves user information.
- */
-class LoginDataSource {
-
-    fun login(username: String, password: String): Result<LoggedInUser> {
-        try {
-            // TODO: handle loggedInUser authentication
-            val fakeUser = LoggedInUser(java.util.UUID.randomUUID().toString(), "Jane Doe")
-            return Result.Success(fakeUser)
-        } catch (e: Throwable) {
-            return Result.Error(IOException("Error logging in", e))
-        }
-    }
-
-    fun logout() {
-        // TODO: revoke authentication
-    }
-}

app/src/main/java/com/fankes/miui/notify/data/LoginRepository.kt

@@ -1,46 +0,0 @@
-package com.fankes.miui.notify.data
-
-import com.fankes.miui.notify.data.model.LoggedInUser
-
-/**
- * Class that requests authentication and user information from the remote data source and
- * maintains an in-memory cache of login status and user credentials information.
- */
-
-class LoginRepository(val dataSource: LoginDataSource) {
-
-    // in-memory cache of the loggedInUser object
-    var user: LoggedInUser? = null
-        private set
-
-    val isLoggedIn: Boolean
-        get() = user != null
-
-    init {
-        // If user credentials will be cached in local storage, it is recommended it be encrypted
-        // @see https://developer.android.com/training/articles/keystore
-        user = null
-    }
-
-    fun logout() {
-        user = null
-        dataSource.logout()
-    }
-
-    fun login(username: String, password: String): Result<LoggedInUser> {
-        // handle login
-        val result = dataSource.login(username, password)
-
-        if (result is Result.Success) {
-            setLoggedInUser(result.data)
-        }
-
-        return result
-    }
-
-    private fun setLoggedInUser(loggedInUser: LoggedInUser) {
-        this.user = loggedInUser
-        // If user credentials will be cached in local storage, it is recommended it be encrypted
-        // @see https://developer.android.com/training/articles/keystore
-    }
-}

app/src/main/java/com/fankes/miui/notify/data/Result.kt

@@ -1,18 +0,0 @@
-package com.fankes.miui.notify.data
-
-/**
- * A generic class that holds a value with its loading status.
- * @param <T>
- */
-sealed class Result<out T : Any> {
-
-    data class Success<out T : Any>(val data: T) : Result<T>()
-    data class Error(val exception: Exception) : Result<Nothing>()
-
-    override fun toString(): String {
-        return when (this) {
-            is Success<*> -> "Success[data=$data]"
-            is Error -> "Error[exception=$exception]"
-        }
-    }
-}

app/src/main/java/com/fankes/miui/notify/data/model/LoggedInUser.kt

@@ -1,9 +0,0 @@
-package com.fankes.miui.notify.data.model
-
-/**
- * Data class that captures user information for logged in users retrieved from LoginRepository
- */
-data class LoggedInUser(
-    val userId: String,
-    val displayName: String
-)

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,7 +30,9 @@ 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_NOTIFY_ICON_HOOK = "_notify_icon_hook"
+    const val ENABLE_COLOR_ICON_COMPAT = "_color_icon_compat"
+    const val ENABLE_NOTIFY_ICON_FIX = "_notify_icon_fix"
+    const val NOTIFY_ICON_DATAS = "_notify_icon_datas"
 
     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
@@ -28,15 +28,18 @@ import android.graphics.Color
 import android.graphics.Outline
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.Icon
+import android.os.Build
 import android.service.notification.StatusBarNotification
 import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
+import com.fankes.miui.notify.bean.IconDataBean
+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
-import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_HOOK
+import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_FIX
 import com.fankes.miui.notify.hook.HookConst.SYSTEMUI_PACKAGE_NAME
 import com.fankes.miui.notify.hook.factory.isAppNotifyHookAllOf
 import com.fankes.miui.notify.hook.factory.isAppNotifyHookOf
@@ -46,6 +49,7 @@ import com.fankes.miui.notify.utils.drawable.drawabletoolbox.DrawableBuilder
 import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed
 import com.highcapable.yukihookapi.hook.bean.VariousClass
 import com.highcapable.yukihookapi.hook.factory.*
+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
@@ -66,22 +70,26 @@ class HookEntry : YukiHookXposedInitProxy {
         private const val NotificationHeaderViewWrapperInjectorClass =
             "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapperInjector"
 
-        /** MIUI 新版本存在的类 */
-        private const val NotificationHeaderViewWrapperClass =
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationHeaderViewWrapper"
-
-        /** MIUI 新版本存在的类 */
-        private const val NotificationViewWrapperClass =
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
-
-        /** 原生存在的类 */
-        private const val StatusBarIconViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.StatusBarIconView"
-
         /** 原生存在的类 */
         private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
 
-        /** 未确定是否只有旧版本存在的类 */
-        private const val ExpandableNotificationRowClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
+        /** 根据多个版本存在不同的包名相同的类 */
+        private val ExpandableNotificationRowClass = VariousClass(
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.ExpandableNotificationRow",
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
+        )
+
+        /** 根据多个版本存在不同的包名相同的类 */
+        private val NotificationViewWrapperClass = VariousClass(
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationViewWrapper",
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
+        )
+
+        /** 根据多个版本存在不同的包名相同的类 */
+        private val NotificationHeaderViewWrapperClass = VariousClass(
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapper",
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationHeaderViewWrapper"
+        )
 
         /** 根据多个版本存在不同的包名相同的类 */
         private val NotificationUtilClass = VariousClass(
@@ -96,6 +104,9 @@ class HookEntry : YukiHookXposedInitProxy {
         )
     }
 
+    /** 缓存的通知优化图标数组 */
+    private var iconDatas = ArrayList<IconDataBean>()
+
     /**
      * - 这个是修复彩色图标的关键核心代码判断
      *
@@ -104,20 +115,18 @@ class HookEntry : YukiHookXposedInitProxy {
      * @param drawable 要判断的图标
      * @return [Boolean]
      */
-    private fun PackageParam.isGrayscaleIcon(context: Context, drawable: Drawable) = safeOfFalse {
-        ContrastColorUtilClass.clazz.let {
-            it.method(name = "isGrayscaleIcon", DrawableClass)
-                ?.call<Boolean>(it.method(name = "getInstance", ContextClass)?.callStatic(context), drawable) ?: false
-        }
-    }
-
-    /**
-     * 获取当前通知栏的样式
-     * @return [Boolean]
-     */
-    private fun PackageParam.isShowMiuiStyle() = safeOfFalse {
-        NotificationUtilClass.clazz.method(name = "showMiuiStyle")?.callStatic() ?: 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 方案
@@ -125,24 +134,124 @@ 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)
+        }
+
+    /**
+     * 是否为旧版本 MIUI 方案
+     *
+     * 拥有 “handleHeaderViews” 方法
+     * @return [Boolean]
+     */
+    private val PackageParam.hasHandleHeaderViews
+        get() = safeOfFalse {
+            NotificationHeaderViewWrapperClass.clazz.hasMethod(name = "handleHeaderViews")
+        }
+
+    /**
+     * 获取当前通知栏的样式
+     *
+     *  - ❗新版本可能不存在这个方法
+     * @return [Boolean]
+     */
+    private val PackageParam.isShowMiuiStyle
+        get() = safeOfFalse {
+            NotificationUtilClass.clazz.method { name = "showMiuiStyle" }.get().invoke() ?: false
+        }
+
+    /**
+     * 适配通知栏、状态栏图标
+     *
+     * 适配第三方图标包对系统包管理器更换图标后的彩色图标
+     *
+     * 自动识别 MIPUSH 图标
+     * @param context 实例
+     * @param iconDrawable 原始图标
+     * @return [Drawable] 适配的图标
+     */
+    private fun StatusBarNotification.compatNotifyIcon(context: Context, iconDrawable: Drawable) = safeOf(iconDrawable) {
+        /** 给 MIPUSH 设置 APP 自己的图标 */
+        if (isXmsf && opPkgName.isNotBlank())
+            findAppIcon(context)
+        else iconDrawable
     }
 
     /**
-     * 获取 [ExpandedNotificationClass] 的应用名称
-     * @param instance 通知实例
+     * 获取推送通知的应用名称
+     * @param context 实例
      * @return [String]
      */
-    private fun PackageParam.findAppName(instance: Any?) = safeOf(default = "<unknown>") {
-        ExpandedNotificationClass.clazz.method(name = "getAppName")?.call(instance) ?: "<empty>"
+    private fun StatusBarNotification.findAppName(context: Context) = safeOf(default = "<unknown>") {
+        context.packageManager.getPackageInfo(opPkgName, 0).applicationInfo.loadLabel(context.packageManager)
     }
 
+    /**
+     * 获取通知栏、状态栏 APP 图标
+     * @param context 实例
+     * @return [Drawable] 适配的图标
+     */
+    private fun StatusBarNotification.findAppIcon(context: Context) = safeOf(notification.smallIcon.loadDrawable(context)) {
+        context.packageManager.getPackageInfo(opPkgName, 0).applicationInfo.loadIcon(context.packageManager)
+    }
+
+    /**
+     * 打印日志
+     * @param tag 标识
+     * @param context 实例
+     * @param expandedNf 通知实例
+     * @param isCustom 是否为通知优化生效图标
+     * @param isGrayscale 是否为灰度图标
+     */
+    private fun PackageParam.printLogcat(
+        tag: String,
+        context: Context,
+        expandedNf: StatusBarNotification?,
+        isCustom: Boolean,
+        isGrayscale: Boolean
+    ) {
+        if (prefs.getBoolean(ENABLE_MODULE_LOG)) loggerD(
+            msg = "$tag --> [${expandedNf?.findAppName(context)}][${expandedNf?.opPkgName}] " +
+                    "custom [$isCustom] " +
+                    "grayscale [$isGrayscale] " +
+                    "xmsf [${expandedNf?.isXmsf}]"
+        )
+    }
+
+    /**
+     * 获取推送通知的包名
+     *
+     * 自动兼容旧版本系统
+     * @return [String]
+     */
+    private val StatusBarNotification.compatOpPkgName
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) opPkg else packageName ?: ""
+
     /**
      * 判断通知是否来自 MIPUSH
      * @return [Boolean]
      */
-    private val StatusBarNotification.isXmsf get() = opPkgName == "com.xiaomi.xmsf"
+    private val StatusBarNotification.isXmsf get() = compatOpPkgName == "com.xiaomi.xmsf"
+
+    /**
+     * 获取推送通知的包名
+     *
+     * 自动判断 MIPUSH
+     * @return [String]
+     */
+    private val StatusBarNotification.opPkgName get() = if (isXmsf) xmsfPkgName else compatOpPkgName
+
+    /**
+     * 获取 MIPUSH 通知真实包名
+     * @return [String]
+     */
+    private val StatusBarNotification.xmsfPkgName: String
+        get() {
+            val xmsfPkg = notification.extras.getString("xmsf_target_package") ?: ""
+            val targetPkg = notification.extras.getString("target_package") ?: ""
+            return xmsfPkg.ifBlank { targetPkg.ifBlank { compatOpPkgName } }
+        }
 
     /**
      * 获取全局上下文
@@ -150,7 +259,9 @@ class HookEntry : YukiHookXposedInitProxy {
      */
     private val PackageParam.globalContext
         get() = safeOfNull {
-            SystemUIApplicationClass.clazz.method(name = "getContext")?.callStatic<Context>()
+            if (SystemUIApplicationClass.clazz.hasMethod(name = "getContext"))
+                SystemUIApplicationClass.clazz.method { name = "getContext" }.get().invoke<Context>()
+            else null
         }
 
     /**
@@ -169,30 +280,38 @@ class HookEntry : YukiHookXposedInitProxy {
         it: (Bitmap) -> Unit
     ) = safeRun(msg = "GetSmallIconOnSet") {
         if (iconDrawable == null) return@safeRun
-        /** 判断是否不是灰度图标 */
-        val isNotGrayscaleIcon = !isGrayscaleIcon(context, iconDrawable)
+        /** 如果没开启修复 APP 的彩色图标 */
+        if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
         /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
         expandedNf?.also { notifyInstance ->
+            /** 判断是 MIUI 样式就停止 Hook */
+            if (context.isMiuiNotifyStyle) {
+                it(notifyInstance.findAppIcon(context).toBitmap())
+                return@safeRun
+            }
+            /** 判断是否不是灰度图标 */
+            val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
+
             /** 目标彩色通知 APP 图标 */
             var customIcon: Bitmap? = null
-            if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true))
+            if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
                 run {
-                    IconPackParams.iconDatas.forEach {
-                        if ((notifyInstance.opPkgName == it.packageName ||
-                                    findAppName(notifyInstance) == it.appName) &&
-                            isAppNotifyHookOf(it)
-                        ) {
-                            if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it))
-                                customIcon = it.iconBitmap
-                            return@run
+                    if (iconDatas.isNotEmpty())
+                        iconDatas.forEach {
+                            if (notifyInstance.opPkgName == it.packageName && isAppNotifyHookOf(it)) {
+                                if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it))
+                                    customIcon = it.iconBitmap
+                                return@run
+                            }
                         }
-                    }
                 }
+            /** 打印日志 */
+            printLogcat(tag = "StatusIcon", context, notifyInstance, isCustom = customIcon != null, !isNotGrayscaleIcon)
             when {
-                /** 如果开启了修复 APP 的彩色图标 */
-                customIcon != null && prefs.getBoolean(ENABLE_NOTIFY_ICON_HOOK, default = true) -> it(customIcon!!)
+                /** 处理自定义通知图标优化 */
+                customIcon != null -> it(customIcon!!)
                 /** 若不是灰度图标自动处理为圆角 */
-                isNotGrayscaleIcon -> it(iconDrawable.toBitmap().round(15.dp(context)))
+                isNotGrayscaleIcon -> it(notifyInstance.compatNotifyIcon(context, iconDrawable).toBitmap())
             }
         }
     }
@@ -207,10 +326,14 @@ class HookEntry : YukiHookXposedInitProxy {
      */
     private fun PackageParam.hookNotifyIconOnSet(context: Context, expandedNf: StatusBarNotification?, iconImageView: ImageView) =
         safeRun(msg = "AutoSetAppIconOnSet") {
+            /** 判断是 MIUI 样式就停止 Hook */
+            if (context.isMiuiNotifyStyle) return@safeRun
+            /** 如果没开启修复 APP 的彩色图标 */
+            if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
             /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
             expandedNf?.let { notifyInstance ->
-                /** 是否 Hook 彩色通知图标 */
-                val isHookColorIcon = prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
+                /** 是否开启修复 APP 的彩色图标 */
+                val isNotifyIconFix = prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true)
 
                 /** 新版风格反色 */
                 val newStyle = if (context.isSystemInDarkMode) 0xFF2D2D2D.toInt() else Color.WHITE
@@ -237,7 +360,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
@@ -245,22 +368,22 @@ class HookEntry : YukiHookXposedInitProxy {
                 /** 自定义默认小图标颜色 */
                 var customIconColor = 0
 
-                if (isHookColorIcon) run {
-                    IconPackParams.iconDatas.forEach {
-                        if ((notifyInstance.opPkgName == it.packageName ||
-                                    findAppName(notifyInstance) == it.appName) &&
-                            isAppNotifyHookOf(it)
-                        ) {
-                            if (!isGrayscaleIcon || isAppNotifyHookAllOf(it)) {
-                                customIcon = it.iconBitmap
-                                customIconColor = it.iconColor
-                                return@run
+                if (isNotifyIconFix) run {
+                    if (iconDatas.isNotEmpty())
+                        iconDatas.forEach {
+                            if (notifyInstance.opPkgName == it.packageName && isAppNotifyHookOf(it)) {
+                                if (!isGrayscaleIcon || isAppNotifyHookAllOf(it)) {
+                                    customIcon = it.iconBitmap
+                                    customIconColor = it.iconColor
+                                    return@run
+                                }
                             }
                         }
-                    }
                 }
-                /** 如果开启了修复 APP 的彩色图标 */
-                if (customIcon != null && prefs.getBoolean(ENABLE_NOTIFY_ICON_HOOK, default = true))
+                /** 打印日志 */
+                printLogcat(tag = "NotifyIcon", context, notifyInstance, isCustom = customIcon != null, isGrayscaleIcon)
+                /** 处理自定义通知图标优化 */
+                if (customIcon != null)
                     iconImageView.apply {
                         /** 设置自定义小图标 */
                         setImageBitmap(customIcon)
@@ -273,33 +396,32 @@ class HookEntry : YukiHookXposedInitProxy {
                 else {
                     /** 重新设置图标 - 防止系统更改它 */
                     iconImageView.setImageDrawable(iconDrawable)
-                    /** 判断是否开启 Hook 彩色图标 */
-                    if (isHookColorIcon) {
-                        /** 判断如果是灰度图标就给他设置一个白色颜色遮罩 */
-                        if (isGrayscaleIcon) iconImageView.apply {
-                            /** 设置图标着色 */
-                            setColorFilter(supportColor)
-                            /** Android 12 设置图标外圈颜色 */
-                            if (isUpperOfAndroidS && hasIconColor)
-                                background = DrawableBuilder().rounded().solidColor(iconColor).build()
-                        } else iconImageView.apply {
-                            clipToOutline = true
-                            /** 设置一个圆角轮廓裁切 */
-                            outlineProvider = object : ViewOutlineProvider() {
-                                override fun getOutline(view: View, out: Outline) {
-                                    out.setRoundRect(
-                                        0, 0,
-                                        view.width, view.height, 5.dp(context)
-                                    )
-                                }
+                    /** 判断如果是灰度图标就给他设置一个白色颜色遮罩 */
+                    if (isGrayscaleIcon) iconImageView.apply {
+                        /** 设置图标着色 */
+                        setColorFilter(supportColor)
+                        /** Android 12 设置图标外圈颜色 */
+                        if (isUpperOfAndroidS && hasIconColor)
+                            background = DrawableBuilder().rounded().solidColor(iconColor).build()
+                    } else iconImageView.apply {
+                        /** 重新设置图标 */
+                        setImageDrawable(notifyInstance.compatNotifyIcon(context, iconDrawable))
+                        /** 设置裁切到边界 */
+                        clipToOutline = true
+                        /** 设置一个圆角轮廓裁切 */
+                        outlineProvider = object : ViewOutlineProvider() {
+                            override fun getOutline(view: View, out: Outline) {
+                                out.setRoundRect(
+                                    0, 0,
+                                    view.width, view.height, 5.dp(context)
+                                )
                             }
-                            /** 清除原生的背景边距设置 */
-                            if (isUpperOfAndroidS) setPadding(0, 0, 0, 0)
-                            /** 清除原生的主题色背景圆圈颜色 */
-                            if (isUpperOfAndroidS) background = null
                         }
-                        /** 否则一律设置灰度图标 */
-                    } else iconImageView.setColorFilter(supportColor)
+                        /** 清除原生的背景边距设置 */
+                        if (isUpperOfAndroidS) setPadding(0, 0, 0, 0)
+                        /** 清除原生的主题色背景圆圈颜色 */
+                        if (isUpperOfAndroidS) background = null
+                    }
                 }
             }
         }
@@ -313,44 +435,42 @@ class HookEntry : YukiHookXposedInitProxy {
      * @return [Boolean] 是否忽略通知图标颜色
      */
     private fun PackageParam.hookIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) =
-        if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) safeOfFalse {
-            /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
-            expandedNf?.let { notifyInstance ->
-                /** 获取通知小图标 */
-                val iconDrawable =
-                    notifyInstance.notification.smallIcon.loadDrawable(context)
+        if (!context.isMiuiNotifyStyle)
+            if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) safeOfFalse {
+                /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
+                expandedNf?.let { notifyInstance ->
+                    /** 获取通知小图标 */
+                    val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
 
-                /** 判断是否不是灰度图标 */
-                val isNotGrayscaleIcon = !isGrayscaleIcon(context, iconDrawable)
+                    /** 判断是否不是灰度图标 */
+                    val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
 
-                /** 获取目标修复彩色图标的 APP */
-                var isTargetApp = false
-                run {
-                    IconPackParams.iconDatas.forEach {
-                        if ((notifyInstance.opPkgName == it.packageName ||
-                                    findAppName(notifyInstance) == it.appName) &&
-                            isAppNotifyHookOf(it)
-                        ) {
-                            if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it)) isTargetApp = true
-                            return@run
+                    /** 获取目标修复彩色图标的 APP */
+                    var isTargetFixApp = false
+                    /** 如果开启了自定义通知图标优化 */
+                    if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
+                        run {
+                            if (iconDatas.isNotEmpty())
+                                iconDatas.forEach {
+                                    if (notifyInstance.opPkgName == it.packageName && isAppNotifyHookOf(it)) {
+                                        if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it)) isTargetFixApp = true
+                                        return@run
+                                    }
+                                }
                         }
-                    }
-                }
-                /**
-                 * 如果开启了修复 APP 的彩色图标
-                 * 只要不是灰度就返回彩色图标
-                 * 否则不对颜色进行反色处理防止一些系统图标出现异常
-                 */
-                if (isTargetApp && prefs.getBoolean(ENABLE_NOTIFY_ICON_HOOK, default = true))
-                    false
-                else isNotGrayscaleIcon
-            } ?: true
-        } else false
+                    /**
+                     * 只要不是灰度就返回彩色图标
+                     * 否则不对颜色进行反色处理防止一些系统图标出现异常
+                     */
+                    if (isTargetFixApp) false else isNotGrayscaleIcon
+                } ?: true
+            } else false
+        else true
 
     override fun onHook() = encase {
         configs {
             debugTag = "MIUINativeNotifyIcon"
-            isDebug = prefs.getBoolean(ENABLE_MODULE_LOG)
+            isDebug = false
         }
         loadApp(SYSTEMUI_PACKAGE_NAME) {
             when {
@@ -364,6 +484,9 @@ class HookEntry : YukiHookXposedInitProxy {
                 !prefs.getBoolean(ENABLE_MODULE, default = true) -> loggerW(msg = "Aborted Hook -> Hook Closed")
                 /** 开始 Hook */
                 else -> {
+                    /** 缓存图标数据 */
+                    iconDatas = IconPackParams(param = this).iconDatas
+                    /** 执行 Hook */
                     NotificationUtilClass.hook {
                         /** 强制回写系统的状态栏图标样式为原生 */
                         injectMember {
@@ -372,12 +495,12 @@ class HookEntry : YukiHookXposedInitProxy {
                                 param(ExpandedNotificationClass.clazz)
                             }
                             /**
-                             * 因为之前的 MIUI 版本的状态栏图标颜色会全部设置为白色的 - 找不到修复的地方就直接判断版本了
-                             * 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook
+                             * 为了防止 MIUI 自身的版本不同造成的各种 BUG
+                             * 判断是 MIUI 样式就停止 Hook
                              */
-                            replaceAny { if (hasIgnoreStatusBarIconColor()) false else isShowMiuiStyle() }
+                            replaceAny { globalContext?.isMiuiNotifyStyle ?: isShowMiuiStyle }
                         }
-                        if (hasIgnoreStatusBarIconColor())
+                        if (hasIgnoreStatusBarIconColor)
                             injectMember {
                                 method {
                                     name = "ignoreStatusBarIconColor"
@@ -407,111 +530,71 @@ class HookEntry : YukiHookXposedInitProxy {
                                 }.onFind { isUseLegacy = true }
                             }
                             afterHook {
-                                /** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
-                                if (hasIgnoreStatusBarIconColor() || !isShowMiuiStyle())
-                                    (globalContext ?: args[0] as Context).also { context ->
-                                        hookSmallIconOnSet(
-                                            context = context,
-                                            args[if (isUseLegacy) 1 else 0] as? StatusBarNotification?,
-                                            (result as Icon).loadDrawable(context)
-                                        ) { icon -> result = Icon.createWithBitmap(icon) }
-                                    }
+                                (globalContext ?: args[0] as Context).also { context ->
+                                    hookSmallIconOnSet(
+                                        context = context,
+                                        args[if (isUseLegacy) 1 else 0] as? StatusBarNotification?,
+                                        (result as Icon).loadDrawable(context)
+                                    ) { icon -> result = Icon.createWithBitmap(icon) }
+                                }
                             }
                         }
                     }
-                    findClass(StatusBarIconViewClass).hook {
-                        /** 修复通知图标为彩色 - MIPUSH 修复 */
+                    NotificationHeaderViewWrapperClass.hook {
+                        /** 修复下拉通知图标自动设置回 APP 图标的方法 */
                         injectMember {
-                            method { name = "updateIconColor" }
+                            if (hasHandleHeaderViews)
+                                method { name = "handleHeaderViews" }
+                            else method { name = "resolveHeaderViews" }
                             afterHook {
-                                /** 获取自身 */
-                                val iconImageView = instance<ImageView?>() ?: return@afterHook
-
-                                /** 获取通知实例 */
-                                val expandedNf = field { name = "mNotification" }.of<StatusBarNotification>(instance)
+                                /** 获取小图标 */
+                                val iconImageView =
+                                    NotificationHeaderViewWrapperClass.clazz
+                                        .field { name = "mIcon" }.of<ImageView>(instance) ?: return@afterHook
 
                                 /**
-                                 * 强制设置图标 - 防止 MIPUSH 不生效
-                                 * 由于之前版本没有 [hasIgnoreStatusBarIconColor] 判断 - MIPUSH 的图标颜色也是白色的
-                                 * 所以之前的版本取消这个 Hook - 实在找不到设置图标的地方 - 状态栏图标就彩色吧
+                                 * 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass]
+                                 * 获取其中的得到通知方法
                                  */
-                                if (hasIgnoreStatusBarIconColor() && expandedNf?.isXmsf == true)
-                                    hookSmallIconOnSet(
-                                        context = iconImageView.context,
-                                        expandedNf,
-                                        expandedNf.notification?.smallIcon?.loadDrawable(iconImageView.context)
-                                    ) { icon -> iconImageView.setImageBitmap(icon) }
+                                val expandedNf = ExpandableNotificationRowClass.clazz
+                                    .method { name = "getEntry" }
+                                    .get(NotificationViewWrapperClass.clazz.field {
+                                        name = "mRow"
+                                    }.get(instance).self).call()?.let {
+                                        it.javaClass.method {
+                                            name = "getSbn"
+                                        }.get(it).invoke<StatusBarNotification>()
+                                    } ?: ExpandableNotificationRowClass.clazz
+                                    .method { name = "getStatusBarNotification" }
+                                    .get(NotificationViewWrapperClass.clazz.field { name = "mRow" }.get(instance).self)
+                                    .invoke<StatusBarNotification>()
+                                /** 执行 Hook */
+                                hookNotifyIconOnSet(iconImageView.context, expandedNf, iconImageView)
                             }
                         }
                     }
-                    if (NotificationHeaderViewWrapperInjectorClass.hasClass)
-                        findClass(NotificationHeaderViewWrapperInjectorClass).hook {
-                            /** 修复下拉通知图标自动设置回 APP 图标的方法 */
-                            injectMember {
-                                var isUseLegacy = false
+                    /** 干掉下拉通知图标自动设置回 APP 图标的方法 */
+                    NotificationHeaderViewWrapperInjectorClass.hook {
+                        injectMember {
+                            method {
+                                name = "setAppIcon"
+                                param(ContextClass, ImageViewClass, ExpandedNotificationClass.clazz)
+                            }.remedys {
                                 method {
                                     name = "setAppIcon"
-                                    param(ContextClass, ImageViewClass, ExpandedNotificationClass.clazz)
-                                }.remedys {
-                                    method {
-                                        name = "setAppIcon"
-                                        param(ImageViewClass, ExpandedNotificationClass.clazz)
-                                    }.onFind { isUseLegacy = true }
-                                }
-                                replaceUnit {
-                                    if (isUseLegacy)
-                                        hookNotifyIconOnSet(
-                                            context = globalContext ?: error("GlobalContext got null"),
-                                            args[1] as? StatusBarNotification?,
-                                            args[0] as ImageView
-                                        )
-                                    else
-                                        hookNotifyIconOnSet(
-                                            context = args[0] as? Context ?: globalContext ?: error("GlobalContext got null"),
-                                            args[2] as? StatusBarNotification?,
-                                            args[1] as ImageView
-                                        )
-
+                                    param(ImageViewClass, ExpandedNotificationClass.clazz)
                                 }
                             }
-                            /** 干掉下拉通知图标自动设置回 APP 图标的方法 - Android 12 */
-                            if (isUpperOfAndroidS)
-                                injectMember {
-                                    method {
-                                        name = "resetIconBgAndPaddings"
-                                        param(ImageViewClass, ExpandedNotificationClass.clazz)
-                                    }
-                                    intercept()
-                                }
-                        }
-                    else
-                        findClass(NotificationHeaderViewWrapperClass).hook {
-                            /** 之前的版本解决方案 */
-                            injectMember {
-                                method { name = "handleHeaderViews" }
-                                afterHook {
-                                    /** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
-                                    if (!hasIgnoreStatusBarIconColor() && isShowMiuiStyle()) return@afterHook
-                                    /** 获取小图标 */
-                                    val iconImageView = field {
-                                        classSet = NotificationHeaderViewWrapperClass.clazz
-                                        name = "mIcon"
-                                    }.of<ImageView>(instance) ?: return@afterHook
-                                    /** 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass] */
-                                    field {
-                                        classSet = NotificationViewWrapperClass.clazz
-                                        name = "mRow"
-                                    }.get(instance).apply {
-                                        /** 获取其中的得到通知方法 */
-                                        val expandedNf =
-                                            ExpandableNotificationRowClass.clazz.method(name = "getStatusBarNotification")
-                                                ?.call<StatusBarNotification>(instance = self)
-                                        /** 执行 Hook */
-                                        hookNotifyIconOnSet(iconImageView.context, expandedNf, iconImageView)
-                                    }
-                                }
+                            intercept()
+                        }.ignoredAllFailure()
+                        injectMember {
+                            method {
+                                name = "resetIconBgAndPaddings"
+                                param(ImageViewClass, ExpandedNotificationClass.clazz)
                             }
-                        }
+                            intercept()
+                        }.ignoredAllFailure()
+                    }
                 }
             }
         }

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/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
@@ -24,6 +24,7 @@
 
 package com.fankes.miui.notify.ui
 
+import android.app.ProgressDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -33,20 +34,20 @@ import android.view.ViewGroup
 import android.widget.BaseAdapter
 import android.widget.ListView
 import android.widget.TextView
-import android.widget.Toast
 import androidx.constraintlayout.utils.widget.ImageFilterView
 import androidx.core.view.isVisible
 import com.fankes.miui.notify.R
+import com.fankes.miui.notify.bean.IconDataBean
 import com.fankes.miui.notify.hook.factory.isAppNotifyHookAllOf
 import com.fankes.miui.notify.hook.factory.isAppNotifyHookOf
 import com.fankes.miui.notify.hook.factory.putAppNotifyHookAllOf
 import com.fankes.miui.notify.hook.factory.putAppNotifyHookOf
 import com.fankes.miui.notify.params.IconPackParams
 import com.fankes.miui.notify.ui.base.BaseActivity
-import com.fankes.miui.notify.utils.SystemUITool
-import com.fankes.miui.notify.utils.showDialog
+import com.fankes.miui.notify.utils.*
 import com.fankes.miui.notify.view.MaterialSwitch
 import com.google.android.material.textfield.TextInputEditText
+import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 
 class ConfigureActivity : BaseActivity() {
 
@@ -56,13 +57,38 @@ class ConfigureActivity : BaseActivity() {
     /** 回调适配器改变 */
     private var onChanged: (() -> Unit)? = null
 
+    /** 回调滚动事件改变 */
+    private var onScrollEvent: ((Boolean) -> Unit)? = null
+
+    /** 全部的通知优化图标数据 */
+    private var iconAllDatas = ArrayList<IconDataBean>()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_config)
+        /** 检查激活状态 */
+        if (!YukiHookModuleStatus.isActive()) {
+            showDialog {
+                title = "模块没有激活"
+                msg = "模块没有激活，你无法使用这里的功能，请先激活模块。"
+                confirmButton(text = "我知道了") { finish() }
+                noCancelable()
+            }
+            return
+        }
         /** 返回按钮点击事件 */
         findViewById<View>(R.id.title_back_icon).setOnClickListener { onBackPressed() }
         /** 刷新适配器结果相关 */
         refreshAdapterResult()
+        /** 设置上下按钮点击事件 */
+        findViewById<View>(R.id.config_title_up).setOnClickListener {
+            snake(msg = "滚动到顶部")
+            onScrollEvent?.invoke(false)
+        }
+        findViewById<View>(R.id.config_title_down).setOnClickListener {
+            snake(msg = "滚动到底部")
+            onScrollEvent?.invoke(true)
+        }
         /** 设置过滤按钮点击事件 */
         findViewById<View>(R.id.config_title_filter).setOnClickListener {
             showDialog {
@@ -81,10 +107,9 @@ class ConfigureActivity : BaseActivity() {
                 confirmButton {
                     if (editText.text.toString().isNotBlank()) {
                         filterText = editText.text.toString().trim()
-                        onChanged?.invoke()
                         refreshAdapterResult()
                     } else {
-                        Toast.makeText(applicationContext, "条件不能为空", Toast.LENGTH_SHORT).show()
+                        toast(msg = "条件不能为空")
                         it.performClick()
                     }
                 }
@@ -92,11 +117,12 @@ class ConfigureActivity : BaseActivity() {
                 if (filterText.isNotBlank())
                     neutralButton(text = "清除条件") {
                         filterText = ""
-                        onChanged?.invoke()
                         refreshAdapterResult()
                     }
             }
         }
+        /** 设置同步列表按钮点击事件 */
+        findViewById<View>(R.id.config_title_sync).setOnClickListener { onStartRefresh() }
         /** 设置列表元素和 Adapter */
         findViewById<ListView>(R.id.config_list_view).apply {
             adapter = object : BaseAdapter() {
@@ -162,28 +188,93 @@ class ConfigureActivity : BaseActivity() {
                     lateinit var switchAll: MaterialSwitch
                 }
             }.apply { onChanged = { notifyDataSetChanged() } }
+            onScrollEvent = { post { setSelection(if (it) iconDatas.lastIndex else 0) } }
         }
         /** 设置点击事件 */
         findViewById<View>(R.id.config_cbr_button).setOnClickListener {
             runCatching {
                 startActivity(Intent().apply {
                     action = "android.intent.action.VIEW"
-                    data = Uri.parse("https://github.com/fankes/MIUINativeNotifyIcon")
+                    data = Uri.parse("https://github.com/fankes/AndroidNotifyIconAdapt/blob/main/CONTRIBUTING.md")
                     /** 防止顶栈一样重叠在自己的 APP 中 */
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 })
             }.onFailure {
-                Toast.makeText(this, "无法启动系统默认浏览器", Toast.LENGTH_SHORT).show()
+                toast(msg = "无法启动系统默认浏览器")
+            }
+        }
+        /** 装载数据 */
+        mockLocalData()
+        /** 更新数据 */
+        onStartRefresh()
+    }
+
+    /** 装载或刷新本地数据 */
+    private fun mockLocalData() {
+        iconAllDatas = IconPackParams(context = this).iconDatas
+        refreshAdapterResult()
+    }
+
+    /** 首次进入或更新数据 */
+    private fun onStartRefresh() =
+        showDialog {
+            title = if (iconAllDatas.isNotEmpty()) "同步列表" else "初始化"
+            msg = (if (iconAllDatas.isNotEmpty()) "建议定期从云端拉取数据以获得最新的通知图标优化名单适配数据。\n\n"
+            else "首次装载需要从云端下载最新适配数据，后续可继续前往这里检查更新。\n\n") +
+                    "通过从 Github 同步最新数据，无法连接可能需要魔法上网。"
+            confirmButton(text = "开始同步") { onRefreshing() }
+            cancelButton()
+        }
+
+    /** 开始更新数据 */
+    private fun onRefreshing() {
+        ProgressDialog(this).apply {
+            setDefaultStyle(context = this@ConfigureActivity)
+            setCancelable(false)
+            setTitle("同步中")
+            setMessage("正在同步 OS 数据")
+            show()
+        }.also {
+            ClientRequestTool.wait(
+                context = this,
+                url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main/OS/MIUI/NotifyIconsSupportConfig.json"
+            ) { isDone1, ctOS ->
+                it.setMessage("正在同步 APP 数据")
+                ClientRequestTool.wait(
+                    context = this,
+                    url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main/APP/NotifyIconsSupportConfig.json"
+                ) { isDone2, ctAPP ->
+                    it.cancel()
+                    IconPackParams(context = this).also { params ->
+                        if (isDone1 && isDone2) params.splicingJsonArray(ctOS, ctAPP).also {
+                            if (params.isCompareDifferent(it)) {
+                                params.save(it)
+                                filterText = ""
+                                mockLocalData()
+                                SystemUITool.showNeedUpdateApplySnake(context = this)
+                            } else snake(msg = "列表数据已是最新")
+                        } else
+                            showDialog {
+                                title = "连接失败"
+                                msg = "连接失败，错误如下：\n${if (!isDone1) ctOS else ctAPP}"
+                                confirmButton(text = "我知道了")
+                            }
+                    }
+                }
             }
         }
     }
 
     /** 刷新适配器结果相关 */
     private fun refreshAdapterResult() {
+        onChanged?.invoke()
         findViewById<TextView>(R.id.config_title_count_text).text =
             if (filterText.isBlank()) "已适配 ${iconDatas.size} 个 APP 的通知图标"
             else "“${filterText}” 匹配到 ${iconDatas.size} 个结果"
-        findViewById<View>(R.id.config_list_no_data_view).isVisible = iconDatas.isEmpty()
+        findViewById<TextView>(R.id.config_list_no_data_view).apply {
+            text = if (iconAllDatas.isEmpty()) "噫，竟然什么都没有~\n请点击右上角同步按钮获取云端数据" else "噫，竟然什么都没找到~"
+            isVisible = iconDatas.isEmpty()
+        }
     }
 
     /**
@@ -191,8 +282,8 @@ class ConfigureActivity : BaseActivity() {
      * @return [Array]
      */
     private val iconDatas
-        get() = if (filterText.isBlank()) IconPackParams.iconDatas
-        else IconPackParams.iconDatas.filter {
+        get() = if (filterText.isBlank()) iconAllDatas
+        else iconAllDatas.filter {
             it.appName.lowercase().contains(filterText.lowercase()) || it.packageName.lowercase().contains(filterText.lowercase())
-        }.toTypedArray()
+        }
 }

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
@@ -32,17 +32,17 @@ import android.os.Bundle
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
-import android.widget.Toast
 import androidx.appcompat.widget.SwitchCompat
 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
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE_LOG
-import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_HOOK
+import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_FIX
 import com.fankes.miui.notify.ui.base.BaseActivity
 import com.fankes.miui.notify.utils.*
 import com.highcapable.yukihookapi.hook.factory.modulePrefs
@@ -93,11 +93,7 @@ class MainActivity : BaseActivity() {
                     noCancelable()
                 }
             /** 判断是否 Hook */
-            isHooked() -> {
-                findViewById<LinearLayout>(R.id.main_lin_status).setBackgroundResource(R.drawable.green_round)
-                findViewById<ImageFilterView>(R.id.main_img_status).setImageResource(R.mipmap.succcess)
-                findViewById<TextView>(R.id.main_text_status).text = "模块已激活"
-            }
+            YukiHookModuleStatus.isActive() -> {}
             else ->
                 showDialog {
                     title = "模块没有激活"
@@ -112,24 +108,34 @@ class MainActivity : BaseActivity() {
         /** 初始化 View */
         val moduleEnableSwitch = findViewById<SwitchCompat>(R.id.module_enable_switch)
         val moduleEnableLogSwitch = findViewById<SwitchCompat>(R.id.module_enable_log_switch)
+        val colorIconHookItem = findViewById<View>(R.id.config_item_color_hook)
         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 notifyIconHookSwitch = findViewById<SwitchCompat>(R.id.notify_icon_fix_switch)
-        /** 设置旧版本警告 */
-        findViewById<View>(R.id.config_notify_app_icon_warn).isVisible = miuiVersion == "12"
+        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 存储的信息 */
-        notifyIconConfigItem.isVisible = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
+        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)
+        notifyIconFixButton.isVisible = modulePrefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true)
         moduleEnableSwitch.isChecked = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
         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)
-        notifyIconHookSwitch.isChecked = modulePrefs.getBoolean(ENABLE_NOTIFY_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
             modulePrefs.putBoolean(ENABLE_MODULE, b)
             moduleEnableLogSwitch.isVisible = b
+            colorIconHookItem.isVisible = b
+            notifyIconConfigItem.isVisible = b && colorIconHookSwitch.isChecked
             SystemUITool.showNeedRestartSnake(context = this)
         }
         moduleEnableLogSwitch.setOnCheckedChangeListener { btn, b ->
@@ -150,19 +156,25 @@ 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)
         }
-        notifyIconHookSwitch.setOnCheckedChangeListener { btn, b ->
+        colorIconCompatSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
-            modulePrefs.putBoolean(ENABLE_NOTIFY_ICON_HOOK, b)
+            modulePrefs.putBoolean(ENABLE_COLOR_ICON_COMPAT, b)
             SystemUITool.showNeedRestartSnake(context = this)
         }
+        notifyIconFixSwitch.setOnCheckedChangeListener { btn, b ->
+            if (!btn.isPressed) return@setOnCheckedChangeListener
+            modulePrefs.putBoolean(ENABLE_NOTIFY_ICON_FIX, b)
+            notifyIconFixButton.isVisible = b
+            SystemUITool.showNeedRestartSnake(context = this)
+        }
+        /** 通知图标优化名单按钮点击事件 */
+        notifyIconFixButton.setOnClickListener { startActivity(Intent(this, ConfigureActivity::class.java)) }
         /** 重启按钮点击事件 */
         findViewById<View>(R.id.title_restart_icon).setOnClickListener { SystemUITool.restartSystemUI(context = this) }
-        /** 通知图标优化名单按钮点击事件 */
-        findViewById<View>(R.id.config_notify_app_button).setOnClickListener {
-            startActivity(Intent(this, ConfigureActivity::class.java))
-        }
         /** 恰饭！ */
         findViewById<View>(R.id.link_with_follow_me).setOnClickListener {
             runCatching {
@@ -174,7 +186,7 @@ class MainActivity : BaseActivity() {
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 })
             }.onFailure {
-                Toast.makeText(this, "你可能没有安装酷安", Toast.LENGTH_SHORT).show()
+                toast(msg = "你可能没有安装酷安")
             }
         }
         /** 项目地址点击事件 */
@@ -187,28 +199,62 @@ class MainActivity : BaseActivity() {
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 })
             }.onFailure {
-                Toast.makeText(this, "无法启动系统默认浏览器", Toast.LENGTH_SHORT).show()
+                toast(msg = "无法启动系统默认浏览器")
             }
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        /** MIUI 12 的版本特殊 - 所以给出提示 */
-        if (!isWarnDialogShowing && isHooked() && miuiVersion == "12" && isMiuiNotifyStyle)
-            showDialog {
-                isWarnDialogShowing = true
-                title = "经典通知栏样式已启用"
-                msg = "在 MIUI 12 中启用了经典通知栏样式后状态栏图标将不再做原生处理，模块停止工作，" +
-                        "这取决于系统设置，你应当在 设置>通知管理>通知显示设置 中将样式设置为“原生样式”。"
-                confirmButton(text = "我知道了") { isWarnDialogShowing = false }
-                noCancelable()
+    /** 刷新模块状态 */
+    private fun refreshModuleStatus() {
+        findViewById<LinearLayout>(R.id.main_lin_status).setBackgroundResource(
+            when {
+                YukiHookModuleStatus.isActive() && isMiuiNotifyStyle -> R.drawable.bg_yellow_round
+                YukiHookModuleStatus.isActive() -> R.drawable.bg_green_round
+                else -> R.drawable.bg_dark_round
+            }
+        )
+        findViewById<ImageFilterView>(R.id.main_img_status).setImageResource(
+            when {
+                YukiHookModuleStatus.isActive() && !isMiuiNotifyStyle -> R.mipmap.ic_success
+                else -> R.mipmap.ic_warn
+            }
+        )
+        findViewById<TextView>(R.id.main_text_status).text =
+            when {
+                YukiHookModuleStatus.isActive() && isMiuiNotifyStyle -> "模块已激活，但未在工作"
+                YukiHookModuleStatus.isActive() -> "模块已激活"
+                else -> "模块未激活"
             }
     }
 
-    /**
-     * 判断模块是否激活
-     * @return [Boolean] 激活状态
-     */
-    private fun isHooked() = YukiHookModuleStatus.isActive()
+    override fun onResume() {
+        super.onResume()
+        /** 刷新模块状态 */
+        refreshModuleStatus()
+        /** 经典样式启用后给出警告 */
+        if (!isWarnDialogShowing && YukiHookModuleStatus.isActive() && isMiuiNotifyStyle)
+            showDialog {
+                isWarnDialogShowing = true
+                title = "经典通知栏样式已启用"
+                msg = "当你启用了经典通知栏样式后，为防止 MIUI 自身不规范 APP 图标被破坏，状态栏图标将不再做原生处理。\n\n" +
+                        "若要使用原生样式，请前往 设置>通知管理>通知显示设置 中将样式设置为“原生样式”，新版本为 设置>通知与控制中心>通知显示设置。"
+                confirmButton(text = "去设置") {
+                    runCatching {
+                        startActivity(Intent().apply {
+                            component = ComponentName(
+                                "com.miui.notification",
+                                "miui.notification.management.activity.NotificationDisplaySettingsActivity"
+                            )
+                            /** 防止顶栈一样重叠在自己的 APP 中 */
+                            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                        })
+                    }.onFailure {
+                        toast(msg = "启动失败，请手动调整设置")
+                    }
+                    isWarnDialogShowing = false
+                }
+                cancelButton { isWarnDialogShowing = false }
+                noCancelable()
+            }
+    }
 }

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/ClientRequestTool.kt

@@ -0,0 +1,110 @@
+/*
+ * 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/25.
+ */
+@file:Suppress("TrustAllX509TrustManager", "CustomX509TrustManager")
+
+package com.fankes.miui.notify.utils
+
+import android.app.Activity
+import com.highcapable.yukihookapi.hook.log.loggerD
+import okhttp3.*
+import java.io.IOException
+import java.security.SecureRandom
+import java.security.cert.X509Certificate
+import javax.net.ssl.*
+
+/**
+ * 网络请求管理类
+ */
+object ClientRequestTool {
+
+    /**
+     * 发送 GET 请求内容并等待
+     * @param context 实例
+     * @param url 请求地址
+     * @param it 回调 - ([Boolean] 是否成功,[String] 成功的内容或失败消息)
+     */
+    fun wait(context: Activity, url: String, it: (Boolean, String) -> Unit) {
+        OkHttpClient().newBuilder().apply {
+            SSLSocketClient.sSLSocketFactory?.let { sslSocketFactory(it, SSLSocketClient.trustManager) }
+            hostnameVerifier(SSLSocketClient.hostnameVerifier)
+        }.build().newCall(
+            Request.Builder()
+                .url(url)
+                .get()
+                .build()
+        ).enqueue(object : Callback {
+            override fun onFailure(call: Call, e: IOException) {
+                context.runOnUiThread { it(false, e.toString()) }
+            }
+
+            override fun onResponse(call: Call, response: Response) {
+                val bodyString = response.body?.string() ?: ""
+                context.runOnUiThread { it(true, bodyString) }
+            }
+        })
+    }
+
+    /**
+     * 自动信任 SSL 证书
+     *
+     * 放行全部加密 SSL 请求
+     */
+    object SSLSocketClient {
+
+        /**
+         * 格式化实例
+         * @return [SSLSocketFactory] or null
+         */
+        val sSLSocketFactory
+            get() = safeOfNull {
+                SSLContext.getInstance("TLS").let {
+                    it.init(null, arrayOf<TrustManager>(trustManager), SecureRandom())
+                    it.socketFactory
+                }
+            }
+
+        /**
+         * 使用的实例
+         * @return [HostnameVerifier]
+         */
+        val hostnameVerifier get() = HostnameVerifier { _, _ -> true }
+
+        /**
+         * 信任管理者
+         * @return [X509TrustManager]
+         */
+        val trustManager
+            get() = object : X509TrustManager {
+
+                override fun checkClientTrusted(chain: Array<X509Certificate?>?, authType: String?) {
+                    loggerD(msg = "TrustX509 --> $authType")
+                }
+
+                override fun checkServerTrusted(chain: Array<X509Certificate?>?, authType: String?) {
+                    loggerD(msg = "TrustX509 --> $authType")
+                }
+
+                override fun getAcceptedIssuers() = arrayOf<X509Certificate>()
+            }
+    }
+}

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
@@ -26,8 +26,6 @@ package com.fankes.miui.notify.utils
 
 import android.app.AlertDialog
 import android.content.Context
-import android.graphics.Color
-import android.graphics.drawable.GradientDrawable
 import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
@@ -109,14 +107,7 @@ class DialogBuilder(private val context: Context) {
     internal fun show() = instance?.create()?.apply {
         val dm = DisplayMetrics()
         (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.getMetrics(dm)
-        customLayoutView?.let { setView(it.apply { minimumWidth = round(dm.widthPixels / 1.3).toInt() }) }
-        window?.setBackgroundDrawable(GradientDrawable(
-            GradientDrawable.Orientation.TOP_BOTTOM,
-            intArrayOf(Color.WHITE, Color.WHITE)
-        ).apply {
-            shape = GradientDrawable.RECTANGLE
-            gradientType = GradientDrawable.LINEAR_GRADIENT
-            cornerRadius = 15.dp(this@DialogBuilder.context)
-        })
+        customLayoutView?.let { setView(it.apply { minimumWidth = round(x = dm.widthPixels / 1.3).toInt() }) }
+        setDefaultStyle(context = this@DialogBuilder.context)
     }?.show()
 }

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
@@ -22,11 +22,9 @@
  */
 package com.fankes.miui.notify.utils
 
-import android.app.Activity
 import android.content.Context
-import android.graphics.Color
-import android.widget.Toast
 import com.google.android.material.snackbar.Snackbar
+import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 
 /**
  * 系统界面工具
@@ -46,7 +44,7 @@ object SystemUITool {
                 execShellSu(cmd = "pgrep systemui").also { pid ->
                     if (pid.isNotBlank())
                         execShellSu(cmd = "kill -9 $pid")
-                    else Toast.makeText(context, "ROOT 权限获取失败", Toast.LENGTH_SHORT).show()
+                    else toast(msg = "ROOT 权限获取失败")
                 }
             }
             cancelButton()
@@ -57,9 +55,16 @@ object SystemUITool {
      * @param context 实例
      */
     fun showNeedRestartSnake(context: Context) =
-        Snackbar.make((context as Activity).findViewById(android.R.id.content), "设置需要重启系统界面才能生效", Snackbar.LENGTH_LONG)
-            .apply {
-                setActionTextColor(Color.WHITE)
-                setAction("立即重启") { restartSystemUI(context) }
-            }.show()
+        if (YukiHookModuleStatus.isActive())
+            context.snake(msg = "设置需要重启系统界面才能生效", actionText = "立即重启") { restartSystemUI(context) }
+        else context.snake(msg = "模块没有激活，更改不会生效")
+
+    /**
+     * 显示更新数据后需要重启系统界面的 [Snackbar]
+     * @param context 实例
+     */
+    fun showNeedUpdateApplySnake(context: Context) =
+        if (YukiHookModuleStatus.isActive())
+            context.snake(msg = "数据已更新，请重启系统界面使更改生效", actionText = "立即重启") { restartSystemUI(context) }
+        else context.snake(msg = "模块没有激活，更改不会生效")
 }

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
@@ -20,22 +20,26 @@
  *
  * This file is Created by fankes on 2022/1/7.
  */
-@file:Suppress("DEPRECATION", "PrivateApi", "unused")
+@file:Suppress("DEPRECATION", "PrivateApi", "unused", "ObsoleteSdkInt")
 
 package com.fankes.miui.notify.utils
 
+import android.app.Activity
+import android.app.AlertDialog
 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.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.provider.Settings
-import android.service.notification.StatusBarNotification
 import android.util.Base64
+import android.widget.Toast
 import com.fankes.miui.notify.application.MNNApplication.Companion.appContext
-import com.highcapable.yukihookapi.hook.factory.callStatic
+import com.google.android.material.snackbar.Snackbar
 import com.highcapable.yukihookapi.hook.factory.classOf
 import com.highcapable.yukihookapi.hook.factory.hasClass
 import com.highcapable.yukihookapi.hook.factory.method
@@ -145,12 +149,6 @@ val miuiFullVersion
     get() = if (isMIUI) (miuiVersion + " " + findPropString(key = "ro.system.build.version.incremental"))
     else "不是 MIUI 系统"
 
-/**
- * 获取推送通知的包名
- * @return [String]
- */
-val StatusBarNotification.opPkgName get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) opPkg else packageName ?: ""
-
 /**
  * 得到安装包信息
  * @return [PackageInfo]
@@ -220,23 +218,19 @@ val ByteArray.bitmap: Bitmap get() = BitmapFactory.decodeByteArray(this, 0, size
 val String.bitmap: Bitmap get() = unbase64.bitmap
 
 /**
- * 圆角图片
- * @param radius 圆角度
- * @return [Bitmap] 圆角后的位图 - 失败会返回处理之前的位图
+ * 设置对话框默认风格
+ * @param context 使用的实例
  */
-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)
-            }
-        }
-    }
+fun AlertDialog.setDefaultStyle(context: Context) =
+    window?.setBackgroundDrawable(
+        GradientDrawable(
+            GradientDrawable.Orientation.TOP_BOTTOM,
+            intArrayOf(Color.WHITE, Color.WHITE)
+        ).apply {
+            shape = GradientDrawable.RECTANGLE
+            gradientType = GradientDrawable.LINEAR_GRADIENT
+            cornerRadius = 15.dp(context)
+        })
 
 /**
  * 获取系统 Prop 值
@@ -245,9 +239,10 @@ fun Bitmap.round(radius: Float): Bitmap =
  * @return [String]
  */
 fun findPropString(key: String, default: String = "") = safeOf(default) {
-    (classOf(name = "android.os.SystemProperties").method(
-        name = "get", StringType, StringType
-    )?.callStatic(key, default)) ?: default
+    (classOf(name = "android.os.SystemProperties").method {
+        name = "get"
+        param(StringType, StringType)
+    }.get().invoke(key, default)) ?: default
 }
 
 /**
@@ -261,6 +256,26 @@ fun execShellSu(cmd: String) = safeOfNothing {
     }
 }
 
+/**
+ * 弹出 [Toast]
+ * @param msg 提示内容
+ */
+fun toast(msg: String) = Toast.makeText(appContext, msg, Toast.LENGTH_SHORT).show()
+
+/**
+ * 弹出 [Snackbar]
+ * @param msg 提示内容
+ * @param actionText 按钮文本 - 不写默认取消按钮
+ * @param it 按钮事件回调
+ */
+fun Context.snake(msg: String, actionText: String = "", it: () -> Unit = {}) =
+    Snackbar.make((this as Activity).findViewById(android.R.id.content), msg, Snackbar.LENGTH_LONG)
+        .apply {
+            if (actionText.isBlank()) return@apply
+            setActionTextColor(Color.WHITE)
+            setAction(actionText) { it() }
+        }.show()
+
 /**
  * 忽略异常返回值
  * @param it 回调 - 如果异常为空

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/drawable/bg_yellow_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FF9800" />
+    <corners android:radius="15dp" />
+</shape>

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

@@ -25,7 +25,7 @@
             android:layout_height="20dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="25dp"
-            android:src="@mipmap/back"
+            android:src="@mipmap/ic_back"
             android:tint="@color/colorTextGray"
             android:tooltipText="返回" />
 
@@ -52,19 +52,46 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
-                android:text="..."
+                android:text="适配列表正在等待装载"
                 android:textColor="@color/colorTextDark"
                 android:textSize="12sp" />
         </LinearLayout>
 
+        <androidx.constraintlayout.utils.widget.ImageFilterView
+            android:id="@+id/config_title_up"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:layout_marginEnd="5dp"
+            android:src="@mipmap/ic_page_top"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="滚动到顶部" />
+
+        <androidx.constraintlayout.utils.widget.ImageFilterView
+            android:id="@+id/config_title_down"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:layout_marginEnd="15dp"
+            android:src="@mipmap/ic_page_bottom"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="滚动到底部" />
+
         <androidx.constraintlayout.utils.widget.ImageFilterView
             android:id="@+id/config_title_filter"
             android:layout_width="22dp"
             android:layout_height="22dp"
             android:layout_marginEnd="10dp"
-            android:src="@mipmap/icon_filter"
+            android:src="@mipmap/ic_filter"
             android:tint="@color/colorTextGray"
             android:tooltipText="按条件过滤" />
+
+        <androidx.constraintlayout.utils.widget.ImageFilterView
+            android:id="@+id/config_title_sync"
+            android:layout_width="23dp"
+            android:layout_height="23dp"
+            android:layout_marginEnd="10dp"
+            android:src="@mipmap/ic_sync"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="同步列表" />
     </LinearLayout>
 
     <LinearLayout
@@ -73,7 +100,7 @@
         android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
         android:layout_marginRight="15dp"
-        android:background="@drawable/permotion_round"
+        android:background="@drawable/bg_permotion_round"
         android:elevation="0dp"
         android:gravity="center"
         android:orientation="horizontal"
@@ -84,7 +111,7 @@
             android:layout_height="15dp"
             android:layout_marginEnd="10dp"
             android:alpha="0.85"
-            android:src="@mipmap/about"
+            android:src="@mipmap/ic_about"
             android:tint="@color/colorTextDark" />
 
         <TextView
@@ -108,7 +135,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="噫，竟然什么都没找到~"
+            android:gravity="center"
+            android:lineSpacingExtra="6dp"
+            android:text="没有数据"
             android:textColor="@color/colorTextDark"
             android:textSize="17sp"
             android:visibility="gone" />
@@ -133,7 +162,7 @@
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         android:layout_marginBottom="15dp"
-        android:background="@drawable/button_round"
+        android:background="@drawable/bg_button_round"
         android:gravity="center"
         android:padding="10dp"
         android:singleLine="true"

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

@@ -36,7 +36,7 @@
             android:layout_height="28dp"
             android:layout_marginEnd="5dp"
             android:alpha="0.85"
-            android:src="@mipmap/restart"
+            android:src="@mipmap/ic_restart"
             android:tint="@color/colorTextGray"
             android:tooltipText="重启系统界面" />
     </LinearLayout>
@@ -49,7 +49,7 @@
         android:layout_marginTop="10dp"
         android:layout_marginRight="15dp"
         android:layout_marginBottom="5dp"
-        android:background="@drawable/dark_round"
+        android:background="@drawable/bg_dark_round"
         android:elevation="0dp"
         android:gravity="center">
 
@@ -59,7 +59,7 @@
             android:layout_height="25dp"
             android:layout_marginStart="25dp"
             android:layout_marginEnd="5dp"
-            android:src="@mipmap/warn"
+            android:src="@mipmap/ic_warn"
             android:tint="@color/white" />
 
         <LinearLayout
@@ -76,7 +76,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
-                android:text="模块未激活"
+                android:text="模块状态未知"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
@@ -121,7 +121,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="horizontal"
@@ -132,7 +132,7 @@
                     android:layout_height="15dp"
                     android:layout_marginEnd="10dp"
                     android:alpha="0.85"
-                    android:src="@mipmap/about"
+                    android:src="@mipmap/ic_about"
                     android:tint="@color/colorTextDark" />
 
                 <TextView
@@ -153,7 +153,7 @@
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="15dp"
                 android:animateLayoutChanges="true"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -184,18 +184,19 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.6"
                     android:lineSpacingExtra="6dp"
-                    android:text="模块关闭后功能都将彻底停止工作，以下选项都将不再生效。"
+                    android:text="模块关闭后一切功能都将彻底停止工作。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/config_item_color_hook"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="10dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -219,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
@@ -228,7 +249,8 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="10dp"
-                android:background="@drawable/permotion_round"
+                android:animateLayoutChanges="true"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -250,7 +272,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="10dp"
-                    android:background="@drawable/button_round"
+                    android:background="@drawable/bg_button_round"
                     android:gravity="center"
                     android:padding="10dp"
                     android:singleLine="true"
@@ -266,12 +288,11 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.6"
                     android:lineSpacingExtra="6dp"
-                    android:text="此选项默认开启，开启后将对优化名单内 APP 通知小图标进行色彩修复，特别是通过 MIPUSH 推送的通知，它们始终是彩色的，修复后使得它们的图标看起来更加符合原生规范。"
+                    android:text="首次安装请打开名单列表从云端更新数据，后期适配的内容也请手动打开名单列表重新拉取数据以检查更新，数据更新后重启系统界面即可生效。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
                 <TextView
-                    android:id="@+id/config_notify_app_icon_warn"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="5dp"
@@ -279,10 +300,9 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.6"
                     android:lineSpacingExtra="6dp"
-                    android:text="⚠️ 你的 MIUI 版本过低，状态栏上 MIPUSH 的彩色图标由于不能识别反色将不会被优化为黑白小图标，仅在通知栏生效。"
-                    android:textColor="#FF9800"
-                    android:textSize="12sp"
-                    android:visibility="gone" />
+                    android:text="此选项默认开启，开启后将对优化名单内的 APP 通知小图标使用单色调进行修复，特别是通过 MIPUSH 推送的通知，它们始终是 APP 默认图标(彩色的 APP 图标)，修复后使得它们的图标看起来更加符合 Android 原生的统一规范。"
+                    android:textColor="@color/colorTextDark"
+                    android:textSize="12sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -291,7 +311,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -323,7 +343,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -340,7 +360,7 @@
                         android:layout_height="15dp"
                         android:layout_marginEnd="5dp"
                         android:alpha="0.85"
-                        android:src="@mipmap/about"
+                        android:src="@mipmap/ic_about"
                         android:tint="@color/colorTextGray" />
 
                     <TextView
@@ -379,7 +399,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" />
 
@@ -400,7 +420,7 @@
                 android:layout_marginLeft="15dp"
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -417,7 +437,7 @@
                         android:layout_height="15dp"
                         android:layout_marginEnd="5dp"
                         android:alpha="0.85"
-                        android:src="@mipmap/about"
+                        android:src="@mipmap/ic_about"
                         android:tint="@color/colorTextGray" />
 
                     <TextView
@@ -447,7 +467,7 @@
                 android:layout_marginTop="15dp"
                 android:layout_marginRight="15dp"
                 android:layout_marginBottom="10dp"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:elevation="0dp"
                 android:gravity="center"
                 android:orientation="vertical"
@@ -476,7 +496,7 @@
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@mipmap/qr_pay" />
+                        android:src="@mipmap/bg_qr_pay" />
                 </androidx.cardview.widget.CardView>
 
                 <TextView
@@ -497,7 +517,7 @@
                 android:layout_marginRight="15dp"
                 android:layout_marginBottom="10dp"
                 android:autoLink="web"
-                android:background="@drawable/permotion_round"
+                android:background="@drawable/bg_permotion_round"
                 android:lineSpacingExtra="6dp"
                 android:padding="10dp"
                 android:text="此模块使用 YukiHookAPI 构建。\n点击这里了解更多 https://github.com/fankes/YukiHookAPI"

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

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/permotion_round"
+    android:background="@drawable/bg_permotion_round"
     android:baselineAligned="false"
     android:gravity="center|start"
     android:orientation="horizontal"
@@ -28,7 +28,7 @@
                 android:layout_width="15dp"
                 android:layout_height="15dp"
                 android:layout_marginEnd="8dp"
-                android:src="@mipmap/about"
+                android:src="@mipmap/ic_about"
                 android:tint="@color/colorTextGray" />
 
             <TextView

app/src/test/java/com/fankes/miui/notify/ExampleUnitTest.kt

@@ -2,16 +2,13 @@ package com.fankes.miui.notify
 
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
 class ExampleUnitTest {
+
     @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
+    fun main() = println("Hello world")
 }

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "1.51"
-    appVersionCode = 10
+    appVersionName = "1.85"
+    appVersionCode = 18
 }
 
 task clean(type: Delete) {

settings.gradle

@@ -10,7 +10,8 @@ dependencyResolutionManagement {
     repositories {
         google()
         maven { url "https://api.xposed.info/" }
-        maven { url 'https://www.jitpack.io' }
+        maven { url "https://www.jitpack.io" }
+        maven { url "https://s01.oss.sonatype.org/content/repositories/releases" }
         mavenCentral()
     }
 }