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,15 @@
         <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_main.xml" value="0.4036346245815399" />
+        <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.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" />
       </map>
     </option>

CONTRIBUTING.md

@@ -1,42 +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
-    contributorName = "" // 贡献者昵称
-)
-```
-
-- 提交时请将后方的注释删除，否则不予合并代码
-
-## 其它要求
-
-- 1.调试性质或大批量注释代码，禁止提交
-- 2.类名和方法名仅能由开发者进行修改和提交，禁止随意修改项目名称、方法名称以及类名
-- 3.禁止随意更新项目依赖以及增加新的依赖，有问题请提前提交到 issues 进行说明
-- 4.禁止更新项目版本号，版本号交由开发者合并代码并发布 release 版本
-- 5.代码语言要求，请统一使用 Kotlin，除特殊情况外，不接受其他语言的提交
-- 6.以上

README.md

@@ -1,8 +1,8 @@
 # MIUI 原生通知图标
 
 ![Eclipse Marketplace](https://img.shields.io/badge/build-passing-brightgreen)
-![Eclipse Marketplace](https://img.shields.io/badge/license-GPL3.0-blue)
-![Eclipse Marketplace](https://img.shields.io/badge/version-v1.25-green)
+![Eclipse Marketplace](https://img.shields.io/badge/license-AGPL3.0-blue)
+![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,77 +12,97 @@ 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.25-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(不推荐)、不支持太极无极(阴)
-- 目前最低支持基于 Android 9 版本的 MIUI12 或 MIUI12.5(建议)
-- 使用 Zygisk 方式运行的 Lsposed 可能会发生 Hook 不生效的问题，若出现问题请使用 Ramdisk 版本的 Lsposed
+- 此模块仅支持 LSPosed(作用域“系统界面”)、~~EdXposed(随时停止支持)~~、不支持太极无极
+- 请确保你使用的是 MIUI 官方版本，任何第三方官改包发生的问题，开发者没有义务去解决和修复，请自求多福
+- 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
+- 建议最低从 MIUI 12.5 `2021-5-18` 开发版以后开始使用模块，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块的问题
+- 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题
 
-# 禁止任何商业用途
+# 请勿用于非法用途
 
-本模块完全开源免费，如果好用你可以打赏支持开发，严禁未经许可进行二改贩卖，违者必惩必究。
+- 本模块完全开源免费，如果好用你可以打赏支持开发，但是请不要用于非法用途。
+- 本模块发布地址仅有 [Xposed-Modules-Repo](https://github.com/Xposed-Modules-Repo/com.fankes.miui.notify/releases)、
+  [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)
 
 # 历史背景
 
-这个模块诞生来源于 MIUI 的乱改和不规范，本来 MIUI 9 之后，官方给出了原生通知图标样式，后面由于用户反应通知栏经常出现黑白块。 这当然不是系统的错，而是国内 APP 极其不规范的通知图标设计，于是 MIUI
-选择直接忽略这个问题把全部图标都改成了 APP 的彩色图标， 使得之前拥有自有样式的原生图标也被破坏，通知中“setSmallIcon”不再有效，这个模块就是为了修复被 MIUI 开发组忽略的图标问题， 并完美地给 MIUI 修复了黑白块图标的问题。
+这个模块诞生来源于 MIUI 的乱改和不规范，本来 MIUI 9 之后，官方给出了原生通知图标样式，后面由于用户反应通知栏经常出现黑白块。<br/><br/>
+这当然不是系统的错，而是国内 APP 和 `MIPUSH` 的通知极其不规范的通知图标设计。<br/><br/>
+但是呢，接到反馈后 MIUI 开发组选择直接忽略这个问题，在 `2021-5-18` 的开发版开始，把全部通知图标都改成了 APP 的彩色图标，使得之前拥有自有样式的原生图标也被破坏。<br/><br/>
+对于 Android 开发者来说，官方文档中的 `setSmallIcon` 不再适用于魔改后的 MIUI，这将会严重破坏非常多的状态图标。<br/><br/>
+当然，国内的手机生态除了 `MIPUSH` 的营销通知就是社交软件的通知，可能大部分人都不会在意这件事情。<br/><br/>
+但是，这个模块就是为了修复被 MIUI 开发组忽略的图标问题才诞生的，并完美地给 MIUI 修复了黑白块图标的问题。
 <br/>
 
 # 探索历程
 
-- 原生 Android 的小图标和通知图标具有状态性<br/>
-  <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/native.jpg" height = "35"/><br/>
-- 而 MIUI 最近的版本直接破坏了这一状态性，全部设置为 APP 的图标，不仅难看而且你无法下拉通知栏区别这些图标代表什么<br/>
-  <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/miui.jpg" height = "40"/><br/>
-- 同样地，通知面板的图标同样遵守这一状态性<br/>
-  <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/native_n_1.jpg" height = "100"/><br/>
-  <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/native_n_2.jpg" height = "100"/><br/>
-- 而 MIUI 做了什么呢<br/>
-  <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/miui_n_1.jpg" height = "100"/><br/>
-  <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/miui_n_2.jpg" height = "100"/><br/>
-- 不曾记得是什么版本开始，MIUI 把通知图标改成了这个鬼样子，寻找开发组提案也是无人问津，最后转念一想，自己干吧。
-- 由于目前大量通知图标都来自 MIPUSH 发出的营销通知，而 MIPUSH 的图标都是统一的彩色应用图标，很多应用也没有适配这一特性， 在通知栏广告满天飞的情况下，MIUI
-  选择放弃原生通知功能，而做出这种违反原生通知规则的做法，而这些彩色图标被设置为单色调图标，也确实会发生黑白块的问题，但是同时又会破坏遵守规范的图标。
-- 真的没有办法了吗？在不断探索下，我找到了原生支持色彩判断的类
+原生 Android 的小图标和通知图标具有状态性。<br/><br/>
+<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/native.jpg" height = "35"/><br/><br/>
+而 MIUI 最近的版本直接破坏了这一状态性，全部设置为 APP 的图标，不仅难看而且你无法下拉通知栏区别这些图标代表什么。<br/><br/>
+<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/miui.jpg" height = "40"/><br/><br/>
+同样地，通知面板的图标同样遵守这一状态性。<br/><br/>
+<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/native_n_1.jpg" height = "100"/><br/>
+<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/native_n_2.jpg" height = "100"/><br/><br/>
+而 MIUI 做了什么呢？<br/><br/>
+<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/miui_n_1.jpg" height = "100"/><br/>
+<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/images/miui_n_2.jpg" height = "100"/><br/><br/>
+不曾记得是什么版本开始，MIUI 把通知图标改成了这个鬼样子，寻找开发组提案也是无人问津，最后转念一想，自己干吧。<br/><br/>
+由于目前大量通知图标都来自 `MIPUSH` 发出的营销通知，而 `MIPUSH` 的图标都是统一的彩色应用图标，很多应用也没有适配这一特性， 在通知栏广告满天飞的情况下，MIUI
+选择放弃原生通知功能，而做出这种违反原生通知规则的做法，而这些彩色图标被设置为单色调图标，也确实会发生黑白块的问题，但是同时又会破坏遵守规范的图标。<br/><br/>
+真的没有办法了吗？在不断探索下，我找到了原生支持色彩判断的类。
 
 ```
 com.android.internal.util.ContrastColorUtil
 ```
 
-- 这个类中有一个方法可以拿出来判断图标的灰度效果
+这个类中有一个方法可以拿出来判断图标的灰度效果。
 
 ```
-ContrastColorUtil.getInstance().isGrayscaleIcon(drawable);
+ContrastColorUtil.getInstance().isGrayscaleIcon(drawable)
 ```
 
-- 问题就被解决了，顺便修了一下被 MIUI 破坏的通知图标以及优化了一下应用本身方块图标的圆角...
-- 最后，我想大声问一句 MIUI 开发组：“就这？” 就这么简单的问题为什么拖了这么长时间也没有结论，还要交给用户去修复，这真的是一种负责任的表现吗？
-- 后来一想，也是啊，被国内生态毒害的用户，怎么可能会去想到这些问题呢，最后只能是我自作多情，还对 MIUI 留有一点情怀吧。
-- ——来自一个无可奈何的 MIUI 老用户
+问题就被解决了，顺便修了一下被 MIUI 破坏的通知图标以及优化了一下应用本身方块图标的圆角......<br/><br/>
+最后，我想大声问一句 MIUI 开发组：“就这？” 就这么简单的问题为什么拖了这么长时间也没有结论，还要交给用户去修复，这真的是一种负责任的表现吗？<br/><br/>
+后来一想，也是啊，被国内生态毒害的用户，怎么可能会去想到这些问题呢，最后只能是我自作多情，还对 MIUI 留有一点情怀吧。<br/><br/>
+——来自一个无可奈何的 MIUI 老用户
+
+# 后记
+
+近期重新适配了 MIUI 12、12.5、13 版本，每个版本的图标设置方法都不一样，而且改的乱七八糟的，我都要无语了，只能用了很多折中方案，毕竟我也没有那么大精力每个版本去修复，实在是累了。<br/><br/>
+特地的把自己能有的小米手机刷成各种 MIUI 版本去为酷友做专项适配，我也是很累了，也希望你们能够多多支持，也能让 MIUI 做得更好。<br/><br/>
+MIUI 再不重写，怕是永远会变成安卓之光。雷军，金凡！！
 
 # 许可证
 
-- [GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.html)
+- [AGPL-3.0](https://www.gnu.org/licenses/agpl-3.0.html)
 
 ```
-Copyright (C) 2020-2022  Fankes Studio(qzmmcn@163.com)
+Copyright (C) 2019-2022 Fankes Studio(qzmmcn@163.com)
 
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+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 (at your option) any later version.
 
 This program 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 General Public License for more details.
-```
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+```
+
+Powered by [YukiHookAPI](https://github.com/fankes/YukiHookAPI)<br/><br/>
+版权所有 © 2019-2022 Fankes Studio(qzmmcn@163.com)

app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
+    id 'com.google.devtools.ksp' version '1.6.10-1.0.2'
 }
 
 android {
@@ -19,10 +20,10 @@ android {
 
     defaultConfig {
         applicationId "com.fankes.miui.notify"
-        minSdk 26
-        targetSdk 26
-        versionCode 5
-        versionName "1.25"
+        minSdk 28
+        targetSdk 31
+        versionCode rootProject.ext.appVersionCode
+        versionName rootProject.ext.appVersionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -41,22 +42,42 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+/** 移除无效耗时 lint Task */
+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
 }
 
 dependencies {
+    implementation "com.github.topjohnwu.libsu:core:3.1.2"
+    implementation 'androidx.annotation:annotation:1.3.0'
+    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.gyf.immersionbar:immersionbar:3.0.0'
-    // Fragment 快速实现
-    implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
-    // Kotlin 扩展
-    implementation 'com.gyf.immersionbar:immersionbar-ktx:3.0.0'
+    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'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    //noinspection GradleDynamicVersion
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.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"
@@ -13,48 +15,43 @@
         android:theme="@style/Theme.MIUINativeNotifyIcon"
         tools:ignore="AllowBackup">
 
-        <!-- 是否是xposed模块 -->
         <meta-data
             android:name="xposedmodule"
             android:value="true" />
-
-        <!-- 模块描述 -->
         <meta-data
             android:name="xposeddescription"
-            android:value="MIUI 状态栏原生图标，修复 12.5、13 后期被破坏的彩色图标。\n开发者：酷安 @星夜不荟" />
-
-        <!-- 最低xposed版本号 -->
+            android:value="MIUI 原生通知图标，修复 12.5、13 后期被破坏的彩色图标。\n开发者：酷安 @星夜不荟" />
         <meta-data
             android:name="xposedminversion"
-            android:value="82" />
+            android:value="93" />
 
         <activity
-            android:name="com.fankes.miui.notify.ui.MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
             android:screenOrientation="behind">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="de.robv.android.xposed.category.MODULE_SETTINGS" />
             </intent-filter>
         </activity>
 
         <activity-alias
-            android:name="com.fankes.miui.notify.Home"
+            android:name=".Home"
             android:enabled="true"
             android:exported="true"
             android:label="@string/app_name"
             android:screenOrientation="behind"
-            android:targetActivity="com.fankes.miui.notify.ui.MainActivity">
-
+            android:targetActivity=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>
 
         <activity
-            android:name="com.fankes.miui.notify.ui.ConfigureActivity"
+            android:name=".ui.ConfigureActivity"
             android:exported="false"
             android:screenOrientation="behind" />
     </application>

app/src/main/assets/xposed_init

@@ -1 +1 @@
-com.fankes.miui.notify.hook.HookMain
+com.fankes.miui.notify.hook.HookEntry_YukiHookXposedInit

app/src/main/assets/yukihookapi_init

@@ -0,0 +1 @@
+com.fankes.miui.notify.hook.HookEntry

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

@@ -1,22 +1,24 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+/*
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/01/24.
+ * This file is Created by fankes on 2022/1/24.
  */
 @file:Suppress("unused")
 

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

@@ -1,20 +1,22 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+/*
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/30.
  */
@@ -26,17 +28,19 @@ import java.io.Serializable
 
 /**
  * 通知栏小图标 bean
- * @param appName APP 名称 - 仅限默认语言区域
+ * @param appName APP 名称
  * @param packageName 包名
  * @param iconBitmap 图标位图
+ * @param iconColor 通知栏中显示的图标颜色 - 设置为 0 使用系统默认颜色
  * @param contributorName 贡献者昵称
- * @param isEnabled 是否默认启用替换
- * @param isEnabledAll 是否默认启用完全替换
+ * @param isEnabled 是否默认启用替换彩色图标 - 关闭后将全部停止替换
+ * @param isEnabledAll 是否默认启用替换全部图标
  */
 data class IconDataBean(
     var appName: String,
     var packageName: String,
     var iconBitmap: Bitmap,
+    var iconColor: Int = 0,
     var contributorName: String,
     var isEnabled: Boolean,
     var isEnabledAll: Boolean,

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

@@ -0,0 +1,38 @@
+/*
+ * 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/1/24.
+ */
+@file:Suppress("DEPRECATION", "SetWorldReadable")
+
+package com.fankes.miui.notify.hook
+
+object HookConst {
+
+    const val ENABLE_MODULE = "_enable_module"
+    const val ENABLE_MODULE_LOG = "_enable_module_log"
+    const val ENABLE_HIDE_ICON = "_hide_icon"
+    const val ENABLE_COLOR_ICON_HOOK = "_color_icon_hook"
+    const val ENABLE_COLOR_ICON_COMPAT = "_color_icon_compat"
+    const val ENABLE_NOTIFY_ICON_FIX = "_notify_icon_fix"
+    const val 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

@@ -0,0 +1,602 @@
+/*
+ * 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/15.
+ */
+package com.fankes.miui.notify.hook
+
+import android.content.Context
+import android.graphics.Bitmap
+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_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
+import com.fankes.miui.notify.params.IconPackParams
+import com.fankes.miui.notify.utils.*
+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
+import com.highcapable.yukihookapi.hook.type.android.DrawableClass
+import com.highcapable.yukihookapi.hook.type.android.ImageViewClass
+import com.highcapable.yukihookapi.hook.type.java.IntType
+import com.highcapable.yukihookapi.hook.xposed.proxy.YukiHookXposedInitProxy
+
+@InjectYukiHookWithXposed
+class HookEntry : YukiHookXposedInitProxy {
+
+    companion object {
+
+        /** MIUI 新版本存在的类 */
+        private const val SystemUIApplicationClass = "$SYSTEMUI_PACKAGE_NAME.SystemUIApplication"
+
+        /** MIUI 新版本存在的类 */
+        private const val NotificationHeaderViewWrapperInjectorClass =
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapperInjector"
+
+        /** 原生存在的类 */
+        private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
+
+        /** 根据多个版本存在不同的包名相同的类 */
+        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(
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtil",
+            "$SYSTEMUI_PACKAGE_NAME.miui.statusbar.notification.NotificationUtil"
+        )
+
+        /** 根据多个版本存在不同的包名相同的类 */
+        private val ExpandedNotificationClass = VariousClass(
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.ExpandedNotification",
+            "$SYSTEMUI_PACKAGE_NAME.miui.statusbar.ExpandedNotification"
+        )
+    }
+
+    /** 缓存的通知优化图标数组 */
+    private var iconDatas = ArrayList<IconDataBean>()
+
+    /**
+     * - 这个是修复彩色图标的关键核心代码判断
+     *
+     * 判断是否为灰度图标 - 反射执行系统方法
+     * @param context 实例
+     * @param drawable 要判断的图标
+     * @return [Boolean]
+     */
+    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 方案
+     *
+     * 拥有状态栏图标颜色检查功能
+     * @return [Boolean]
+     */
+    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
+    }
+
+    /**
+     * 获取推送通知的应用名称
+     * @param context 实例
+     * @return [String]
+     */
+    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() = 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 } }
+        }
+
+    /**
+     * 获取全局上下文
+     * @return [Context] or null
+     */
+    private val PackageParam.globalContext
+        get() = safeOfNull {
+            if (SystemUIApplicationClass.clazz.hasMethod(name = "getContext"))
+                SystemUIApplicationClass.clazz.method { name = "getContext" }.get().invoke<Context>()
+            else null
+        }
+
+    /**
+     * Hook 状态栏小图标
+     *
+     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
+     * @param context 实例
+     * @param expandedNf 通知实例
+     * @param iconDrawable 小图标 [Drawable]
+     * @param it 回调小图标 - ([Bitmap] 小图标)
+     */
+    private fun PackageParam.hookSmallIconOnSet(
+        context: Context,
+        expandedNf: StatusBarNotification?,
+        iconDrawable: Drawable?,
+        it: (Bitmap) -> Unit
+    ) = safeRun(msg = "GetSmallIconOnSet") {
+        if (iconDrawable == null) return@safeRun
+        /** 如果没开启修复 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_NOTIFY_ICON_FIX, default = true))
+                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 {
+                /** 处理自定义通知图标优化 */
+                customIcon != null -> it(customIcon!!)
+                /** 若不是灰度图标自动处理为圆角 */
+                isNotGrayscaleIcon -> it(notifyInstance.compatNotifyIcon(context, iconDrawable).toBitmap())
+            }
+        }
+    }
+
+    /**
+     * Hook 通知栏小图标
+     *
+     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
+     * @param context 实例
+     * @param expandedNf 通知实例
+     * @param iconImageView 通知图标实例
+     */
+    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 ->
+                /** 是否开启修复 APP 的彩色图标 */
+                val isNotifyIconFix = prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true)
+
+                /** 新版风格反色 */
+                val newStyle = if (context.isSystemInDarkMode) 0xFF2D2D2D.toInt() else Color.WHITE
+
+                /** 旧版风格反色 */
+                val oldStyle = if (context.isNotSystemInDarkMode) 0xFF707070.toInt() else Color.WHITE
+
+                /** 通知图标原始颜色 */
+                val iconColor = notifyInstance.notification.color
+
+                /** 是否有通知栏图标颜色 */
+                val hasIconColor = iconColor != 0
+
+                /** 通知图标适配颜色 */
+                val supportColor = iconColor.let {
+                    when {
+                        isUpperOfAndroidS -> newStyle
+                        it == 0 -> oldStyle
+                        else -> it
+                    }
+                }
+
+                /** 获取通知小图标 */
+                val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
+
+                /** 判断图标风格 */
+                val isGrayscaleIcon = !notifyInstance.isXmsf && isGrayscaleIcon(context, iconDrawable)
+
+                /** 自定义默认小图标 */
+                var customIcon: Bitmap? = null
+
+                /** 自定义默认小图标颜色 */
+                var customIconColor = 0
+
+                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
+                                }
+                            }
+                        }
+                }
+                /** 打印日志 */
+                printLogcat(tag = "NotifyIcon", context, notifyInstance, isCustom = customIcon != null, isGrayscaleIcon)
+                /** 处理自定义通知图标优化 */
+                if (customIcon != null)
+                    iconImageView.apply {
+                        /** 设置自定义小图标 */
+                        setImageBitmap(customIcon)
+                        /** 上色 */
+                        setColorFilter(if (isUpperOfAndroidS || customIconColor == 0) supportColor else customIconColor)
+                        /** Android 12 设置图标外圈颜色 */
+                        if (isUpperOfAndroidS && customIconColor != 0)
+                            background = DrawableBuilder().rounded().solidColor(customIconColor).build()
+                    }
+                else {
+                    /** 重新设置图标 - 防止系统更改它 */
+                    iconImageView.setImageDrawable(iconDrawable)
+                    /** 判断如果是灰度图标就给他设置一个白色颜色遮罩 */
+                    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
+                    }
+                }
+            }
+        }
+
+    /**
+     * Hook 通知栏小图标颜色
+     *
+     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
+     * @param context 实例
+     * @param expandedNf 状态栏实例
+     * @return [Boolean] 是否忽略通知图标颜色
+     */
+    private fun PackageParam.hookIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) =
+        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 = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
+
+                    /** 获取目标修复彩色图标的 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
+                                    }
+                                }
+                        }
+                    /**
+                     * 只要不是灰度就返回彩色图标
+                     * 否则不对颜色进行反色处理防止一些系统图标出现异常
+                     */
+                    if (isTargetFixApp) false else isNotGrayscaleIcon
+                } ?: true
+            } else false
+        else true
+
+    override fun onHook() = encase {
+        configs {
+            debugTag = "MIUINativeNotifyIcon"
+            isDebug = false
+        }
+        loadApp(SYSTEMUI_PACKAGE_NAME) {
+            when {
+                /** 不是 MIUI 系统停止 Hook */
+                isNotMIUI -> loggerW(msg = "Aborted Hook -> This System is not MIUI")
+                /** 系统版本低于 Android P 停止 Hook */
+                isLowerAndroidP -> loggerW(msg = "Aborted Hook -> This System is lower than Android P")
+                /** 不是支持的 MIUI 系统停止 Hook */
+                isNotSupportMiuiVersion -> loggerW(msg = "Aborted Hook -> This MIUI Version $miuiVersion not supported")
+                /** Hook 被手动关闭停止 Hook */
+                !prefs.getBoolean(ENABLE_MODULE, default = true) -> loggerW(msg = "Aborted Hook -> Hook Closed")
+                /** 开始 Hook */
+                else -> {
+                    /** 缓存图标数据 */
+                    iconDatas = IconPackParams(param = this).iconDatas
+                    /** 执行 Hook */
+                    NotificationUtilClass.hook {
+                        /** 强制回写系统的状态栏图标样式为原生 */
+                        injectMember {
+                            method {
+                                name = "shouldSubstituteSmallIcon"
+                                param(ExpandedNotificationClass.clazz)
+                            }
+                            /**
+                             * 为了防止 MIUI 自身的版本不同造成的各种 BUG
+                             * 判断是 MIUI 样式就停止 Hook
+                             */
+                            replaceAny { globalContext?.isMiuiNotifyStyle ?: isShowMiuiStyle }
+                        }
+                        if (hasIgnoreStatusBarIconColor)
+                            injectMember {
+                                method {
+                                    name = "ignoreStatusBarIconColor"
+                                    param(ExpandedNotificationClass.clazz)
+                                }
+                                replaceAny {
+                                    hookIgnoreStatusBarIconColor(
+                                        context = globalContext ?: error("GlobalContext got null"),
+                                        expandedNf = args[0] as? StatusBarNotification?
+                                    )
+                                }
+                            }
+                        /** 强制回写系统的状态栏图标样式为原生 */
+                        injectMember {
+                            var isUseLegacy = false
+                            method {
+                                name = "getSmallIcon"
+                                param(ExpandedNotificationClass.clazz, IntType)
+                            }.remedys {
+                                method {
+                                    name = "getSmallIcon"
+                                    param(ExpandedNotificationClass.clazz)
+                                }
+                                method {
+                                    name = "getSmallIcon"
+                                    param(ContextClass, ExpandedNotificationClass.clazz)
+                                }.onFind { isUseLegacy = true }
+                            }
+                            afterHook {
+                                (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) }
+                                }
+                            }
+                        }
+                    }
+                    NotificationHeaderViewWrapperClass.hook {
+                        /** 修复下拉通知图标自动设置回 APP 图标的方法 */
+                        injectMember {
+                            if (hasHandleHeaderViews)
+                                method { name = "handleHeaderViews" }
+                            else method { name = "resolveHeaderViews" }
+                            afterHook {
+                                /** 获取小图标 */
+                                val iconImageView =
+                                    NotificationHeaderViewWrapperClass.clazz
+                                        .field { name = "mIcon" }.of<ImageView>(instance) ?: return@afterHook
+
+                                /**
+                                 * 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass]
+                                 * 获取其中的得到通知方法
+                                 */
+                                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)
+                            }
+                        }
+                    }
+                    /** 干掉下拉通知图标自动设置回 APP 图标的方法 */
+                    NotificationHeaderViewWrapperInjectorClass.hook {
+                        injectMember {
+                            method {
+                                name = "setAppIcon"
+                                param(ContextClass, ImageViewClass, ExpandedNotificationClass.clazz)
+                            }.remedys {
+                                method {
+                                    name = "setAppIcon"
+                                    param(ImageViewClass, ExpandedNotificationClass.clazz)
+                                }
+                            }
+                            intercept()
+                        }.ignoredAllFailure()
+                        injectMember {
+                            method {
+                                name = "resetIconBgAndPaddings"
+                                param(ImageViewClass, ExpandedNotificationClass.clazz)
+                            }
+                            intercept()
+                        }.ignoredAllFailure()
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -1,667 +0,0 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
- *
- * This file is part of MIUINativeNotifyIcon.
- *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is Created by fankes on 2022/01/24.
- */
-@file:Suppress("SameParameterValue", "DEPRECATION")
-
-package com.fankes.miui.notify.hook
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.graphics.Outline
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.Icon
-import android.service.notification.StatusBarNotification
-import android.util.Log
-import android.view.View
-import android.view.ViewOutlineProvider
-import android.widget.ImageView
-import androidx.annotation.Keep
-import androidx.core.graphics.drawable.toBitmap
-import com.fankes.miui.notify.hook.HookMedium.SELF_PACKAGE_NAME
-import com.fankes.miui.notify.hook.HookMedium.SYSTEMUI_PACKAGE_NAME
-import com.fankes.miui.notify.params.IconPackParams
-import com.fankes.miui.notify.utils.*
-import de.robv.android.xposed.*
-import de.robv.android.xposed.callbacks.XC_LoadPackage
-
-@Keep
-class HookMain : IXposedHookLoadPackage {
-
-    companion object {
-
-        private const val SystemUIApplicationClass = "$SYSTEMUI_PACKAGE_NAME.SystemUIApplication"
-
-        private const val NotificationHeaderViewWrapperInjectorClass =
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapperInjector"
-
-        private const val StatusBarIconViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.StatusBarIconView"
-
-        private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
-
-        private val NotificationUtilClass = Pair(
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtil",
-            "$SYSTEMUI_PACKAGE_NAME.miui.statusbar.notification.NotificationUtil"
-        )
-
-        private val ExpandedNotificationClass = Pair(
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.ExpandedNotification",
-            "$SYSTEMUI_PACKAGE_NAME.miui.statusbar.ExpandedNotification"
-        )
-    }
-
-    /** 仅作用于替换的 Hook 方法体 */
-    private val replaceToNull = object : XC_MethodReplacement() {
-        override fun replaceHookedMethod(param: MethodHookParam?): Any? {
-            return null
-        }
-    }
-
-    /** 仅作用于替换的 Hook 方法体 */
-    private val replaceToTrue = object : XC_MethodReplacement() {
-        override fun replaceHookedMethod(param: MethodHookParam?): Any {
-            return true
-        }
-    }
-
-    /** 仅作用于替换的 Hook 方法体 */
-    private val replaceToFalse = object : XC_MethodReplacement() {
-        override fun replaceHookedMethod(param: MethodHookParam?): Any {
-            return false
-        }
-    }
-
-    /**
-     * 忽略异常运行
-     * @param error 错误信息
-     * @param it 正常回调
-     */
-    private fun runWithoutError(error: String = "", it: () -> Unit) {
-        try {
-            it()
-        } catch (e: Throwable) {
-            logE(content = "hookFailed: $error", e)
-        }
-    }
-
-    /**
-     * Print the log
-     * @param content
-     * @param it 继续执行的方法
-     */
-    private fun logD(content: String, it: () -> Unit = {}) {
-        it()
-        if (!HookMedium.getBoolean(HookMedium.ENABLE_MODULE_LOG, default = false)) return
-        XposedBridge.log("[MIUINativeNotifyIcon][D]>$content")
-        Log.d("MIUINativeNotifyIcon", content)
-    }
-
-    /**
-     * Print the log
-     * @param content
-     * @param it 继续执行的方法
-     */
-    private fun logW(content: String, it: () -> Unit = {}) {
-        it()
-        if (!HookMedium.getBoolean(HookMedium.ENABLE_MODULE_LOG, default = false)) return
-        XposedBridge.log("[MIUINativeNotifyIcon][W]>$content")
-        Log.d("MIUINativeNotifyIcon", content)
-    }
-
-    /**
-     * Print the log
-     * @param content
-     * @param e 异常
-     * @param it 继续执行的方法
-     */
-    private fun logE(content: String, e: Throwable? = null, it: () -> Unit = {}) {
-        it()
-        XposedBridge.log("[MIUINativeNotifyIcon][E]>$content")
-        XposedBridge.log(e)
-        Log.e("MIUINativeNotifyIcon", content, e)
-    }
-
-    /**
-     * 目标类是否存在
-     * @param name 类名
-     * @return [Boolean]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.isClassExist(name: String) = try {
-        classLoader.loadClass(name)
-        true
-    } catch (_: Throwable) {
-        false
-    }
-
-    /**
-     * 目标方法是否存在
-     * @param classPair 类数组
-     * @param name 方法名
-     * @param param 方法参数类型数组
-     * @return [Boolean]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.isMethodExist(
-        classPair: Pair<String, String>,
-        name: String, vararg param: Class<*>
-    ) = try {
-        (try {
-            classLoader.loadClass(classPair.first)
-        } catch (_: Throwable) {
-            try {
-                classLoader.loadClass(classPair.second)
-            } catch (_: Throwable) {
-                null
-            }
-        })?.getDeclaredMethod(name, *param)
-        true
-    } catch (_: Throwable) {
-        false
-    }
-
-    /**
-     * 目标方法是否存在
-     * @param className 类名
-     * @param name 方法名
-     * @param param 方法参数类型数组
-     * @return [Boolean]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.isMethodExist(className: String, name: String, vararg param: Class<*>) =
-        try {
-            (try {
-                classLoader.loadClass(className)
-            } catch (_: Throwable) {
-                null
-            })?.getDeclaredMethod(name, *param)
-            true
-        } catch (_: Throwable) {
-            false
-        }
-
-    /**
-     * 查找目标类
-     * @param name 类名
-     * @return [Class]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.findClass(name: String) =
-        classLoader.loadClass(name)
-
-    /**
-     * 查找目标类 - 两个类都没找到才会报错
-     * @param pair 类名数组
-     * @return [Class]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.findClass(pair: Pair<String, String>) = try {
-        classLoader.loadClass(pair.first)
-    } catch (_: Throwable) {
-        try {
-            classLoader.loadClass(pair.second)
-        } catch (e: Throwable) {
-            logE(content = "Cannot find Class ${pair.first} and ${pair.second}", e)
-            error("[Throwable] Cannot find Class ${pair.first} and ${pair.second}")
-        }
-    }
-
-    /**
-     * 存在目标类的类名 - 两个类都没找到会抛出异常
-     * @param pair 类名数组
-     * @return [String] 目标类名
-     */
-    private fun XC_LoadPackage.LoadPackageParam.existClass(pair: Pair<String, String>) = try {
-        classLoader.loadClass(pair.first)
-        pair.first
-    } catch (_: Throwable) {
-        try {
-            classLoader.loadClass(pair.second)
-            pair.second
-        } catch (_: Throwable) {
-            logE(content = "Cannot find Class ${pair.first} and ${pair.second}")
-            error("[Throwable] Cannot find Class ${pair.first} and ${pair.second}")
-        }
-    }
-
-    /**
-     * ⚠️ 这个是修复彩色图标的关键核心代码判断
-     * 判断是否为灰度图标 - 反射执行系统方法
-     * @param context 实例
-     * @param icon 要判断的图标
-     * @return [Boolean]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.isGrayscaleIcon(context: Context, icon: Drawable) =
-        findClass(ContrastColorUtilClass).let {
-            val instance = it.getDeclaredMethod("getInstance", Context::class.java)
-                .apply { isAccessible = true }.invoke(null, context)
-            it.getDeclaredMethod("isGrayscaleIcon", Drawable::class.java)
-                .apply { isAccessible = true }.invoke(instance, icon) as Boolean
-        }
-
-    /**
-     * 获取 [ExpandedNotificationClass] 的应用名称
-     * @param instance 通知实例
-     * @return [String]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.findAppName(instance: Any?) = try {
-        findClass(ExpandedNotificationClass).getDeclaredMethod("getAppName").let {
-            it.isAccessible = true
-            it.invoke(instance) as? String ?: "unknown"
-        }
-    } catch (_: Throwable) {
-        "unknown"
-    }
-
-    /**
-     * 获取全局上下文
-     * @return [Context]
-     */
-    private val XC_LoadPackage.LoadPackageParam.globalContext
-        get() = findClass(SystemUIApplicationClass)
-            .getDeclaredMethod("getContext").apply { isAccessible = true }
-            .invoke(null) as Context
-
-    /**
-     * Hook 状态栏小图标
-     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
-     * @param param Hook Param
-     */
-    private fun XC_LoadPackage.LoadPackageParam.hookSmallIconOnSet(param: XC_MethodHook.MethodHookParam) =
-        runWithoutError(error = "GetSmallIconOnSet") {
-            /** 获取通知小图标 */
-            val iconDrawable = (param.result as Icon).loadDrawable(globalContext)
-
-            /** 判断是否不是灰度图标 */
-            val isNotGrayscaleIcon = !isGrayscaleIcon(globalContext, iconDrawable)
-            /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
-            (param.args?.get(0) as? StatusBarNotification?)?.also { notifyInstance ->
-                /** 目标彩色通知 APP 图标 */
-                var customIcon: Icon? = null
-                if (HookMedium.getBoolean(HookMedium.ENABLE_COLOR_ICON_HOOK, default = true))
-                    run {
-                        IconPackParams.iconDatas.forEach {
-                            if ((notifyInstance.opPkgName == it.packageName ||
-                                        findAppName(notifyInstance) == it.appName) &&
-                                HookMedium.isAppNotifyHookOf(it)
-                            ) {
-                                if (isNotGrayscaleIcon || HookMedium.isAppNotifyHookAllOf(it))
-                                    customIcon = Icon.createWithBitmap(it.iconBitmap)
-                                return@run
-                            }
-                        }
-                    }
-                when {
-                    /** 如果开启了修复 APP 的彩色图标 */
-                    customIcon != null && HookMedium.getBoolean(HookMedium.ENABLE_NOTIFY_ICON_HOOK, default = true) ->
-                        logD(
-                            content = "GetSmallIconOnSet -> " +
-                                    "hook Custom AppIcon [pkgName] ${notifyInstance.opPkgName} " +
-                                    "[appName] ${findAppName(notifyInstance)}"
-                        ) { param.result = customIcon }
-                    /** 若不是灰度图标自动处理为圆角 */
-                    isNotGrayscaleIcon ->
-                        logD(
-                            content = "GetSmallIconOnSet -> " +
-                                    "hook Color AppIcon [pkgName] ${notifyInstance.opPkgName} " +
-                                    "[appName] ${findAppName(notifyInstance)}"
-                        ) {
-                            param.result = Icon.createWithBitmap(
-                                iconDrawable.toBitmap().round(15.dp(globalContext))
-                            )
-                        }
-                }
-            } ?: logW(content = "GetSmallIconOnSet -> StatusBarNotification got null")
-        }
-
-    /**
-     * Hook 通知栏小图标
-     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
-     * @param param Hook Param
-     * @param isNew 是否为新版方式
-     */
-    private fun XC_LoadPackage.LoadPackageParam.hookNotifyIconOnSet(param: XC_MethodHook.MethodHookParam, isNew: Boolean) =
-        runWithoutError(error = "AutoSetAppIconOnSet") {
-            /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
-            (param.args?.get(if (isNew) 2 else 1) as? StatusBarNotification?)?.let { notifyInstance ->
-                /** 是否 Hook 彩色通知图标 */
-                val isHookColorIcon = HookMedium.getBoolean(HookMedium.ENABLE_COLOR_ICON_HOOK, default = true)
-
-                /** 获取 [Context] */
-                val context = if (isNew) param.args[0] as Context else globalContext
-
-                /** 新版风格反色 */
-                val newStyle = if (context.isSystemInDarkMode) 0xFF2D2D2D.toInt() else Color.WHITE
-
-                /** 旧版风格反色 */
-                val oldStyle = if (context.isNotSystemInDarkMode) 0xFF515151.toInt() else Color.WHITE
-
-                /** 获取图标框 */
-                val iconImageView = param.args[if (isNew) 1 else 0] as ImageView
-
-                /** 获取通知小图标 */
-                val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
-
-                /** 判断图标风格 */
-                val isGrayscaleIcon = isGrayscaleIcon(context, iconDrawable)
-
-                /** 自定义默认小图标 */
-                var customIcon: Bitmap? = null
-                if (isHookColorIcon)
-                    run {
-                        IconPackParams.iconDatas.forEach {
-                            if ((notifyInstance.opPkgName == it.packageName ||
-                                        findAppName(notifyInstance) == it.appName) &&
-                                HookMedium.isAppNotifyHookOf(it)
-                            ) {
-                                if (!isGrayscaleIcon || HookMedium.isAppNotifyHookAllOf(it))
-                                    customIcon = it.iconBitmap
-                                return@run
-                            }
-                        }
-                    }
-                /** 如果开启了修复 APP 的彩色图标 */
-                if (customIcon != null && HookMedium.getBoolean(HookMedium.ENABLE_NOTIFY_ICON_HOOK, default = true))
-                    iconImageView.apply {
-                        /** 设置自定义小图标 */
-                        setImageBitmap(customIcon)
-                        /** 上色 */
-                        setColorFilter(if (isUpperOfAndroidS) newStyle else oldStyle)
-                        /** 输出调试日志 */
-                        logD(
-                            content = "AutoSetAppIconOnSet -> " +
-                                    "hook Custom AppIcon [pkgName] ${notifyInstance.opPkgName} " +
-                                    "[appName] ${findAppName(notifyInstance)}"
-                        )
-                    }
-                else {
-                    /** 重新设置图标 - 防止系统更改它 */
-                    iconImageView.setImageDrawable(iconDrawable)
-                    /** 判断是否开启 Hook 彩色图标 */
-                    if (isHookColorIcon) {
-                        /** 判断如果是灰度图标就给他设置一个白色颜色遮罩 */
-                        if (isGrayscaleIcon)
-                            logD(
-                                content = "AutoSetAppIconOnSet -> " +
-                                        "hook Grayscale AppIcon [pkgName] ${notifyInstance.opPkgName} " +
-                                        "[appName] ${findAppName(notifyInstance)}"
-                            ) { iconImageView.setColorFilter(if (isUpperOfAndroidS) newStyle else oldStyle) }
-                        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 (isUpperOfAndroidS) setPadding(0, 0, 0, 0)
-                                /** 清除原生的主题色背景圆圈颜色 */
-                                if (isUpperOfAndroidS) background = null
-                                /** 输出调试日志 */
-                                logD(
-                                    content = "AutoSetAppIconOnSet -> " +
-                                            "hook Color AppIcon [pkgName] ${notifyInstance.opPkgName} " +
-                                            "[appName] ${findAppName(notifyInstance)}"
-                                )
-                            }
-                        /** 否则一律设置灰度图标 */
-                    } else
-                        logD(
-                            content = "AutoSetAppIconOnSet -> " +
-                                    "hook NonColor AppIcon [pkgName] ${notifyInstance.opPkgName} " +
-                                    "[appName] ${findAppName(notifyInstance)}"
-                        ) { iconImageView.setColorFilter(if (isUpperOfAndroidS) newStyle else oldStyle) }
-                }
-            } ?: logW(content = "AutoSetAppIconOnSet -> StatusBarNotification got null")
-        }
-
-    /**
-     * Hook 通知栏小图标颜色
-     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
-     * @param expandedNf 状态栏实例
-     * @return [Boolean] 是否忽略通知图标颜色
-     */
-    private fun XC_LoadPackage.LoadPackageParam.hookIgnoreStatusBarIconColor(expandedNf: StatusBarNotification?) =
-        if (HookMedium.getBoolean(HookMedium.ENABLE_COLOR_ICON_HOOK, default = true))
-            try {
-                /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
-                expandedNf?.let { notifyInstance ->
-                    /** 获取通知小图标 */
-                    val iconDrawable =
-                        notifyInstance.notification.smallIcon.loadDrawable(globalContext)
-
-                    /** 判断是否不是灰度图标 */
-                    val isNotGrayscaleIcon = !isGrayscaleIcon(globalContext, iconDrawable)
-
-                    /** 获取目标修复彩色图标的 APP */
-                    var isTargetApp = false
-                    run {
-                        IconPackParams.iconDatas.forEach {
-                            if ((notifyInstance.opPkgName == it.packageName ||
-                                        findAppName(notifyInstance) == it.appName) &&
-                                HookMedium.isAppNotifyHookOf(it)
-                            ) {
-                                if (isNotGrayscaleIcon || HookMedium.isAppNotifyHookAllOf(it)) isTargetApp = true
-                                return@run
-                            }
-                        }
-                    }
-                    /** 如果开启了修复 APP 的彩色图标 */
-                    if (isTargetApp && HookMedium.getBoolean(HookMedium.ENABLE_NOTIFY_ICON_HOOK, default = true)) let {
-                        logD(
-                            content = "IgnoreStatusBarIconColor -> " +
-                                    "hook Color AppIcon [pkgName] ${notifyInstance.opPkgName} " +
-                                    "[appName] ${findAppName(notifyInstance)}"
-                        )
-                        false
-                    }
-                    else let {
-                        logD(
-                            content = "IgnoreStatusBarIconColor -> " +
-                                    "hook Grayscale[${!isNotGrayscaleIcon}] AppIcon " +
-                                    "[pkgName] ${notifyInstance.opPkgName} " +
-                                    "[appName] ${findAppName(notifyInstance)}"
-                        )
-                        /** 只要不是灰度就返回彩色图标 */
-                        isNotGrayscaleIcon
-                    }
-                } ?: let {
-                    logW(content = "IgnoreStatusBarIconColor -> StatusBarNotification got null")
-                    /** 否则不对颜色进行反色处理防止一些系统图标出现异常 */
-                    true
-                }
-            } catch (e: Exception) {
-                logE("Failed to hook ignoreStatusBarIconColor", e)
-                false
-            }
-        else let {
-            logD(content = "IgnoreStatusBarIconColor -> hook NonColor AppIcon")
-            false
-        }
-
-    override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam?) {
-        if (lpparam == null) return
-        when (lpparam.packageName) {
-            /** Hook 自身 */
-            SELF_PACKAGE_NAME ->
-                runWithoutError(error = "HookModuleSelf") {
-                    XposedHelpers.findAndHookMethod(
-                        "$SELF_PACKAGE_NAME.hook.HookMedium",
-                        lpparam.classLoader,
-                        "isHooked",
-                        replaceToTrue
-                    )
-                }
-            /** Hook 系统 UI */
-            SYSTEMUI_PACKAGE_NAME ->
-                when {
-                    /** 不是 MIUI 系统停止 Hook */
-                    isNotMIUI ->
-                        logW(content = "Aborted Hook -> This System is not MIUI")
-                    /** 系统版本低于 Android P 停止 Hook */
-                    isLowerAndroidP ->
-                        logW(content = "Aborted Hook -> This System is lower than Android P")
-                    /** 不是支持的 MIUI 系统停止 Hook */
-                    isNotSupportMiuiVersion ->
-                        logW(content = "Aborted Hook -> This MIUI Version $miuiVersion not supported")
-                    /** Hook 被手动关闭停止 Hook */
-                    !HookMedium.getBoolean(HookMedium.ENABLE_MODULE, default = true) ->
-                        logW(content = "Aborted Hook -> Hook Closed")
-                    else -> {
-                        /** 强制回写系统的状态栏图标样式为原生 */
-                        runWithoutError(error = "SubstituteSmallIcon") {
-                            XposedHelpers.findAndHookMethod(
-                                lpparam.existClass(NotificationUtilClass),
-                                lpparam.classLoader,
-                                "shouldSubstituteSmallIcon",
-                                lpparam.findClass(ExpandedNotificationClass),
-                                replaceToFalse
-                            )
-                        }
-                        /** 修复通知图标为彩色 */
-                        if (lpparam.isMethodExist(NotificationUtilClass, name = "ignoreStatusBarIconColor"))
-                            runWithoutError(error = "IgnoreStatusBarIconColor") {
-                                XposedHelpers.findAndHookMethod(
-                                    lpparam.existClass(NotificationUtilClass),
-                                    lpparam.classLoader,
-                                    "ignoreStatusBarIconColor",
-                                    lpparam.findClass(ExpandedNotificationClass),
-                                    object : XC_MethodReplacement() {
-                                        override fun replaceHookedMethod(param: MethodHookParam) =
-                                            lpparam.hookIgnoreStatusBarIconColor(param.args?.get(0) as? StatusBarNotification?)
-                                    }
-                                )
-                            }
-                        else
-                            runWithoutError(error = "UpdateIconColor") {
-                                XposedHelpers.findAndHookMethod(
-                                    StatusBarIconViewClass,
-                                    lpparam.classLoader, "updateIconColor",
-                                    object : XC_MethodHook() {
-                                        override fun afterHookedMethod(param: MethodHookParam) =
-                                            runWithoutError(error = "UpdateIconColorOnSet") {
-                                                /** 是否忽略图标颜色 */
-                                                val isIgnoredColor = lpparam.hookIgnoreStatusBarIconColor(
-                                                    param.thisObject.javaClass.getDeclaredField("mNotification").apply {
-                                                        isAccessible = true
-                                                    }[param.thisObject] as? StatusBarNotification?
-                                                )
-
-                                                /** 当前着色颜色 */
-                                                val currentColor =
-                                                    param.thisObject.javaClass.getDeclaredField("mCurrentSetColor").apply {
-                                                        isAccessible = true
-                                                    }[param.thisObject] as? Int ?: Color.WHITE
-                                                /** 判断并设置颜色 */
-                                                if (isIgnoredColor)
-                                                    (param.thisObject as? ImageView?)?.colorFilter = null
-                                                else (param.thisObject as? ImageView?)?.setColorFilter(currentColor)
-                                                logD(content = "IgnoreStatusBarIconColor[UseOldWay] -> isIgnored[$isIgnoredColor]")
-                                            }
-                                    }
-                                )
-                            }
-                        /** 强制回写系统的状态栏图标样式为原生 */
-                        runWithoutError(error = "GetSmallIcon") {
-                            try {
-                                /** 新版方法 */
-                                lpparam.findClass(NotificationUtilClass)
-                                    .getDeclaredMethod(
-                                        "getSmallIcon",
-                                        lpparam.findClass(ExpandedNotificationClass),
-                                        Int::class.java
-                                    ).apply { isAccessible = true }
-                            } catch (_: Throwable) {
-                                try {
-                                    /** 旧版方法 */
-                                    lpparam.findClass(NotificationUtilClass)
-                                        .getDeclaredMethod("getSmallIcon", lpparam.findClass(ExpandedNotificationClass))
-                                        .apply { isAccessible = true }
-                                } catch (_: Throwable) {
-                                    /** 超旧版方法 */
-                                    lpparam.findClass(NotificationUtilClass)
-                                        .getDeclaredMethod(
-                                            "getSmallIcon",
-                                            Context::class.java,
-                                            lpparam.findClass(ExpandedNotificationClass)
-                                        ).apply { isAccessible = true }
-                                }
-                            }.also {
-                                XposedBridge.hookMethod(it, object : XC_MethodHook() {
-                                    override fun afterHookedMethod(param: MethodHookParam) {
-                                        lpparam.hookSmallIconOnSet(param)
-                                    }
-                                })
-                            }
-                        }
-                        /** 修复下拉通知图标自动设置回 APP 图标的方法 */
-                        if (lpparam.isClassExist(NotificationHeaderViewWrapperInjectorClass))
-                            runWithoutError(error = "AutoSetAppIcon") {
-                                var isNewWay = true
-                                try {
-                                    /** 新版方法 */
-                                    lpparam.findClass(NotificationHeaderViewWrapperInjectorClass)
-                                        .getDeclaredMethod(
-                                            "setAppIcon",
-                                            Context::class.java,
-                                            ImageView::class.java,
-                                            lpparam.findClass(ExpandedNotificationClass)
-                                        ).apply { isAccessible = true }
-                                } catch (_: Throwable) {
-                                    isNewWay = false
-                                    /** 旧版方法 */
-                                    lpparam.findClass(NotificationHeaderViewWrapperInjectorClass)
-                                        .getDeclaredMethod(
-                                            "setAppIcon",
-                                            ImageView::class.java,
-                                            lpparam.findClass(ExpandedNotificationClass)
-                                        ).apply { isAccessible = true }
-                                }.also {
-                                    XposedBridge.hookMethod(it, object : XC_MethodReplacement() {
-                                        override fun replaceHookedMethod(param: MethodHookParam): Any? {
-                                            lpparam.hookNotifyIconOnSet(param, isNew = isNewWay)
-                                            return null
-                                        }
-                                    })
-                                }
-                            }
-                        else logW(content = "Your MIUI Version $miuiVersion is too old and not support for RowsIcon")
-                        /** 干掉下拉通知图标自动设置回 APP 图标的方法 - Android 12 */
-                        if (isUpperOfAndroidS &&
-                            lpparam.isMethodExist(
-                                NotificationHeaderViewWrapperInjectorClass,
-                                name = "resetIconBgAndPaddings"
-                            )
-                        ) runWithoutError(error = "ResetIconBgAndPaddings") {
-                            XposedHelpers.findAndHookMethod(
-                                NotificationHeaderViewWrapperInjectorClass,
-                                lpparam.classLoader,
-                                "resetIconBgAndPaddings",
-                                ImageView::class.java,
-                                lpparam.findClass(ExpandedNotificationClass),
-                                replaceToNull
-                            )
-                        }
-                        logD(content = "hook Completed!")
-                    }
-                }
-        }
-    }
-}

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

@@ -1,137 +0,0 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
- *
- * This file is part of MIUINativeNotifyIcon.
- *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is Created by fankes on 2022/1/24.
- */
-@file:Suppress("DEPRECATION", "SetWorldReadable")
-
-package com.fankes.miui.notify.hook
-
-import android.content.Context
-import android.os.Handler
-import android.util.Log
-import android.widget.Toast
-import androidx.annotation.Keep
-import com.fankes.miui.notify.application.MNNApplication.Companion.appContext
-import com.fankes.miui.notify.application.MNNApplication.Companion.isMineStarted
-import com.fankes.miui.notify.bean.IconDataBean
-import com.fankes.miui.notify.utils.FileUtils
-import com.fankes.miui.notify.utils.XPrefUtils
-import java.io.File
-
-@Keep
-object HookMedium {
-
-    const val ENABLE_MODULE = "_enable_module"
-    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 SELF_PACKAGE_NAME = "com.fankes.miui.notify"
-    const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui"
-
-    /**
-     * 判断模块是否激活
-     * 在 [HookMain] 中 Hook 掉此方法
-     * @return [Boolean] 激活状态
-     */
-    fun isHooked(): Boolean {
-        Log.d("MIUINativeNotifyIcon", "isHooked: true")
-        return false
-    }
-
-    /**
-     * 获取此 APP 的通知图标是否被 Hook
-     * @param bean 图标 bean
-     */
-    fun isAppNotifyHookOf(bean: IconDataBean) = getBoolean(key = bean.toEnabledName(), default = bean.isEnabled)
-
-    /**
-     * 设置 Hook 此 APP 的通知图标
-     * @param bean 图标 bean
-     * @param isHook 是否 Hook
-     */
-    fun putAppNotifyHookOf(bean: IconDataBean, isHook: Boolean) = putBoolean(key = bean.toEnabledName(), bool = isHook)
-
-    /**
-     * 获取此 APP 的通知图标是否被全部 Hook
-     * @param bean 图标 bean
-     */
-    fun isAppNotifyHookAllOf(bean: IconDataBean) = getBoolean(key = bean.toEnabledAllName(), default = bean.isEnabledAll)
-
-    /**
-     * 设置全部 Hook 此 APP 的通知图标
-     * @param bean 图标 bean
-     * @param isHook 是否 Hook
-     */
-    fun putAppNotifyHookAllOf(bean: IconDataBean, isHook: Boolean) = putBoolean(key = bean.toEnabledAllName(), bool = isHook)
-
-    /**
-     * 获取保存的值
-     * @param key 名称
-     * @param default 默认值
-     * @return [Boolean] 保存的值
-     */
-    fun getBoolean(key: String, default: Boolean = false) =
-        if (isMineStarted)
-            appContext.getSharedPreferences(
-                appContext.packageName + "_preferences",
-                Context.MODE_PRIVATE
-            ).getBoolean(key, default)
-        else XPrefUtils.getBoolean(key, default)
-
-    /**
-     * 保存值
-     * @param key 名称
-     * @param bool 值
-     */
-    fun putBoolean(key: String, bool: Boolean) {
-        appContext.getSharedPreferences(
-            appContext.packageName + "_preferences",
-            Context.MODE_PRIVATE
-        ).edit().putBoolean(key, bool).apply()
-        setWorldReadable(appContext)
-        /** 延迟继续设置强制允许 SP 可读可写 */
-        Handler().postDelayed({ setWorldReadable(appContext) }, 500)
-        Handler().postDelayed({ setWorldReadable(appContext) }, 1000)
-        Handler().postDelayed({ setWorldReadable(appContext) }, 1500)
-    }
-
-    /**
-     * 强制设置 Sp 存储为全局可读可写
-     * 以供模块使用
-     * @param context 实例
-     */
-    fun setWorldReadable(context: Context) {
-        try {
-            if (FileUtils.getDefaultPrefFile(context).exists()) {
-                for (file in arrayOf<File>(
-                    FileUtils.getDataDir(context),
-                    FileUtils.getPrefDir(context),
-                    FileUtils.getDefaultPrefFile(context)
-                )) {
-                    file.setReadable(true, false)
-                    file.setExecutable(true, false)
-                }
-            }
-        } catch (_: Exception) {
-            Toast.makeText(context, "无法写入模块设置，请检查权限\n如果此提示一直显示，请不要双开模块", Toast.LENGTH_SHORT).show()
-        }
-    }
-}

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

@@ -0,0 +1,70 @@
+/*
+ * 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/15.
+ */
+package com.fankes.miui.notify.hook.factory
+
+import android.content.Context
+import com.fankes.miui.notify.bean.IconDataBean
+import com.highcapable.yukihookapi.hook.factory.modulePrefs
+import com.highcapable.yukihookapi.hook.param.PackageParam
+
+/**
+ * 获取此 APP 的通知图标是否被 Hook
+ * @param bean 图标 bean
+ */
+fun PackageParam.isAppNotifyHookOf(bean: IconDataBean) = prefs.getBoolean(key = bean.toEnabledName(), default = bean.isEnabled)
+
+/**
+ * 获取此 APP 的通知图标是否被 Hook
+ * @param bean 图标 bean
+ */
+fun Context.isAppNotifyHookOf(bean: IconDataBean) = modulePrefs.getBoolean(key = bean.toEnabledName(), default = bean.isEnabled)
+
+/**
+ * 设置 Hook 此 APP 的通知图标
+ * @param bean 图标 bean
+ * @param isHook 是否 Hook
+ */
+fun Context.putAppNotifyHookOf(bean: IconDataBean, isHook: Boolean) =
+    modulePrefs.putBoolean(key = bean.toEnabledName(), value = isHook)
+
+/**
+ * 获取此 APP 的通知图标是否被全部 Hook
+ * @param bean 图标 bean
+ */
+fun PackageParam.isAppNotifyHookAllOf(bean: IconDataBean) =
+    prefs.getBoolean(key = bean.toEnabledAllName(), default = bean.isEnabledAll)
+
+/**
+ * 获取此 APP 的通知图标是否被全部 Hook
+ * @param bean 图标 bean
+ */
+fun Context.isAppNotifyHookAllOf(bean: IconDataBean) =
+    modulePrefs.getBoolean(key = bean.toEnabledAllName(), default = bean.isEnabledAll)
+
+/**
+ * 设置全部 Hook 此 APP 的通知图标
+ * @param bean 图标 bean
+ * @param isHook 是否 Hook
+ */
+fun Context.putAppNotifyHookAllOf(bean: IconDataBean, isHook: Boolean) =
+    modulePrefs.putBoolean(key = bean.toEnabledAllName(), value = isHook)

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

@@ -1,27 +1,30 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+/*
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/01/30.
+ * This file is Created by fankes on 2022/1/30.
  */
-@file:Suppress("SetTextI18n", "InflateParams")
+@file:Suppress("SetTextI18n", "InflateParams", "DEPRECATION")
 
 package com.fankes.miui.notify.ui
 
+import android.app.ProgressDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -31,32 +34,104 @@ 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.hook.HookMedium
+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.*
 import com.fankes.miui.notify.view.MaterialSwitch
+import com.google.android.material.textfield.TextInputEditText
+import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 
 class ConfigureActivity : BaseActivity() {
 
+    /** 当前筛选条件 */
+    private var filterText = ""
+
+    /** 回调适配器改变 */
+    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() }
-        /** 设置标题个数文本 */
-        findViewById<TextView>(R.id.config_title_count_text).text = "已适配 ${IconPackParams.iconDatas.size} 个 APP 的通知图标"
+        /** 刷新适配器结果相关 */
+        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 {
+                title = "按条件过滤"
+                var editText: TextInputEditText
+                addView(R.layout.dia_icon_filter).apply {
+                    editText = findViewById<TextInputEditText>(R.id.dia_icon_filter_input_edit).apply {
+                        requestFocus()
+                        invalidate()
+                        if (filterText.isNotBlank()) {
+                            setText(filterText)
+                            setSelection(filterText.length)
+                        }
+                    }
+                }
+                confirmButton {
+                    if (editText.text.toString().isNotBlank()) {
+                        filterText = editText.text.toString().trim()
+                        refreshAdapterResult()
+                    } else {
+                        toast(msg = "条件不能为空")
+                        it.performClick()
+                    }
+                }
+                cancelButton()
+                if (filterText.isNotBlank())
+                    neutralButton(text = "清除条件") {
+                        filterText = ""
+                        refreshAdapterResult()
+                    }
+            }
+        }
+        /** 设置同步列表按钮点击事件 */
+        findViewById<View>(R.id.config_title_sync).setOnClickListener { onStartRefresh() }
         /** 设置列表元素和 Adapter */
         findViewById<ListView>(R.id.config_list_view).apply {
             adapter = object : BaseAdapter() {
 
                 private val inflater = LayoutInflater.from(context)
 
-                override fun getCount() = IconPackParams.iconDatas.size
+                override fun getCount() = iconDatas.size
 
-                override fun getItem(position: Int) = IconPackParams.iconDatas[position]
+                override fun getItem(position: Int) = iconDatas[position]
 
                 override fun getItemId(position: Int) = position.toLong()
 
@@ -77,22 +152,28 @@ class ConfigureActivity : BaseActivity() {
                     } else holder = convertView.tag as ViewHolder
                     getItem(position).also {
                         holder.appIcon.setImageBitmap(it.iconBitmap)
+                        (if (it.iconColor != 0) it.iconColor else resources.getColor(R.color.colorTextGray)).also { color ->
+                            holder.appIcon.setColorFilter(color)
+                            holder.appName.setTextColor(color)
+                        }
                         holder.appName.text = it.appName
                         holder.pkgName.text = it.packageName
                         holder.cbrName.text = "贡献者：" + it.contributorName
-                        HookMedium.isAppNotifyHookOf(it).also { e ->
+                        isAppNotifyHookOf(it).also { e ->
                             holder.switchOpen.isChecked = e
                             holder.switchAll.isEnabled = e
                         }
                         holder.switchOpen.setOnCheckedChangeListener { btn, b ->
                             if (!btn.isPressed) return@setOnCheckedChangeListener
-                            HookMedium.putAppNotifyHookOf(it, b)
+                            putAppNotifyHookOf(it, b)
                             holder.switchAll.isEnabled = b
+                            SystemUITool.showNeedRestartSnake(context = this@ConfigureActivity)
                         }
-                        holder.switchAll.isChecked = HookMedium.isAppNotifyHookAllOf(it)
+                        holder.switchAll.isChecked = isAppNotifyHookAllOf(it)
                         holder.switchAll.setOnCheckedChangeListener { btn, b ->
                             if (!btn.isPressed) return@setOnCheckedChangeListener
-                            HookMedium.putAppNotifyHookAllOf(it, b)
+                            putAppNotifyHookAllOf(it, b)
+                            SystemUITool.showNeedRestartSnake(context = this@ConfigureActivity)
                         }
                     }
                     return cView!!
@@ -106,20 +187,103 @@ class ConfigureActivity : BaseActivity() {
                     lateinit var switchOpen: MaterialSwitch
                     lateinit var switchAll: MaterialSwitch
                 }
-            }
+            }.apply { onChanged = { notifyDataSetChanged() } }
+            onScrollEvent = { post { setSelection(if (it) iconDatas.lastIndex else 0) } }
         }
         /** 设置点击事件 */
         findViewById<View>(R.id.config_cbr_button).setOnClickListener {
-            try {
+            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
                 })
-            } catch (e: Exception) {
-                Toast.makeText(this, "无法启动系统默认浏览器", Toast.LENGTH_SHORT).show()
+            }.onFailure {
+                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<TextView>(R.id.config_list_no_data_view).apply {
+            text = if (iconAllDatas.isEmpty()) "噫，竟然什么都没有~\n请点击右上角同步按钮获取云端数据" else "噫，竟然什么都没找到~"
+            isVisible = iconDatas.isEmpty()
+        }
+    }
+
+    /**
+     * 当前结果下的图标数组
+     * @return [Array]
+     */
+    private val iconDatas
+        get() = if (filterText.isBlank()) iconAllDatas
+        else iconAllDatas.filter {
+            it.appName.lowercase().contains(filterText.lowercase()) || it.packageName.lowercase().contains(filterText.lowercase())
+        }
 }

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

@@ -1,22 +1,24 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+/*
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/01/24.
+ * This file is Created by fankes on 2022/1/24.
  */
 @file:Suppress("SetTextI18n")
 
@@ -30,15 +32,21 @@ 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.HookMedium
+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_FIX
 import com.fankes.miui.notify.ui.base.BaseActivity
 import com.fankes.miui.notify.utils.*
+import com.highcapable.yukihookapi.hook.factory.modulePrefs
+import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 
 class MainActivity : BaseActivity() {
 
@@ -48,6 +56,8 @@ class MainActivity : BaseActivity() {
         private const val moduleVersion = BuildConfig.VERSION_NAME
     }
 
+    private var isWarnDialogShowing = false // 警告对话框是否显示
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -83,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 = "模块没有激活"
@@ -102,30 +108,44 @@ 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)
+        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 = getBoolean(HookMedium.ENABLE_COLOR_ICON_HOOK, default = true)
-        moduleEnableLogSwitch.isVisible = getBoolean(HookMedium.ENABLE_MODULE, default = true)
-        moduleEnableSwitch.isChecked = getBoolean(HookMedium.ENABLE_MODULE, default = true)
-        moduleEnableLogSwitch.isChecked = getBoolean(HookMedium.ENABLE_MODULE_LOG, default = false)
-        hideIconInLauncherSwitch.isChecked = getBoolean(HookMedium.ENABLE_HIDE_ICON)
-        colorIconHookSwitch.isChecked = getBoolean(HookMedium.ENABLE_COLOR_ICON_HOOK, default = true)
-        notifyIconHookSwitch.isChecked = getBoolean(HookMedium.ENABLE_NOTIFY_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)
+        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
-            putBoolean(HookMedium.ENABLE_MODULE, b)
+            modulePrefs.putBoolean(ENABLE_MODULE, b)
             moduleEnableLogSwitch.isVisible = b
+            colorIconHookItem.isVisible = b
+            notifyIconConfigItem.isVisible = b && colorIconHookSwitch.isChecked
+            SystemUITool.showNeedRestartSnake(context = this)
         }
         moduleEnableLogSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
-            putBoolean(HookMedium.ENABLE_MODULE_LOG, b)
+            modulePrefs.putBoolean(ENABLE_MODULE_LOG, b)
+            SystemUITool.showNeedRestartSnake(context = this)
         }
         hideIconInLauncherSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
-            putBoolean(HookMedium.ENABLE_HIDE_ICON, b)
+            modulePrefs.putBoolean(ENABLE_HIDE_ICON, b)
             packageManager.setComponentEnabledSetting(
                 ComponentName(this@MainActivity, "com.fankes.miui.notify.Home"),
                 if (b) PackageManager.COMPONENT_ENABLED_STATE_DISABLED else PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
@@ -134,30 +154,30 @@ class MainActivity : BaseActivity() {
         }
         colorIconHookSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
-            putBoolean(HookMedium.ENABLE_COLOR_ICON_HOOK, b)
+            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
-            putBoolean(HookMedium.ENABLE_NOTIFY_ICON_HOOK, b)
+            modulePrefs.putBoolean(ENABLE_COLOR_ICON_COMPAT, b)
+            SystemUITool.showNeedRestartSnake(context = this)
         }
-        /** 重启按钮点击事件 */
-        findViewById<View>(R.id.title_restart_icon).setOnClickListener {
-            showDialog {
-                title = "重启系统界面"
-                msg = "你确定要立即重启系统界面吗？\n\n" +
-                        "部分 MIUI 系统使用了状态栏主题可能会发生主题失效的情况，这种情况请再重启一次即可。"
-                confirmButton { restartSystemUI() }
-                cancelButton()
-            }
+        notifyIconFixSwitch.setOnCheckedChangeListener { btn, b ->
+            if (!btn.isPressed) return@setOnCheckedChangeListener
+            modulePrefs.putBoolean(ENABLE_NOTIFY_ICON_FIX, b)
+            notifyIconFixButton.isVisible = b
+            SystemUITool.showNeedRestartSnake(context = this)
         }
         /** 通知图标优化名单按钮点击事件 */
-        findViewById<View>(R.id.config_notify_app_button).setOnClickListener {
-            startActivity(Intent(this, ConfigureActivity::class.java))
-        }
+        notifyIconFixButton.setOnClickListener { startActivity(Intent(this, ConfigureActivity::class.java)) }
+        /** 重启按钮点击事件 */
+        findViewById<View>(R.id.title_restart_icon).setOnClickListener { SystemUITool.restartSystemUI(context = this) }
         /** 恰饭！ */
         findViewById<View>(R.id.link_with_follow_me).setOnClickListener {
-            try {
+            runCatching {
                 startActivity(Intent().apply {
                     setPackage("com.coolapk.market")
                     action = "android.intent.action.VIEW"
@@ -165,51 +185,76 @@ class MainActivity : BaseActivity() {
                     /** 防止顶栈一样重叠在自己的 APP 中 */
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 })
-            } catch (e: Exception) {
-                Toast.makeText(this, "你可能没有安装酷安", Toast.LENGTH_SHORT).show()
+            }.onFailure {
+                toast(msg = "你可能没有安装酷安")
             }
         }
         /** 项目地址点击事件 */
         findViewById<View>(R.id.link_with_project_address).setOnClickListener {
-            try {
+            runCatching {
                 startActivity(Intent().apply {
                     action = "android.intent.action.VIEW"
                     data = Uri.parse("https://github.com/fankes/MIUINativeNotifyIcon")
                     /** 防止顶栈一样重叠在自己的 APP 中 */
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 })
-            } catch (e: Exception) {
-                Toast.makeText(this, "无法启动系统默认浏览器", Toast.LENGTH_SHORT).show()
+            }.onFailure {
+                toast(msg = "无法启动系统默认浏览器")
             }
         }
     }
 
-    /**
-     * 判断模块是否激活
-     * @return [Boolean] 激活状态
-     */
-    private fun isHooked() = HookMedium.isHooked()
+    /** 刷新模块状态 */
+    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 -> "模块未激活"
+            }
+    }
 
-    /** 重启系统界面 */
-    private fun restartSystemUI() =
-        execShellCmd(cmd = "pgrep systemui").also { pid ->
-            if (pid.isNotBlank())
-                execShellCmd(cmd = "kill -9 $pid")
-            else Toast.makeText(this, "ROOT 权限获取失败", Toast.LENGTH_SHORT).show()
-        }
-
-    /**
-     * 获取保存的值
-     * @param key 名称
-     * @param default 默认值
-     * @return [Boolean] 保存的值
-     */
-    private fun getBoolean(key: String, default: Boolean = false) = HookMedium.getBoolean(key, default)
-
-    /**
-     * 保存值
-     * @param key 名称
-     * @param bool 值
-     */
-    private fun putBoolean(key: String, bool: Boolean) = HookMedium.putBoolean(key, bool)
+    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

@@ -1,29 +1,30 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+/*
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/01/30.
+ * This file is Created by fankes on 2022/1/30.
  */
 package com.fankes.miui.notify.ui.base
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.fankes.miui.notify.R
-import com.fankes.miui.notify.hook.HookMedium
 import com.fankes.miui.notify.utils.isNotSystemInDarkMode
 import com.gyf.immersionbar.ktx.immersionBar
 
@@ -43,24 +44,4 @@ abstract class BaseActivity : AppCompatActivity() {
             fitsSystemWindows(true)
         }
     }
-
-    override fun onResume() {
-        super.onResume()
-        HookMedium.setWorldReadable(this)
-    }
-
-    override fun onRestart() {
-        super.onRestart()
-        HookMedium.setWorldReadable(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        HookMedium.setWorldReadable(this)
-    }
-
-    override fun onBackPressed() {
-        HookMedium.setWorldReadable(this)
-        super.onBackPressed()
-    }
 }

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

@@ -1,32 +1,36 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+/*
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/7.
  */
-@file:Suppress("unused")
+@file:Suppress("unused", "DEPRECATION")
 
 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
+import android.view.WindowManager
+import kotlin.math.round
 
 /**
  * 构造对话框
@@ -42,6 +46,8 @@ class DialogBuilder(private val context: Context) {
 
     private var instance: AlertDialog.Builder? = null // 实例对象
 
+    private var customLayoutView: View? = null // 自定义布局
+
     init {
         instance = AlertDialog.Builder(context, android.R.style.Theme_Material_Light_Dialog)
     }
@@ -63,6 +69,16 @@ class DialogBuilder(private val context: Context) {
             instance?.setMessage(value)
         }
 
+    /**
+     * 设置对话框自定义布局
+     * @param resId 属性资源 Id
+     * @return [View]
+     */
+    fun addView(resId: Int): View {
+        customLayoutView = LayoutInflater.from(context).inflate(resId, null)
+        return customLayoutView ?: error("Inflate $resId failed")
+    }
+
     /**
      * 设置对话框确定按钮
      * @param text 按钮文本内容
@@ -89,13 +105,9 @@ class DialogBuilder(private val context: Context) {
 
     /** 显示对话框 */
     internal fun show() = instance?.create()?.apply {
-        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)
-        })
+        val dm = DisplayMetrics()
+        (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.getMetrics(dm)
+        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/FileUtils.java

@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
- *
- * This file is part of MIUINativeNotifyIcon.
- *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is Created by zpp0196 on 2019/2/9.
- */
-package com.fankes.miui.notify.utils;
-
-import android.content.Context;
-
-import com.fankes.miui.notify.BuildConfig;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-@SuppressWarnings("ALL")
-public class FileUtils {
-
-    private static final String FILE_PREF_NAME = BuildConfig.APPLICATION_ID + "_preferences.xml";
-
-    public static boolean copyFile(File srcFile, File targetFile) {
-        FileInputStream ins = null;
-        FileOutputStream out = null;
-        try {
-            if (targetFile.exists()) {
-                targetFile.delete();
-            }
-            File targetParent = targetFile.getParentFile();
-            if (!targetParent.exists()) {
-                targetParent.mkdirs();
-            }
-            targetFile.createNewFile();
-            ins = new FileInputStream(srcFile);
-            out = new FileOutputStream(targetFile);
-            byte[] b = new byte[1024];
-            int n;
-            while ((n = ins.read(b)) != -1) {
-                out.write(b, 0, n);
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        } finally {
-            try {
-                if (ins != null) {
-                    ins.close();
-                }
-                if (out != null) {
-                    out.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return true;
-    }
-
-    public static File getDataDir(Context context) {
-        return new File(context.getApplicationInfo().dataDir);
-    }
-
-    public static File getPrefDir(Context context) {
-        return new File(getDataDir(context), "shared_prefs");
-    }
-
-    public static File getDefaultPrefFile(Context context) {
-        return new File(getPrefDir(context), FILE_PREF_NAME);
-    }
-}

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

@@ -0,0 +1,70 @@
+/*
+ * 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/8.
+ */
+package com.fankes.miui.notify.utils
+
+import android.content.Context
+import com.google.android.material.snackbar.Snackbar
+import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
+
+/**
+ * 系统界面工具
+ */
+object SystemUITool {
+
+    /**
+     * 重启系统界面
+     * @param context 实例
+     */
+    fun restartSystemUI(context: Context) =
+        context.showDialog {
+            title = "重启系统界面"
+            msg = "你确定要立即重启系统界面吗？\n\n" +
+                    "部分 MIUI 系统使用了状态栏主题可能会发生主题失效的情况，这种情况请再重启一次即可。"
+            confirmButton {
+                execShellSu(cmd = "pgrep systemui").also { pid ->
+                    if (pid.isNotBlank())
+                        execShellSu(cmd = "kill -9 $pid")
+                    else toast(msg = "ROOT 权限获取失败")
+                }
+            }
+            cancelButton()
+        }
+
+    /**
+     * 显示需要重启系统界面的 [Snackbar]
+     * @param context 实例
+     */
+    fun showNeedRestartSnake(context: Context) =
+        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

@@ -1,39 +1,51 @@
-/**
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+/*
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/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.service.notification.StatusBarNotification
+import android.provider.Settings
 import android.util.Base64
+import android.widget.Toast
 import com.fankes.miui.notify.application.MNNApplication.Companion.appContext
-import java.io.DataInputStream
-import java.io.DataOutputStream
+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
+import com.highcapable.yukihookapi.hook.log.loggerE
+import com.highcapable.yukihookapi.hook.type.java.StringType
+import com.topjohnwu.superuser.Shell
 
 /**
  * 系统深色模式是否开启
@@ -54,6 +66,12 @@ inline val isNotSystemInDarkMode get() = !isSystemInDarkMode
  */
 val Context.isSystemInDarkMode get() = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
 
+/**
+ * 通知栏是否为 MIUI 样式
+ * @return [Boolean] 是否符合条件
+ */
+val Context.isMiuiNotifyStyle get() = safeOfFalse { Settings.System.getInt(contentResolver, "status_bar_notification_style") == 0 }
+
 /**
  * 系统深色模式是否没开启
  * @return [Boolean] 是否开启
@@ -76,14 +94,7 @@ inline val isLowerAndroidP get() = Build.VERSION.SDK_INT < Build.VERSION_CODES.P
  * 当前设备是否是 MIUI 定制 Android 系统
  * @return [Boolean] 是否符合条件
  */
-val isMIUI by lazy {
-    try {
-        Class.forName("android.miui.R")
-        true
-    } catch (_: Exception) {
-        false
-    }
-}
+val isMIUI by lazy { ("android.miui.R").hasClass }
 
 /**
  * 当前设备是否不是 MIUI 定制 Android 系统
@@ -138,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]
@@ -155,16 +160,13 @@ val Context.packageInfo get() = packageManager?.getPackageInfo(packageName, 0) ?
  * @return [Boolean]
  */
 val String.isInstall
-    get() =
-        try {
-            appContext.packageManager.getPackageInfo(
-                this,
-                PackageManager.GET_UNINSTALLED_PACKAGES
-            )
-            true
-        } catch (e: Exception) {
-            false
-        }
+    get() = safeOfFalse {
+        appContext.packageManager.getPackageInfo(
+            this,
+            PackageManager.GET_UNINSTALLED_PACKAGES
+        )
+        true
+    }
 
 /**
  * 得到版本信息
@@ -216,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 值
@@ -240,44 +238,137 @@ fun Bitmap.round(radius: Float): Bitmap =
  * @param default 默认值
  * @return [String]
  */
-fun findPropString(key: String, default: String = "") =
-    try {
-        (Class.forName("android.os.SystemProperties").getDeclaredMethod(
-            "get",
-            String::class.java,
-            String::class.java
-        ).apply { isAccessible = true }.invoke(null, key, default)) as? String? ?: default
-    } catch (_: Exception) {
-        default
-    }
+fun findPropString(key: String, default: String = "") = safeOf(default) {
+    (classOf(name = "android.os.SystemProperties").method {
+        name = "get"
+        param(StringType, StringType)
+    }.get().invoke(key, default)) ?: default
+}
 
 /**
  * 执行命令 - su
  * @param cmd 命令
  * @return [String] 执行结果
  */
-fun execShellCmd(cmd: String): String {
-    var result = ""
-    var dos: DataOutputStream? = null
-    var dis: DataInputStream? = null
-    try {
-        val p = Runtime.getRuntime().exec("su")
-        dos = DataOutputStream(p.outputStream)
-        dis = DataInputStream(p.inputStream)
-        dos.writeBytes("$cmd\n")
-        dos.flush()
-        dos.writeBytes("exit\n")
-        dos.flush()
-        var line: String
-        while (dis.readLine().also { line = it } != null) result += line
-        p.waitFor()
-    } catch (_: Exception) {
-    } finally {
-        try {
-            dos?.close()
-            dis?.close()
-        } catch (_: Exception) {
-        }
+fun execShellSu(cmd: String) = safeOfNothing {
+    Shell.su(cmd).exec().out.let {
+        if (it.isNotEmpty()) it[0].trim() else ""
+    }
+}
+
+/**
+ * 弹出 [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 回调 - 如果异常为空
+ * @return [T] 发生异常时返回设定值否则返回正常值
+ */
+inline fun <T> safeOfNull(it: () -> T): T? = safeOf(null, it)
+
+/**
+ * 忽略异常返回值
+ * @param it 回调 - 如果异常为 false
+ * @return [Boolean] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfFalse(it: () -> Boolean) = safeOf(default = false, it)
+
+/**
+ * 忽略异常返回值
+ * @param it 回调 - 如果异常为 true
+ * @return [Boolean] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfTrue(it: () -> Boolean) = safeOf(default = true, it)
+
+/**
+ * 忽略异常返回值
+ * @param it 回调 - 如果异常为 false
+ * @return [String] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfNothing(it: () -> String) = safeOf(default = "", it)
+
+/**
+ * 忽略异常返回值
+ * @param it 回调 - 如果异常为 false
+ * @return [Int] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfNan(it: () -> Int) = safeOf(default = 0, it)
+
+/**
+ * 忽略异常返回值
+ * @param default 异常返回值
+ * @param it 正常回调值
+ * @return [T] 发生异常时返回设定值否则返回正常值
+ */
+inline fun <T> safeOf(default: T, it: () -> T): T {
+    return try {
+        it()
+    } catch (t: NullPointerException) {
+        default
+    } catch (t: UnsatisfiedLinkError) {
+        default
+    } catch (t: UnsupportedOperationException) {
+        default
+    } catch (t: ClassNotFoundException) {
+        default
+    } catch (t: IllegalStateException) {
+        default
+    } catch (t: NoSuchMethodError) {
+        default
+    } catch (t: NoSuchFieldError) {
+        default
+    } catch (t: Error) {
+        default
+    } catch (t: Exception) {
+        default
+    } catch (t: Throwable) {
+        default
+    }
+}
+
+/**
+ * 忽略异常运行
+ * @param msg 出错输出的消息 - 默认为空
+ * @param it 正常回调
+ */
+inline fun safeRun(msg: String = "", it: () -> Unit) {
+    try {
+        it()
+    } catch (e: NullPointerException) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: UnsatisfiedLinkError) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: UnsupportedOperationException) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: ClassNotFoundException) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: IllegalStateException) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: NoSuchMethodError) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: NoSuchFieldError) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: Error) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: Exception) {
+        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
+    } catch (e: Throwable) {
     }
-    return result.trim()
 }

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

@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
- *
- * This file is part of MIUINativeNotifyIcon.
- *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * This file is Created by zpp0196 on 2018/4/11.
- */
-package com.fankes.miui.notify.utils
-
-import com.fankes.miui.notify.BuildConfig
-import de.robv.android.xposed.XSharedPreferences
-
-object XPrefUtils {
-
-    private var xPrefCacheKeyValueBooleans = HashMap<String, Boolean>()
-
-    fun getBoolean(key: String, default: Boolean = false) =
-        xPrefCacheKeyValueBooleans[key].let {
-            it ?: pref.getBoolean(key, default).let { e ->
-                xPrefCacheKeyValueBooleans[key] = e
-                e
-            }
-        }
-
-    private val pref: XSharedPreferences
-        get() {
-            val preferences = XSharedPreferences(BuildConfig.APPLICATION_ID)
-            preferences.makeWorldReadable()
-            preferences.reload()
-            return preferences
-        }
-}

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,24 +1,25 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */
-
 package com.fankes.miui.notify.utils.drawable.drawabletoolbox
 
 class Constants {

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,20 +1,22 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */

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

@@ -1,24 +1,25 @@
 /*
- * Copyright (C) 2022. Fankes Studio(qzmmcn@163.com)
+ * 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 file is part of 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>
  *
- * MIUINativeNotifyIcon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MIUINativeNotifyIcon is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/1/8.
  */
-
 @file:Suppress("SameParameterValue")
 
 package com.fankes.miui.notify.view

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,12 +25,14 @@
             android:layout_height="20dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="25dp"
-            android:src="@mipmap/back"
-            android:tint="@color/colorTextGray" />
+            android:src="@mipmap/ic_back"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="返回" />
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_weight="1"
             android:gravity="center|start"
             android:orientation="vertical">
@@ -50,10 +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/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
@@ -62,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"
@@ -73,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
@@ -81,24 +119,41 @@
             android:layout_height="wrap_content"
             android:alpha="0.6"
             android:lineSpacingExtra="5dp"
-            android:text="启用替换后 APP 的彩色通知图标将被替换为预设的小图标。\n启用完全替换将忽略 APP 非彩色图标，强制将全部通知图标替换为列表中预设的小图标。"
+            android:text="启用替换后 APP 的彩色通知图标将被替换为预设的小图标。\n启用全部替换将忽略 APP 单色图标，强制将全部通知图标替换为列表中预设的小图标。"
             android:textColor="@color/colorTextGray"
             android:textSize="11sp"
             tools:ignore="SmallSp" />
     </LinearLayout>
 
-    <ListView
-        android:id="@+id/config_list_view"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:divider="@color/trans"
-        android:dividerHeight="15dp"
-        android:fadingEdgeLength="10dp"
-        android:listSelector="@null"
-        android:padding="15dp"
-        android:requiresFadingEdge="vertical"
-        android:scrollbars="none" />
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+id/config_list_no_data_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:lineSpacingExtra="6dp"
+            android:text="没有数据"
+            android:textColor="@color/colorTextDark"
+            android:textSize="17sp"
+            android:visibility="gone" />
+
+        <ListView
+            android:id="@+id/config_list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:divider="@color/trans"
+            android:dividerHeight="15dp"
+            android:fadingEdgeLength="10dp"
+            android:listSelector="@null"
+            android:padding="15dp"
+            android:requiresFadingEdge="vertical"
+            android:scrollbars="none" />
+    </FrameLayout>
 
     <TextView
         android:id="@+id/config_cbr_button"
@@ -107,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

@@ -32,11 +32,13 @@
         <androidx.constraintlayout.utils.widget.ImageFilterView
             android:id="@+id/title_restart_icon"
             style="?android:attr/selectableItemBackgroundBorderless"
-            android:layout_width="25dp"
-            android:layout_height="25dp"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
             android:layout_marginEnd="5dp"
-            android:src="@mipmap/restart"
-            android:tint="@color/colorTextGray" />
+            android:alpha="0.85"
+            android:src="@mipmap/ic_restart"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="重启系统界面" />
     </LinearLayout>
 
     <LinearLayout
@@ -47,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">
 
@@ -57,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
@@ -74,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" />
 
@@ -119,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"
@@ -130,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
@@ -151,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"
@@ -182,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"
@@ -217,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
@@ -226,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"
@@ -248,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"
@@ -264,7 +288,19 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.6"
                     android:lineSpacingExtra="6dp"
-                    android:text="此选项默认开启，开启后将对优化名单内 APP 通知小图标进行色彩修复，使得它们的图标看起来更加美观。"
+                    android:text="首次安装请打开名单列表从云端更新数据，后期适配的内容也请手动打开名单列表重新拉取数据以检查更新，数据更新后重启系统界面即可生效。"
+                    android:textColor="@color/colorTextDark"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginBottom="10dp"
+                    android:alpha="0.6"
+                    android:lineSpacingExtra="6dp"
+                    android:text="此选项默认开启，开启后将对优化名单内的 APP 通知小图标使用单色调进行修复，特别是通过 MIPUSH 推送的通知，它们始终是 APP 默认图标(彩色的 APP 图标)，修复后使得它们的图标看起来更加符合 Android 原生的统一规范。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -275,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"
@@ -296,7 +332,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.6"
                     android:lineSpacingExtra="6dp"
-                    android:text="隐藏模块图标后界面可能会被关闭，将不会再在桌面显示，你可以在 EdXposed、LsPosed 中找到模块设置并打开。"
+                    android:text="隐藏模块图标后界面可能会被关闭，将不会再在桌面显示，你可以在 EdXposed、LSPosed 中找到模块设置并打开。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -307,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"
@@ -324,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
@@ -343,7 +379,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.8"
                     android:lineSpacingExtra="6dp"
-                    android:text="Q.这个模块是如何诞生的？\nA.这个模块诞生来源于 MIUI 的乱改和不规范，本来 MIUI 9 之后，官方给出了原生通知图标样式，后面由于用户反应通知栏经常出现黑白块，这当然不是系统的错，而是国内 APP 极其不规范的通知图标设计，于是 MIUI 选择直接忽略这个问题把全部图标都改成了 APP 的彩色图标，使得之前拥有自有样式的原生图标也被破坏，通知中“setSmallIcon”不再有效，这个模块就是为了修复被 MIUI 开发组忽略的图标问题，并完美地给 MIUI 修复了黑白块图标的问题。"
+                    android:text="Q.这个模块是如何诞生的？\nA.这个模块诞生来源于 MIUI 的乱改和不规范，本来 MIUI 9 之后，官方给出了原生通知图标样式，后面由于用户反应通知栏经常出现黑白块。\n这当然不是系统的错，而是国内 APP 和 MIPUSH 的通知极其不规范的通知图标设计。\n但是呢，接到反馈后 MIUI 开发组选择直接忽略这个问题，在 2021-5-18 的开发版开始，把全部通知图标都改成了 APP 的彩色图标，使得之前拥有自有样式的原生图标也被破坏。\n对于 Android 开发者来说，官方文档中的 “setSmallIcon” 不再适用于魔改后的 MIUI，这将会严重破坏非常多的状态图标。\n当然，国内的手机生态除了 MIPUSH 的营销通知就是社交软件的通知，可能大部分人都不会在意这件事情。\n但是，这个模块就是为了修复被 MIUI 开发组忽略的图标问题才诞生的，并完美地给 MIUI 修复了黑白块图标的问题。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
@@ -353,7 +389,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.8"
                     android:lineSpacingExtra="6dp"
-                    android:text="Q.如何使用？\nA.模块仅支持 EdXposed、LsPosed，由于涉及到修改系统应用，不支持太极(阴)框架，在 LsPosed 的作用域中，只需勾选“系统界面”即可，应用设置后需要重启系统界面。"
+                    android:text="Q.如何使用？\nA.模块仅支持 LSPosed，EdXposed 也可以使用但随时停止支持，由于模块涉及到修改系统应用，不支持其它 Hook 框架，在 LSPosed 的作用域中，只需勾选“系统界面”(旧版本为“系统 UI”)即可，应用设置后需要重启系统界面。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
@@ -363,7 +399,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.8"
                     android:lineSpacingExtra="6dp"
-                    android:text="Q.哪些是已知问题？\nA.以下是问题描述列表：\n(1) MIUI 自己的系统应用的通知图标仍然可能出现黑白块的情况，可使用通知图标优化暂时修复其图标问题，后期只能等官方修复(基本上没什么可能性)。\n(2) 动态小图标可能会在高版本系统中闪烁，这是 MIUI 的问题，后期仍在想解决办法。\n(3) 使用 Zygisk 方式运行的 Lsposed 可能会发生通知优化图标 Hook 不生效的问题(出现黑白块)，仅在最新版本的 MIUI 13 开发内测版中遇到，若出现问题请使用 Ramdisk 版本的 Lsposed。"
+                    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" />
 
@@ -384,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"
@@ -401,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
@@ -419,7 +455,7 @@
                     android:layout_height="wrap_content"
                     android:alpha="0.8"
                     android:lineSpacingExtra="6dp"
-                    android:text="本软件是免费开源项目，遵循 GPL 协议，你可以点击这里前往 Github 查看源码以及获取模块更新。\n严禁以任何形式贩卖、商用本软件，否则开发者有权追究其法律责任。"
+                    android:text="本软件是免费开源项目，遵循 AGPL3.0 协议，你可以点击这里前往 Github 查看源码以及获取模块更新。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -431,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"
@@ -460,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
@@ -473,6 +509,20 @@
                     android:textColor="@color/colorTextGray"
                     android:textSize="16sp" />
             </LinearLayout>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="10dp"
+                android:autoLink="web"
+                android:background="@drawable/bg_permotion_round"
+                android:lineSpacingExtra="6dp"
+                android:padding="10dp"
+                android:text="此模块使用 YukiHookAPI 构建。\n点击这里了解更多 https://github.com/fankes/YukiHookAPI"
+                android:textColor="@color/colorTextGray"
+                android:textSize="12sp" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </LinearLayout>

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
@@ -80,7 +80,7 @@
             android:id="@+id/adp_app_all_switch"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
-            android:text="完全替换  "
+            android:text="全部替换  "
             android:textColor="@color/colorTextGray"
             android:textSize="13sp" />
     </LinearLayout>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="15dp"
+    android:paddingTop="15dp"
+    android:paddingRight="15dp"
+    tools:ignore="HardcodedText">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/dia_icon_filter_input_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:hint="可输入 APP 名称、包名"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>

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

@@ -1,30 +1,12 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = "1.6.10"
-    repositories {
-        google()
-        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' }
-        maven { url "https://www.jitpack.io" }
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.android.tools.build:gradle:7.0.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
+plugins {
+    id 'com.android.application' version '7.1.1' apply false
+    id 'com.android.library' version '7.1.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
 }
 
-allprojects {
-    repositories {
-        google()
-        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
-        maven { url 'https://maven.aliyun.com/nexus/content/repositories/jcenter' }
-        maven { url "https://www.jitpack.io" }
-        mavenCentral()
-    }
+ext {
+    appVersionName = "1.85"
+    appVersionCode = 18
 }
 
 task clean(type: Delete) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jan 24 04:31:03 CST 2022
+#Tue Feb 15 02:09:05 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,2 +1,19 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        maven { url "https://api.xposed.info/" }
+        maven { url "https://www.jitpack.io" }
+        maven { url "https://s01.oss.sonatype.org/content/repositories/releases" }
+        mavenCentral()
+    }
+}
 rootProject.name = "MIUINativeNotifyIcon"
 include ':app'