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

修复动态设置图标时系统主题色透明问题

Browse Source
This commit is contained in:
Fankesyooni
2022-03-23 14:04:24 +08:00
parent 16e3780c97
commit 12ce701334
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,14 +383,12 @@ class HookEntry : YukiHookXposedInitProxy {
* @param context 实例 * @param context 实例
* @param expandedNf 通知实例 * @param expandedNf 通知实例
* @param iconImageView 通知图标实例 * @param iconImageView 通知图标实例
* @param origColor 通知图标系统默认颜色 - Android >= 12
* @param isExpanded 通知是否展开 - 可做最小化通知处理 * @param isExpanded 通知是否展开 - 可做最小化通知处理
*/ */
private fun PackageParam.compatNotifyIcon( private fun PackageParam.compatNotifyIcon(
context: Context, context: Context,
expandedNf: StatusBarNotification?, expandedNf: StatusBarNotification?,
iconImageView: ImageView, iconImageView: ImageView,
origColor: Int,
isExpanded: Boolean isExpanded: Boolean
) = runInSafe(msg = "compatNotifyIcon") { ) = runInSafe(msg = "compatNotifyIcon") {
/** 判断是 MIUI 样式就停止 Hook */ /** 判断是 MIUI 样式就停止 Hook */
@@ -432,7 +430,8 @@ class HookEntry : YukiHookXposedInitProxy {
var customIconColor: Int var customIconColor: Int
compatCustomIcon(isGrayscaleIcon, notifyInstance.opPkgName).also { compatCustomIcon(isGrayscaleIcon, notifyInstance.opPkgName).also {
customIcon = it.first customIcon = it.first
customIconColor = if (isUpperOfAndroidS || isExpanded) it.second else 0 customIconColor = if (isUpperOfAndroidS || isExpanded)
(it.second.takeIf { e -> e != 0 } ?: context.systemAccentColor) else 0
} }
/** 打印日志 */ /** 打印日志 */
printLogcat(tag = "NotifyIcon", context, notifyInstance, isCustom = customIcon != null, isGrayscaleIcon) printLogcat(tag = "NotifyIcon", context, notifyInstance, isCustom = customIcon != null, isGrayscaleIcon)
@@ -460,7 +459,7 @@ class HookEntry : YukiHookXposedInitProxy {
setColorFilter(supportColor) setColorFilter(supportColor)
/** Android 12 设置图标外圈颜色 */ /** Android 12 设置图标外圈颜色 */
if (isUpperOfAndroidS) background = if (isUpperOfAndroidS) background =
DrawableBuilder().rounded().solidColor(if (hasIconColor) iconColor else origColor).build() DrawableBuilder().rounded().solidColor(if (hasIconColor) iconColor else context.systemAccentColor).build()
/** 设置原生的背景边距 */ /** 设置原生的背景边距 */
if (isUpperOfAndroidS) setPadding(4.dp(context), 4.dp(context), 4.dp(context), 4.dp(context)) if (isUpperOfAndroidS) setPadding(4.dp(context), 4.dp(context), 4.dp(context), 4.dp(context))
} else iconImageView.apply { } else iconImageView.apply {
@@ -696,12 +695,6 @@ class HookEntry : YukiHookXposedInitProxy {
method { name = "handleHeaderViews" } method { name = "handleHeaderViews" }
else method { name = "resolveHeaderViews" } else method { name = "resolveHeaderViews" }
afterHook { afterHook {
/** 获取通知图标系统默认颜色 */
val origColor =
NotificationHeaderViewWrapperClass.clazz.method { name = "getOriginalIconColor" }
.ignoredError()
.get(instance).invoke<Int>() ?: 0
/** 获取小图标 */ /** 获取小图标 */
val iconImageView = val iconImageView =
NotificationHeaderViewWrapperClass.clazz NotificationHeaderViewWrapperClass.clazz
@@ -739,7 +732,7 @@ class HookEntry : YukiHookXposedInitProxy {
/** 非最小化优先级的通知全部设置为展开状态 */ /** 非最小化优先级的通知全部设置为展开状态 */
if (importance != 1) isExpanded = true if (importance != 1) isExpanded = true
/** 执行 Hook */ /** 执行 Hook */
compatNotifyIcon(iconImageView.context, expandedNf, iconImageView, origColor, isExpanded) compatNotifyIcon(iconImageView.context, expandedNf, iconImageView, isExpanded)
} }
} }
/** 记录实例 */ /** 记录实例 */

9
app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt
View File

@@ -267,6 +267,15 @@ fun Number.dp(context: Context) = dpFloat(context).toInt()
*/ */
fun Number.dpFloat(context: Context) = toFloat() * context.resources.displayMetrics.density fun Number.dpFloat(context: Context) = toFloat() * context.resources.displayMetrics.density
/**
* 获取系统主题色
* @return [Int] Android < 12 返回透明色
*/
val Context.systemAccentColor
get() = safeOfNan {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) resources.getColor(android.R.color.system_accent1_600) else 0
}
/** /**
* 是否为白色 * 是否为白色
* @return [Boolean] * @return [Boolean]