fankes/MIUINativeNotifyIcon
2
0
Fork 0
mirror of https://github.com/fankes/MIUINativeNotifyIcon.git synced 2025-10-22 21:39:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复 MIUI 在 Android 11 上最小化优先级图标的着色问题

Browse Source
This commit is contained in:
Fankesyooni
2022-03-01 02:50:30 +08:00
parent c7d9b2661b
commit 8d6a05e02c
2 changed files with 101 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@
*/ */
package com.fankes.miui.notify.hook package com.fankes.miui.notify.hook
import android.app.NotificationManager
import android.content.Context import android.content.Context
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Color import android.graphics.Color
@@ -55,6 +56,7 @@ import com.highcapable.yukihookapi.hook.param.PackageParam
import com.highcapable.yukihookapi.hook.type.android.ContextClass import com.highcapable.yukihookapi.hook.type.android.ContextClass
import com.highcapable.yukihookapi.hook.type.android.DrawableClass import com.highcapable.yukihookapi.hook.type.android.DrawableClass
import com.highcapable.yukihookapi.hook.type.android.ImageViewClass import com.highcapable.yukihookapi.hook.type.android.ImageViewClass
import com.highcapable.yukihookapi.hook.type.java.BooleanType
import com.highcapable.yukihookapi.hook.type.java.IntType import com.highcapable.yukihookapi.hook.type.java.IntType
import com.highcapable.yukihookapi.hook.xposed.proxy.YukiHookXposedInitProxy import com.highcapable.yukihookapi.hook.xposed.proxy.YukiHookXposedInitProxy
@@ -334,96 +336,102 @@ class HookEntry : YukiHookXposedInitProxy {
* @param context 实例 * @param context 实例
* @param expandedNf 通知实例 * @param expandedNf 通知实例
* @param iconImageView 通知图标实例 * @param iconImageView 通知图标实例
* @param isExpanded 通知是否展开 - 可做最小化通知处理
*/ */
private fun PackageParam.hookNotifyIconOnSet(context: Context, expandedNf: StatusBarNotification?, iconImageView: ImageView) = private fun PackageParam.hookNotifyIconOnSet(
safeRun(msg = "AutoSetAppIconOnSet") { context: Context,
/** 判断是 MIUI 样式就停止 Hook */ expandedNf: StatusBarNotification?,
if (context.isMiuiNotifyStyle) return@safeRun iconImageView: ImageView,
/** 如果没开启修复 APP 的彩色图标 */ isExpanded: Boolean
if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun ) = safeRun(msg = "AutoSetAppIconOnSet") {
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */ /** 判断是 MIUI 样式就停止 Hook */
expandedNf?.let { notifyInstance -> if (context.isMiuiNotifyStyle) return@safeRun
/** 新版风格反色 */ /** 如果没开启修复 APP 的彩色图标 */
val newStyle = if (context.isSystemInDarkMode) 0xFF2D2D2D.toInt() else Color.WHITE if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
expandedNf?.let { notifyInstance ->
/** 旧版风格反色 */ /** 新版风格反色 */
val oldStyle = if (context.isNotSystemInDarkMode) 0xFF707070.toInt() else Color.WHITE val newStyle = if (context.isSystemInDarkMode) 0xFF2D2D2D.toInt() else Color.WHITE
/** 通知图标原始颜色 */ /** 旧版风格反色 */
val iconColor = notifyInstance.notification.color val oldStyle = if (context.isNotSystemInDarkMode) 0xFF707070.toInt() else Color.WHITE
/** 是否有通知栏图标颜色 */ /** 通知图标原始颜色 */
val hasIconColor = iconColor != 0 val iconColor = notifyInstance.notification.color
/** 通知图标适配颜色 */ /** 是否有通知栏图标颜色 */
val supportColor = iconColor.let { val hasIconColor = iconColor != 0
when {
isUpperOfAndroidS -> newStyle /** 通知图标适配颜色 */
it == 0 -> oldStyle val supportColor = iconColor.let {
else -> it when {
} isUpperOfAndroidS -> newStyle
it == 0 || !isExpanded -> oldStyle
else -> it
} }
}
/** 获取通知小图标 */ /** 获取通知小图标 */
val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context) val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
/** 判断图标风格 */ /** 判断图标风格 */
val isGrayscaleIcon = !notifyInstance.isXmsf && isGrayscaleIcon(context, iconDrawable) val isGrayscaleIcon = !notifyInstance.isXmsf && isGrayscaleIcon(context, iconDrawable)
/** 自定义默认小图标 */ /** 自定义默认小图标 */
var customIcon: Bitmap? var customIcon: Bitmap?
/** 自定义默认小图标颜色 */ /** 自定义默认小图标颜色 */
var customIconColor: Int var customIconColor: Int
compatCustomIcon(isGrayscaleIcon, notifyInstance.opPkgName).also { compatCustomIcon(isGrayscaleIcon, notifyInstance.opPkgName).also {
customIcon = it.first customIcon = it.first
customIconColor = it.second customIconColor = if (isUpperOfAndroidS || isExpanded) it.second else 0
}
/** 打印日志 */
printLogcat(tag = "NotifyIcon", context, notifyInstance, isCustom = customIcon != null, isGrayscaleIcon)
/** 处理自定义通知图标优化 */
if (customIcon != null)
iconImageView.apply {
/** 设置自定义小图标 */
setImageBitmap(customIcon)
/** 上色 */
setColorFilter(if (isUpperOfAndroidS || customIconColor == 0) supportColor else customIconColor)
/** Android 12 设置图标外圈颜色 */
if (isUpperOfAndroidS && customIconColor != 0)
background = DrawableBuilder().rounded().solidColor(customIconColor).build()
} }
/** 打印日志 */ else {
printLogcat(tag = "NotifyIcon", context, notifyInstance, isCustom = customIcon != null, isGrayscaleIcon) /** 重新设置图标 - 防止系统更改它 */
/** 处理自定义通知图标优化 */ iconImageView.setImageDrawable(iconDrawable)
if (customIcon != null) /** 判断如果是灰度图标就给他设置一个白色颜色遮罩 */
iconImageView.apply { if (isGrayscaleIcon) iconImageView.apply {
/** 设置自定义小图标 */ /** 设置图标着色 */
setImageBitmap(customIcon) setColorFilter(supportColor)
/** 上色 */ /** Android 12 设置图标外圈颜色 */
setColorFilter(if (isUpperOfAndroidS || customIconColor == 0) supportColor else customIconColor) if (isUpperOfAndroidS && hasIconColor)
/** Android 12 设置图标外圈颜色 */ background = DrawableBuilder().rounded().solidColor(iconColor).build()
if (isUpperOfAndroidS && customIconColor != 0) } else iconImageView.apply {
background = DrawableBuilder().rounded().solidColor(customIconColor).build() /** 重新设置图标 */
} setImageDrawable(notifyInstance.compatNotifyIcon(context, iconDrawable))
else { /** 设置裁切到边界 */
/** 重新设置图标 - 防止系统更改它 */ clipToOutline = true
iconImageView.setImageDrawable(iconDrawable) /** 设置一个圆角轮廓裁切 */
/** 判断如果是灰度图标就给他设置一个白色颜色遮罩 */ outlineProvider = object : ViewOutlineProvider() {
if (isGrayscaleIcon) iconImageView.apply { override fun getOutline(view: View, out: Outline) {
/** 设置图标着色 */ out.setRoundRect(
setColorFilter(supportColor) 0, 0,
/** Android 12 设置图标外圈颜色 */ view.width, view.height, 5.dp(context)
if (isUpperOfAndroidS && hasIconColor) )
background = DrawableBuilder().rounded().solidColor(iconColor).build()
} else iconImageView.apply {
/** 重新设置图标 */
setImageDrawable(notifyInstance.compatNotifyIcon(context, iconDrawable))
/** 设置裁切到边界 */
clipToOutline = true
/** 设置一个圆角轮廓裁切 */
outlineProvider = object : ViewOutlineProvider() {
override fun getOutline(view: View, out: Outline) {
out.setRoundRect(
0, 0,
view.width, view.height, 5.dp(context)
)
}
} }
/** 清除原生的背景边距设置 */
if (isUpperOfAndroidS) setPadding(0, 0, 0, 0)
/** 清除原生的主题色背景圆圈颜色 */
if (isUpperOfAndroidS) background = null
} }
/** 清除原生的背景边距设置 */
if (isUpperOfAndroidS) setPadding(0, 0, 0, 0)
/** 清除原生的主题色背景圆圈颜色 */
if (isUpperOfAndroidS) background = null
} }
} }
} }
}
/** /**
* Hook 通知栏小图标颜色 * Hook 通知栏小图标颜色
@@ -540,6 +548,9 @@ class HookEntry : YukiHookXposedInitProxy {
NotificationHeaderViewWrapperClass.clazz NotificationHeaderViewWrapperClass.clazz
.field { name = "mIcon" }.of<ImageView>(instance) ?: return@afterHook .field { name = "mIcon" }.of<ImageView>(instance) ?: return@afterHook
/** 通知是否展开 */
var isExpanded = false
/** /**
* 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass] * 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass]
* 获取其中的得到通知方法 * 获取其中的得到通知方法
@@ -548,7 +559,12 @@ class HookEntry : YukiHookXposedInitProxy {
.method { name = "getEntry" } .method { name = "getEntry" }
.get(NotificationViewWrapperClass.clazz.field { .get(NotificationViewWrapperClass.clazz.field {
name = "mRow" name = "mRow"
}.get(instance).self).call()?.let { }.get(instance).self?.also {
isExpanded = ExpandableNotificationRowClass.clazz.method {
name = "isExpanded"
returnType = BooleanType
}.get(it).invoke<Boolean>() == true
}).call()?.let {
it.javaClass.method { it.javaClass.method {
name = "getSbn" name = "getSbn"
}.get(it).invoke<StatusBarNotification>() }.get(it).invoke<StatusBarNotification>()
@@ -556,8 +572,15 @@ class HookEntry : YukiHookXposedInitProxy {
.method { name = "getStatusBarNotification" } .method { name = "getStatusBarNotification" }
.get(NotificationViewWrapperClass.clazz.field { name = "mRow" }.get(instance).self) .get(NotificationViewWrapperClass.clazz.field { name = "mRow" }.get(instance).self)
.invoke<StatusBarNotification>() .invoke<StatusBarNotification>()
/** 获取优先级 */
val importance =
(iconImageView.context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager?)
?.getNotificationChannel(expandedNf?.notification?.channelId)?.importance ?: 0
/** 非最小化优先级的通知全部设置为展开状态 */
if (importance != 1) isExpanded = true
/** 执行 Hook */ /** 执行 Hook */
hookNotifyIconOnSet(iconImageView.context, expandedNf, iconImageView) hookNotifyIconOnSet(iconImageView.context, expandedNf, iconImageView, isExpanded)
} }
} }
} }

4
build.gradle
View File

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