Merge remote-tracking branch 'origin/main'

# Conflicts: # app/src/main/java/com/sevtinge/hyperceiler/module/base/dexkit/DexKit.java
ReChronoRain · Dec 10, 2024 · 7811d19 · 7811d19
2 parents 0ed1a78 + aa306eb
commit 7811d19
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 20 deletions.
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/home/dock/DockCustomNew.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/home/dock/DockCustomNew.kt
@@ -27,7 +27,6 @@ import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createHooks
 import com.github.kyuubiran.ezxhelper.finders.MethodFinder.`-Static`.methodFinder
 import com.sevtinge.hyperceiler.module.base.*
 import com.sevtinge.hyperceiler.module.base.dexkit.*
-import com.sevtinge.hyperceiler.module.hook.systemui.statusbar.model.public.MobileClass.miuiMobileIconBinder
 import com.sevtinge.hyperceiler.utils.*
 import com.sevtinge.hyperceiler.utils.blur.MiBlurUtilsKt.addMiBackgroundBlendColor
 import com.sevtinge.hyperceiler.utils.blur.MiBlurUtilsKt.clearMiBackgroundBlendColor
@@ -38,9 +37,7 @@ import com.sevtinge.hyperceiler.utils.blur.MiBlurUtilsKt.setMiViewBlurMode
 import com.sevtinge.hyperceiler.utils.blur.MiBlurUtilsKt.setPassWindowBlurEnabled
 import com.sevtinge.hyperceiler.utils.devicesdk.DisplayUtils.*
 import de.robv.android.xposed.*
-import org.luckypray.dexkit.query.*
 import org.luckypray.dexkit.query.enums.*
-import org.luckypray.dexkit.query.matchers.*
 import java.lang.reflect.*
 import java.util.function.*
 
@@ -54,13 +51,14 @@ object DockCustomNew : BaseHook() {
 
     private val showAnimationLambda by lazy {
         DexKit.findMember("ShowAnimationLambda") { bridge ->
-            bridge.findMethod(
-                FindMethod.create().matcher(
-                    MethodMatcher.create()
-                        .declaredClass("com.miui.home.launcher.compat.UserPresentAnimationCompatV12Phone")
-                        .name("lambda\$showUserPresentAnimation", StringMatchType.StartsWith)
-                )
-            ).singleOrNull()
+            bridge.findMethod {
+                matcher {
+                    declaredClass {
+                         className = "com.miui.home.launcher.compat.UserPresentAnimationCompatV12Phone"
+                    }
+                    name("lambda\$showUserPresentAnimation", StringMatchType.StartsWith)
+                }
+            }.singleOrNull()
         } as Method
     }
 

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/Dependency.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/Dependency.kt
@@ -1,3 +1,21 @@
+/*
+  * This file is part of HyperCeiler.
+
+  * HyperCeiler is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as
+  * published by the Free Software Foundation, either version 3 of the
+  * License.
+
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU Affero General Public License for more details.
+
+  * You should have received a copy of the GNU Affero General Public License
+  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  * Copyright (C) 2023-2024 HyperCeiler Contributions
+*/
 package com.sevtinge.hyperceiler.module.hook.systemui
 
 import com.github.kyuubiran.ezxhelper.*

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/other/DefaultPluginTheme.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/other/DefaultPluginTheme.kt
@@ -0,0 +1,35 @@
+/*
+  * This file is part of HyperCeiler.
+
+  * HyperCeiler is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as
+  * published by the Free Software Foundation, either version 3 of the
+  * License.
+
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU Affero General Public License for more details.
+
+  * You should have received a copy of the GNU Affero General Public License
+  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  * Copyright (C) 2023-2024 HyperCeiler Contributions
+*/
+package com.sevtinge.hyperceiler.module.hook.systemui.other
+
+import com.github.kyuubiran.ezxhelper.ClassUtils.loadClass
+import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createAfterHook
+import com.github.kyuubiran.ezxhelper.finders.MethodFinder.`-Static`.methodFinder
+import com.sevtinge.hyperceiler.utils.log.XposedLogUtils.*
+
+object DefaultPluginTheme {
+    fun initDefaultPluginTheme(mClassLoader: ClassLoader) {
+        loadClass("miui.systemui.util.ThemeUtils", mClassLoader).methodFinder()
+            .filterByName("getDefaultPluginTheme").single()
+            .createAfterHook {
+                it.result = true
+            }
+        logD("DefaultPluginTheme", "initDefaultPluginTheme hook success")
+    }
+}
diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/plugin/NewPluginHelperKt.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/plugin/NewPluginHelperKt.kt
@@ -26,6 +26,7 @@ import com.github.kyuubiran.ezxhelper.finders.MethodFinder.`-Static`.methodFinde
 import com.sevtinge.hyperceiler.module.base.*
 import com.sevtinge.hyperceiler.module.hook.systemui.*
 import com.sevtinge.hyperceiler.module.hook.systemui.controlcenter.*
+import com.sevtinge.hyperceiler.module.hook.systemui.other.*
 import com.sevtinge.hyperceiler.module.hook.systemui.statusbar.icon.v.*
 import com.sevtinge.hyperceiler.utils.api.*
 import java.lang.ref.*
@@ -65,6 +66,8 @@ object NewPluginHelperKt : BaseHook() {
                     if (mPrefsMap.getBoolean("system_framework_volume_separate_control") &&
                         mPrefsMap.getBoolean("system_framework_volume_separate_slider"))
                         NotificationVolumeSeparateSlider.initHideDeviceControlEntry(classLoader)
+                    if (mPrefsMap.getBoolean("system_ui_other_default_plugin_theme"))
+                        DefaultPluginTheme.initDefaultPluginTheme(classLoader)
                 }
 
                 factory.componentNames("miui.systemui.miplay.MiPlayPluginImpl") -> {
@@ -92,6 +95,8 @@ object NewPluginHelperKt : BaseHook() {
                     ) {
                         QSColor.pluginHook(classLoader)
                     }
+                    if (mPrefsMap.getBoolean("system_ui_other_default_plugin_theme"))
+                        DefaultPluginTheme.initDefaultPluginTheme(classLoader)
                 }
 
                 factory.componentNames("miui.systemui.controlcenter.MiuiControlCenter") -> {
@@ -113,6 +118,8 @@ object NewPluginHelperKt : BaseHook() {
                     ) {
                         QSColor.pluginHook(classLoader)
                     }
+                    if (mPrefsMap.getBoolean("system_ui_other_default_plugin_theme"))
+                        DefaultPluginTheme.initDefaultPluginTheme(classLoader)
                 }
 
                 factory.componentNames("miui.systemui.notification.NotificationStatPluginImpl") -> {
@@ -121,6 +128,8 @@ object NewPluginHelperKt : BaseHook() {
 
                     if (mPrefsMap.getBoolean("system_ui_statusbar_music_switch"))
                         FocusNotifLyric.initLoader(classLoader);
+                    if (mPrefsMap.getBoolean("system_ui_other_default_plugin_theme"))
+                        DefaultPluginTheme.initDefaultPluginTheme(classLoader)
                 }
 
                 else -> {
@@ -136,7 +145,6 @@ object NewPluginHelperKt : BaseHook() {
                         ShowDeviceName.initShowDeviceName(classLoader)
                     if (mPrefsMap.getBoolean("system_ui_control_center_disable_device_managed"))
                         DisableDeviceManaged.initDisableDeviceManaged(classLoader)
-
                     // logD(TAG, lpparam.packageName, "Plugin is ${factory.mComponentName}")
                     // 仅备份当前可用注入 ClassLoader
                     // miui.systemui.volume.VolumeDialogPlugin

diff --git a/.../java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/DualRowSignalHookV.kt b/.../java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/DualRowSignalHookV.kt
@@ -1,3 +1,21 @@
+/*
+  * This file is part of HyperCeiler.
+
+  * HyperCeiler is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as
+  * published by the Free Software Foundation, either version 3 of the
+  * License.
+
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU Affero General Public License for more details.
+
+  * You should have received a copy of the GNU Affero General Public License
+  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  * Copyright (C) 2023-2024 HyperCeiler Contributions
+*/
 package com.sevtinge.hyperceiler.module.hook.systemui.statusbar.model
 
 import android.content.*
@@ -58,14 +76,13 @@ class DualRowSignalHookV : BaseHook() {
 
     private val setImageResWithTintLight by lazy {
         DexKit.findMember("SetImageResWithTintLight") { bridge ->
-            bridge.findMethod(
-                FindMethod.create().matcher(
-                    MethodMatcher.create()
-                        .declaredClass(miuiMobileIconBinder)
-                        .modifiers(Modifier.STATIC)
-                        .name("setImageResWithTintLight", StringMatchType.Contains)
-                )
-            ).singleOrNull()
+            bridge.findMethod {
+                matcher {
+                    declaredClass(miuiMobileIconBinder)
+                    modifiers = Modifier.STATIC
+                    name("setImageResWithTintLight", StringMatchType.Contains)
+                }
+            }.singleOrNull()
         } as Method
     }
 

diff --git a/...n/java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/MobilePublicHookV.kt b/...n/java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/MobilePublicHookV.kt
@@ -1,3 +1,21 @@
+/*
+  * This file is part of HyperCeiler.
+
+  * HyperCeiler is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as
+  * published by the Free Software Foundation, either version 3 of the
+  * License.
+
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU Affero General Public License for more details.
+
+  * You should have received a copy of the GNU Affero General Public License
+  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  * Copyright (C) 2023-2024 HyperCeiler Contributions
+*/
 package com.sevtinge.hyperceiler.module.hook.systemui.statusbar.model
 
 import android.telephony.*

diff --git a/.../java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/public/MobileClass.kt b/.../java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/public/MobileClass.kt
@@ -1,3 +1,21 @@
+/*
+  * This file is part of HyperCeiler.
+
+  * HyperCeiler is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as
+  * published by the Free Software Foundation, either version 3 of the
+  * License.
+
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU Affero General Public License for more details.
+
+  * You should have received a copy of the GNU Affero General Public License
+  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  * Copyright (C) 2023-2024 HyperCeiler Contributions
+*/
 package com.sevtinge.hyperceiler.module.hook.systemui.statusbar.model.public
 
 import com.github.kyuubiran.ezxhelper.ClassUtils.loadClass

diff --git a/.../java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/public/MobilePrefs.kt b/.../java/com/sevtinge/hyperceiler/module/hook/systemui/statusbar/model/public/MobilePrefs.kt
@@ -1,3 +1,21 @@
+/*
+  * This file is part of HyperCeiler.
+
+  * HyperCeiler is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU Affero General Public License as
+  * published by the Free Software Foundation, either version 3 of the
+  * License.
+
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU Affero General Public License for more details.
+
+  * You should have received a copy of the GNU Affero General Public License
+  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  * Copyright (C) 2023-2024 HyperCeiler Contributions
+*/
 package com.sevtinge.hyperceiler.module.hook.systemui.statusbar.model.public
 
 import com.sevtinge.hyperceiler.module.base.BaseHook.*

diff --git a/...rc/main/java/com/sevtinge/hyperceiler/ui/fragment/app/systemui/SystemUIOtherSettings.java b/...rc/main/java/com/sevtinge/hyperceiler/ui/fragment/app/systemui/SystemUIOtherSettings.java
@@ -51,6 +51,7 @@ public class SystemUIOtherSettings extends DashboardFragment {
     SwitchPreference mShowPct;
     SwitchPreference mFuckSG;
     SwitchPreference mTimer;
+    SwitchPreference mPluginThemeBlur;
 
     @Override
     public int getPreferenceScreenResId() {
@@ -72,6 +73,7 @@ public void initPrefs() {
         mShowPct = findPreference("prefs_key_system_showpct_title");
         mFuckSG = findPreference("prefs_key_system_ui_move_log_to_miui");
         mTimer = findPreference("prefs_key_system_ui_volume_timer");
+        mPluginThemeBlur = findPreference("prefs_key_system_ui_other_default_plugin_theme");
 
         mChargeAnimationTitle.setVisible(!isMoreHyperOSVersion(1f));
         mDisableBluetoothRestrict.setVisible(isMiuiVersion(14f) && !isMoreHyperOSVersion(1f));
@@ -83,6 +85,7 @@ public void initPrefs() {
         mShowPct.setVisible(!isMoreHyperOSVersion(1f));
         mFuckSG.setVisible(isMoreHyperOSVersion(2f));
         mTimer.setVisible(!isMoreAndroidVersion(35));
+        mPluginThemeBlur.setVisible(isMoreHyperOSVersion(1f));
 
         mVolume.setOnPreferenceChangeListener(
                 (preference, o) -> {

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1074,6 +1074,8 @@
     <string name="system_ui_qs_label">快捷开关标签</string>
     <string name="system_ui_notification_title">通知</string>
     <string name="system_ui_other_notification_fix">禁用通知白名单</string>
+    <string name="system_ui_other_default_plugin_theme">解除高级材质模糊限制</string>
+    <string name="system_ui_other_default_plugin_theme_desc">解除系统界面组件对第三方主题默认禁用的高级材质模糊</string>
     <string name="system_ui_plugin_enable_volume_blur">音量条模糊</string>
     <string name="system_ui_plugin_enable_volume_blur_desc">仅供 Android 12 及以上的 MTK 机型使用，可能存在 GPU 负载较高的情况</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1056,6 +1056,8 @@
     <string name="system_ui_qs_label">Quick switch tab</string>
     <string name="system_ui_notification_title">Notification</string>
     <string name="system_ui_other_notification_fix">Disable notification whitelist</string>
+    <string name="system_ui_other_default_plugin_theme">Remove advanced material blur restrictions</string>
+    <string name="system_ui_other_default_plugin_theme_desc">Unlock the advanced material blur that is disabled by default for third-party themes in SystemUI Plugin</string>
     <string name="system_ui_plugin_enable_volume_blur">Enable volume bar blur</string>
     <string name="system_ui_move_log_to_miui">Move statusbar_gestures.dat to MIUI dir</string>
     <string name="system_ui_plugin_enable_volume_blur_desc">Only for Android12+ MTK models. There may be high GPU load.</string>

diff --git a/app/src/main/res/xml/system_ui_other.xml b/app/src/main/res/xml/system_ui_other.xml
@@ -152,13 +152,18 @@
             android:key="prefs_key_system_ui_volume_timer"
             android:title="@string/system_ui_volume_timer" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="prefs_key_system_ui_other_default_plugin_theme"
+            android:summary="@string/system_ui_other_default_plugin_theme_desc"
+            android:title="@string/system_ui_other_default_plugin_theme" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="prefs_key_system_ui_plugin_enable_volume_blur"
             android:summary="@string/system_ui_plugin_enable_volume_blur_desc"
             android:title="@string/system_ui_plugin_enable_volume_blur" />
 
-
         <SwitchPreference
             android:defaultValue="false"
             android:key="prefs_key_system_ui_move_log_to_miui"