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

Modify merge hasIgnoreStatusBarIconColor function to isGrayscaleIcon function in SystemUIHooker

Browse Source
This commit is contained in:
fankesyooni
2023-02-04 04:05:05 +08:00
parent a1819c6e1d
commit 9fda7a975c
1 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt
View File

@@ -512,33 +512,29 @@ object SystemUIHooker : YukiBaseHooker() {
} }
/** /**
* 判断状态栏小图标颜色以及反射的核心方法 * 获取 [StatusBarIconViewClass] 实例是否为灰度图标 (单色图标)
* * @return [Boolean]
* 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
* @param context 实例
* @param expandedNf 状态栏实例
* @return [Boolean] 是否忽略通知图标颜色
*/ */
private fun hasIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) = safeOfFalse { private fun ImageView.isGrayscaleIcon(): Boolean {
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */ /** 获取 [StatusBarNotification] 实例 */
expandedNf?.let { notifyInstance -> val notifyInstance = current().field { name = "mNotification" }.cast<StatusBarNotification>()
/** 获取通知小图标 */ ?: return loggerW(msg = "isGrayscaleIcon got null mNotification").let { false }
val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
?: return loggerW(msg = "hasIgnoreStatusBarIconColor got null smallIcon").let { true }
/** 判断是否不是灰度图标 */ /** 获取通知小图标 */
val isNotGrayscaleIcon = notifyInstance.isXmsf || isGrayscaleIcon(context, iconDrawable).not() val iconDrawable = notifyInstance.notification?.smallIcon?.loadDrawable(context)
?: return loggerW(msg = "isGrayscaleIcon got null smallIcon").let { false }
/** 获取目标修复彩色图标的 APP */ /** 判断是否不是灰度图标 */
val isTargetFixApp = compatCustomIcon(isNotGrayscaleIcon.not(), notifyInstance.nfPkgName).first != null val isGrayscaleIcon = notifyInstance.isXmsf.not() && isGrayscaleIcon(context, iconDrawable)
/**
* 只要不是灰度就返回彩色图标 /** 获取目标修复彩色图标的 APP */
* 否则不对颜色进行反色处理防止一些系统图标出现异常 val isTargetFixApp = compatCustomIcon(isGrayscaleIcon, notifyInstance.nfPkgName).first != null
*/ /**
(if (isTargetFixApp) false else isNotGrayscaleIcon).also { * 只要不是灰度就返回彩色图标
printLogcat(tag = "IconColor", context, expandedNf, isTargetFixApp, isNotGrayscaleIcon.not()) * 否则不对颜色进行反色处理防止一些系统图标出现异常
} */
} ?: true.also { printLogcat(tag = "IconColor", context, expandedNf = null, isCustom = false, isGrayscale = false) } printLogcat(tag = "IconColor", context, notifyInstance, isTargetFixApp, isGrayscaleIcon)
return isTargetFixApp || isGrayscaleIcon
} }
/** /**
@@ -548,20 +544,18 @@ object SystemUIHooker : YukiBaseHooker() {
* @param animColor 动画过渡颜色 * @param animColor 动画过渡颜色
*/ */
private fun updateStatusBarIconColor(container: ViewGroup, isDarkIconMode: Boolean = this.isDarkIconMode, animColor: Int? = null) { private fun updateStatusBarIconColor(container: ViewGroup, isDarkIconMode: Boolean = this.isDarkIconMode, animColor: Int? = null) {
if (container.childCount > 0) container.children.forEach { if (container.childCount > 0) container.children.forEach { iconView ->
(it as? ImageView?)?.also { iconView -> if (iconView !is ImageView) return@forEach
val notification = iconView.current().field { name = "mNotification" }.cast<StatusBarNotification>() if (iconView.isGrayscaleIcon()) {
if (hasIgnoreStatusBarIconColor(iconView.context, notification)) { /**
iconView.alpha = 1f * 防止图标不是纯黑的问题
iconView.colorFilter = null * 图标在任何场景下跟随状态栏其它图标保持半透明
} else { */
/** iconView.alpha = if (animColor != null) 1f else statusBarIconAlpha
* 防止图标不是纯黑的问题 iconView.setColorFilter(animColor ?: (if (isDarkIconMode) Color.BLACK else Color.WHITE))
* 图标在任何场景下跟随状态栏其它图标保持半透明 } else {
*/ iconView.alpha = 1f
iconView.alpha = if (animColor != null) 1f else statusBarIconAlpha iconView.colorFilter = null
iconView.setColorFilter(animColor ?: (if (isDarkIconMode) Color.BLACK else Color.WHITE))
}
} }
} }
} }
@@ -573,8 +567,8 @@ object SystemUIHooker : YukiBaseHooker() {
private fun updateStatusBarIconAlpha(container: ViewGroup) { private fun updateStatusBarIconAlpha(container: ViewGroup) {
val iconStateMethod = container.current().method { name = "getIconState"; param(StatusBarIconViewClass) } val iconStateMethod = container.current().method { name = "getIconState"; param(StatusBarIconViewClass) }
if (container.childCount > 0) container.children.forEach { iconView -> if (container.childCount > 0) container.children.forEach { iconView ->
val notification = iconView.current().field { name = "mNotification" }.cast<StatusBarNotification>() if (iconView !is ImageView) return@forEach
val iconAlpha = if (hasIgnoreStatusBarIconColor(iconView.context, notification)) 1f else statusBarIconAlpha val iconAlpha = if (iconView.isGrayscaleIcon()) statusBarIconAlpha else 1f
iconView.alpha = iconAlpha iconView.alpha = iconAlpha
iconStateMethod.call(iconView)?.current()?.field { name = "alpha"; superClass() }?.set(iconAlpha) iconStateMethod.call(iconView)?.current()?.field { name = "alpha"; superClass() }?.set(iconAlpha)
} }