Skip to content

Commit f149751

Browse files
committed
fix theme in v22
1 parent 800278d commit f149751

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,19 @@ public class IColors {
2626
colors.put("15603e", "15603e");
2727
// colors.put("#0b141a", "#ff0b141a");
2828

29+
// background
30+
colors.put("0a1014", "0a1014"); // background green color (above version 22)
31+
colors.put("#ff0a1014", "#ff0a1014"); // background green color (above version 22)
32+
colors.put("#ff10161a", "#ff10161a"); // background header green color (above version 22)
33+
colors.put("#ff12181c", "#ff12181c"); // background header green color (above version 22)
34+
35+
2936
colors.put("#ffffffff", "#ffffffff"); // background color in light theme
3037
colors.put("#ff1b8755", "#ff1b8755"); // background toolbar color in light theme
3138

3239
// Secondary
3340
colors.put("#ff202c33", "#ff202c33");
41+
colors.put("#ff2a2f33", "#ff2a2f33");
3442

3543
// New theme color
3644
colors.put("0b141a", "0b141a");

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ private void hookColors() throws Exception {
173173
case "00a884", "1da457", "21c063", "d9fdd3" ->
174174
IColors.colors.put(c, primaryColor.substring(3));
175175
case "#ff00a884", "#ff1da457", "#ff21c063", "#ff1daa61", "#ff25d366",
176-
"#ffd9fdd3" ->
177-
IColors.colors.put(c, primaryColor);
176+
"#ffd9fdd3" -> IColors.colors.put(c, primaryColor);
178177
case "#ff103529" ->
179178
IColors.colors.put(c, "#66" + primaryColor.substring(3));
180179
}
@@ -183,15 +182,16 @@ private void hookColors() throws Exception {
183182
if (!backgroundColor.equals("0") && DesignUtils.isValidColor(backgroundColor)) {
184183
backgroundColor = backgroundColor.length() == 9 ? backgroundColor : "#ff" + backgroundColor.substring(1);
185184
switch (c) {
186-
case "0b141a" -> IColors.colors.put(c, backgroundColor.substring(3));
187-
case "#ff0b141a", "#ff111b21", "#ff000000" ->
185+
case "0b141a", "0a1014" ->
186+
IColors.colors.put(c, backgroundColor.substring(3));
187+
case "#ff0b141a", "#ff111b21", "#ff000000", "#ff0a1014", "#ff10161a" ->
188188
IColors.colors.put(c, backgroundColor);
189189
}
190190
}
191191

192192
if (!secondaryColor.equals("0") && DesignUtils.isValidColor(secondaryColor)) {
193193
secondaryColor = secondaryColor.length() == 9 ? secondaryColor : "#ff" + secondaryColor.substring(1);
194-
if (c.equals("#ff202c33")) {
194+
if (c.equals("#ff202c33") || c.equals("#ff2a2f33")) {
195195
IColors.colors.put(c, secondaryColor);
196196
}
197197
}
@@ -256,7 +256,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
256256
private void replaceTransparency(HashMap<String, String> wallpaperColors, float mAlpha) {
257257
var hexAlpha = Integer.toHexString((int) Math.ceil(mAlpha * 255));
258258
hexAlpha = hexAlpha.length() == 1 ? "0" + hexAlpha : hexAlpha;
259-
for (var c : List.of("#ff0b141a", "#ff111b21", "#ff000000", "#ffffffff", "#ff1b8755")) {
259+
for (var c : List.of("#ff0b141a", "#ff10161a", "#ff111b21", "#ff000000", "#ffffffff", "#ff1b8755", "#ff0a1014", "#ff12181c")) {
260260
var oldColor = wallpaperColors.get(c);
261261
if (oldColor == null) continue;
262262
var newColor = "#" + hexAlpha + oldColor.substring(3);

0 commit comments

Comments
 (0)