Fix bugs in Custom Theme V2

Signed-off-by: Dev4Mod <[email protected]>

Author: Dev4Mod

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

@@ -13,7 +13,6 @@
 
 import java.util.HashMap;
 
-import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 
 public class ColorReplacement {
@@ -63,14 +62,12 @@ static void replace(TextView view, HashMap<String, String> colors) {
             var newColor = colors.get(sColor);
             if (newColor != null) {
                 view.setTextColor(IColors.parseColor(newColor));
-                XposedBridge.log("ColorReplacement.Text.replace: " + sColor + "->" + newColor);
             } else {
                 if (!sColor.startsWith("#ff") && !sColor.startsWith("#0")) {
                     var sColorSub = sColor.substring(0, 3);
                     newColor = colors.get(sColor.substring(3));
                     if (newColor != null) {
                         view.setTextColor(IColors.parseColor(sColorSub + newColor));
-                        XposedBridge.log("ColorReplacement.Text.replace: " + sColor + "->" + newColor);
                     }
                 }
             }

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

@@ -55,6 +55,8 @@ public static String toString(int i) {
         var color = Integer.toHexString(i);
         if (color.length() == 7) {
             color = "0" + color;
+        } else if (color.length() == 1) {
+            color = "00000000";
         }
         return "#" + color;
     }

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

@@ -280,6 +280,20 @@ private boolean checkNotHomeActivity() {
         return (currentActivity == null || !homeClass.isInstance(currentActivity));
     }
 
+    private static int getOriginalColor(String sColor) {
+        var colors = IColors.colors.keySet();
+        var resultColor = -1;
+        for (var c : colors) {
+            var vColor = IColors.colors.getOrDefault(c, "");
+            if (vColor.length() < 9) continue;
+            if (sColor.equals(vColor)) {
+                resultColor = IColors.parseColor(c);
+                break;
+            }
+        }
+        return resultColor;
+    }
+
     public static class IntBgColorHook extends XC_MethodHook {
 
 
@@ -295,15 +309,12 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     return;
                 }
             } else if (param.thisObject instanceof Paint) {
-                if (ReflectionUtils.isCalledFromStrings("getValue")) {
-                    var colors = IColors.colors.keySet();
-                    for (var c : colors) {
-                        var vColor = IColors.colors.getOrDefault(c, "");
-                        if (vColor.length() < 9) continue;
-                        if (sColor.equals(vColor)) {
-                            param.args[0] = IColors.parseColor(c);
-                            return;
-                        }
+                if (ReflectionUtils.isCalledFromStrings("getValue") && !ReflectionUtils.isCalledFromStrings("android.view")) {
+                    XposedBridge.log(new Exception());
+                    var resultColor = getOriginalColor(sColor);
+                    if (resultColor != -1) {
+                        param.args[0] = resultColor;
+                        return;
                     }
                 }
             }