From d02ae1e21253de4c1ceb3ae03e021c6e48f3e992 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 10 Jul 2022 16:01:04 +0300 Subject: [PATCH] amoled theme wtf --- .../java/ru/vtosters/lite/utils/Themes.java | 20 +- smali/res/values/styles.xml | 749 ++++++++++++++++++ .../com/vk/core/ui/themes/VKTheme.smali | 8 + 3 files changed, 763 insertions(+), 14 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 38dbf58bd..2c6ea5ede 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -129,27 +129,19 @@ public class Themes{ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? isDarkTheme() ? SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR : 0 : 0; } - public static String getDarkThemeRes(){ - if("amoled".equals(getPrefsValue("darktheme"))){ - return isMilkshake() ? "amoled milk" : "not milk but amoled"; + public static int getDarkThemeRes(){ + if(getPrefsValue("darktheme").equals("amoled")){ + return isMilkshake() ? getIdentifier("VkMilkAmoledStyle", "style") : getIdentifier("VkAmoledStyle", "style"); } - return isMilkshake() ? "dark milk" : "not milk"; + return isMilkshake() ? R.style.VkMilkDarkStyle : R.style.VkDarkStyle; } // Return needed res theme public static VKTheme getDarkTheme(){ - switch(getPrefsValue("darktheme")) { - case "amoled": - return VKTheme.VKAPP_MILK_AMOLED; - default: - return isMilkshake() ? VKTheme.VKAPP_MILK_DARK : VKTheme.VKAPP_DARK; - } + return isMilkshake() ? VKTheme.VKAPP_MILK_DARK : VKTheme.VKAPP_DARK; } // Return needed theme for theme changer public static VKTheme getLightTheme(){ - switch(getPrefsValue("lighttheme")) { - default: - return isMilkshake() ? VKTheme.VKAPP_MILK_LIGHT : VKTheme.VKAPP_LIGHT; - } + return isMilkshake() ? VKTheme.VKAPP_MILK_LIGHT : VKTheme.VKAPP_LIGHT; } // Return needed theme for theme changer public static int getColorFromAttr(int attr){ diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml index 626621770..859809e4e 100644 --- a/smali/res/values/styles.xml +++ b/smali/res/values/styles.xml @@ -6234,6 +6234,526 @@ @color/gray_400 + + + + + + + + + + + + + + +