Update version to 1.76

.idea/misc.xml

@@ -11,7 +11,7 @@
         <entry key="app/src/main/res/drawable/ic_notify_icon.xml" value="0.232" />
         <entry key="app/src/main/res/drawable/ic_system_clock.xml" value="0.232" />
         <entry key="app/src/main/res/layout/activity_config.xml" value="0.4375" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.31423220973782773" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.31170825335892516" />
         <entry key="app/src/main/res/layout/adapter_config.xml" value="0.4375" />
         <entry key="app/src/main/res/layout/dia_icon_filter.xml" value="0.4375" />
         <entry key="app/src/main/res/layout/dia_source_from.xml" value="0.4375" />

README.md

@@ -2,7 +2,7 @@
 
 [![Blank](https://img.shields.io/badge/build-passing-brightgreen)](https://github.com/fankes/ColorOSNotifyIcon)
 [![Blank](https://img.shields.io/badge/license-AGPL3.0-blue)](https://github.com/fankes/ColorOSNotifyIcon/blob/master/LICENSE)
-[![Blank](https://img.shields.io/badge/version-v1.75-green)](https://github.com/fankes/ColorOSNotifyIcon/releases)
+[![Blank](https://img.shields.io/badge/version-v1.76-green)](https://github.com/fankes/ColorOSNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/fankes/ColorOSNotifyIcon/total?label=Release)](https://github.com/fankes/ColorOSNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/Xposed-Modules-Repo/com.fankes.coloros.notify/total?label=LSPosed%20Repo&logo=Android&style=flat&labelColor=F48FB1&logoColor=ffffff)](https://github.com/Xposed-Modules-Repo/com.fankes.coloros.notify/releases)
 [![Telegram](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/XiaofangInternet)

app/build.gradle

@@ -69,8 +69,8 @@ tasks.whenTaskAdded {
 
 dependencies {
     compileOnly 'de.robv.android.xposed:api:82'
-    implementation 'com.highcapable.yukihookapi:api:1.0.85'
+    implementation 'com.highcapable.yukihookapi:api:1.0.86'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.85'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.86'
     implementation "com.github.topjohnwu.libsu:core:3.1.2"
     implementation 'androidx.annotation:annotation:1.3.0'
     implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
@@ -78,7 +78,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.android.material:material:1.6.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

app/src/main/java/com/fankes/coloros/notify/const/Const.kt

@@ -41,7 +41,7 @@ object Const {
     const val MODULE_VERSION_CODE = BuildConfig.VERSION_CODE
 
     /** 当前模块的版本校验 */
-    const val MODULE_VERSION_VERIFY = "${MODULE_VERSION_NAME}_${MODULE_VERSION_CODE}_202205051512"
+    const val MODULE_VERSION_VERIFY = "${MODULE_VERSION_NAME}_${MODULE_VERSION_CODE}_202205090117"
 
     /** 当前模块的版本校验标签 */
     const val MODULE_VERSION_VERIFY_TAG = "module_version_verify"

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

@@ -47,7 +47,7 @@ class HookEntry : IYukiHookXposedInit {
             /** Hook 被手动关闭停止 Hook */
             prefs.get(DataConst.ENABLE_MODULE).not() -> loggerW(msg = "Aborted Hook -> Hook Closed")
             /** 开始 Hook */
-            else -> loadApp(SYSTEMUI_PACKAGE_NAME, SystemUIHooker())
+            else -> loadApp(SYSTEMUI_PACKAGE_NAME, SystemUIHooker)
         }
     }
 }

app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt

@@ -20,6 +20,8 @@
  *
  * This file is Created by fankes on 2022/3/25.
  */
+@file:Suppress("StaticFieldLeak")
+
 package com.fankes.coloros.notify.hook.entity
 
 import android.app.WallpaperManager
@@ -71,111 +73,108 @@ import com.highcapable.yukihookapi.hook.type.java.LongType
 /**
  * 系统界面核心 Hook 类
  */
-class SystemUIHooker : YukiBaseHooker() {
+object SystemUIHooker : YukiBaseHooker() {
 
-    companion object {
+    /** 原生存在的类 */
+    private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
 
-        /** 原生存在的类 */
+    /** 原生存在的类 */
-        private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
+    private const val NotificationUtilsClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtils"
 
-        /** 原生存在的类 */
+    /** 原生存在的类 */
-        private const val NotificationUtilsClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtils"
+    private const val NotificationEntryClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.collection.NotificationEntry"
 
-        /** 原生存在的类 */
+    /** 原生存在的类 */
-        private const val NotificationEntryClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.collection.NotificationEntry"
+    private const val StatusBarIconClass = "com.android.internal.statusbar.StatusBarIcon"
 
-        /** 原生存在的类 */
+    /** 原生存在的类 */
-        private const val StatusBarIconClass = "com.android.internal.statusbar.StatusBarIcon"
+    private const val StatusBarIconViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.StatusBarIconView"
 
-        /** 原生存在的类 */
+    /** 原生存在的类 */
-        private const val StatusBarIconViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.StatusBarIconView"
+    private const val IconBuilderClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.icon.IconBuilder"
 
-        /** 原生存在的类 */
+    /** 原生存在的类 */
-        private const val IconBuilderClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.icon.IconBuilder"
+    private const val IconManagerClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.icon.IconManager"
 
-        /** 原生存在的类 */
+    /** ColorOS 存在的类 - 旧版本不存在 */
-        private const val IconManagerClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.icon.IconManager"
+    private const val OplusContrastColorUtilClass = "com.oplusos.util.OplusContrastColorUtil"
 
-        /** ColorOS 存在的类 - 旧版本不存在 */
+    /** 原生存在的类 */
-        private const val OplusContrastColorUtilClass = "com.oplusos.util.OplusContrastColorUtil"
+    private const val PluginManagerImplClass = "$SYSTEMUI_PACKAGE_NAME.shared.plugins.PluginManagerImpl"
 
-        /** 原生存在的类 */
+    /** 原生存在的类 */
-        private const val PluginManagerImplClass = "$SYSTEMUI_PACKAGE_NAME.shared.plugins.PluginManagerImpl"
+    private const val NotificationBackgroundViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.NotificationBackgroundView"
 
-        /** 原生存在的类 */
+    /** ColorOS 存在的类 - 旧版本不存在 */
-        private const val NotificationBackgroundViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.NotificationBackgroundView"
+    private const val OplusNotificationBackgroundViewClass =
+        "com.oplusos.systemui.statusbar.notification.row.OplusNotificationBackgroundView"
 
-        /** ColorOS 存在的类 - 旧版本不存在 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private const val OplusNotificationBackgroundViewClass =
+    private val OplusNotificationIconAreaControllerClass = VariousClass(
-            "com.oplusos.systemui.statusbar.notification.row.OplusNotificationBackgroundView"
+        "com.oplusos.systemui.statusbar.phone.OplusNotificationIconAreaController",
+        "com.oplusos.systemui.statusbar.policy.OplusNotificationIconAreaController",
+        "com.coloros.systemui.statusbar.policy.ColorNotificationIconAreaController"
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val OplusNotificationIconAreaControllerClass = VariousClass(
+    private val SystemPromptControllerClass = VariousClass(
-            "com.oplusos.systemui.statusbar.phone.OplusNotificationIconAreaController",
+        "com.oplusos.systemui.statusbar.policy.SystemPromptController",
-            "com.oplusos.systemui.statusbar.policy.OplusNotificationIconAreaController",
+        "com.coloros.systemui.statusbar.policy.ColorSystemPromptController"
-            "com.coloros.systemui.statusbar.policy.ColorNotificationIconAreaController"
+    )
-        )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val SystemPromptControllerClass = VariousClass(
+    private val RoundRectDrawableUtilClass = VariousClass(
-            "com.oplusos.systemui.statusbar.policy.SystemPromptController",
+        "com.oplusos.systemui.notification.util.RoundRectDrawableUtil",
-            "com.coloros.systemui.statusbar.policy.ColorSystemPromptController"
+        "com.coloros.systemui.notification.util.RoundRectDrawableUtil"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val RoundRectDrawableUtilClass = VariousClass(
+    private val RoundRectDrawableUtil_CompanionClass = VariousClass(
-            "com.oplusos.systemui.notification.util.RoundRectDrawableUtil",
+        "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion",
-            "com.coloros.systemui.notification.util.RoundRectDrawableUtil"
+        "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val RoundRectDrawableUtil_CompanionClass = VariousClass(
+    private val DndAlertHelperClass = VariousClass(
-            "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion",
+        "com.oplusos.systemui.notification.helper.DndAlertHelper",
-            "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion"
+        "com.coloros.systemui.notification.helper.DndAlertHelper"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val DndAlertHelperClass = VariousClass(
+    private val OplusPowerNotificationWarningsClass = VariousClass(
-            "com.oplusos.systemui.notification.helper.DndAlertHelper",
+        "com.oplusos.systemui.notification.power.OplusPowerNotificationWarnings",
-            "com.coloros.systemui.notification.helper.DndAlertHelper"
+        "com.coloros.systemui.notification.power.ColorosPowerNotificationWarnings"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val OplusPowerNotificationWarningsClass = VariousClass(
+    private val AbstractReceiverClass = VariousClass(
-            "com.oplusos.systemui.notification.power.OplusPowerNotificationWarnings",
+        "com.oplusos.systemui.common.receiver.AbstractReceiver",
-            "com.coloros.systemui.notification.power.ColorosPowerNotificationWarnings"
+        "com.coloros.systemui.common.receiver.AbstractReceiver"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val AbstractReceiverClass = VariousClass(
+    private val StatusBarNotificationPresenterClass = VariousClass(
-            "com.oplusos.systemui.common.receiver.AbstractReceiver",
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.phone.StatusBarNotificationPresenter",
-            "com.coloros.systemui.common.receiver.AbstractReceiver"
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.phone.StatusBar"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val StatusBarNotificationPresenterClass = VariousClass(
+    private val ExpandableNotificationRowClass = VariousClass(
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.phone.StatusBarNotificationPresenter",
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.ExpandableNotificationRow",
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.phone.StatusBar"
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val ExpandableNotificationRowClass = VariousClass(
+    private val NotificationViewWrapperClass = VariousClass(
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.ExpandableNotificationRow",
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationViewWrapper",
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
-        )
+    )
 
-        /** 根据多个版本存在不同的包名相同的类 */
+    /** 根据多个版本存在不同的包名相同的类 */
-        private val NotificationViewWrapperClass = VariousClass(
+    private val NotificationHeaderViewWrapperClass = VariousClass(
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationViewWrapper",
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapper",
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
+        "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationHeaderViewWrapper"
-        )
+    )
-
-        /** 根据多个版本存在不同的包名相同的类 */
-        private val NotificationHeaderViewWrapperClass = VariousClass(
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapper",
-            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationHeaderViewWrapper"
-        )
-    }
 
     /** 缓存的彩色 APP 图标 */
     private var appIcons = ArrayMap<String, Drawable>()
@@ -711,6 +710,11 @@ class SystemUIHooker : YukiBaseHooker() {
                 method {
                     name = "drawRegionBlur"
                     paramCount = 2
+                }.remedys {
+                    method {
+                        name = "draw"
+                        paramCount = 2
+                    }
                 }
                 beforeHook { modifyNotifyPanelAlpha(instance(), args().last().cast<Drawable>()) }
             }

app/src/main/java/com/fankes/coloros/notify/ui/activity/auto/NotifyIconRuleUpdateActivity.kt

@@ -43,13 +43,13 @@ class NotifyIconRuleUpdateActivity : Activity() {
             View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
         window?.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
         window?.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
+        /** 注册 */
+        SystemUITool.register(context = this)
         /** 检测运行状态 */
         if (BaseActivity.isMainThreadRunning) {
             finish()
             return
         }
-        /** 注册 */
-        SystemUITool.register(context = this)
         /** 拉取云端数据 */
         IconRuleManagerTool.sync(appContext) {
             /** 刷新系统界面 */

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

@@ -47,7 +47,7 @@ object SystemUITool {
      * 注册广播
      * @param context 实例
      */
-    fun register(context: Context) {
+    fun register(context: Context) = runInSafe {
         /** 注册广播检查模块激活状态 */
         context.registerReceiver(moduleHandlerReceiver, IntentFilter().apply { addAction(Const.ACTION_MODULE_HANDLER_RECEIVER) })
         /** 注册广播通知系统界面改变 */
@@ -58,7 +58,7 @@ object SystemUITool {
      * 取消注册广播
      * @param context 实例
      */
-    fun unregister(context: Context) {
+    fun unregister(context: Context) = runInSafe {
         context.unregisterReceiver(moduleHandlerReceiver)
         context.unregisterReceiver(remindHandlerReceiver)
     }

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

@@ -499,7 +499,7 @@
                     android:lineSpacingExtra="6dp"
                     android:paddingLeft="15dp"
                     android:paddingRight="15dp"
-                    android:text="此功能为实验性功能，后期不一定继续维护，且仅在 ColorOS 12~12.1 测试正常，不能保证可以和各种通知栏主题模块配合使用，如有冲突请关闭此功能或禁用相关重复功能的主题模块。"
+                    android:text="此功能为实验性功能，后期不一定继续维护，且仅在 ColorOS 12.1 测试通过，不能保证可以在任何系统版本中生效，以及和各种通知栏主题模块配合使用，如有冲突请关闭此功能或禁用相关重复功能的主题模块。\n已知问题：悬浮通知也会被透明，在透明度较低的时候下拉会有阴影光晕，后期看需求再解决。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
             </LinearLayout>

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "1.75"
+    appVersionName = "1.76"
-    appVersionCode = 13
+    appVersionCode = 14
     enableR8 = true
 }