Merge pull request #350 from Mahmud0808/beta

Merge beta into stable
Mahmud0808 · Nov 13, 2023 · 4a91a94 · 4a91a94
2 parents ee55c6d + 91dccfe
commit 4a91a94
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/app/src/main/java/com/drdisagree/iconify/xposed/modules/QuickSettings.java b/app/src/main/java/com/drdisagree/iconify/xposed/modules/QuickSettings.java
@@ -237,7 +237,11 @@ protected void afterHookedMethod(MethodHookParam param) {
 
                     View notificationBackgroundView = (View) getObjectField(param.thisObject, "mBackgroundNormal");
 
-                    setObjectField(param.thisObject, "mCurrentBackgroundTint", 0);
+                    try {
+                        setObjectField(param.thisObject, "mCurrentBackgroundTint", (int) param.args[0]);
+                    } catch (Throwable ignored) {
+                    }
+
                     callMethod(getObjectField(notificationBackgroundView, "mBackground"), "clearColorFilter");
                     setObjectField(notificationBackgroundView, "mTintColor", 0);
                     notificationBackgroundView.invalidate();
@@ -246,6 +250,7 @@ protected void afterHookedMethod(MethodHookParam param) {
 
             hookAllMethods(ActivatableNotificationViewClass, "setBackgroundTintColor", removeNotificationTint);
             hookAllMethods(ActivatableNotificationViewClass, "updateBackgroundColors", removeNotificationTint);
+            hookAllMethods(ActivatableNotificationViewClass, "updateBackgroundTint", removeNotificationTint);
 
             XC_MethodHook replaceTintColor = new XC_MethodHook() {
                 @Override
@@ -256,10 +261,14 @@ protected void beforeHookedMethod(MethodHookParam param) {
                 }
             };
 
+            try {
+                hookAllMethods(NotificationBackgroundViewClass, "setCustomBackground$1", replaceTintColor);
+            } catch (Throwable ignored) {
+            }
+
             try {
                 hookAllMethods(NotificationBackgroundViewClass, "setCustomBackground", replaceTintColor);
             } catch (Throwable ignored) {
-                hookAllMethods(NotificationBackgroundViewClass, "setCustomBackground$1", replaceTintColor);
             }
 
             hookAllMethods(FooterViewClass, "updateColors", new XC_MethodHook() {