From 4b7fb8271027e589e447ffa19707536200042a24 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 22 Jun 2022 19:34:20 +0300 Subject: [PATCH] fixes themes --- .../ru/vtosters/lite/ui/fragments/VTSettings.java | 4 ---- app/src/main/java/ru/vtosters/lite/utils/Themes.java | 4 ++++ .../com/vk/core/ui/themes/VKThemeHelper.smali | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 437e450a1..a3bc8924c 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -92,10 +92,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { edit().putBoolean("isdark", value).commit(); - isLoaded = false; - - new WebView(getActivity()).clearCache(true); - setTheme(this.getActivity()); return true; }); 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 0d9fe2e05..20b9bab58 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -14,6 +14,7 @@ import static ru.vtosters.lite.utils.Preferences.systemtheme; import static ru.vtosters.lite.utils.Preferences.vkme; import static ru.vtosters.lite.utils.Preferences.vksans; import static ru.vtosters.lite.utils.ReflectionUtils.*; +import static ru.vtosters.lite.utils.VKUIInjector.isLoaded; import android.annotation.SuppressLint; import android.app.Activity; @@ -25,6 +26,7 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.view.View; import android.view.Window; +import android.webkit.WebView; import android.widget.ImageButton; import androidx.appcompat.widget.Toolbar; @@ -54,6 +56,8 @@ public class Themes { public static void setTheme(Activity activity) { VKThemeHelper.b(activity, getCenterScreenCoords()); ThemeTracker.a(); + isLoaded = false; + new WebView(activity).clearCache(true); WebCachePreloader.e(); } // apply changed theme diff --git a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali index f959ddd8b..4b1f52c6d 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali @@ -1768,6 +1768,17 @@ return-void .end method +.method public static final theme(Lcom/vk/core/ui/themes/VKTheme;Landroid/app/Activity;[F)V + .locals 3 + + .line 10 + sget-object v1, Lcom/vk/core/ui/themes/VKThemeHelper;->k:Lcom/vk/core/ui/themes/VKThemeHelper; + + invoke-direct {v1, p1, p0, p2}, Lcom/vk/core/ui/themes/VKThemeHelper;->a(Landroid/app/Activity;Lcom/vk/core/ui/themes/VKTheme;[F)V + + return-void +.end method + .method public static final b(Landroid/view/View;I)V .locals 1 .param p1 # I