From 985a2b30c6d7ff889b58d2e5b294f0294961692b Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sun, 19 Jun 2022 14:17:37 +0300
Subject: [PATCH] fixes

---
 .../java/ru/vtosters/lite/utils/Themes.java   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
index ea04d3103..63764b32c 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -1,23 +1,15 @@
 package ru.vtosters.lite.utils;
 
 import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-import static com.vk.core.ui.themes.VKThemeHelper.k;
-import static com.vk.core.ui.themes.VKThemeHelper.l;
-import static com.vk.im.ui.themes.ImTheme.VKAPP_AMOLED;
-import static com.vk.im.ui.themes.ImTheme.VKAPP_DARK;
-import static com.vk.im.ui.themes.ImTheme.VKAPP_LIGHT;
-import static com.vk.im.ui.themes.ImTheme.VKME_AMOLED;
-import static com.vk.im.ui.themes.ImTheme.VKME_DARK;
-import static com.vk.im.ui.themes.ImTheme.VKME_LIGHT;
 import static ru.vtosters.lite.utils.Globals.edit;
 import static ru.vtosters.lite.utils.Globals.getCenterScreenCoords;
+import static ru.vtosters.lite.utils.Globals.getCurrentActivity;
 import static ru.vtosters.lite.utils.Globals.getIdentifier;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getResources;
 import static ru.vtosters.lite.utils.Preferences.color_grishka;
 import static ru.vtosters.lite.utils.Preferences.isBGStickersEnabled;
 import static ru.vtosters.lite.utils.Preferences.navbar;
-import static ru.vtosters.lite.utils.Preferences.roundedmsgs;
 import static ru.vtosters.lite.utils.Preferences.systemtheme;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 import static ru.vtosters.lite.utils.Preferences.vksans;
@@ -34,6 +26,7 @@ import android.view.View;
 import android.view.Window;
 import android.widget.ImageButton;
 
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.graphics.ColorUtils;
 
 import com.vk.articles.preload.WebCachePreloader;
@@ -41,7 +34,6 @@ import com.vk.core.drawable.RecoloredDrawable;
 import com.vk.core.ui.themes.MilkshakeHelper;
 import com.vk.core.ui.themes.VKTheme;
 import com.vk.core.ui.themes.VKThemeHelper;
-import com.vk.im.ui.themes.ImTheme;
 import com.vtosters.lite.R;
 import com.vtosters.lite.data.ThemeTracker;
 
@@ -54,7 +46,7 @@ public class Themes {
     );
 
     public static void applyTheme(VKTheme theme) {
-        // TODO
+        setSelectedTheme(getCurrentActivity(), theme);
     } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing)
 
     public static void setTheme(Activity activity) {
@@ -67,6 +59,10 @@ public class Themes {
         return VKThemeHelper.r();
     }
 
+    public static void setSelectedTheme(Activity paramActivity, VKTheme theme) {
+        VKThemeHelper.k.a(paramActivity, theme, getCenterScreenCoords());
+    }
+
     public static int getAccentColor() {
         return getColorFromAttr(R.attr.accent);
     } // Color accent
@@ -379,9 +375,9 @@ public class Themes {
         boolean isDarkTheme = isDarkTheme();
 
         if (isDarkTheme){
-            applyTheme(getDarkTheme(), getImDarkTheme());
+            applyTheme(getDarkTheme());
         } else {
-            applyTheme(getLightTheme(), getImLightTheme());
+            applyTheme(getLightTheme());
         }
 
         if (!systemtheme()){