From 1b3896f4ca6c5fe5a414d977857dd4fa5a936c4c Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Fri, 28 Jul 2023 19:01:57 +0300
Subject: [PATCH] fix colors issue

---
 app/src/main/java/ru/vtosters/hooks/VKUIHook.java              | 2 +-
 app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java     | 2 +-
 .../main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/hooks/VKUIHook.java b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java
index 68a623aa3..5d0c8c2f0 100644
--- a/app/src/main/java/ru/vtosters/hooks/VKUIHook.java
+++ b/app/src/main/java/ru/vtosters/hooks/VKUIHook.java
@@ -23,7 +23,7 @@ public class VKUIHook {
     }
 
     private static void applyVKUIStyles(WebView webView) {
-        if (getBoolValue("VKUI_INJ", true) && webView != null &&webView.getUrl() != null && !webView.getUrl().contains("static.vk.com/memories")) {
+        if (getBoolValue("VKUI_INJ", true) && webView != null && webView.getUrl() != null && !webView.getUrl().contains("static.vk.com/memories")) {
             if (!WebViewColoringUtils.isLoaded) {
                 WebViewColoringUtils.load();
             }
diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java
index 317efe1de..958ea2ed1 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesHacks.java
@@ -23,7 +23,7 @@ public class ThemesHacks {
     }
 
     public static int getHackedColor(@NonNull Context context, @ColorRes int color) {
-        if (ThemesUtils.isMonetTheme()) {
+        if (ThemesUtils.isMonetTheme() || ThemesManager.canApplyCustomAccent()) {
             if (Preferences.getBoolValue("logColors", false)) {
                 try {
                     Log.d("ThemesCore", "Requesting color by color " + context.getResources().getResourceName(color));
diff --git a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java
index 8d48e66a8..131e7b9e7 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 import com.vk.core.drawable.RecoloredDrawable;
 import ru.vtosters.hooks.other.ThemesUtils;
 import ru.vtosters.lite.themes.ColorReferences;
+import ru.vtosters.lite.themes.ThemesManager;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class RecolorUtils {
@@ -43,7 +44,7 @@ public class RecolorUtils {
     }
 
     public static int recolorHexColor(int i) {
-        if (!ThemesUtils.isMonetTheme()) return i;
+        if (!ThemesUtils.isMonetTheme() || !ThemesManager.canApplyCustomAccent()) return i;
         var accented = ColorReferences.isAccentedColor(i);
         var mutedaccented = ColorReferences.isMutedAccentedColor(i);
         return (accented || mutedaccented) ? (accented ? ThemesUtils.getAccentColor() : ThemesUtils.getMutedAccentColor()) : i;