Fix bug in custom Wallpaper

Author: Dev4Mod

app/src/main/java/com/wmods/wppenhacer/utils/DrawableColors.java

@@ -62,7 +62,7 @@ public static void replaceColor(Drawable drawable, HashMap<String, String> color
             if (gradientColors != null) {
                 for (var i = 0; i < gradientColors.length; i++) {
                     var color = gradientColors[i];
-                    var newColor = IColors.getFromIntColor(color);
+                    var newColor = IColors.getFromIntColor(color, colors);
                     if (color == newColor) continue;
                     gradientColors[i] = newColor;
                 }
@@ -72,16 +72,15 @@ public static void replaceColor(Drawable drawable, HashMap<String, String> color
             replaceColor(insetDrawable.getDrawable(), colors);
         } else if (drawable instanceof NinePatchDrawable ninePatchDrawable) {
             var color = getNinePatchDrawableColor(ninePatchDrawable);
-            var newColor = IColors.getFromIntColor(color);
+            var newColor = IColors.getFromIntColor(color, colors);
             if (color == newColor) return;
             ninePatchDrawable.setTintList(ColorStateList.valueOf(newColor));
-
         } else if (drawable instanceof ColorDrawable colorDrawable) {
             var color = getColorDrawableColor(colorDrawable);
-            colorDrawable.setColor(IColors.getFromIntColor(color));
+            colorDrawable.setColor(IColors.getFromIntColor(color, colors));
         } else {
             var color = getColor(drawable);
-            var newColor = IColors.getFromIntColor(color);
+            var newColor = IColors.getFromIntColor(color, colors);
             if (color == newColor) return;
             drawable.setColorFilter(new PorterDuffColorFilter(newColor, PorterDuff.Mode.SRC_IN));
         }

app/src/main/java/com/wmods/wppenhacer/utils/IColors.java

@@ -67,7 +67,7 @@ public static String toString(int i) {
     }
 
 
-    public static int getFromIntColor(int color) {
+    public static int getFromIntColor(int color, HashMap<String, String> colors) {
         var sColor = IColors.toString(color);
         var newColor = colors.get(sColor);
         if (newColor != null && newColor.length() == 9) {

app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/CustomTheme.java

@@ -75,7 +75,7 @@ private void hookWallpaper() throws Exception {
             return;
 
         var clazz = XposedHelpers.findClass("com.whatsapp.HomeActivity", classLoader);
-        XposedHelpers.findAndHookMethod(clazz.getSuperclass(), "onCreate", Bundle.class, new XC_MethodHook() {
+        XposedHelpers.findAndHookMethod(clazz, "onCreate", Bundle.class, new XC_MethodHook() {
             @Override
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 var activity = (Activity) param.thisObject;
@@ -107,12 +107,9 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                     var colorfilters = XposedHelpers.getObjectField(background, "A01");
                     var fields = ReflectionUtils.getFieldsByType(colorfilters.getClass(), ColorStateList.class);
                     var colorStateList = (ColorStateList) fields.get(0).get(colorfilters);
-                    if (colorStateList == null) return;
-                    var color = IColors.toString(colorStateList.getDefaultColor());
-                    var newColor = navAlpha.get(color);
-                    if (newColor != null) {
-                        background.setTint(IColors.parseColor(newColor));
-                    }
+                    var newColor = IColors.getFromIntColor(colorStateList.getDefaultColor(), navAlpha);
+                    if (newColor == colorStateList.getDefaultColor()) return;
+                    background.setTint(newColor);
                 } catch (Throwable ignored) {
                 }
             }
@@ -257,7 +254,9 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
     private void replaceTransparency(HashMap<String, String> wallpaperColors, float mAlpha) {
         var hexAlpha = Integer.toHexString((int) Math.ceil(mAlpha * 255));
         hexAlpha = hexAlpha.length() == 1 ? "0" + hexAlpha : hexAlpha;
-        for (var c : List.of("#ff0b141a", "#ff10161a", "#ff111b21", "#ff000000", "#ffffffff", "#ff1b8755", "#ff0a1014", "#ff12181c", "#ff10161a", "#ff20272b")) {
+        for (var c : List.of("#ff0b141a", "#ff10161a", "#ff111b21", "#ff000000",
+                "#ffffffff", "#ff1b8755", "#ff0a1014", "#ff12181c", "#ff20272b", "#ff3a484f"
+        )) {
             var oldColor = wallpaperColors.get(c);
             if (oldColor == null) continue;
             var newColor = "#" + hexAlpha + oldColor.substring(3);
@@ -269,7 +268,8 @@ private void replaceTransparency(HashMap<String, String> wallpaperColors, float
     private void injectWallpaper(View view) {
         var content = (ViewGroup) view;
         var rootView = (ViewGroup) content.getChildAt(0);
-        var header = (ViewGroup) rootView.findViewById(Utils.getID("header", "id"));
+
+        var header = content.findViewById(Utils.getID("header", "id"));
         replaceColors(header, toolbarAlpha);
         var frameLayout = new WallpaperView(rootView.getContext(), prefs, properties);
         rootView.addView(frameLayout, 0);
@@ -298,7 +298,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
             if (colorStateList != null) {
                 var mColors = (int[]) XposedHelpers.getObjectField(colorStateList, "mColors");
                 for (int i = 0; i < mColors.length; i++) {
-                    mColors[i] = IColors.getFromIntColor(mColors[i]);
+                    mColors[i] = IColors.getFromIntColor(mColors[i], IColors.colors);
                 }
                 XposedHelpers.setObjectField(colorStateList, "mColors", mColors);
                 param.args[0] = colorStateList;
@@ -324,7 +324,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     return;
                 }
             }
-            param.args[0] = IColors.getFromIntColor(color);
+            param.args[0] = IColors.getFromIntColor(color, IColors.colors);
         }
     }
 }

app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/CustomThemeV2.java

@@ -87,7 +87,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                     if (typedValue.type >= TypedValue.TYPE_FIRST_INT
                             && typedValue.type <= TypedValue.TYPE_LAST_INT) {
                         if (typedValue.data == 0) return;
-                        typedValue.data = IColors.getFromIntColor(typedValue.data);
+                        typedValue.data = IColors.getFromIntColor(typedValue.data, IColors.colors);
                     }
                 }
             }