Update version to 1.95

- Remove replacement notification icon views function
- Use a new way to fix notification icons color

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.9-green)](https://github.com/fankes/ColorOSNotifyIcon/releases)
+[![Blank](https://img.shields.io/badge/version-v1.95-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)
@@ -51,7 +51,7 @@ Optimize notification icons for ColorOS and adapt to native notification icon sp
 
 - [Automatic Build on Commit](https://github.com/fankes/ColorOSNotifyIcon/actions/workflows/commit_ci.yml)
 
-上述更新为代码 `commit` 后自动触发，具体更新内容可点击上方的文字前往 **Github Actions** 进行查看，本更新由开源的流程自动编译发布，**不保证其稳定性**，所发布的版本**仅供测试**，且不会特殊说明甚至可能会变更版本号或保持与当前稳定版相同的版本号。
+上述更新为代码 `commit` 后自动触发，具体更新内容可点击上方的文字前往 **GitHub Actions** 进行查看，本更新由开源的流程自动编译发布，**不保证其稳定性**，所发布的版本**仅供测试**，且不会特殊说明甚至可能会变更版本号或保持与当前稳定版相同的版本号。
 
 - [Release](https://github.com/fankes/ColorOSNotifyIcon/releases)
 - [Xposed-Modules-Repo](https://github.com/Xposed-Modules-Repo/com.fankes.coloros.notify/releases)

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

@@ -39,10 +39,10 @@ object PackageName {
  */
 object IconRuleSourceSyncType {
 
-    /** Github Raw (代理) */
+    /** GitHub Raw (代理) */
     const val GITHUB_RAW_PROXY = 1000
 
-    /** Github Raw (直连) */
+    /** GitHub Raw (直连) */
     const val GITHUB_RAW_DIRECT = 2000
 
     /** 自定义地址 */

app/src/main/java/com/fankes/coloros/notify/data/ConfigData.kt

@@ -68,7 +68,7 @@ object ConfigData {
     val ENABLE_NOTIFY_MEDIA_PANEL_AUTO_EXP = PrefsData("_enable_notify_media_panel_auto_exp", false)
 
     /** 启用自定义通知面板背景透明度 */
-    val ENABLE_NOTIFY_PANEL_ALPHA = PrefsData("_enable_notify_panel_alpha", false)
+    val ENABLE_NOTIFY_PANEL_ALPHA = PrefsData("_enable_notify_panel_alpha_pst", false)
 
     /** 自定义通知面板背景透明度 */
     val NOTIFY_PANEL_ALPHA_LEVEL = PrefsData("_notify_panel_alpha_pst", 75)

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

@@ -141,7 +141,7 @@ object SystemUIHooker : YukiBaseHooker() {
     /** 根据多个版本存在不同的包名相同的类 */
     private val RoundRectDrawableUtil_CompanionClass = VariousClass(
         "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion",
-        "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion"
+        "com.coloros.systemui.notification.util.RoundRectDrawableUtil\$Companion"
     )
 
     /** 根据多个版本存在不同的包名相同的类 */
@@ -369,7 +369,7 @@ object SystemUIHooker : YukiBaseHooker() {
                     }
                 }
                 if (isGrayscaleIcon.not() && ConfigData.isEnableNotifyIconFixPlaceholder)
-                    customPair = Triple(context.resources.drawableOf(R.drawable.ic_unsupported), 0, true)
+                    customPair = Triple(context.resources.drawableOf(R.drawable.ic_message), 0, true)
             }
         }
         return customPair ?: Triple(null, 0, false)
@@ -416,37 +416,28 @@ object SystemUIHooker : YukiBaseHooker() {
         iconView: ImageView
     ) = runInSafe {
         compatCustomIcon(context, isGrayscaleIcon, packageName).also { customTriple ->
-            /** 设置一个用于替换的图标 */
-            val placeholderView = ImageView(context)
-            /** 克隆之前图标的所有布局信息 */
-            (iconView.parent as? ViewGroup?)?.apply { addView(placeholderView.apply { layoutParams = iconView.layoutParams }) }
-                ?: loggerE(msg = "Cannot got the orginal notification icon's parent view \"${nf.packageName}\"(\"${nf.opPkg}\") of $nf")
-            /** 将之前图标的间距设置为一个超大值以达到隐藏的效果 */
-            999.also { iconView.setPadding(it, it, it, it) }
-            /** 清除之前图标可能存在的背景 */
-            iconView.background = null
             when {
-                ConfigData.isEnableNotifyIconForceAppIcon -> placeholderView.apply {
+                ConfigData.isEnableNotifyIconForceAppIcon -> iconView.apply {
                     /** 重新设置图标 */
                     setImageDrawable(appIcons[packageName] ?: context.appIconOf(packageName))
                     /** 设置默认样式 */
                     setDefaultNotifyIconViewStyle()
                 }
-                (customTriple.first != null && customTriple.third.not()) || isGrayscaleIcon -> placeholderView.apply {
+                (customTriple.first != null && customTriple.third.not()) || isGrayscaleIcon -> iconView.apply {
                     /** 设置不要裁切到边界 */
                     clipToOutline = false
                     /** 重新设置图标 */
                     setImageDrawable(customTriple.first ?: drawable)
 
                     /** 旧版风格 */
-                    val oldStyle = (if (context.isSystemInDarkMode) 0xffdcdcdc else 0xff707173).toInt()
+                    val oldStyle = if (context.isSystemInDarkMode) 0xFFDCDCDC.toInt() else 0xFF707173.toInt()
 
                     /** 新版风格 */
-                    val newStyle = (if (context.isSystemInDarkMode) 0xffdcdcdc else Color.WHITE).toInt()
+                    val newStyle = if (context.isSystemInDarkMode) 0xFFDCDCDC.toInt() else Color.WHITE
 
                     /** 原生着色 */
                     val md3Style = if (isUpperOfAndroidS) context.systemAccentColor else
-                        (if (context.isSystemInDarkMode) 0xff707173 else oldStyle).toInt()
+                        (if (context.isSystemInDarkMode) 0xFF707173.toInt() else oldStyle)
 
                     /** 旧版图标着色 */
                     val oldApplyColor = customTriple.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: oldStyle
@@ -470,7 +461,7 @@ object SystemUIHooker : YukiBaseHooker() {
                         setPadding(0, 0, 0, 0)
                     }
                 }
-                else -> placeholderView.apply {
+                else -> iconView.apply {
                     /** 重新设置图标 */
                     setImageDrawable(nf.compatPushingIcon(drawable))
                     /** 设置默认样式 */
@@ -630,7 +621,7 @@ object SystemUIHooker : YukiBaseHooker() {
         DndAlertHelperClass.hook {
             injectMember {
                 method {
-                    name = "sendNotificationWithEndtime"
+                    name { it.lowercase() == "sendnotificationwithendtime" }
                     param(LongType)
                 }
                 beforeHook {
@@ -639,15 +630,22 @@ object SystemUIHooker : YukiBaseHooker() {
                 }
             }
         }
-        /** 修复并替换新版本 ColorOS 原生灰度图标色彩判断 */
+        /** 修复并替换 ColorOS 以及原生灰度图标色彩判断 */
         NotificationUtilsClass.hook {
+            injectMember {
+                method {
+                    name = "isGrayscale"
+                    param(ImageViewClass, ContrastColorUtilClass)
+                }
+                replaceAny { args().first().cast<ImageView>()?.let { isGrayscaleIcon(it.context, it.drawable) } ?: callOriginal() }
+            }
             injectMember {
                 method {
                     name = "isGrayscaleOplus"
                     param(ImageViewClass, OplusContrastColorUtilClass)
                 }
                 replaceAny { args().first().cast<ImageView>()?.let { isGrayscaleIcon(it.context, it.drawable) } ?: callOriginal() }
-            }.ignoredHookingFailure()
+            }.ignoredNoSuchMemberFailure()
         }
         /** 替换状态栏图标 */
         IconManagerClass.hook {
@@ -748,7 +746,7 @@ object SystemUIHooker : YukiBaseHooker() {
                 }
                 beforeHook { modifyNotifyPanelAlpha(instance(), args().last().cast<Drawable>()) }
             }
-        }.by { isOldNotificationBackground.not() }
+        }.ignoredHookClassNotFoundFailure().by { isOldNotificationBackground.not() }
         /** 替换通知面板背景 - 旧版本 */
         NotificationBackgroundViewClass.hook {
             injectMember {
@@ -764,7 +762,7 @@ object SystemUIHooker : YukiBaseHooker() {
                     paramCount = 2
                 }
                 beforeHook { modifyNotifyPanelAlpha(instance(), args().last().cast<Drawable>()) }
-            }
+            }.ignoredNoSuchMemberFailure()
         }.by { isOldNotificationBackground }
         /** 替换通知面板背景 - 避免折叠展开通知二次修改通知面板背景 */
         ExpandableNotificationRowClass.hook {
@@ -822,7 +820,7 @@ object SystemUIHooker : YukiBaseHooker() {
         /** 替换通知图标和样式 */
         NotificationHeaderViewWrapperClass.hook {
             injectMember {
-                method { name = "resolveHeaderViews" }
+                method { name { it == "resolveHeaderViews" || it == "onContentUpdated" } }.all()
                 afterHook {
                     NotificationHeaderViewWrapperClass.toClass()
                         .field { name = "mIcon" }.get(instance).cast<ImageView>()?.apply {

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

@@ -124,6 +124,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             binding.notifyMediaPanelAutoExpSwitch.isVisible = false
             binding.notifyMediaPanelAutoExpText.isVisible = false
         }
+        /** 通知面板背景透明度功能仅支持 ColorOS 12、12.1、13 */
+        binding.notifyPanelConfigItem.isVisible = colorOSNumberVersion.let { it == "V12" || it == "V12.1" || it == "V13" }
         binding.notifyIconAutoSyncText.text = ConfigData.notifyIconFixAutoTime
         binding.moduleEnableSwitch.bind(ConfigData.ENABLE_MODULE) {
             onInitialize {

app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt

@@ -338,12 +338,12 @@ val Context.systemAccentColor
 
 /**
  * 获取系统壁纸颜色
- * @return [Int] 无法获取时返回透明色
+ * @return [Int] 无法获取时返回默认颜色
  */
 val Context.wallpaperColor
-    get() = safeOfNan {
+    get() = runCatching {
-        WallpaperManager.getInstance(this).getWallpaperColors(WallpaperManager.FLAG_SYSTEM)?.primaryColor?.toArgb() ?: 0
+        WallpaperManager.getInstance(this).getWallpaperColors(WallpaperManager.FLAG_SYSTEM)?.primaryColor?.toArgb()
-    }
+    }.getOrNull() ?: (if (isSystemInDarkMode) 0xFFD8D8D8.toInt() else 0xFF707173.toInt())
 
 /**
  * 是否为白色

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

@@ -35,7 +35,7 @@ import java.io.Serializable
 import java.util.*
 
 /**
- * 获取 Github Release 最新版本工具类
+ * 获取 GitHub Release 最新版本工具类
  */
 object GithubReleaseTool {
 
@@ -129,7 +129,7 @@ object GithubReleaseTool {
     }
 
     /**
-     * Github Release bean
+     * GitHub Release bean
      * @param name 版本名称
      * @param htmlUrl 网页地址
      * @param content 更新日志

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

@@ -67,10 +67,10 @@ object IconRuleManagerTool {
     /** 当前规则的通知图标颜色 */
     private const val OS_COLOR = 0xFF4E8A5A.toInt()
 
-    /** 同步地址 - Github Raw (代理) */
+    /** 同步地址 - GitHub Raw (代理) */
     private const val SYNC_PROXY_URL = "https://raw.githubusercontentS.com/fankes/AndroidNotifyIconAdapt/main"
 
-    /** 同步地址 - Github Raw (直连) */
+    /** 同步地址 - GitHub Raw (直连) */
     private const val SYNC_DIRECT_URL = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main"
 
     /** 云端规则展示地址 (OS) */

app/src/main/res/drawable/ic_message.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="m522.8,93.9c-244.2,0 -442.1,173.2 -442.1,386.9 0,122.1 64.9,230.9 165.8,301.7v195.7l193.7,-117.5c26.8,4.4 54.3,7 82.6,7 244.2,0 442.1,-173.2 442.1,-386.9C965,267.1 767.1,93.9 522.8,93.9Z"
+        android:strokeWidth="1.10883" />
+</vector>

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

@@ -617,6 +617,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
                     android:orientation="vertical">
 
                     <com.fankes.coloros.notify.ui.widget.MaterialSwitch
@@ -633,7 +634,6 @@
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
                         android:alpha="0.6"
                         android:lineSpacingExtra="6dp"
                         android:paddingLeft="15dp"
@@ -646,8 +646,8 @@
                 <com.fankes.coloros.notify.ui.widget.MaterialSwitch
                     android:id="@+id/notify_media_panel_auto_exp_switch"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="30dp"
-                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
                     android:paddingLeft="15dp"
                     android:paddingRight="15dp"
                     android:text="启用媒体通知播放时自动展开"
@@ -668,11 +668,17 @@
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
+                <LinearLayout
+                    android:id="@+id/notify_panel_config_item"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
                     <com.fankes.coloros.notify.ui.widget.MaterialSwitch
                         android:id="@+id/notify_panel_config_switch"
                         android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                        android:layout_height="30dp"
-                    android:layout_marginTop="5dp"
+                        android:layout_marginBottom="5dp"
                         android:paddingLeft="15dp"
                         android:paddingRight="15dp"
                         android:text="自定义通知面板背景透明度"
@@ -772,6 +778,7 @@
                             android:textStyle="bold" />
                     </LinearLayout>
                 </LinearLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/notify_icon_config_item"

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

@@ -28,14 +28,14 @@
             android:id="@+id/source_radio_1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Github Raw (7ED Services)"
+            android:text="GitHub Raw (7ED Services)"
             app:buttonTint="@color/colorPrimaryAccent" />
 
         <com.google.android.material.radiobutton.MaterialRadioButton
             android:id="@+id/source_radio_2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Github Raw (直连)"
+            android:text="GitHub Raw (直连)"
             app:buttonTint="@color/colorPrimaryAccent" />
 
         <com.google.android.material.radiobutton.MaterialRadioButton

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "1.9"
+    appVersionName = "1.95"
-    appVersionCode = 18
+    appVersionCode = 19
     enableR8 = true
 }