From 86d85aec3cc98244f4bf1ed0dedc6e0a50f1889f Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sun, 10 Jul 2022 14:52:23 +0300
Subject: [PATCH] updated jars + added amoled theme values to code

---
 app/libs/classes2-dex2jar.jar.REMOVED.git-id  |  2 +-
 app/libs/classes3-dex2jar.jar.REMOVED.git-id  |  2 +-
 .../java/ru/vtosters/lite/utils/Themes.java   | 33 +-----------
 .../com/vk/core/ui/themes/VKTheme.smali       | 53 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/app/libs/classes2-dex2jar.jar.REMOVED.git-id b/app/libs/classes2-dex2jar.jar.REMOVED.git-id
index a0ee51e0c..500874678 100644
--- a/app/libs/classes2-dex2jar.jar.REMOVED.git-id
+++ b/app/libs/classes2-dex2jar.jar.REMOVED.git-id
@@ -1 +1 @@
-3fe6da1658de23c476a31b9640cef27a4ec80893
\ No newline at end of file
+ea0425fab4379ae5f7e9db05a22d4b7afd709560
\ No newline at end of file
diff --git a/app/libs/classes3-dex2jar.jar.REMOVED.git-id b/app/libs/classes3-dex2jar.jar.REMOVED.git-id
index a299366e9..a064f8665 100644
--- a/app/libs/classes3-dex2jar.jar.REMOVED.git-id
+++ b/app/libs/classes3-dex2jar.jar.REMOVED.git-id
@@ -1 +1 @@
-69d775adb5e4658c0363ab5f05321405b0ec1915
\ No newline at end of file
+3b92d8876dd59d5afc60a53bb23b103cede6a194
\ No newline at end of file
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 6d7e9341e..d79086d27 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -135,8 +135,8 @@ public class Themes{
 
     public static VKTheme getDarkTheme(){
         switch(getPrefsValue("darktheme")) {
-            //case "amoled":
-            //return VKTheme.AMOLED;
+            case "amoled":
+                return isMilkshake() ? VKTheme.VKAPP_MILK_AMOLED : VKTheme.VKAPP_AMOLED;
             default:
                 return isMilkshake() ? VKTheme.VKAPP_MILK_DARK : VKTheme.VKAPP_DARK;
         }
@@ -215,7 +215,6 @@ public class Themes{
 
     @SuppressLint("UseCompatLoadingForColorStateLists")
     public static ColorStateList themeCSL(Context context, int color){
-
         if(isColorRefAccented(color) && isAndroidMonet()){
             return ColorStateList.valueOf(getAccentColor());
         }
@@ -309,34 +308,6 @@ public class Themes{
         return String.format("#%06X", Integer.valueOf(i & 16777215));
     } // Get color as hex string
 
-//    public static int vk_sans_display_demibold(){
-//        return vksans() ? R.font.vk_sans_display_demibold : R.font.tt_commons_demi_bold;
-//    }
-//
-//    public static int vk_sans_text_black(){
-//        return vksans() ? R.font.vk_sans_display_bold : R.font.roboto_black;
-//    }
-//
-//    public static int vk_sans_text_bold(){
-//        return vksans() ? R.font.vk_sans_text_bold : R.font.roboto_bold;
-//    }
-//
-//    public static int vk_sans_text_demibold(){
-//        return vksans() ? R.font.vk_sans_text_demibold : R.font.roboto_bold_italic;
-//    }
-//
-//    public static int vk_sans_text_light(){
-//        return vksans() ? R.font.vk_sans_text_light : R.font.roboto_light;
-//    }
-//
-//    public static int vk_sans_text_medium(){
-//        return vksans() ? R.font.vk_sans_text_medium : R.font.roboto_medium;
-//    }
-//
-//    public static int vk_sans_text_regular(){
-//        return vksans() ? R.font.vk_sans_text_regular : R.font.roboto_regular;
-//    }
-
     public static int getNavigationHeight(int Default){
         int VKME = R.dimen.design_bottom_sheet_peek_height_min;
 
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 756b6e464..cecc42afd 100644
--- a/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali
+++ b/smali/smali_classes2/com/vk/core/ui/themes/VKTheme.smali
@@ -30,6 +30,10 @@
 
 .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;
@@ -53,7 +57,7 @@
 .method static constructor <clinit>()V
     .locals 20
 
-    const/4 v0, 0x6
+    const/16 v0, 0x8
 
     new-array v0, v0, [Lcom/vk/core/ui/themes/VKTheme;
 
@@ -215,6 +219,53 @@
 
     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;-><init>(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;-><init>(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;