From 8a775b3fdd15beaec3bd9c1187486cd3ded3c394 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Wed, 25 Jun 2025 23:25:23 +0800 Subject: [PATCH] refactor: migrate and update to YukiHookAPI 1.3.0 --- app/build.gradle.kts | 2 + .../miui/notify/hook/entity/SystemUIHooker.kt | 414 +++++++++--------- .../notify/ui/activity/base/BaseActivity.kt | 17 +- .../utils/factory/BaseAdapterFactory.kt | 1 + .../utils/factory/DialogBuilderFactory.kt | 1 + .../notify/utils/factory/FunctionFactory.kt | 8 +- .../notify/utils/tool/BitmapCompatTool.kt | 6 +- app/src/main/res/layout/activity_main.xml | 29 ++ app/src/main/res/mipmap-xxhdpi/ic_kavaref.png | Bin 0 -> 17389 bytes .../sweet-dependency-config.yaml | 15 +- 10 files changed, 271 insertions(+), 222 deletions(-) create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_kavaref.png diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 659527e..31da98b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -81,6 +81,8 @@ dependencies { compileOnly(de.robv.android.xposed.api) implementation(com.highcapable.yukihookapi.api) ksp(com.highcapable.yukihookapi.ksp.xposed) + implementation(com.highcapable.kavaref.kavaref.core) + implementation(com.highcapable.kavaref.kavaref.extension) implementation(com.fankes.projectpromote.project.promote) implementation(com.github.topjohnwu.libsu.core) implementation(com.github.duanhong169.drawabletoolbox) diff --git a/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt b/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt index e04a414..e9caa36 100644 --- a/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt +++ b/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt @@ -30,7 +30,6 @@ import android.app.WallpaperManager import android.content.Context import android.content.Intent import android.content.IntentFilter -import android.graphics.Bitmap import android.graphics.Color import android.graphics.Outline import android.graphics.drawable.Drawable @@ -45,7 +44,9 @@ import android.widget.ImageView import android.widget.RemoteViews import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toDrawable +import androidx.core.graphics.scale import androidx.core.view.children +import androidx.core.view.isNotEmpty import androidx.core.view.isVisible import androidx.core.view.setPadding import com.fankes.miui.notify.R @@ -76,28 +77,19 @@ import com.fankes.miui.notify.utils.tool.ActivationPromptTool import com.fankes.miui.notify.utils.tool.BitmapCompatTool import com.fankes.miui.notify.utils.tool.IconAdaptationTool import com.fankes.miui.notify.utils.tool.SystemUITool -import com.highcapable.yukihookapi.hook.bean.VariousClass +import com.highcapable.kavaref.KavaRef.Companion.resolve +import com.highcapable.kavaref.condition.MethodCondition +import com.highcapable.kavaref.extension.VariousClass +import com.highcapable.kavaref.extension.classOf +import com.highcapable.kavaref.extension.isSubclassOf import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker -import com.highcapable.yukihookapi.hook.factory.constructor -import com.highcapable.yukihookapi.hook.factory.current -import com.highcapable.yukihookapi.hook.factory.extends -import com.highcapable.yukihookapi.hook.factory.field -import com.highcapable.yukihookapi.hook.factory.hasMethod import com.highcapable.yukihookapi.hook.factory.injectModuleAppResources -import com.highcapable.yukihookapi.hook.factory.method import com.highcapable.yukihookapi.hook.log.YLog import com.highcapable.yukihookapi.hook.param.HookParam import com.highcapable.yukihookapi.hook.type.android.ContextClass -import com.highcapable.yukihookapi.hook.type.android.DrawableClass -import com.highcapable.yukihookapi.hook.type.android.ImageViewClass import com.highcapable.yukihookapi.hook.type.android.NotificationClass import com.highcapable.yukihookapi.hook.type.android.RemoteViewsClass -import com.highcapable.yukihookapi.hook.type.android.StatusBarNotificationClass -import com.highcapable.yukihookapi.hook.type.java.ArrayListClass import com.highcapable.yukihookapi.hook.type.java.BooleanClass -import com.highcapable.yukihookapi.hook.type.java.BooleanType -import com.highcapable.yukihookapi.hook.type.java.FloatType -import com.highcapable.yukihookapi.hook.type.java.IntType import top.defaults.drawabletoolbox.DrawableBuilder /** @@ -238,13 +230,18 @@ object SystemUIHooker : YukiBaseHooker() { * @return [Context] or null */ private val globalContext - get() = SystemUIApplicationClass?.method { name = "getContext" }?.ignored()?.get()?.invoke() ?: appContext + get() = SystemUIApplicationClass?.resolve()?.optional(silent = true) + ?.firstMethodOrNull { name = "getContext" } + ?.invoke() ?: appContext /** * 是否为 MIUI 样式通知栏 - 旧版 - 新版一律返回 false * @return [Boolean] */ - private val isShowMiuiStyle get() = NotificationUtilClass.method { name = "showMiuiStyle" }.ignored().get().boolean() + private val isShowMiuiStyle + get() = NotificationUtilClass.resolve().optional(silent = true) + .firstMethodOrNull { name = "showMiuiStyle" } + ?.invoke() == true /** * 是否没有单独的 MIUI 通知栏样式 @@ -360,15 +357,19 @@ object SystemUIHooker : YukiBaseHooker() { */ private fun isGrayscaleIcon(context: Context, drawable: Drawable) = if (ConfigData.isEnableColorIconCompat.not()) safeOfFalse { - ContrastColorUtilClass.let { - it.method { - name = "isGrayscaleIcon" - param(DrawableClass) - }.get(it.method { - name = "getInstance" - param(ContextClass) - }.get().invoke(context)).boolean(drawable) - } + ContrastColorUtilClass.resolve() + .optional(silent = true) + .let { + it.firstMethodOrNull { + name = "isGrayscaleIcon" + parameters(Drawable::class) + }?.of( + it.firstMethodOrNull { + name = "getInstance" + parameters(Context::class) + }?.invoke(context) + )?.invokeQuietly(drawable) == true + } } else BitmapCompatTool.isGrayscaleDrawable(drawable) /** @@ -408,10 +409,10 @@ object SystemUIHooker : YukiBaseHooker() { /** 刷新状态栏小图标 */ private fun refreshStatusBarIcons() = runInSafe { - StatusBarIconViewClass.field { name = "mNotification" }.also { result -> + StatusBarIconViewClass.resolve().optional(silent = true).firstFieldOrNull { name = "mNotification" }?.also { result -> notificationIconContainer?.children?.forEach { /** 得到通知实例 */ - val nf = result.get(it).cast() ?: return + val nf = result.of(it).get() ?: return /** 刷新状态栏图标 */ compatStatusIcon(it.context, nf, nf.notification.smallIcon.loadDrawable(it.context)).also { pair -> pair.first.let { e -> (it as? ImageView?)?.setImageDrawable(e) } @@ -423,14 +424,13 @@ object SystemUIHooker : YukiBaseHooker() { /** 刷新通知小图标 */ private fun refreshNotificationIcons() = runInSafe { val updateNotificationMethodName = "updateNotificationsOnDensityOrFontScaleChanged" - if (StatusBarNotificationPresenterClass.hasMethod { name = updateNotificationMethodName }) - notificationPresenter?.current(ignored = true)?.method { - name = updateNotificationMethodName - emptyParam() - }?.call() - else settingsManager?.current { - field { name = "notifStyle" }.set(-100) - method { name = "onNotifStyleChanged" }.call() + val result = notificationPresenter?.resolve()?.optional(silent = true)?.firstMethodOrNull { + name = updateNotificationMethodName + emptyParameters() + }?.invoke() + if (result == null) settingsManager?.resolve()?.optional(silent = true)?.apply { + firstFieldOrNull { name = "notifStyle" }?.set(-100) + firstMethodOrNull { name = "onNotifStyleChanged" }?.invoke() } } @@ -645,7 +645,7 @@ object SystemUIHooker : YukiBaseHooker() { */ private fun ImageView.isGrayscaleIcon(): Boolean { /** 获取 [StatusBarNotification] 实例 */ - val notifyInstance = current().field { name = "mNotification" }.cast() ?: return false + val notifyInstance = resolve().optional().firstFieldOrNull { name = "mNotification" }?.get() ?: return false /** 获取通知小图标 */ val iconDrawable = notifyInstance.notification?.smallIcon?.loadDrawable(context) ?: return false @@ -669,7 +669,7 @@ object SystemUIHooker : YukiBaseHooker() { * @param animColor 动画过渡颜色 */ private fun updateStatusBarIconsColor(container: ViewGroup, isDarkIconMode: Boolean = this.isDarkIconMode, animColor: Int? = null) { - if (container.childCount > 0) container.children.forEach { iconView -> + if (container.isNotEmpty()) container.children.forEach { iconView -> if (iconView !is ImageView) return@forEach updateStatusBarIconColor(iconView, isDarkIconMode, animColor) } @@ -699,12 +699,15 @@ object SystemUIHooker : YukiBaseHooker() { * @param container 当前 [NotificationIconContainerClass] 的实例 */ private fun updateStatusBarIconsAlpha(container: ViewGroup) { - val iconStatesMap = container.current().field { name = "mIconStates" }.cast>() - if (container.childCount > 0) container.children.forEach { iconView -> + val iconStatesMap = container.resolve().optional().firstFieldOrNull { name = "mIconStates" }?.get>() + if (container.isNotEmpty()) container.children.forEach { iconView -> if (iconView !is ImageView) return@forEach val iconAlpha = if (iconView.isGrayscaleIcon()) statusBarIconAlpha else 1f iconView.alpha = iconAlpha - iconStatesMap?.get(iconView)?.current()?.field { name { it == "alpha" || it == "mAlpha" }; superClass() }?.set(iconAlpha) + iconStatesMap?.get(iconView)?.resolve()?.optional()?.firstFieldOrNull { + name { it == "alpha" || it == "mAlpha" } + superclass() + }?.set(iconAlpha) } } @@ -713,7 +716,7 @@ object SystemUIHooker : YukiBaseHooker() { * @param instance 被 Hook 的 Method 的实例 */ private fun hookStatusBarMaxStaticIcons(instance: Any) { - val maxStaticIconsField = NotificationIconContainerClass.field { + val maxStaticIconsResolver = NotificationIconContainerClass.resolve().optional().firstFieldOrNull { name { /** 旧版名称 */ val oldVersion = it == "mMaxStaticIcons" @@ -725,22 +728,22 @@ object SystemUIHooker : YukiBaseHooker() { val newVersion = it == "mMaxIcons" oldVersion || oldVersion2 || newVersion } - }.get(instance) + }?.of(instance) ?: return if (statusBarMaxStaticIcons == -1 || /** 系统设置内修改，模块同步更新 */ - moduleLastSetStatusBarMaxStaticIcons != maxStaticIconsField.int()) { - statusBarMaxStaticIcons = maxStaticIconsField.int() + moduleLastSetStatusBarMaxStaticIcons != maxStaticIconsResolver.get()) { + statusBarMaxStaticIcons = maxStaticIconsResolver.get() ?: return } if (!ConfigData.isEnableLiftedStatusIconCount) { - maxStaticIconsField.set(statusBarMaxStaticIcons) + maxStaticIconsResolver.set(statusBarMaxStaticIcons) return } /** 解除状态栏通知图标个数限制 */ if (isShowNotificationIcons) { moduleLastSetStatusBarMaxStaticIcons = ConfigData.liftedStatusIconCount.let { if (it in 0..100) it else 5 } - maxStaticIconsField.set(moduleLastSetStatusBarMaxStaticIcons) + maxStaticIconsResolver.set(moduleLastSetStatusBarMaxStaticIcons) } else { - maxStaticIconsField.set(0) + maxStaticIconsResolver.set(0) moduleLastSetStatusBarMaxStaticIcons = 0 } } @@ -754,8 +757,8 @@ object SystemUIHooker : YukiBaseHooker() { if (isNotHasAbsoluteMiuiStyle && isShowMiuiStyle) return /** 获取小图标 */ - val iconImageView = NotificationHeaderViewWrapperClass - .field { name = "mIcon" }.get(wrapper).cast() ?: return + val iconImageView = NotificationHeaderViewWrapperClass.resolve().optional() + .firstFieldOrNull { name = "mIcon" }?.of(wrapper)?.get() ?: return /** 获取 [ExpandableNotificationRowClass] */ val rowPair = wrapper.getRowPair() @@ -788,16 +791,15 @@ object SystemUIHooker : YukiBaseHooker() { * 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass] * 获取其中的得到通知方法 */ - val row = NotificationViewWrapperClass.field { + val row = NotificationViewWrapperClass.resolve().optional().firstFieldOrNull { name = "mRow" - }.get(this).any()?.also { - isExpanded = ExpandableNotificationRowClass.method { + }?.of(this)?.get()?.also { + isExpanded = ExpandableNotificationRowClass.resolve().optional().firstMethodOrNull { name = "isExpanded" - param(BooleanType) - returnType = BooleanType - }.get(it).boolean(false) - } - return Pair(isExpanded, row) + parameters(Boolean::class) + returnType = Boolean::class + }?.of(it)?.invoke(false) == true + }; return isExpanded to row } /** @@ -805,15 +807,18 @@ object SystemUIHooker : YukiBaseHooker() { * @return [StatusBarNotification] or null */ private fun Any?.getSbn() = - ExpandableNotificationRowClass - .field { name = "mEntry" } - .get(this) - .current(ignored = true) - ?.field { name = "mSbn" } - ?.cast() - ?: ExpandableNotificationRowClass - .method { name = "getStatusBarNotification" } - .get(this).invoke() + ExpandableNotificationRowClass.resolve() + .optional(silent = true) + .firstFieldOrNull { + name = "mEntry" + }?.of(this)?.get()?.resolve() + ?.optional(silent = true) + ?.firstFieldOrNull { name = "mSbn" } + ?.get() + ?: ExpandableNotificationRowClass.resolve() + .optional(silent = true) + .firstMethodOrNull { name = "getStatusBarNotification" } + ?.of(this)?.invoke() /** * 根据当前 [ImageView] 的父布局克隆一个新的 [ImageView] @@ -916,71 +921,77 @@ object SystemUIHooker : YukiBaseHooker() { /** 注入 MIUI 自己增加的一个工具类 */ NotificationUtilClass.apply { /** 强制回写系统的状态栏图标样式为原生 */ - method { + resolve().optional().method { name { it == "shouldSubstituteSmallIcon" || it == "shouldSubstituteSmallIconForStatusBarNotification" } - param { it[0] extends StatusBarNotificationClass } + parameters { it.first() isSubclassOf StatusBarNotification::class } }.hookAll().replaceToFalse() var isUseLegacy = false /** * 强制修改 getCustomAppIcon 获取的图标为 smallIcon * 部分系统没有 "getCustomAppIcon" 这个方法 - 所以直接忽略 */ - if (hasMethod { name = "getCustomAppIcon" }) - method { - name = "getCustomAppIcon" - param(NotificationClass, ContextClass) - }.hook().after { - val nf = args().first().cast() - val context = args(index = 1).cast() - val iconBitmap = nf?.smallIcon?.loadDrawable(context)?.toBitmap() - result = if (context != null && iconBitmap != null && !iconBitmap.isRecycled) - iconBitmap.toDrawable(context.resources) - else null - } + resolve().optional(silent = true).firstMethodOrNull { + name = "getCustomAppIcon" + parameters(Notification::class, Context::class) + }?.hook()?.after { + val nf = args().first().cast() + val context = args(index = 1).cast() + val iconBitmap = nf?.smallIcon?.loadDrawable(context)?.toBitmap() + result = if (context != null && iconBitmap != null && !iconBitmap.isRecycled) + iconBitmap.toDrawable(context.resources) + else null + } /** * 强制回写系统的状态栏图标样式为原生 * 部分系统没有 "getSmallIcon" 这个方法 - 所以直接忽略 */ - if (hasMethod { name = "getSmallIcon" }) - method { - name = "getSmallIcon" - param { it[0] extends StatusBarNotificationClass && it[1] == IntType } - }.remedys { - method { - name = "getSmallIcon" - param(ExpandedNotificationClass) - } - method { - name = "getSmallIcon" - param { it[0] == ContextClass && it[1] extends StatusBarNotificationClass } - }.onFind { isUseLegacy = true } - }.hook().after { - (globalContext ?: args().first().cast())?.also { context -> - val expandedNf = args(if (isUseLegacy) 1 else 0).cast() - /** Hook 状态栏小图标 */ - compatStatusIcon( - context = context, - nf = expandedNf, - iconDrawable = result()?.loadDrawable(context) - ).also { pair -> if (pair.second) result = Icon.createWithBitmap(pair.first?.toBitmap()) } - } + val getSmallIconCondition1 = MethodCondition().apply { + name = "getSmallIcon" + parameters { it[0] isSubclassOf StatusBarNotification::class && it[1] == classOf() } + } + val getSmallIconCondition2 = MethodCondition().apply { + name = "getSmallIcon" + parameters(ExpandedNotificationClass) + } + val getSmallIconCondition3 = MethodCondition().apply { + name = "getSmallIcon" + parameters { it[0] == classOf() && it[1] isSubclassOf StatusBarNotification::class } + } + val getSmallIconResolver = resolve().optional(silent = true) + val getSmallIcon = getSmallIconResolver.firstMethodOrNull(getSmallIconCondition1) + ?: getSmallIconResolver.firstMethodOrNull(getSmallIconCondition2) + ?: getSmallIconResolver.firstMethodOrNull(getSmallIconCondition3) + ?.also { isUseLegacy = true } + getSmallIcon?.hook()?.after { + (globalContext ?: args().first().cast())?.also { context -> + val expandedNf = args(if (isUseLegacy) 1 else 0).cast() + /** Hook 状态栏小图标 */ + compatStatusIcon( + context = context, + nf = expandedNf, + iconDrawable = result()?.loadDrawable(context) + ).also { pair -> if (pair.second) result = Icon.createWithBitmap(pair.first?.toBitmap()) } } + } } /** 焦点通知深色模式切换点 */ - FocusedNotifPromptViewClass?.apply { - method { + FocusedNotifPromptViewClass?.resolve()?.optional()?.apply { + firstMethodOrNull { name = "onDarkChanged" - param(ArrayListClass, FloatType, IntType, IntType, IntType, BooleanType) - }.hook().after { + parameters(ArrayList::class, Float::class, Int::class, Int::class, Int::class, Boolean::class) + }?.hook()?.after { val isDark = args(index = 1).float() - val mIcon = field { name = "mIcon" }.get(instance) + val mIcon = firstFieldOrNull { name = "mIcon" }?.of(instance)?.get() if (ConfigData.isEnableModuleLog) - YLog.debug("FocusedNotifPromptView DEBUG $isDark ${mIcon.any()}") - mIcon.current()?.superClass()?.method { name = "setColorFilter" }?.call(if (isDark <= 0.5f) Color.WHITE else Color.BLACK) + YLog.debug("FocusedNotifPromptView DEBUG $isDark $mIcon") + mIcon?.resolve()?.optional()?.firstMethodOrNull { + name = "setColorFilter" + superclass() + }?.invoke(if (isDark <= 0.5f) Color.WHITE else Color.BLACK) } } /** 去他妈的焦点通知彩色图标 */ - FocusUtilsClass?.apply { + FocusUtilsClass?.resolve()?.optional()?.apply { fun HookParam.hookTickerDarkIcon(isDark: Boolean) { (globalContext ?: args().first().cast())?.also { context -> val expandedNf = args().first().cast() @@ -992,37 +1003,33 @@ object SystemUIHooker : YukiBaseHooker() { iconDrawable = small?.loadDrawable(context) ).also { pair -> val originalBitmap = pair.first?.toBitmap() - val bitmap = originalBitmap?.let { Bitmap.createScaledBitmap(it, 50, 50, true) } + val bitmap = originalBitmap?.scale(50, 50) result = Icon.createWithBitmap(bitmap).apply { if (pair.second) setTint(if (isDark) Color.BLACK else Color.WHITE) } } } } - method { + firstMethodOrNull { name = "getStatusBarTickerDarkIcon" - param(StatusBarNotificationClass) - }.remedys { - method { - name = "getStatusBarTickerDarkIcon" - param(ExpandedNotificationClass) + parameters { + (it.first() == classOf() || + it.first() == ExpandedNotificationClass) && it.size == 1 } - }.hook().after { hookTickerDarkIcon(isDark = true) } - method { + }?.hook()?.after { hookTickerDarkIcon(isDark = true) } + firstMethodOrNull { name = "getStatusBarTickerIcon" - param(StatusBarNotificationClass) - }.remedys { - method { - name = "getStatusBarTickerIcon" - param(ExpandedNotificationClass) + parameters { + (it.first() == classOf() || + it.first() == ExpandedNotificationClass) && it.size == 1 } - }.hook().after { hookTickerDarkIcon(isDark = false) } + }?.hook()?.after { hookTickerDarkIcon(isDark = false) } } /** 注入状态栏通知图标实例 */ - StatusBarIconViewClass.method { + StatusBarIconViewClass.resolve().optional().firstMethodOrNull { name = "updateIconColor" - emptyParam() - }.ignored().hook().after { + emptyParameters() + }?.hook()?.after { val iconView = instance() - val expandedNf = iconView.current().field { name = "mNotification" }.cast() + val expandedNf = iconView.resolve().optional().firstFieldOrNull { name = "mNotification" }?.get() /** Hook 状态栏小图标 */ compatStatusIcon( context = iconView.context, @@ -1039,13 +1046,13 @@ object SystemUIHooker : YukiBaseHooker() { * 在 Android 15 中，这个类被移除变成了 `interface`，所以判断并跳过 Hook 行为 */ val isPlaceholder = NotificationIconAreaControllerClass?.isInterface == true - if (!isPlaceholder) NotificationIconAreaControllerClass?.apply { + if (!isPlaceholder) NotificationIconAreaControllerClass?.resolve()?.optional()?.apply { /** Hook 深色图标模式改变 */ - method { + firstMethodOrNull { name = "onDarkChanged" - paramCount { it > 0 } - }.hook().after { - field { name = "mNotificationIcons" }.get(instance).cast()?.also { + parameterCount { it > 0 } + }?.hook()?.after { + firstFieldOrNull { name = "mNotificationIcons" }?.of(instance)?.get()?.also { /** 重新设置通知图标容器实例 */ notificationIconContainer = it when (args(index = 1).float()) { @@ -1065,7 +1072,7 @@ object SystemUIHooker : YukiBaseHooker() { method { name { it == "updateNotificationIcons" || it.startsWith("onChanged") } }.hookAll().after { - field { name = "mNotificationIcons" }.get(instance).cast()?.also { + firstFieldOrNull { name = "mNotificationIcons" }?.of(instance)?.get()?.also { /** 重新设置通知图标容器实例 */ notificationIconContainer = it updateStatusBarIconsColor(it) @@ -1073,11 +1080,11 @@ object SystemUIHooker : YukiBaseHooker() { delayedRun { updateStatusBarIconsColor(it) } } } - } else MiuiClockClass?.apply { - method { + } else MiuiClockClass?.resolve()?.optional()?.apply { + firstMethodOrNull { name = "onDarkChanged" - paramCount { it > 4 } - }.hook().after { + parameterCount { it > 4 } + }?.hook()?.after { notificationIconContainer?.let { when (args(index = 1).float()) { 1.0f -> { @@ -1094,24 +1101,22 @@ object SystemUIHooker : YukiBaseHooker() { } } /** 注入状态栏通知图标实例 */ - StatusBarIconViewClass.apply { - method { + StatusBarIconViewClass.resolve().optional().apply { + firstMethodOrNull { name = "setNotification" - param(StatusBarNotificationClass) - }.remedys { - method { - name = "setNotification" - param(ExpandedNotificationClass) + parameters { + (it.first() == classOf() || + it.first() == ExpandedNotificationClass) && it.size == 1 } - }.hook().after { + }?.hook()?.after { /** 注册壁纸颜色监听 */ if (args().first().any() != null) instance().also { registerWallpaperColorChanged(it) } } /** Hook 深色图标模式改变 */ - if (isPlaceholder) method { + if (isPlaceholder) firstMethodOrNull { name = "onDarkChanged" - paramCount { it > 4 } - }.hook().after { + parameterCount { it > 4 } + }?.hook()?.after { val self = instance() when (args(index = 1).float()) { 1.0f -> { @@ -1127,24 +1132,24 @@ object SystemUIHooker : YukiBaseHooker() { } } /** 注入设置管理器实例 */ - SettingsManagerClass?.constructor()?.hookAll()?.after { settingsManager = instance } + SettingsManagerClass?.resolve()?.optional()?.constructor {}?.hookAll()?.after { settingsManager = instance } /** 注入通知控制器实例 */ - StatusBarNotificationPresenterClass.constructor().hookAll().after { notificationPresenter = instance } + StatusBarNotificationPresenterClass.resolve().optional().constructor {}.hookAll().after { notificationPresenter = instance } /** 注入状态栏通知图标容器实例 */ NotificationIconContainerClass.apply { - method { + resolve().optional().firstMethodOrNull { name = "applyIconStates" - }.hook().after { updateStatusBarIconsAlpha(instance()) } - method { + }?.hook()?.after { updateStatusBarIconsAlpha(instance()) } + resolve().optional().firstMethodOrNull { name = "resetViewStates" - }.hook().after { + }?.hook()?.after { updateStatusBarIconsAlpha(instance()) /** HyperOS 系统设置修改通知图标个数触发此方法 */ hookStatusBarMaxStaticIcons(instance) } - method { + resolve().optional().firstMethodOrNull { name { it == "calculateIconTranslations" || it == "calculateIconXTranslations" } - }.hook().after { + }?.hook()?.after { /** 缓存实例 */ notificationIconContainer = instance() /** 修复部分开发版状态栏图标只能显示一个的问题 */ @@ -1154,38 +1159,38 @@ object SystemUIHooker : YukiBaseHooker() { } } /** 旧版方法 (A13 MIUI) - 新版不存在 */ - method { + resolve().optional(silent = true).firstMethodOrNull { name = "updateState" - }.ignored().hook().before { hookStatusBarMaxStaticIcons(instance) } + }?.hook()?.before { hookStatusBarMaxStaticIcons(instance) } /** 新版方法 (A14 MIUI14 / A14 HyperOS) - 旧版不存在 */ - method { + resolve().optional(silent = true).firstMethodOrNull { name = "onMeasure" - }.ignored().hook().before { hookStatusBarMaxStaticIcons(instance) } + }?.hook()?.before { hookStatusBarMaxStaticIcons(instance) } /** 旧版方法 - 新版不存在 */ - method { + resolve().optional(silent = true).firstMethodOrNull { name = "setMaxStaticIcons" - param(IntType) - }.ignored().hook().before { isShowNotificationIcons = args().first().int() > 0 } + parameters(Int::class) + }?.hook()?.before { isShowNotificationIcons = args().first().int() > 0 } /** 旧版方法 - 新版 (A15 HyperOS) 不存在 */ - method { + resolve().optional(silent = true).firstMethodOrNull { name = "miuiShowNotificationIcons" - param(BooleanType) - }.ignored().hook().before { isShowNotificationIcons = args().first().boolean() } + parameters(Boolean::class) + }?.hook()?.before { isShowNotificationIcons = args().first().boolean() } } /** 注入原生通知包装纸实例 */ - NotificationHeaderViewWrapperClass.apply { - method { + NotificationHeaderViewWrapperClass.resolve().optional().apply { + firstMethodOrNull { name { it == "resolveHeaderViews" || it == "handleHeaderViews" || it == "resolveViews" } - }.hook().after { hookNotificationViewWrapper(instance) } - method { + }?.hook()?.after { hookNotificationViewWrapper(instance) } + firstMethodOrNull { name = "onContentUpdated" - }.hook().after { hookNotificationViewWrapper(instance) } + }?.hook()?.after { hookNotificationViewWrapper(instance) } } /** 修改 MIUI 风格通知栏的通知图标 */ - MiuiNotificationViewWrapperClass?.apply { - constructor().hook().after { + MiuiNotificationViewWrapperClass?.resolve()?.optional()?.apply { + constructor {}.hookAll().after { val nf = instance.getRowPair().second.getSbn() ?: return@after - field { name = "mAppIcon" }.get(instance).cast()?.clone { + firstFieldOrNull { name = "mAppIcon" }?.of(instance)?.get()?.clone { if (ConfigData.isEnableReplaceMiuiStyleNotifyIcon || ConfigData.isEnableNotifyIconForceAppIcon) compatNotifyIcon(context, nf, iconView = this, isUseMaterial3Style = true, isMiuiPanel = true) else setImageDrawable(nf.miuiAppIcon?.loadDrawable(context) ?: context.appIconOf(nf.packageName)) @@ -1193,16 +1198,16 @@ object SystemUIHooker : YukiBaseHooker() { } } /** 修改 MIUI 风格通知栏的通知图标 - 折叠通知 */ - MiuiNotificationChildrenContainerClass?.apply { + MiuiNotificationChildrenContainerClass?.resolve()?.optional()?.apply { /** 替换通知小图标 */ - method { + firstMethodOrNull { name = "updateAppIcon" - param(BooleanType) - }.hook().after { - field { name = "mAppIcon" }.get(instance).cast()?.apply { - val nf = NotificationChildrenContainerClass.field { + parameters(Boolean::class) + }?.hook()?.after { + firstFieldOrNull { name = "mAppIcon" }?.of(instance)?.get()?.apply { + val nf = NotificationChildrenContainerClass.resolve().optional().firstFieldOrNull { name = "mContainingNotification" - }.get(instance).any()?.getSbn() ?: return@after + }?.of(instance)?.get()?.getSbn() ?: return@after if (ConfigData.isEnableReplaceMiuiStyleNotifyIcon || ConfigData.isEnableNotifyIconForceAppIcon) compatNotifyIcon(context, nf, iconView = this, isUseMaterial3Style = true, isMiuiPanel = true) else setImageDrawable(nf.miuiAppIcon?.loadDrawable(context) ?: context.appIconOf(nf.packageName)) @@ -1210,29 +1215,28 @@ object SystemUIHooker : YukiBaseHooker() { } } /** 干掉下拉通知图标自动设置回 APP 图标的方法 */ - NotificationHeaderViewWrapperInjectorClass?.apply { - method { + NotificationHeaderViewWrapperInjectorClass?.resolve()?.optional(silent = true)?.apply { + firstMethodOrNull { name = "setAppIcon" - param(ContextClass, ImageViewClass, ExpandedNotificationClass) - }.remedys { - method { - name = "setAppIcon" - param(ImageViewClass, ExpandedNotificationClass) - } - }.ignored().hook().intercept() - method { + parameters(Context::class, ImageView::class, ExpandedNotificationClass) + }?.hook()?.intercept() + firstMethodOrNull { + name = "setAppIcon" + parameters(ImageView::class, ExpandedNotificationClass) + }?.hook()?.intercept() + firstMethodOrNull { name = "resetIconBgAndPaddings" - param(ImageViewClass, ExpandedNotificationClass) - }.ignored().hook().intercept() + parameters(ImageView::class, ExpandedNotificationClass) + }?.hook()?.intercept() } - NotificationContentInflaterInjectorClass?.method { + NotificationContentInflaterInjectorClass?.resolve()?.optional()?.firstMethodOrNull { name = "handleAppIcon" /** * MIUI 14 ([RemoteViewsClass], [NotificationClass]) * HyperOS ([RemoteViewsClass], [NotificationClass], [ContextClass]) * HyperOS 2.0 ([RemoteViewsClass], [NotificationClass], [ContextClass], [BooleanClass]) */ - paramCount(numRange = 2..4) + parameterCount { it in 2..4 } }?.hook()?.intercept() /** * 尝试修复从 MIUI 14 开始出现的一个崩溃问题 @@ -1245,14 +1249,14 @@ object SystemUIHooker : YukiBaseHooker() { * } * ``` */ - NotificationStatClass?.method { + NotificationStatClass?.resolve()?.optional(silent = true)?.firstMethodOrNull { name = "isUnimportantEntry" - paramCount = 1 - }?.ignored()?.hook()?.replaceAny { - args().first().current(ignored = true).method { + parameterCount = 1 + }?.hook()?.replaceAny { + args().first().resolve().optional().firstMethodOrNull { name = "getSbn" - superClass() - }.invoke()?.let { sbn -> + superclass() + }?.invoke()?.let { sbn -> sbn.packageName == PackageName.SYSTEMUI && sbn.tag == "UNIMPORTANT" } ?: false } diff --git a/app/src/main/java/com/fankes/miui/notify/ui/activity/base/BaseActivity.kt b/app/src/main/java/com/fankes/miui/notify/ui/activity/base/BaseActivity.kt index 1ac24e7..1efbcf2 100644 --- a/app/src/main/java/com/fankes/miui/notify/ui/activity/base/BaseActivity.kt +++ b/app/src/main/java/com/fankes/miui/notify/ui/activity/base/BaseActivity.kt @@ -20,21 +20,20 @@ * * This file is created by fankes on 2022/1/30. */ -@file:Suppress("DEPRECATION") - package com.fankes.miui.notify.ui.activity.base import android.os.Build import android.os.Bundle +import android.view.LayoutInflater import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat import androidx.core.view.WindowCompat import androidx.viewbinding.ViewBinding import com.fankes.miui.notify.R import com.fankes.miui.notify.utils.factory.isNotSystemInDarkMode -import com.highcapable.yukihookapi.hook.factory.current -import com.highcapable.yukihookapi.hook.factory.method -import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass +import com.highcapable.kavaref.KavaRef.Companion.resolve +import com.highcapable.kavaref.extension.genericSuperclassTypeArguments +import com.highcapable.kavaref.extension.toClassOrNull abstract class BaseActivity : AppCompatActivity() { @@ -50,10 +49,11 @@ abstract class BaseActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) isMainThreadRunning = true - binding = current().generic()?.argument()?.method { + val bindingClass = javaClass.genericSuperclassTypeArguments().firstOrNull()?.toClassOrNull() + binding = bindingClass?.resolve()?.optional()?.firstMethodOrNull { name = "inflate" - param(LayoutInflaterClass) - }?.get()?.invoke(layoutInflater) ?: error("binding failed") + parameters(LayoutInflater::class) + }?.invoke(layoutInflater) ?: error("binding failed") if (Build.VERSION.SDK_INT >= 35) binding.root.fitsSystemWindows = true setContentView(binding.root) /** 隐藏系统的标题栏 */ @@ -63,6 +63,7 @@ abstract class BaseActivity : AppCompatActivity() { isAppearanceLightStatusBars = isNotSystemInDarkMode isAppearanceLightNavigationBars = isNotSystemInDarkMode } + @Suppress("DEPRECATION") ResourcesCompat.getColor(resources, R.color.colorThemeBackground, null).also { window?.statusBarColor = it window?.navigationBarColor = it diff --git a/app/src/main/java/com/fankes/miui/notify/utils/factory/BaseAdapterFactory.kt b/app/src/main/java/com/fankes/miui/notify/utils/factory/BaseAdapterFactory.kt index cc998d4..1969320 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/factory/BaseAdapterFactory.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/factory/BaseAdapterFactory.kt @@ -64,6 +64,7 @@ class BaseAdapterCreater(val context: Context) { * 绑定 [BaseAdapter] 到 [ListView] * @param bindViews 回调 - ([VB] 每项,[Int] 下标) */ + @Suppress("DEPRECATION") inline fun onBindViews(crossinline bindViews: (binding: VB, position: Int) -> Unit) { baseAdapter = object : BaseAdapter() { override fun getCount() = listDataCallback?.let { it() }?.size ?: 0 diff --git a/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt b/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt index 575f238..bfcbd82 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt @@ -68,6 +68,7 @@ inline fun Context.showDialog(initiate: DialogBuilder<*>.() -> Unit) = DialogBui * @param context 实例 * @param bindingClass [ViewBinding] 的 [Class] 实例 or null */ +@Suppress("DEPRECATION") class DialogBuilder(val context: Context, private val bindingClass: Class<*>? = null) { /** 实例对象 */ diff --git a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt index 88cb878..bf9cc6b 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt @@ -63,6 +63,8 @@ import androidx.core.app.NotificationManagerCompat import androidx.core.content.getSystemService import androidx.core.content.pm.PackageInfoCompat import androidx.core.content.res.ResourcesCompat +import androidx.core.graphics.createBitmap +import androidx.core.net.toUri import com.fankes.miui.notify.wrapper.BuildConfigWrapper import com.google.android.material.snackbar.Snackbar import com.highcapable.yukihookapi.hook.factory.hasClass @@ -148,6 +150,7 @@ val isNotMiSystem get() = !isMiSystem * 当前设备是否是 MIUI 定制 Android 系统 * @return [Boolean] 是否符合条件 */ +@Suppress("DEPRECATION") val isMIUI by lazy { "android.miui.R".hasClass() } /** @@ -541,7 +544,7 @@ val String.bitmap: Bitmap get() = unbase64.bitmap * @return [Bitmap] 圆角后的位图 - 失败会返回处理之前的位图 */ fun Bitmap.round(radius: Float): Bitmap = safeOf(default = this) { - Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888).also { out -> + createBitmap(width, height).also { out -> Canvas(out).also { canvas -> Paint().also { paint -> paint.isAntiAlias = true @@ -561,6 +564,7 @@ fun Bitmap.round(radius: Float): Bitmap = safeOf(default = this) { * @param default 默认值 * @return [String] */ +@Suppress("DEPRECATION") fun findPropString(key: String, default: String = "") = safeOf(default) { "android.os.SystemProperties".toClassOrNull()?.method { name = "get" @@ -634,7 +638,7 @@ fun Context.openBrowser(url: String, packageName: String = "") = runCatching { startActivity(Intent().apply { if (packageName.isNotBlank()) setPackage(packageName) action = Intent.ACTION_VIEW - data = Uri.parse(url) + data = url.toUri() /** 防止顶栈一样重叠在自己的 APP 中 */ flags = Intent.FLAG_ACTIVITY_NEW_TASK }) diff --git a/app/src/main/java/com/fankes/miui/notify/utils/tool/BitmapCompatTool.kt b/app/src/main/java/com/fankes/miui/notify/utils/tool/BitmapCompatTool.kt index c70579a..7c78c2d 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/tool/BitmapCompatTool.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/tool/BitmapCompatTool.kt @@ -32,6 +32,7 @@ import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.VectorDrawable import android.util.ArrayMap +import androidx.core.graphics.createBitmap import androidx.core.graphics.drawable.toBitmap import com.fankes.miui.notify.utils.factory.safeOfFalse import kotlin.math.abs @@ -77,7 +78,7 @@ object BitmapCompatTool { var width = bitmap.width if (height > 64 || width > 64) { if (tempCompactBitmap == null) { - tempCompactBitmap = Bitmap.createBitmap(64, 64, Bitmap.Config.ARGB_8888) + tempCompactBitmap = createBitmap(64, 64) .also { tempCompactBitmapCanvas = Canvas(it) } tempCompactBitmapPaint = Paint(Paint.FILTER_BITMAP_FLAG).apply { isFilterBitmap = true } } @@ -91,11 +92,12 @@ object BitmapCompatTool { val size = height * width ensureBufferSize(size) tempCompactBitmap?.getPixels(tempBuffer, 0, width, 0, 0, width, height) - for (i in 0 until size) + for (i in 0 until size) { if (isGrayscaleColor(tempBuffer[i]).not()) { cachedBitmapGrayscales[bitmap.generationId] = false return@let false } + } cachedBitmapGrayscales[bitmap.generationId] = true true } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 64aa8b4..b6a1207 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1457,6 +1457,35 @@ android:textColor="@color/colorTextGray" android:textSize="11sp" /> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/ic_kavaref.png b/app/src/main/res/mipmap-xxhdpi/ic_kavaref.png new file mode 100644 index 0000000000000000000000000000000000000000..1fd561699dd11d7d2f5e437fa936c010193f0528 GIT binary patch literal 17389 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 R2!L#Yl%A+RE_!Gl{C@>F9i0FG literal 0 HcmV?d00001 diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index 6cd8caf..6f19b26 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -22,7 +22,7 @@ repositories: plugins: com.android.application: alias: android-application - version: 8.9.0 + version: 8.9.3 org.jetbrains.kotlin.android: alias: kotlin-android version: 2.1.10 @@ -43,9 +43,14 @@ libraries: rovo89-xposed-api com.highcapable.yukihookapi: api: - version: 1.2.1 + version: 1.3.0 ksp-xposed: version-ref: ::api + com.highcapable.kavaref: + kavaref-core: + version: 1.0.0 + kavaref-extension: + version: 1.0.0 com.github.topjohnwu.libsu: core: version: 5.2.2 @@ -55,13 +60,13 @@ libraries: version: 1.0.7 com.squareup.okhttp3: okhttp: - version: 5.0.0-alpha.14 + version: 5.0.0-alpha.16 androidx.core: core-ktx: - version: 1.15.0 + version: 1.16.0 androidx.appcompat: appcompat: - version: 1.7.0 + version: 1.7.1 com.google.android.material: material: version: 1.12.0