Update version to 1.51,fix more bugs

.idea/misc.xml

@@ -9,8 +9,10 @@
         <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.37516748548459133" />
         <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

@@ -21,11 +21,12 @@
 
 ```kotlin
 IconDataBean(
-    isEnabled = true, // 是否默认启用替换
-    isEnabledAll = false, // 是否默认启用完全替换
+    isEnabled = true, // 是否默认启用替换彩色图标 - 关闭后将全部停止替换
+    isEnabledAll = false, // 是否默认启用替换全部图标
     appName = "", // APP 名称
     packageName = "", // APP 包名
     iconBitmap = ("").bitmap, // 位图数据 Base64
+    iconColor = 0, // 通知栏中显示的图标颜色 - 设置为 0 使用系统默认颜色 (不设置颜色可不写)
     contributorName = "" // 贡献者昵称
 )
 ```

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.2-green)
+![Eclipse Marketplace](https://img.shields.io/badge/license-AGPL3.0-blue)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v1.51-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,17 +12,20 @@ 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.2-green)</a>
+<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.51-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>
 
-- 此模块仅支持 Lsposed(作用域“系统界面”)、EdXposed(不推荐)、不支持太极无极(阴)
-- 目前最低支持基于 Android 9 版本的 MIUI12 或 MIUI12.5(建议)
-- 使用 Zygisk 方式运行的 Lsposed 可能会发生 Hook 不生效的问题，若出现问题请使用 Ramdisk 版本的 Lsposed
+- 此模块仅支持 LSPosed(作用域“系统界面”)、~~EdXposed(随时停止支持)~~、不支持太极无极
+- 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
+- 请始终保持最新版本的 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)，从其他非正规渠道下载到的版本或对您造成任何影响均与我们无关。
 
 # 开始贡献
 
@@ -33,56 +36,72 @@ Fix the native notification bar icon function abandoned by the MIUI development
 
 # 历史背景
 
-这个模块诞生来源于 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,17 +20,17 @@ android {
 
     defaultConfig {
         applicationId "com.fankes.miui.notify"
-        minSdk 26
-        targetSdk 26
-        versionCode 4
-        versionName "1.2"
+        minSdk 28
+        targetSdk 31
+        versionCode rootProject.ext.appVersionCode
+        versionName rootProject.ext.appVersionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             signingConfig signingConfigs.debug
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -41,22 +42,37 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+/** 移除无效耗时 lint Task */
+tasks.whenTaskAdded {
+    task -> if (task.name == "lintVitalRelease") task.enabled = false
+}
+tasks.whenTaskAdded {
+    task -> if (task.name == "lintVitalAnalyzeRelease") task.enabled = false
+}
+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.1'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.1'
+    implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
+    implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.0'
     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

@@ -13,49 +13,45 @@
         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版本号 -->
         <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>
+
 </manifest>

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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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.
  */
@@ -29,14 +31,16 @@ import java.io.Serializable
  * @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/data/LoginDataSource.kt

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

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

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

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

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

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

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

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

@@ -0,0 +1,36 @@
+/*
+ * 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 and our eula as published
+ * by ferredoxin.
+ *
+ * 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_NOTIFY_ICON_HOOK = "_notify_icon_hook"
+
+    const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui"
+}

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

@@ -0,0 +1,519 @@
+/*
+ * 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 and our eula as published
+ * by ferredoxin.
+ *
+ * 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.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.hook.HookConst.ENABLE_COLOR_ICON_HOOK
+import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
+import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE_LOG
+import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_HOOK
+import com.fankes.miui.notify.hook.HookConst.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.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"
+
+        /** MIUI 新版本存在的类 */
+        private const val NotificationHeaderViewWrapperClass =
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationHeaderViewWrapper"
+
+        /** MIUI 新版本存在的类 */
+        private const val NotificationViewWrapperClass =
+            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
+
+        /** 原生存在的类 */
+        private const val StatusBarIconViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.StatusBarIconView"
+
+        /** 原生存在的类 */
+        private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
+
+        /** 未确定是否只有旧版本存在的类 */
+        private const val ExpandableNotificationRowClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
+
+        /** 根据多个版本存在不同的包名相同的类 */
+        private val 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"
+        )
+    }
+
+    /**
+     * - 这个是修复彩色图标的关键核心代码判断
+     *
+     * 判断是否为灰度图标 - 反射执行系统方法
+     * @param context 实例
+     * @param drawable 要判断的图标
+     * @return [Boolean]
+     */
+    private fun PackageParam.isGrayscaleIcon(context: Context, drawable: Drawable) = safeOfFalse {
+        ContrastColorUtilClass.clazz.let {
+            it.method(name = "isGrayscaleIcon", DrawableClass)
+                ?.call<Boolean>(it.method(name = "getInstance", ContextClass)?.callStatic(context), drawable) ?: false
+        }
+    }
+
+    /**
+     * 获取当前通知栏的样式
+     * @return [Boolean]
+     */
+    private fun PackageParam.isShowMiuiStyle() = safeOfFalse {
+        NotificationUtilClass.clazz.method(name = "showMiuiStyle")?.callStatic() ?: false
+    }
+
+    /**
+     * 是否为新版本 MIUI 方案
+     *
+     * 拥有状态栏图标颜色检查功能
+     * @return [Boolean]
+     */
+    private fun PackageParam.hasIgnoreStatusBarIconColor() = safeOfFalse {
+        NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
+    }
+
+    /**
+     * 获取 [ExpandedNotificationClass] 的应用名称
+     * @param instance 通知实例
+     * @return [String]
+     */
+    private fun PackageParam.findAppName(instance: Any?) = safeOf(default = "<unknown>") {
+        ExpandedNotificationClass.clazz.method(name = "getAppName")?.call(instance) ?: "<empty>"
+    }
+
+    /**
+     * 判断通知是否来自 MIPUSH
+     * @return [Boolean]
+     */
+    private val StatusBarNotification.isXmsf get() = opPkgName == "com.xiaomi.xmsf"
+
+    /**
+     * 获取全局上下文
+     * @return [Context] or null
+     */
+    private val PackageParam.globalContext
+        get() = safeOfNull {
+            SystemUIApplicationClass.clazz.method(name = "getContext")?.callStatic<Context>()
+        }
+
+    /**
+     * 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
+        /** 判断是否不是灰度图标 */
+        val isNotGrayscaleIcon = !isGrayscaleIcon(context, iconDrawable)
+        /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
+        expandedNf?.also { notifyInstance ->
+            /** 目标彩色通知 APP 图标 */
+            var customIcon: Bitmap? = null
+            if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true))
+                run {
+                    IconPackParams.iconDatas.forEach {
+                        if ((notifyInstance.opPkgName == it.packageName ||
+                                    findAppName(notifyInstance) == it.appName) &&
+                            isAppNotifyHookOf(it)
+                        ) {
+                            if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it))
+                                customIcon = it.iconBitmap
+                            return@run
+                        }
+                    }
+                }
+            when {
+                /** 如果开启了修复 APP 的彩色图标 */
+                customIcon != null && prefs.getBoolean(ENABLE_NOTIFY_ICON_HOOK, default = true) -> it(customIcon!!)
+                /** 若不是灰度图标自动处理为圆角 */
+                isNotGrayscaleIcon -> it(iconDrawable.toBitmap().round(15.dp(context)))
+            }
+        }
+    }
+
+    /**
+     * Hook 通知栏小图标
+     *
+     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
+     * @param context 实例
+     * @param expandedNf 通知实例
+     * @param iconImageView 通知图标实例
+     */
+    private fun PackageParam.hookNotifyIconOnSet(context: Context, expandedNf: StatusBarNotification?, iconImageView: ImageView) =
+        safeRun(msg = "AutoSetAppIconOnSet") {
+            /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
+            expandedNf?.let { notifyInstance ->
+                /** 是否 Hook 彩色通知图标 */
+                val isHookColorIcon = prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, 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 = isGrayscaleIcon(context, iconDrawable)
+
+                /** 自定义默认小图标 */
+                var customIcon: Bitmap? = null
+
+                /** 自定义默认小图标颜色 */
+                var customIconColor = 0
+
+                if (isHookColorIcon) run {
+                    IconPackParams.iconDatas.forEach {
+                        if ((notifyInstance.opPkgName == it.packageName ||
+                                    findAppName(notifyInstance) == it.appName) &&
+                            isAppNotifyHookOf(it)
+                        ) {
+                            if (!isGrayscaleIcon || isAppNotifyHookAllOf(it)) {
+                                customIcon = it.iconBitmap
+                                customIconColor = it.iconColor
+                                return@run
+                            }
+                        }
+                    }
+                }
+                /** 如果开启了修复 APP 的彩色图标 */
+                if (customIcon != null && prefs.getBoolean(ENABLE_NOTIFY_ICON_HOOK, default = true))
+                    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)
+                    /** 判断是否开启 Hook 彩色图标 */
+                    if (isHookColorIcon) {
+                        /** 判断如果是灰度图标就给他设置一个白色颜色遮罩 */
+                        if (isGrayscaleIcon) iconImageView.apply {
+                            /** 设置图标着色 */
+                            setColorFilter(supportColor)
+                            /** Android 12 设置图标外圈颜色 */
+                            if (isUpperOfAndroidS && hasIconColor)
+                                background = DrawableBuilder().rounded().solidColor(iconColor).build()
+                        } else iconImageView.apply {
+                            clipToOutline = true
+                            /** 设置一个圆角轮廓裁切 */
+                            outlineProvider = object : ViewOutlineProvider() {
+                                override fun getOutline(view: View, out: Outline) {
+                                    out.setRoundRect(
+                                        0, 0,
+                                        view.width, view.height, 5.dp(context)
+                                    )
+                                }
+                            }
+                            /** 清除原生的背景边距设置 */
+                            if (isUpperOfAndroidS) setPadding(0, 0, 0, 0)
+                            /** 清除原生的主题色背景圆圈颜色 */
+                            if (isUpperOfAndroidS) background = null
+                        }
+                        /** 否则一律设置灰度图标 */
+                    } else iconImageView.setColorFilter(supportColor)
+                }
+            }
+        }
+
+    /**
+     * Hook 通知栏小图标颜色
+     *
+     * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
+     * @param context 实例
+     * @param expandedNf 状态栏实例
+     * @return [Boolean] 是否忽略通知图标颜色
+     */
+    private fun PackageParam.hookIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) =
+        if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) safeOfFalse {
+            /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
+            expandedNf?.let { notifyInstance ->
+                /** 获取通知小图标 */
+                val iconDrawable =
+                    notifyInstance.notification.smallIcon.loadDrawable(context)
+
+                /** 判断是否不是灰度图标 */
+                val isNotGrayscaleIcon = !isGrayscaleIcon(context, iconDrawable)
+
+                /** 获取目标修复彩色图标的 APP */
+                var isTargetApp = false
+                run {
+                    IconPackParams.iconDatas.forEach {
+                        if ((notifyInstance.opPkgName == it.packageName ||
+                                    findAppName(notifyInstance) == it.appName) &&
+                            isAppNotifyHookOf(it)
+                        ) {
+                            if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it)) isTargetApp = true
+                            return@run
+                        }
+                    }
+                }
+                /**
+                 * 如果开启了修复 APP 的彩色图标
+                 * 只要不是灰度就返回彩色图标
+                 * 否则不对颜色进行反色处理防止一些系统图标出现异常
+                 */
+                if (isTargetApp && prefs.getBoolean(ENABLE_NOTIFY_ICON_HOOK, default = true))
+                    false
+                else isNotGrayscaleIcon
+            } ?: true
+        } else false
+
+    override fun onHook() = encase {
+        configs {
+            debugTag = "MIUINativeNotifyIcon"
+            isDebug = prefs.getBoolean(ENABLE_MODULE_LOG)
+        }
+        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 -> {
+                    NotificationUtilClass.hook {
+                        /** 强制回写系统的状态栏图标样式为原生 */
+                        injectMember {
+                            method {
+                                name = "shouldSubstituteSmallIcon"
+                                param(ExpandedNotificationClass.clazz)
+                            }
+                            /**
+                             * 因为之前的 MIUI 版本的状态栏图标颜色会全部设置为白色的 - 找不到修复的地方就直接判断版本了
+                             * 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook
+                             */
+                            replaceAny { if (hasIgnoreStatusBarIconColor()) false else 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 {
+                                /** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
+                                if (hasIgnoreStatusBarIconColor() || !isShowMiuiStyle())
+                                    (globalContext ?: args[0] as Context).also { context ->
+                                        hookSmallIconOnSet(
+                                            context = context,
+                                            args[if (isUseLegacy) 1 else 0] as? StatusBarNotification?,
+                                            (result as Icon).loadDrawable(context)
+                                        ) { icon -> result = Icon.createWithBitmap(icon) }
+                                    }
+                            }
+                        }
+                    }
+                    findClass(StatusBarIconViewClass).hook {
+                        /** 修复通知图标为彩色 - MIPUSH 修复 */
+                        injectMember {
+                            method { name = "updateIconColor" }
+                            afterHook {
+                                /** 获取自身 */
+                                val iconImageView = instance<ImageView?>() ?: return@afterHook
+
+                                /** 获取通知实例 */
+                                val expandedNf = field { name = "mNotification" }.of<StatusBarNotification>(instance)
+
+                                /**
+                                 * 强制设置图标 - 防止 MIPUSH 不生效
+                                 * 由于之前版本没有 [hasIgnoreStatusBarIconColor] 判断 - MIPUSH 的图标颜色也是白色的
+                                 * 所以之前的版本取消这个 Hook - 实在找不到设置图标的地方 - 状态栏图标就彩色吧
+                                 */
+                                if (hasIgnoreStatusBarIconColor() && expandedNf?.isXmsf == true)
+                                    hookSmallIconOnSet(
+                                        context = iconImageView.context,
+                                        expandedNf,
+                                        expandedNf.notification?.smallIcon?.loadDrawable(iconImageView.context)
+                                    ) { icon -> iconImageView.setImageBitmap(icon) }
+                            }
+                        }
+                    }
+                    if (NotificationHeaderViewWrapperInjectorClass.hasClass)
+                        findClass(NotificationHeaderViewWrapperInjectorClass).hook {
+                            /** 修复下拉通知图标自动设置回 APP 图标的方法 */
+                            injectMember {
+                                var isUseLegacy = false
+                                method {
+                                    name = "setAppIcon"
+                                    param(ContextClass, ImageViewClass, ExpandedNotificationClass.clazz)
+                                }.remedys {
+                                    method {
+                                        name = "setAppIcon"
+                                        param(ImageViewClass, ExpandedNotificationClass.clazz)
+                                    }.onFind { isUseLegacy = true }
+                                }
+                                replaceUnit {
+                                    if (isUseLegacy)
+                                        hookNotifyIconOnSet(
+                                            context = globalContext ?: error("GlobalContext got null"),
+                                            args[1] as? StatusBarNotification?,
+                                            args[0] as ImageView
+                                        )
+                                    else
+                                        hookNotifyIconOnSet(
+                                            context = args[0] as? Context ?: globalContext ?: error("GlobalContext got null"),
+                                            args[2] as? StatusBarNotification?,
+                                            args[1] as ImageView
+                                        )
+
+                                }
+                            }
+                            /** 干掉下拉通知图标自动设置回 APP 图标的方法 - Android 12 */
+                            if (isUpperOfAndroidS)
+                                injectMember {
+                                    method {
+                                        name = "resetIconBgAndPaddings"
+                                        param(ImageViewClass, ExpandedNotificationClass.clazz)
+                                    }
+                                    intercept()
+                                }
+                        }
+                    else
+                        findClass(NotificationHeaderViewWrapperClass).hook {
+                            /** 之前的版本解决方案 */
+                            injectMember {
+                                method { name = "handleHeaderViews" }
+                                afterHook {
+                                    /** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
+                                    if (!hasIgnoreStatusBarIconColor() && isShowMiuiStyle()) return@afterHook
+                                    /** 获取小图标 */
+                                    val iconImageView = field {
+                                        classSet = NotificationHeaderViewWrapperClass.clazz
+                                        name = "mIcon"
+                                    }.of<ImageView>(instance) ?: return@afterHook
+                                    /** 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass] */
+                                    field {
+                                        classSet = NotificationViewWrapperClass.clazz
+                                        name = "mRow"
+                                    }.get(instance).apply {
+                                        /** 获取其中的得到通知方法 */
+                                        val expandedNf =
+                                            ExpandableNotificationRowClass.clazz.method(name = "getStatusBarNotification")
+                                                ?.call<StatusBarNotification>(instance = self)
+                                        /** 执行 Hook */
+                                        hookNotifyIconOnSet(iconImageView.context, expandedNf, iconImageView)
+                                    }
+                                }
+                            }
+                        }
+                }
+            }
+        }
+    }
+}

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

@@ -1,521 +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")
-
-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 NotificationUtilClass =
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtil"
-
-        private const val NotificationHeaderViewWrapperInjectorClass =
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapperInjector"
-
-        private const val ExpandedNotificationClass =
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.ExpandedNotification"
-
-        private const val SystemUIApplicationClass = "$SYSTEMUI_PACKAGE_NAME.SystemUIApplication"
-
-        private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
-    }
-
-    /** 仅作用于替换的 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 [Class]
-     */
-    private fun XC_LoadPackage.LoadPackageParam.findClass(name: String) =
-        classLoader.loadClass(name)
-
-    /**
-     * ⚠️ 这个是修复彩色图标的关键核心代码判断
-     * 判断是否为灰度图标 - 反射执行系统方法
-     * @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")
-        }
-
-    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")
-                    /** Hook 被手动关闭停止 Hook */
-                    !HookMedium.getBoolean(HookMedium.ENABLE_MODULE, default = true) ->
-                        logW(content = "Aborted Hook -> Hook Closed")
-                    else -> {
-                        /** 强制回写系统的状态栏图标样式为原生 */
-                        runWithoutError(error = "SubstituteSmallIcon") {
-                            XposedHelpers.findAndHookMethod(
-                                NotificationUtilClass,
-                                lpparam.classLoader,
-                                "shouldSubstituteSmallIcon",
-                                lpparam.findClass(ExpandedNotificationClass),
-                                replaceToFalse
-                            )
-                        }
-                        /** 修复通知图标为彩色 */
-                        runWithoutError(error = "IgnoreStatusBarIconColor") {
-                            XposedHelpers.findAndHookMethod(
-                                NotificationUtilClass,
-                                lpparam.classLoader,
-                                "ignoreStatusBarIconColor",
-                                lpparam.findClass(ExpandedNotificationClass),
-                                object : XC_MethodReplacement() {
-                                    override fun replaceHookedMethod(param: MethodHookParam) =
-                                        if (HookMedium.getBoolean(HookMedium.ENABLE_COLOR_ICON_HOOK, default = true))
-                                            try {
-                                                /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
-                                                (param.args?.get(0) as? StatusBarNotification?)?.let { notifyInstance ->
-                                                    /** 获取通知小图标 */
-                                                    val iconDrawable =
-                                                        notifyInstance.notification.smallIcon.loadDrawable(lpparam.globalContext)
-
-                                                    /** 判断是否不是灰度图标 */
-                                                    val isNotGrayscaleIcon =
-                                                        !lpparam.isGrayscaleIcon(lpparam.globalContext, iconDrawable)
-
-                                                    /** 获取目标修复彩色图标的 APP */
-                                                    var isTargetApp = false
-                                                    run {
-                                                        IconPackParams.iconDatas.forEach {
-                                                            if ((notifyInstance.opPkgName == it.packageName ||
-                                                                        lpparam.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] ${lpparam.findAppName(notifyInstance)}"
-                                                        )
-                                                        false
-                                                    }
-                                                    else let {
-                                                        logD(
-                                                            content = "IgnoreStatusBarIconColor -> " +
-                                                                    "hook Grayscale[${!isNotGrayscaleIcon}] AppIcon " +
-                                                                    "[pkgName] ${notifyInstance.opPkgName} " +
-                                                                    "[appName] ${lpparam.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
-                                        }
-                                }
-                            )
-                        }
-                        /** 强制回写系统的状态栏图标样式为原生 */
-                        runWithoutError(error = "GetSmallIcon") {
-                            try {
-                                /** 新版方法 */
-                                lpparam.findClass(NotificationUtilClass)
-                                    .getDeclaredMethod(
-                                        "getSmallIcon",
-                                        lpparam.findClass(ExpandedNotificationClass),
-                                        Int::class.java
-                                    ).apply { isAccessible = true }
-                            } catch (_: Throwable) {
-                                /** 旧版方法 */
-                                lpparam.findClass(NotificationUtilClass)
-                                    .getDeclaredMethod("getSmallIcon", lpparam.findClass(ExpandedNotificationClass))
-                                    .apply { isAccessible = true }
-                            }.also {
-                                XposedBridge.hookMethod(it, object : XC_MethodHook() {
-
-                                    override fun afterHookedMethod(param: MethodHookParam) {
-                                        lpparam.hookSmallIconOnSet(param)
-                                    }
-                                })
-                            }
-                        }
-                        /** 修复下拉通知图标自动设置回 APP 图标的方法 */
-                        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
-                                    }
-                                })
-                            }
-                        }
-                        /** 干掉下拉通知图标自动设置回 APP 图标的方法 - Android 12 */
-                        if (isUpperOfAndroidS)
-                            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 and our eula as published
+ * by ferredoxin.
+ *
+ * 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,24 +1,26 @@
-/**
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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
 
@@ -33,28 +35,77 @@ 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.hook.factory.isAppNotifyHookAllOf
+import com.fankes.miui.notify.hook.factory.isAppNotifyHookOf
+import com.fankes.miui.notify.hook.factory.putAppNotifyHookAllOf
+import com.fankes.miui.notify.hook.factory.putAppNotifyHookOf
 import com.fankes.miui.notify.params.IconPackParams
 import com.fankes.miui.notify.ui.base.BaseActivity
+import com.fankes.miui.notify.utils.SystemUITool
+import com.fankes.miui.notify.utils.showDialog
 import com.fankes.miui.notify.view.MaterialSwitch
+import com.google.android.material.textfield.TextInputEditText
 
 class ConfigureActivity : BaseActivity() {
 
+    /** 当前筛选条件 */
+    private var filterText = ""
+
+    /** 回调适配器改变 */
+    private var onChanged: (() -> Unit)? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_config)
         /** 返回按钮点击事件 */
         findViewById<View>(R.id.title_back_icon).setOnClickListener { onBackPressed() }
+        /** 刷新适配器结果相关 */
+        refreshAdapterResult()
+        /** 设置过滤按钮点击事件 */
+        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()
+                        onChanged?.invoke()
+                        refreshAdapterResult()
+                    } else {
+                        Toast.makeText(applicationContext, "条件不能为空", Toast.LENGTH_SHORT).show()
+                        it.performClick()
+                    }
+                }
+                cancelButton()
+                if (filterText.isNotBlank())
+                    neutralButton(text = "清除条件") {
+                        filterText = ""
+                        onChanged?.invoke()
+                        refreshAdapterResult()
+                    }
+            }
+        }
         /** 设置列表元素和 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()
 
@@ -75,22 +126,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!!
@@ -104,20 +161,38 @@ class ConfigureActivity : BaseActivity() {
                     lateinit var switchOpen: MaterialSwitch
                     lateinit var switchAll: MaterialSwitch
                 }
-            }
+            }.apply { onChanged = { notifyDataSetChanged() } }
         }
         /** 设置点击事件 */
         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")
                     /** 防止顶栈一样重叠在自己的 APP 中 */
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 })
-            } catch (e: Exception) {
+            }.onFailure {
                 Toast.makeText(this, "无法启动系统默认浏览器", Toast.LENGTH_SHORT).show()
             }
         }
     }
+
+    /** 刷新适配器结果相关 */
+    private fun refreshAdapterResult() {
+        findViewById<TextView>(R.id.config_title_count_text).text =
+            if (filterText.isBlank()) "已适配 ${iconDatas.size} 个 APP 的通知图标"
+            else "“${filterText}” 匹配到 ${iconDatas.size} 个结果"
+        findViewById<View>(R.id.config_list_no_data_view).isVisible = iconDatas.isEmpty()
+    }
+
+    /**
+     * 当前结果下的图标数组
+     * @return [Array]
+     */
+    private val iconDatas
+        get() = if (filterText.isBlank()) IconPackParams.iconDatas
+        else IconPackParams.iconDatas.filter {
+            it.appName.lowercase().contains(filterText.lowercase()) || it.packageName.lowercase().contains(filterText.lowercase())
+        }.toTypedArray()
 }

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

@@ -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 and our eula as published
+ * by ferredoxin.
  *
- * 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")
 
@@ -36,9 +38,15 @@ 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_HOOK
+import com.fankes.miui.notify.hook.HookConst.ENABLE_HIDE_ICON
+import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
+import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE_LOG
+import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_HOOK
 import com.fankes.miui.notify.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,12 +56,14 @@ 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)
         /** 设置文本 */
         findViewById<TextView>(R.id.main_text_version).text = "当前版本：$moduleVersion"
-        findViewById<TextView>(R.id.main_text_miui_version).text = "MIUI 版本：$miuiVersion"
+        findViewById<TextView>(R.id.main_text_miui_version).text = "MIUI 版本：$miuiFullVersion"
         when {
             /** 判断是否为 MIUI 系统 */
             isNotMIUI ->
@@ -64,15 +74,24 @@ class MainActivity : BaseActivity() {
                     confirmButton(text = "退出") { finish() }
                     noCancelable()
                 }
-            /** 判断最低系统版本 */
+            /** 判断最低 Android 系统版本 */
             isLowerAndroidP ->
                 showDialog {
-                    title = "系统版本过低"
+                    title = "Android 系统版本过低"
                     msg = "此模块最低支持基于 Android 9 的 MIUI 系统，你的系统版本过低不再进行适配。\n" +
                             "如有问题请联系 酷安 @星夜不荟"
                     confirmButton(text = "退出") { finish() }
                     noCancelable()
                 }
+            /** 判断最低 MIUI 版本 */
+            isNotSupportMiuiVersion ->
+                showDialog {
+                    title = "MIUI 版本过低"
+                    msg = "此模块最低支持 MIUI 12 系统，你的 MIUI 版本为 ${miuiVersion}，不再进行适配。\n" +
+                            "如有问题请联系 酷安 @星夜不荟"
+                    confirmButton(text = "退出") { finish() }
+                    noCancelable()
+                }
             /** 判断是否 Hook */
             isHooked() -> {
                 findViewById<LinearLayout>(R.id.main_lin_status).setBackgroundResource(R.drawable.green_round)
@@ -97,26 +116,30 @@ class MainActivity : BaseActivity() {
         val hideIconInLauncherSwitch = findViewById<SwitchCompat>(R.id.hide_icon_in_launcher_switch)
         val colorIconHookSwitch = findViewById<SwitchCompat>(R.id.color_icon_fix_switch)
         val notifyIconHookSwitch = findViewById<SwitchCompat>(R.id.notify_icon_fix_switch)
+        /** 设置旧版本警告 */
+        findViewById<View>(R.id.config_notify_app_icon_warn).isVisible = miuiVersion == "12"
         /** 获取 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)
+        notifyIconConfigItem.isVisible = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
+        moduleEnableLogSwitch.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
+        moduleEnableSwitch.isChecked = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
+        moduleEnableLogSwitch.isChecked = modulePrefs.getBoolean(ENABLE_MODULE_LOG, default = false)
+        hideIconInLauncherSwitch.isChecked = modulePrefs.getBoolean(ENABLE_HIDE_ICON)
+        colorIconHookSwitch.isChecked = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
+        notifyIconHookSwitch.isChecked = modulePrefs.getBoolean(ENABLE_NOTIFY_ICON_HOOK, default = true)
         moduleEnableSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
-            putBoolean(HookMedium.ENABLE_MODULE, b)
+            modulePrefs.putBoolean(ENABLE_MODULE, b)
             moduleEnableLogSwitch.isVisible = b
+            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,
@@ -125,30 +148,24 @@ 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
+            SystemUITool.showNeedRestartSnake(context = this)
         }
         notifyIconHookSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
-            putBoolean(HookMedium.ENABLE_NOTIFY_ICON_HOOK, b)
+            modulePrefs.putBoolean(ENABLE_NOTIFY_ICON_HOOK, b)
+            SystemUITool.showNeedRestartSnake(context = this)
         }
         /** 重启按钮点击事件 */
-        findViewById<View>(R.id.title_restart_icon).setOnClickListener {
-            showDialog {
-                title = "重启系统界面"
-                msg = "你确定要立即重启系统界面吗？\n\n" +
-                        "部分 MIUI 系统使用了状态栏主题可能会发生主题失效的情况，这种情况请再重启一次即可。"
-                confirmButton { restartSystemUI() }
-                cancelButton()
-            }
-        }
+        findViewById<View>(R.id.title_restart_icon).setOnClickListener { SystemUITool.restartSystemUI(context = this) }
         /** 通知图标优化名单按钮点击事件 */
         findViewById<View>(R.id.config_notify_app_button).setOnClickListener {
             startActivity(Intent(this, ConfigureActivity::class.java))
         }
         /** 恰饭！ */
         findViewById<View>(R.id.link_with_follow_me).setOnClickListener {
-            try {
+            runCatching {
                 startActivity(Intent().apply {
                     setPackage("com.coolapk.market")
                     action = "android.intent.action.VIEW"
@@ -156,51 +173,42 @@ class MainActivity : BaseActivity() {
                     /** 防止顶栈一样重叠在自己的 APP 中 */
                     flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 })
-            } catch (e: Exception) {
+            }.onFailure {
                 Toast.makeText(this, "你可能没有安装酷安", Toast.LENGTH_SHORT).show()
             }
         }
         /** 项目地址点击事件 */
         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) {
+            }.onFailure {
                 Toast.makeText(this, "无法启动系统默认浏览器", Toast.LENGTH_SHORT).show()
             }
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        /** MIUI 12 的版本特殊 - 所以给出提示 */
+        if (!isWarnDialogShowing && isHooked() && miuiVersion == "12" && isMiuiNotifyStyle)
+            showDialog {
+                isWarnDialogShowing = true
+                title = "经典通知栏样式已启用"
+                msg = "在 MIUI 12 中启用了经典通知栏样式后状态栏图标将不再做原生处理，模块停止工作，" +
+                        "这取决于系统设置，你应当在 设置>通知管理>通知显示设置 中将样式设置为“原生样式”。"
+                confirmButton(text = "我知道了") { isWarnDialogShowing = false }
+                noCancelable()
+            }
+    }
+
     /**
      * 判断模块是否激活
      * @return [Boolean] 激活状态
      */
-    private fun isHooked() = HookMedium.isHooked()
-
-    /** 重启系统界面 */
-    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)
+    private fun isHooked() = YukiHookModuleStatus.isActive()
 }

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 and our eula as published
+ * by ferredoxin.
  *
- * 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/DialogBuilder.kt

@@ -1,24 +1,26 @@
-/**
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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
 
@@ -26,7 +28,11 @@ 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 +48,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 +71,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,6 +107,9 @@ class DialogBuilder(private val context: Context) {
 
     /** 显示对话框 */
     internal fun show() = instance?.create()?.apply {
+        val dm = DisplayMetrics()
+        (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.getMetrics(dm)
+        customLayoutView?.let { setView(it.apply { minimumWidth = round(dm.widthPixels / 1.3).toInt() }) }
         window?.setBackgroundDrawable(GradientDrawable(
             GradientDrawable.Orientation.TOP_BOTTOM,
             intArrayOf(Color.WHITE, Color.WHITE)

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,65 @@
+/*
+ * 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 and our eula as published
+ * by ferredoxin.
+ *
+ * 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.app.Activity
+import android.content.Context
+import android.graphics.Color
+import android.widget.Toast
+import com.google.android.material.snackbar.Snackbar
+
+/**
+ * 系统界面工具
+ */
+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.makeText(context, "ROOT 权限获取失败", Toast.LENGTH_SHORT).show()
+                }
+            }
+            cancelButton()
+        }
+
+    /**
+     * 显示需要重启系统界面的 [Snackbar]
+     * @param context 实例
+     */
+    fun showNeedRestartSnake(context: Context) =
+        Snackbar.make((context as Activity).findViewById(android.R.id.content), "设置需要重启系统界面才能生效", Snackbar.LENGTH_LONG)
+            .apply {
+                setActionTextColor(Color.WHITE)
+                setAction("立即重启") { restartSystemUI(context) }
+            }.show()
+}

app/src/main/java/com/fankes/miui/notify/utils/Utils.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 and our eula as published
+ * by ferredoxin.
  *
- * 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.
  */
@@ -29,11 +31,17 @@ import android.content.res.Configuration
 import android.graphics.*
 import android.graphics.Bitmap.createBitmap
 import android.os.Build
+import android.provider.Settings
 import android.service.notification.StatusBarNotification
 import android.util.Base64
 import com.fankes.miui.notify.application.MNNApplication.Companion.appContext
-import java.io.DataInputStream
-import java.io.DataOutputStream
+import com.highcapable.yukihookapi.hook.factory.callStatic
+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 +62,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 +90,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 系统
@@ -91,6 +98,24 @@ val isMIUI by lazy {
  */
 inline val isNotMIUI get() = !isMIUI
 
+/**
+ * 是否为支持的 MIUI 版本
+ * @return [Boolean]
+ */
+val isSupportMiuiVersion
+    get() = when (miuiVersion) {
+        "12" -> true
+        "12.5" -> true
+        "13" -> true
+        else -> false
+    }
+
+/**
+ * 是否不为支持的 MIUI 版本
+ * @return [Boolean]
+ */
+inline val isNotSupportMiuiVersion get() = !isSupportMiuiVersion
+
 /**
  * 获取 MIUI 版本
  * @return [String]
@@ -109,8 +134,16 @@ val miuiVersion
                     "V13" -> "13"
                     else -> it.replace(oldValue = "V", newValue = "")
                 }
-            } + " " + findPropString(key = "ro.system.build.version.incremental")
-        else "不是 MIUI 系统"
+            }.trim()
+        else "NULL"
+
+/**
+ * 获取 MIUI 完全版本
+ * @return [String]
+ */
+val miuiFullVersion
+    get() = if (isMIUI) (miuiVersion + " " + findPropString(key = "ro.system.build.version.incremental"))
+    else "不是 MIUI 系统"
 
 /**
  * 获取推送通知的包名
@@ -129,16 +162,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
+    }
 
 /**
  * 得到版本信息
@@ -214,44 +244,116 @@ 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", StringType, StringType
+    )?.callStatic(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 ""
+    }
+}
+
+/**
+ * 忽略异常返回值
+ * @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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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 and our eula as published
+ * by ferredoxin.
  *
- * 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/layout/activity_config.xml

@@ -26,17 +26,45 @@
             android:layout_marginStart="10dp"
             android:layout_marginEnd="25dp"
             android:src="@mipmap/back"
-            android:tint="@color/colorTextGray" />
+            android:tint="@color/colorTextGray"
+            android:tooltipText="返回" />
 
-        <TextView
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
             android:layout_weight="1"
-            android:singleLine="true"
-            android:text="通知图标优化名单"
-            android:textColor="@color/colorTextGray"
-            android:textSize="25sp"
-            android:textStyle="bold" />
+            android:gravity="center|start"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:singleLine="true"
+                android:text="通知图标优化名单"
+                android:textColor="@color/colorTextGray"
+                android:textSize="19sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/config_title_count_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:text="..."
+                android:textColor="@color/colorTextDark"
+                android:textSize="12sp" />
+        </LinearLayout>
+
+        <androidx.constraintlayout.utils.widget.ImageFilterView
+            android:id="@+id/config_title_filter"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:layout_marginEnd="10dp"
+            android:src="@mipmap/icon_filter"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="按条件过滤" />
     </LinearLayout>
 
     <LinearLayout
@@ -64,24 +92,39 @@
             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: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"

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:alpha="0.85"
             android:src="@mipmap/restart"
-            android:tint="@color/colorTextGray" />
+            android:tint="@color/colorTextGray"
+            android:tooltipText="重启系统界面" />
     </LinearLayout>
 
     <LinearLayout
@@ -264,9 +266,23 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.6"
                     android:lineSpacingExtra="6dp"
-                    android:text="此选项默认开启，开启后将对优化名单内 APP 通知小图标进行色彩修复，使得它们的图标看起来更加美观。"
+                    android:text="此选项默认开启，开启后将对优化名单内 APP 通知小图标进行色彩修复，特别是通过 MIPUSH 推送的通知，它们始终是彩色的，修复后使得它们的图标看起来更加符合原生规范。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
+
+                <TextView
+                    android:id="@+id/config_notify_app_icon_warn"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:layout_marginBottom="10dp"
+                    android:alpha="0.6"
+                    android:lineSpacingExtra="6dp"
+                    android:text="⚠️ 你的 MIUI 版本过低，状态栏上 MIPUSH 的彩色图标由于不能识别反色将不会被优化为黑白小图标，仅在通知栏生效。"
+                    android:textColor="#FF9800"
+                    android:textSize="12sp"
+                    android:visibility="gone" />
             </LinearLayout>
 
             <LinearLayout
@@ -296,7 +312,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>
@@ -343,7 +359,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 +369,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 +379,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 不生效的问题。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
@@ -419,7 +435,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>
@@ -473,6 +489,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/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

@@ -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>

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.51"
+    appVersionCode = 10
 }
 
 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,18 @@
+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' }
+        mavenCentral()
+    }
+}
 rootProject.name = "MIUINativeNotifyIcon"
 include ':app'