From 32e1bfe6fd298e33ded0bf5335baf62652393c53 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sun, 2 Jul 2023 00:04:10 +0300
Subject: [PATCH] fix messages color accent

---
 app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java | 3 ++-
 app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java b/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java
index e08ea3187..184e709b4 100644
--- a/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java
+++ b/app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java
@@ -28,6 +28,7 @@ import com.vtosters.lite.data.ThemeTracker;
 import ru.vtosters.lite.deviceinfo.OEMDetector;
 import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.ThemesHacks;
+import ru.vtosters.lite.themes.ThemesManager;
 import ru.vtosters.lite.ui.wallpapers.WallpapersHooks;
 import ru.vtosters.lite.utils.LifecycleUtils;
 import ru.vtosters.lite.utils.WebViewColoringUtils;
@@ -59,7 +60,7 @@ public class ThemesUtils {
             activity = LifecycleUtils.getCurrentActivity();
         }
         VKThemeHelper.theme(theme, activity, fl);
-        if (isMonetTheme()) ThemesCore.clear();
+        if (isMonetTheme() || ThemesManager.canApplyCustomAccent()) ThemesCore.clear();
         if (restartActivity) activity.recreate();
         ThemeTracker.a();
         WebViewColoringUtils.isLoaded = false;
diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
index 3aa8ae4ef..42c186ebd 100644
--- a/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
+++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java
@@ -166,7 +166,7 @@ public class ThemesCore {
     }
 
     public static boolean hasThemedAttr(Context context, int attrID) {
-        if (ThemesUtils.isMonetTheme()) {
+        if (ThemesUtils.isMonetTheme() || ThemesManager.canApplyCustomAccent()) {
             if (Preferences.getBoolValue("logColors", false)) {
                 try {
                     Log.d(TAG, "Requesting color by attr " + context.getResources().getResourceName(attrID));