From 01f0175467196c18039044bfa65ba5e3315af8df Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 10 Jul 2022 15:25:19 +0300 Subject: [PATCH] fixed crash at start --- .../java/ru/vtosters/lite/utils/Themes.java | 11 ++-- .../com/vk/core/ui/themes/VKTheme.smali | 53 +------------------ 2 files changed, 8 insertions(+), 56 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 d79086d27..38dbf58bd 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -129,14 +129,17 @@ public class Themes{ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? isDarkTheme() ? SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR : 0 : 0; } - public static int getNeededColorStatusbarFix(){ - return VKThemeHelper.r() ? 8192 : 0; - } + public static String getDarkThemeRes(){ + if("amoled".equals(getPrefsValue("darktheme"))){ + return isMilkshake() ? "amoled milk" : "not milk but amoled"; + } + return isMilkshake() ? "dark milk" : "not milk"; + } // Return needed res theme public static VKTheme getDarkTheme(){ switch(getPrefsValue("darktheme")) { case "amoled": - return isMilkshake() ? VKTheme.VKAPP_MILK_AMOLED : VKTheme.VKAPP_AMOLED; + return VKTheme.VKAPP_MILK_AMOLED; default: return isMilkshake() ? VKTheme.VKAPP_MILK_DARK : VKTheme.VKAPP_DARK; } diff --git a/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali b/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali index cecc42afd..756b6e464 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali @@ -30,10 +30,6 @@ .field public static final enum VKAPP_MILK_DARK:Lcom/vk/core/ui/themes/VKTheme; -.field public static final enum VKAPP_MILK_AMOLED:Lcom/vk/core/ui/themes/VKTheme; - -.field public static final enum VKAPP_AMOLED:Lcom/vk/core/ui/themes/VKTheme; - .field public static final enum VKAPP_MILK_LIGHT:Lcom/vk/core/ui/themes/VKTheme; .field public static final enum VKME_DARK:Lcom/vk/core/ui/themes/VKTheme; @@ -57,7 +53,7 @@ .method static constructor ()V .locals 20 - const/16 v0, 0x8 + const/4 v0, 0x6 new-array v0, v0, [Lcom/vk/core/ui/themes/VKTheme; @@ -219,53 +215,6 @@ aput-object v1, v0, v2 - - .line 6 - sget v10, Lb/h/g/e;->VkMilkDarkStyle:I - - const-string v4, "VKAPP_MILK_AMOLED" - - const/4 v5, 0x6 - - const-wide/16 v6, 0x6 - - const/4 v8, 0x0 - - const-string v11, "space_gray" - - move-object v3, v1 - - invoke-direct/range {v3 .. v11}, Lcom/vk/core/ui/themes/VKTheme;->(Ljava/lang/String;IJZZILjava/lang/String;)V - - sput-object v1, Lcom/vk/core/ui/themes/VKTheme;->VKAPP_MILK_AMOLED:Lcom/vk/core/ui/themes/VKTheme; - - const/4 v2, 0x6 - - aput-object v1, v0, v2 - - .line 6 - sget v10, Lb/h/g/e;->VkMilkDarkStyle:I - - const-string v4, "VKAPP_AMOLED" - - const/4 v5, 0x7 - - const-wide/16 v6, 0x7 - - const/4 v8, 0x0 - - const-string v11, "space_gray" - - move-object v3, v1 - - invoke-direct/range {v3 .. v11}, Lcom/vk/core/ui/themes/VKTheme;->(Ljava/lang/String;IJZZILjava/lang/String;)V - - sput-object v1, Lcom/vk/core/ui/themes/VKTheme;->VKAPP_AMOLED:Lcom/vk/core/ui/themes/VKTheme; - - const/4 v2, 0x7 - - aput-object v1, v0, v2 - sput-object v0, Lcom/vk/core/ui/themes/VKTheme;->$VALUES:[Lcom/vk/core/ui/themes/VKTheme; new-instance v0, Lcom/vk/core/ui/themes/VKTheme$a;