From a61ed0cd2a995299efbf0c8650646e1f5a0f5c0d Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Thu, 24 Mar 2022 01:33:19 +0800 Subject: [PATCH] Merge code --- .../fankes/coloros/notify/hook/HookEntry.kt | 108 +++++++++--------- .../notify/utils/factory/FunctionFactory.kt | 3 +- .../notify/utils/tool/IconRuleManagerTool.kt | 2 +- .../coloros/notify/utils/tool/SystemUITool.kt | 2 +- app/src/main/res/layout/activity_main.xml | 4 +- 5 files changed, 61 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt index 478173d..a52cf61 100644 --- a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt +++ b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt @@ -27,14 +27,13 @@ import android.content.Context import android.content.Intent import android.graphics.Bitmap import android.graphics.Color -import android.graphics.Outline import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.Icon import android.graphics.drawable.VectorDrawable import android.service.notification.StatusBarNotification +import android.util.ArraySet import android.view.View -import android.view.ViewOutlineProvider import android.widget.ImageView import androidx.core.graphics.drawable.toBitmap import com.fankes.coloros.notify.application.CNNApplication.Companion.MODULE_PACKAGE_NAME @@ -62,10 +61,12 @@ import com.highcapable.yukihookapi.hook.factory.encase import com.highcapable.yukihookapi.hook.factory.field import com.highcapable.yukihookapi.hook.factory.method import com.highcapable.yukihookapi.hook.log.loggerD +import com.highcapable.yukihookapi.hook.log.loggerE import com.highcapable.yukihookapi.hook.log.loggerW import com.highcapable.yukihookapi.hook.param.PackageParam import com.highcapable.yukihookapi.hook.type.android.* 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 com.highcapable.yukihookapi.hook.type.java.LongType import com.highcapable.yukihookapi.hook.xposed.proxy.YukiHookXposedInitProxy @@ -108,6 +109,18 @@ class HookEntry : YukiHookXposedInitProxy { "com.coloros.systemui.statusbar.policy.SystemPromptController" ) + /** 根据多个版本存在不同的包名相同的类 */ + private val RoundRectDrawableUtilClass = VariousClass( + "com.oplusos.systemui.notification.util.RoundRectDrawableUtil", + "com.coloros.systemui.notification.util.RoundRectDrawableUtil" + ) + + /** 根据多个版本存在不同的包名相同的类 */ + private val RoundRectDrawableUtil_CompanionClass = VariousClass( + "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion", + "com.oplusos.systemui.notification.util.RoundRectDrawableUtil\$Companion" + ) + /** 根据多个版本存在不同的包名相同的类 */ private val DndAlertHelperClass = VariousClass( "com.oplusos.systemui.notification.helper.DndAlertHelper", @@ -149,7 +162,7 @@ class HookEntry : YukiHookXposedInitProxy { private var iconDatas = ArrayList() /** 缓存的状态栏小图标实例 */ - private var statusBarIconViews = HashSet() + private var statusBarIconViews = ArraySet() /** 缓存的通知小图标包装纸实例 */ private var notificationViewWrappers = HashSet() @@ -195,36 +208,49 @@ class HookEntry : YukiHookXposedInitProxy { * @param view 实例 */ private fun PackageParam.registerWallpaperColorChanged(view: View) = runInSafe { - if (isUpperOfAndroidS && !isWallpaperColorListenerSetUp) - WallpaperManager.getInstance(view.context).addOnColorsChangedListener({ _, _ -> refreshNotificationIcons() }, view.handler) + if (!isWallpaperColorListenerSetUp && isUpperOfAndroidS) view.apply { + WallpaperManager.getInstance(context).addOnColorsChangedListener({ _, _ -> refreshNotificationIcons() }, handler) + } isWallpaperColorListenerSetUp = true } /** 刷新状态栏小图标 */ private fun PackageParam.refreshStatusBarIcons() = runInSafe { - val unknown = StatusBarIconViewClass.clazz.field { name = "mIcon" } - val iconScaleField = StatusBarIconViewClass.clazz.field { name = "mIconScale" } - val methodUnused = StatusBarIconViewClass.clazz.method { name = "maybeUpdateIconScaleDimens" } - StatusBarIconViewClass.clazz.field { name = "mNotification" }.also { result -> + val nfField = StatusBarIconViewClass.clazz.field { name = "mNotification" } + val sRadiusField = StatusBarIconViewClass.clazz.field { name = "sIconRadiusFraction" } + val sNfSizeField = StatusBarIconViewClass.clazz.field { name = "sNotificationRoundIconSize" } + val roundUtil = RoundRectDrawableUtil_CompanionClass.clazz.method { + name = "getRoundRectDrawable" + param(DrawableClass, FloatType, IntType, IntType, ContextClass) + }.onNoSuchMethod { loggerE(msg = "Your system not support \"getRoundRectDrawable\"!", e = it) } + .get(RoundRectDrawableUtilClass.clazz.field { name = "Companion" }.get().self) + /** 启动一个线程防止卡顿 */ + Thread { statusBarIconViews.takeIf { it.isNotEmpty() }?.forEach { - /** 得到通知实例 */ - val nf = result.of(it) ?: return - val base = nf.notification.smallIcon.loadDrawable(it.context) + runInSafe { + /** 得到通知实例 */ + val nf = nfField.of(it) ?: return@Thread - /** 刷新状态栏图标 */ - val icon = compatStatusIcon( - context = it.context, - isGrayscaleIcon = isGrayscaleIcon(it.context, base), - packageName = nf.packageName, - drawable = base - ) - /** 移除诡异的间距 FIXME 间距总是有问题不知道为什么 */ - methodUnused.get(it).call() - // FIXME ignored this mabe bugss --> iconScaleField.get(it).set(if (icon.second) 0.75f else 0.68f) - it.setImageDrawable(icon.first.rounded(it.context)) - it.invalidate() + /** 得到原始通知图标 */ + val iconDrawable = nf.notification.smallIcon.loadDrawable(it.context) + /** 获取优化后的状态栏通知图标 */ + compatStatusIcon( + context = it.context, + isGrayscaleIcon = isGrayscaleIcon(it.context, iconDrawable), + packageName = nf.packageName, + drawable = iconDrawable + ).also { pair -> + /** 得到图标圆角 */ + val sRadius = sRadiusField.of(it) + + /** 得到缩放大小 */ + val sNfSize = sNfSizeField.of(it) + /** 在主线程设置图标 */ + it.post { it.setImageDrawable(roundUtil.invoke(pair.first, sRadius, sNfSize, sNfSize, it.context)) } + } + } } - } + }.start() } /** 刷新通知小图标 */ @@ -258,7 +284,7 @@ class HookEntry : YukiHookXposedInitProxy { * @return [Drawable] */ private fun Drawable.rounded(context: Context) = - safeOf(default = this) { BitmapDrawable(context.resources, toBitmap().round(10.dpFloat(context))) } + safeOf(default = this) { BitmapDrawable(context.resources, toBitmap().round(20.dpFloat(context))) } /** * 自动适配状态栏、通知栏自定义小图标 @@ -315,14 +341,13 @@ class HookEntry : YukiHookXposedInitProxy { drawable: Drawable, iconColor: Int, iconView: ImageView - ) { + ) = runInSafe { compatCustomIcon(isGrayscaleIcon, packageName).also { customPair -> when { customPair.first != null || isGrayscaleIcon -> iconView.apply { /** 重新设置图标 */ setImageBitmap(customPair.first ?: drawable.toBitmap()) - /** 设置不要裁切到边界 */ - clipToOutline = false + /** 是否开启 Android 12 风格 */ val isA12Style = prefs.getBoolean(ENABLE_ANDROID12_STYLE, isUpperOfAndroidS) @@ -341,6 +366,7 @@ class HookEntry : YukiHookXposedInitProxy { /** 新版图标着色 */ val newApplyColor = customPair.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: a12Style + /** 判断风格并开始 Hook */ if (isA12Style) { background = DrawableBuilder().rounded().solidColor(newApplyColor).build() @@ -354,18 +380,7 @@ class HookEntry : YukiHookXposedInitProxy { } else -> iconView.apply { /** 重新设置图标 */ - setImageDrawable(drawable) - /** 设置裁切到边界 */ - clipToOutline = true - /** 设置一个圆角轮廓裁切 */ - outlineProvider = object : ViewOutlineProvider() { - override fun getOutline(view: View, out: Outline) { - out.setRoundRect( - 0, 0, - view.width, view.height, 3.dpFloat(context) - ) - } - } + setImageDrawable(drawable.rounded(context)) /** 清除图标间距 */ setPadding(0, 0, 0, 0) /** 清除背景 */ @@ -509,17 +524,6 @@ class HookEntry : YukiHookXposedInitProxy { } } } - injectMember { - method { - name = "onConfigurationChanged" - param(ConfigurationClass) - } - intercept() - } - injectMember { - method { name = "updateIconScaleForSystemIcons" } - intercept() - } } /** 替换通知图标和样式 */ NotificationHeaderViewWrapperClass.hook { diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt index 84fc60f..01863d2 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt @@ -59,8 +59,7 @@ import java.io.ByteArrayOutputStream * 系统深色模式是否开启 * @return [Boolean] 是否开启 */ -val isSystemInDarkMode - get() = (appContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES +val isSystemInDarkMode get() = appContext.isSystemInDarkMode /** * 系统深色模式是否没开启 diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt index 315a344..e6b9413 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/IconRuleManagerTool.kt @@ -375,7 +375,7 @@ object IconRuleManagerTool { Handler().postDelayed({ context.getSystemService()?.cancel(1) cancel() - }, 500) + }, 1000) noCancelable() } } diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt index f8247df..36826de 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/tool/SystemUITool.kt @@ -40,7 +40,7 @@ object SystemUITool { context.showDialog { title = "重启系统界面" msg = "你确定要立即重启系统界面吗？\n\n" + - "部分 MIUI 系统使用了状态栏主题可能会发生主题失效的情况，这种情况请再重启一次即可。" + "重启过程会黑屏并等待进入锁屏重新解锁。" confirmButton { execShellSu(cmd = "pgrep systemui").also { pid -> if (pid.isNotBlank()) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 369f78b..e7acd2e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -398,7 +398,7 @@ android:layout_marginBottom="10dp" android:alpha="0.6" android:lineSpacingExtra="6dp" - android:text="无论任何版本，开启后都将使用 Android 12 原生通知图标方式为通知栏推送的通知图标增加外部圆形轮廓。" + android:text="无论任何版本，开启后都将使用 Android 12 原生通知图标方式为通知栏推送的通知图标增加外部圆形轮廓。\n目标为 Android 12 的系统将自动使用系统主题色着色。" android:textColor="@color/colorTextDark" android:textSize="12sp" /> @@ -475,7 +475,7 @@ android:layout_marginBottom="10dp" android:alpha="0.6" android:lineSpacingExtra="6dp" - android:text="首次安装请打开名单列表从云端更新数据，后期适配的内容也请手动打开名单列表重新拉取数据以检查更新，数据更新后重启系统界面即可生效。" + android:text="首次安装请打开名单列表从云端更新数据，后期适配的内容也请手动打开名单列表重新拉取数据以检查更新，数据更新后无需重启系统界面，实时生效。" android:textColor="@color/colorTextDark" android:textSize="12sp" />