From f1b7a52f0cf8bd68985359b26ab8a54685d5dd5b Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Fri, 22 Apr 2022 17:03:41 +0300
Subject: [PATCH] Test Amoled Theme Styles + Updated R.java

---
 app/src/main/java/com/vtosters/lite/R.java    |   5 +
 .../java/ru/vtosters/lite/utils/Themes.java   |   9 +
 smali/res/values-v21/styles.xml               |  61 +++++
 smali/res/values-v22/styles.xml               |  52 ++++
 smali/res/values/styles.xml                   | 248 ++++++++++++++++++
 .../smali/com/vk/core/ui/themes/VKTheme.smali |   4 +-
 .../com/vk/core/ui/themes/VKThemeHelper.smali |  13 +-
 .../vk/core/dialogs/snackbar/VkSnackbar.smali |  14 +-
 8 files changed, 382 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/vtosters/lite/R.java b/app/src/main/java/com/vtosters/lite/R.java
index 2c5b24d14..37695bc43 100644
--- a/app/src/main/java/com/vtosters/lite/R.java
+++ b/app/src/main/java/com/vtosters/lite/R.java
@@ -164,6 +164,8 @@ public final class R {
         public static final int start_values = 0x7f03005c;
         public static final int proxy = 0x7f03005d;
         public static final int proxy_value = 0x7f03005e;
+        public static final int msgcount = 0x7f03005f;
+        public static final int msgcount_value = 0x7f030060;
     }
 
     public static final class attr {
@@ -15927,6 +15929,9 @@ public final class R {
         public static final int MD_Button_Borderless = 0x7f1203a7;
         public static final int MD_Button_Borderless_Dialog = 0x7f1203a8;
         public static final int MaterialDialogTheme_Dark = 0x7f1203a9;
+        public static final int BaseAmoledStyle = 0x7f1203aa;
+        public static final int BaseAmoledTheme = 0x7f1203ab;
+        public static final int Vk_Theme_client_amoled_generated = 0x7f1203ac;
     }
 
     public static final class xml {
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 5a0848b7d..e5a381966 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -8,6 +8,7 @@ import android.support.v7.widget.Toolbar;
 import android.widget.ImageButton;
 
 import com.vk.core.d.RecoloredDrawable;
+import com.vk.core.ui.themes.VKTheme;
 import com.vk.core.ui.themes.VKThemeHelper;
 import com.vtosters.lite.R;
 
@@ -28,6 +29,14 @@ public class Themes {
         return VKThemeHelper.a((int) R.attr.tabbar_background);
     }
 
+    public static int getAmoledTheme() {
+        return Helper.GetContext().getResources().getIdentifier("BaseAmoledStyle", "style", Helper.GetContext().getPackageName());
+    }
+
+    public static VKTheme getCurrentDarkTheme() {
+        return amoled() ? VKTheme.AMOLED : VKTheme.DARK;
+    }
+
     public static int getColorFromAttr(int attr) {
         return VKThemeHelper.a(attr);
     }
diff --git a/smali/res/values-v21/styles.xml b/smali/res/values-v21/styles.xml
index 3f3c7190b..6594f6b66 100644
--- a/smali/res/values-v21/styles.xml
+++ b/smali/res/values-v21/styles.xml
@@ -208,6 +208,67 @@
         <item name="android:colorControlHighlight">#33999999</item>
         <item name="android:navigationBarColor">@android:color/black</item>
     </style>
+
+    <style name="BaseAmoledStyle" parent="@style/BaseAmoledTheme">
+        <item name="android:textColorSecondary">@color/prefs_subtitle</item>
+        <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
+        <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:listViewStyle">@style/NoPaddingListView</item>
+        <item name="android:fadingEdgeLength">0.0dip</item>
+        <item name="android:actionDropDownStyle">@style/ActionBarSpinner</item>
+        <item name="android:actionModeBackground">?accent</item>
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionOverflowButtonStyle">@style/VKActionButtonOverflow</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
+        <item name="android:selectableItemBackground">@drawable/highlight</item>
+        <item name="android:windowCloseOnTouchOutside">true</item>
+        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionBarDivider">@null</item>
+        <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
+        <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingRight">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingEnd">@dimen/standard_list_item_padding</item>
+        <item name="android:actionBarTheme">@style/ActionBarTheme</item>
+        <item name="android:textAppearanceListItemSecondary">@style/MaterialSmallText</item>
+        <item name="android:actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="BuyMusicSubscriptionButtonStyle">@style/BuyMusicSubscriptionBtn</item>
+        <item name="actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
+        <item name="actionBarTheme">@style/ActionBarTheme</item>
+        <item name="actionModeBackground">?accent</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_back_24</item>
+        <item name="appkitDefaultErrorText">@string/err_text</item>
+        <item name="appkitEmptyButtonStyle">@style/VKUIButton.Primary.Small</item>
+        <item name="appkitErrorButtonStyle">@style/VKUIButton.Secondary.Small</item>
+        <item name="appkitRetryButtonText">@string/retry</item>
+        <item name="attach_left_right_padding">0.0dip</item>
+        <item name="ic_attach_checkin">@drawable/ic_attachment_checkin</item>
+        <item name="ic_attach_document">@drawable/ic_attachment_document</item>
+        <item name="ic_attach_link">@drawable/ic_attachment_link</item>
+        <item name="ic_attach_note">@drawable/ic_attachment_note</item>
+        <item name="ic_attach_poll">@drawable/ic_attachment_poll</item>
+        <item name="ic_attach_post">@drawable/ic_attachment_post</item>
+        <item name="is_messages_snippet">false</item>
+        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="searchViewCursorDrawable">@drawable/toolbar_blue_text_cursor_drawable</item>
+        <item name="searchViewTextColorHint">@color/toolbar_blue_searchViewTextColorHint</item>
+        <item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
+        <item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
+        <item name="tabBarTheme">@style/TabBarTheme</item>
+        <item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+    <style name="BaseAmoledTheme" parent="@style/Vk.Theme.client_amoled_generated">
+        <item name="android:buttonStyle">@style/ButtonStyle</item>
+        <item name="android:progressBarStyle">@style/ProgressBar</item>
+        <item name="android:seekBarStyle">@style/SolidSeekBar</item>
+        <item name="android:alertDialogTheme">@style/MaterialDialogTheme.Dark</item>
+        <item name="android:colorControlHighlight">#33999999</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
+    </style>
+
     <style name="BaseStyle" parent="@style/BaseTheme">
         <item name="android:textColorSecondary">@color/prefs_subtitle</item>
         <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
diff --git a/smali/res/values-v22/styles.xml b/smali/res/values-v22/styles.xml
index c3f065770..142a86ecb 100644
--- a/smali/res/values-v22/styles.xml
+++ b/smali/res/values-v22/styles.xml
@@ -54,6 +54,58 @@
         <item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
         <item name="windowActionModeOverlay">true</item>
     </style>
+    <style name="BaseAmoledStyle" parent="@style/BaseAmoledTheme">
+        <item name="android:textColorSecondary">@color/prefs_subtitle</item>
+        <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
+        <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:listViewStyle">@style/NoPaddingListView</item>
+        <item name="android:fadingEdgeLength">0.0dip</item>
+        <item name="android:actionDropDownStyle">@style/ActionBarSpinner</item>
+        <item name="android:actionModeBackground">?accent</item>
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionOverflowButtonStyle">@style/VKActionButtonOverflow</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
+        <item name="android:selectableItemBackground">@drawable/highlight</item>
+        <item name="android:windowCloseOnTouchOutside">true</item>
+        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionBarDivider">@null</item>
+        <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
+        <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingRight">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingEnd">@dimen/standard_list_item_padding</item>
+        <item name="android:actionBarTheme">@style/ActionBarTheme</item>
+        <item name="android:textAppearanceListItemSecondary">@style/MaterialSmallText</item>
+        <item name="android:actionBarPopupTheme">@style/Theme.AppCompat</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">default</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="BuyMusicSubscriptionButtonStyle">@style/BuyMusicSubscriptionBtn</item>
+        <item name="actionBarPopupTheme">@style/Theme.AppCompat</item>
+        <item name="actionBarTheme">@style/ActionBarTheme</item>
+        <item name="actionModeBackground">?accent</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_back_24</item>
+        <item name="appkitDefaultErrorText">@string/err_text</item>
+        <item name="appkitEmptyButtonStyle">@style/VKUIButton.Primary.Small</item>
+        <item name="appkitErrorButtonStyle">@style/VKUIButton.Secondary.Small</item>
+        <item name="appkitRetryButtonText">@string/retry</item>
+        <item name="attach_left_right_padding">0.0dip</item>
+        <item name="ic_attach_checkin">@drawable/ic_attachment_checkin</item>
+        <item name="ic_attach_document">@drawable/ic_attachment_document</item>
+        <item name="ic_attach_link">@drawable/ic_attachment_link</item>
+        <item name="ic_attach_note">@drawable/ic_attachment_note</item>
+        <item name="ic_attach_poll">@drawable/ic_attachment_poll</item>
+        <item name="ic_attach_post">@drawable/ic_attachment_post</item>
+        <item name="is_messages_snippet">false</item>
+        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="searchViewCursorDrawable">@drawable/toolbar_blue_text_cursor_drawable</item>
+        <item name="searchViewTextColorHint">@color/toolbar_blue_searchViewTextColorHint</item>
+        <item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
+        <item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
+        <item name="tabBarTheme">@style/TabBarTheme</item>
+        <item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
     <style name="BaseStyle" parent="@style/BaseTheme">
         <item name="android:textColorSecondary">@color/prefs_subtitle</item>
         <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
diff --git a/smali/res/values/styles.xml b/smali/res/values/styles.xml
index 11210713e..ef2a40fd0 100644
--- a/smali/res/values/styles.xml
+++ b/smali/res/values/styles.xml
@@ -1157,6 +1157,61 @@
         <item name="appkitDefaultErrorText">@string/err_text</item>
         <item name="appkitRetryButtonText">@string/retry</item>
     </style>
+
+    <style name="BaseAmoledStyle" parent="@style/BaseAmoledTheme">
+        <item name="android:textColorSecondary">@color/prefs_subtitle</item>
+        <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
+        <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:listViewStyle">@style/NoPaddingListView</item>
+        <item name="android:fadingEdgeLength">0.0dip</item>
+        <item name="android:actionDropDownStyle">@style/ActionBarSpinner</item>
+        <item name="android:actionModeBackground">?accent</item>
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionOverflowButtonStyle">@style/VKActionButtonOverflow</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/highlight</item>
+        <item name="android:selectableItemBackground">@drawable/highlight</item>
+        <item name="android:windowCloseOnTouchOutside">true</item>
+        <item name="android:actionMenuTextColor">@color/base_action_menu_text_color</item>
+        <item name="android:actionBarDivider">@null</item>
+        <item name="android:textAppearanceListItem">@style/MaterialMediumText</item>
+        <item name="android:listPreferredItemPaddingLeft">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingRight">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingStart">@dimen/standard_list_item_padding</item>
+        <item name="android:listPreferredItemPaddingEnd">@dimen/standard_list_item_padding</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="BuyMusicSubscriptionButtonStyle">@style/BuyMusicSubscriptionBtn</item>
+        <item name="actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
+        <item name="actionBarTheme">@style/ActionBarTheme</item>
+        <item name="actionModeBackground">?accent</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_back_24</item>
+        <item name="appkitDefaultErrorText">@string/err_text</item>
+        <item name="appkitEmptyButtonStyle">@style/VKUIButton.Primary.Small</item>
+        <item name="appkitErrorButtonStyle">@style/VKUIButton.Secondary.Small</item>
+        <item name="appkitRetryButtonText">@string/retry</item>
+        <item name="attach_left_right_padding">0.0dip</item>
+        <item name="ic_attach_checkin">@drawable/ic_attachment_checkin</item>
+        <item name="ic_attach_document">@drawable/ic_attachment_document</item>
+        <item name="ic_attach_link">@drawable/ic_attachment_link</item>
+        <item name="ic_attach_note">@drawable/ic_attachment_note</item>
+        <item name="ic_attach_poll">@drawable/ic_attachment_poll</item>
+        <item name="ic_attach_post">@drawable/ic_attachment_post</item>
+        <item name="is_messages_snippet">false</item>
+        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="searchViewCursorDrawable">@drawable/toolbar_blue_text_cursor_drawable</item>
+        <item name="searchViewTextColorHint">@color/toolbar_blue_searchViewTextColorHint</item>
+        <item name="shadowBottom">@drawable/bg_toolbar_shadow_dark</item>
+        <item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
+        <item name="tabBarTheme">@style/TabBarTheme</item>
+        <item name="toolbarIconsColor">@color/toolbar_blue_textColorSecondary</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+    <style name="BaseAmoledTheme" parent="@style/Vk.Theme.client_amoled_generated">
+        <item name="android:progressBarStyle">@style/ProgressBar</item>
+        <item name="appkitDefaultErrorText">@string/err_text</item>
+        <item name="appkitRetryButtonText">@string/retry</item>
+    </style>
+
     <style name="BasePickerTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
     </style>
@@ -3619,6 +3674,199 @@
         <item name="writebar_icon">@color/azure_300</item>
         <item name="tabbar_fix">?accent</item>
     </style>
+    <style name="Vk.Theme.client_amoled_generated" parent="@style/Vk.Theme.Dark">
+        <item name="accent">@color/sky_300</item>
+        <item name="action_sheet_action_foreground">@color/white</item>
+        <item name="action_sheet_separator">@color/white_alpha12</item>
+        <item name="activity_indicator_tint">@color/gray_600</item>
+        <item name="attach_picker_tab_active_background">@color/gray_100</item>
+        <item name="attach_picker_tab_active_icon">@color/black</item>
+        <item name="attach_picker_tab_active_text">@color/gray_100</item>
+        <item name="attach_picker_tab_inactive_background">@color/black</item>
+        <item name="attach_picker_tab_inactive_icon">@color/gray_100</item>
+        <item name="attach_picker_tab_inactive_text">@color/gray_500</item>
+        <item name="background_content">@color/black</item>
+        <item name="background_highlighted">@color/white_alpha12</item>
+        <item name="background_keyboard">@color/black</item>
+        <item name="background_light">@color/black</item>
+        <item name="background_page">@color/black</item>
+        <item name="background_suggestions">@color/black</item>
+        <item name="button_bot_shadow">@color/black</item>
+        <item name="button_bot_shadow_disabled">#6619191a</item>
+        <item name="button_commerce_background">@color/green</item>
+        <item name="button_commerce_background_disabled">#664bb34b</item>
+        <item name="button_commerce_foreground">@color/white</item>
+        <item name="button_commerce_foreground_disabled">#66ffffff</item>
+        <item name="button_muted_background">@color/black</item>
+        <item name="button_muted_background_disabled">#662c2d2e</item>
+        <item name="button_muted_foreground">@color/gray_100</item>
+        <item name="button_muted_foreground_disabled">#66e1e3e6</item>
+        <item name="button_outline_border">@color/gray_100</item>
+        <item name="button_outline_border_disabled">#66e1e3e6</item>
+        <item name="button_outline_foreground">@color/gray_100</item>
+        <item name="button_outline_foreground_disabled">#66e1e3e6</item>
+        <item name="button_primary_background">@color/gray_100</item>
+        <item name="button_primary_background_disabled">#66e1e3e6</item>
+        <item name="button_primary_foreground">@color/black</item>
+        <item name="button_primary_foreground_disabled">#6619191a</item>
+        <item name="button_secondary_background">@color/gray_700</item>
+        <item name="button_secondary_background_disabled">#66454647</item>
+        <item name="button_secondary_foreground">@color/gray_100</item>
+        <item name="button_secondary_foreground_disabled">#66e1e3e6</item>
+        <item name="button_tertiary_background">@color/clear</item>
+        <item name="button_tertiary_background_disabled">#66000000</item>
+        <item name="button_tertiary_foreground">@color/gray_100</item>
+        <item name="button_tertiary_foreground_disabled">#66e1e3e6</item>
+        <item name="cell_button_foreground">@color/gray_100</item>
+        <item name="cell_button_foreground_disabled">#66e1e3e6</item>
+        <item name="content_placeholder_icon">@color/gray_300</item>
+        <item name="content_placeholder_text">@color/gray_300</item>
+        <item name="content_tint_background">@color/black</item>
+        <item name="content_tint_foreground">@color/gray_400</item>
+        <item name="control_background">@color/gray_700</item>
+        <item name="control_foreground">@color/gray_100</item>
+        <item name="control_tint">@color/black</item>
+        <item name="control_tint_muted">@color/gray_400</item>
+        <item name="counter_primary_background">@color/sky_300</item>
+        <item name="counter_primary_text">@color/white</item>
+        <item name="counter_secondary_background">@color/gray_500</item>
+        <item name="counter_secondary_text">@color/black</item>
+        <item name="destructive">@color/red_light</item>
+        <item name="feed_recommended_friend_promo_background">@color/steel_gray_500</item>
+        <item name="field_background">@color/black</item>
+        <item name="field_border">@color/white_alpha12</item>
+        <item name="field_error_background">@color/red_dark</item>
+        <item name="field_error_border">@color/red_light</item>
+        <item name="field_text_placeholder">@color/gray_500</item>
+        <item name="field_valid_border">@color/green</item>
+        <item name="float_button_background">@color/gray_700</item>
+        <item name="float_button_background_disabled">#66454647</item>
+        <item name="float_button_background_highlighted">@color/black</item>
+        <item name="float_button_background_highlighted_disabled">#660a0a0a</item>
+        <item name="float_button_border">@color/black_alpha12</item>
+        <item name="float_button_border_disabled">#0c000000</item>
+        <item name="float_button_foreground">@color/gray_300</item>
+        <item name="float_button_foreground_disabled">#66aaaeb3</item>
+        <item name="header_alternate_background">@color/black</item>
+        <item name="header_alternate_tab_active_indicator">@color/gray_100</item>
+        <item name="header_alternate_tab_active_text">@color/gray_100</item>
+        <item name="header_alternate_tab_inactive_text">@color/gray_500</item>
+        <item name="header_background">@color/black</item>
+        <item name="header_background_before_blur">@color/gray_950</item>
+        <item name="header_background_before_blur_alternate">@color/gray_950</item>
+        <item name="header_search_field_background">@color/gray_700</item>
+        <item name="header_search_field_tint">@color/gray_100</item>
+        <item name="header_tab_active_background">@color/gray_600</item>
+        <item name="header_tab_active_indicator">@color/gray_100</item>
+        <item name="header_tab_active_text">@color/gray_100</item>
+        <item name="header_tab_inactive_text">@color/gray_500</item>
+        <item name="header_text">@color/gray_100</item>
+        <item name="header_text_alternate">@color/gray_100</item>
+        <item name="header_text_secondary">@color/white_alpha60</item>
+        <item name="header_tint">@color/gray_100</item>
+        <item name="header_tint_alternate">@color/gray_100</item>
+        <item name="icon_alpha_placeholder">@color/gray_100</item>
+        <item name="icon_medium">@color/gray_400</item>
+        <item name="icon_name">@color/gray_300</item>
+        <item name="icon_outline_medium">@color/gray_300</item>
+        <item name="icon_outline_secondary">@color/gray_400</item>
+        <item name="icon_secondary">@color/gray_500</item>
+        <item name="icon_tertiary">@color/gray_700</item>
+        <item name="im_attach_tint">@color/sky_300</item>
+        <item name="im_bubble_border_alternate">@color/clear</item>
+        <item name="im_bubble_border_alternate_highlighted">@color/clear</item>
+        <item name="im_bubble_button_background">@color/black</item>
+        <item name="im_bubble_button_background_disabled">#66313233</item>
+        <item name="im_bubble_button_foreground">@color/gray_100</item>
+        <item name="im_bubble_button_foreground_disabled">#66e1e3e6</item>
+        <item name="im_bubble_gift_background">@color/gold_300</item>
+        <item name="im_bubble_gift_text">@color/gold_100</item>
+        <item name="im_bubble_gift_text_secondary">@color/gold_150</item>
+        <item name="im_bubble_incoming">@color/black</item>
+        <item name="im_bubble_incoming_alternate">@color/black</item>
+        <item name="im_bubble_incoming_alternate_highlighted">@color/gray_600</item>
+        <item name="im_bubble_incoming_highlighted">@color/gray_600</item>
+        <item name="im_bubble_outgoing">@color/gray_700</item>
+        <item name="im_bubble_outgoing_alternate">@color/gray_700</item>
+        <item name="im_bubble_outgoing_alternate_highlighted">@color/gray_500</item>
+        <item name="im_bubble_outgoing_highlighted">@color/gray_600</item>
+        <item name="im_forward_line_tint">@color/white</item>
+        <item name="im_reply_sender_text">@color/white</item>
+        <item name="im_reply_separator">@color/white</item>
+        <item name="im_service_message_text">@color/steel_gray_400</item>
+        <item name="im_toolbar_separator">@color/gray_300</item>
+        <item name="im_toolbar_voice_msg_background">@color/gray_700</item>
+        <item name="image_border">@color/white_alpha8</item>
+        <item name="input_background">@color/gray_700</item>
+        <item name="input_border">@color/gray_700</item>
+        <item name="landing_background">?accent</item>
+        <item name="landing_primary_button_background">@color/white</item>
+        <item name="landing_primary_button_background_disabled">#66ffffff</item>
+        <item name="landing_primary_button_foreground">?accent</item>
+        <item name="landing_primary_button_foreground_disabled">#665181b8</item>
+        <item name="landing_snippet_border">@color/clear</item>
+        <item name="landing_text_secondary">@color/white_alpha60</item>
+        <item name="landing_text_title">@color/white</item>
+        <item name="like_text_tint">@color/red_light</item>
+        <item name="link_alternate">@color/sky_300</item>
+        <item name="loader_background">@color/black</item>
+        <item name="loader_tint">@color/gray_500</item>
+        <item name="loader_track_fill">@color/gray_700</item>
+        <item name="loader_track_value_fill">@color/sky_300</item>
+        <item name="media_overlay_button_background">@color/white</item>
+        <item name="media_overlay_button_background_disabled">#66ffffff</item>
+        <item name="media_overlay_button_foreground">@color/black</item>
+        <item name="media_overlay_button_foreground_disabled">#662c2d2e</item>
+        <item name="modal_card_background">@color/black</item>
+        <item name="modal_card_border">@color/white_alpha12</item>
+        <item name="modal_card_header_close">@color/white</item>
+        <item name="music_playback_icon">@color/white</item>
+        <item name="overlay_status_background">@color/black</item>
+        <item name="overlay_status_foreground">@color/gray_100</item>
+        <item name="overlay_status_icon">@color/gray_50</item>
+        <item name="panel_tab_active_background">@color/gray_700</item>
+        <item name="panel_tab_active_text">@color/gray_100</item>
+        <item name="panel_tab_inactive_text">@color/gray_500</item>
+        <item name="placeholder_icon_background">@color/white_alpha8</item>
+        <item name="placeholder_icon_foreground_primary">@color/gray_400</item>
+        <item name="placeholder_icon_foreground_secondary">@color/gray_600</item>
+        <item name="placeholder_icon_tint">@color/white</item>
+        <item name="poll_option_background">@color/white</item>
+        <item name="search_bar_background">@color/black</item>
+        <item name="search_bar_field_background">@color/gray_700</item>
+        <item name="search_bar_field_tint">@color/gray_300</item>
+        <item name="search_bar_segmented_control_tint">@color/gray_400</item>
+        <item name="segmented_control_bar_background">@color/black</item>
+        <item name="segmented_control_tint">@color/gray_500</item>
+        <item name="selection_off_icon">@color/gray_700</item>
+        <item name="separator_alpha">@color/white_alpha15</item>
+        <item name="separator_alternate">@color/black</item>
+        <item name="separator_common">@color/black</item>
+        <item name="snippet_background">@color/black</item>
+        <item name="snippet_border">@color/white_alpha12</item>
+        <item name="snippet_icon_tertiary">@color/gray_600</item>
+        <item name="splashscreen_icon">@color/black</item>
+        <item name="statusbar_alternate_legacy_background">@color/clear</item>
+        <item name="stories_skeleton_loader_background">@color/gray_700</item>
+        <item name="switch_ios_off_border">@color/black</item>
+        <item name="tabbar_active_icon">@color/white</item>
+        <item name="tabbar_background">@color/black</item>
+        <item name="tabbar_inactive_icon">@color/gray_500</item>
+        <item name="text_action_counter">@color/gray_300</item>
+        <item name="text_link">@color/sky_300</item>
+        <item name="text_link_hightlighted_background">@color/sky_300</item>
+        <item name="text_muted">@color/gray_200</item>
+        <item name="text_name">@color/gray_100</item>
+        <item name="text_placeholder">@color/gray_300</item>
+        <item name="text_primary">@color/gray_100</item>
+        <item name="text_secondary">@color/gray_500</item>
+        <item name="text_subhead">@color/gray_400</item>
+        <item name="text_tertiary">@color/gray_600</item>
+        <item name="toolbar_attach_background_from">@color/gray_500</item>
+        <item name="toolbar_attach_background_to">@color/gray_600</item>
+        <item name="writebar_icon">@color/gray_400</item>
+        <item name="tabbar_fix">?tabbar_background</item>
+    </style>
     <style name="Vk.Theme.client_dark_generated" parent="@style/Vk.Theme.Dark">
         <item name="accent">@color/sky_300</item>
         <item name="action_sheet_action_foreground">@color/white</item>
diff --git a/smali/smali/com/vk/core/ui/themes/VKTheme.smali b/smali/smali/com/vk/core/ui/themes/VKTheme.smali
index 0519fe137..fa4b50e75 100644
--- a/smali/smali/com/vk/core/ui/themes/VKTheme.smali
+++ b/smali/smali/com/vk/core/ui/themes/VKTheme.smali
@@ -84,7 +84,9 @@
     const-string v9, "AMOLED"
 
     .line 292
-    sget v13, Lcom/vk/s/R$g;->BaseDarkStyle:I
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getAmoledTheme()I
+
+    move-result v13
 
     const/4 v10, 0x2
 
diff --git a/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali b/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali
index b4d314180..44dd7ee7a 100644
--- a/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali
+++ b/smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali
@@ -351,18 +351,9 @@
 
     if-eqz v0, :cond_0
 
-    invoke-static {}, Lru/vtosters/lite/utils/Themes;->amoled()Z
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getCurrentDarkTheme()Lcom/vk/core/ui/themes/VKTheme;
 
-    move-result v1
-
-    if-eqz v1, :cond_10
-
-    sget-object v0, Lcom/vk/core/ui/themes/VKTheme;->AMOLED:Lcom/vk/core/ui/themes/VKTheme;
-
-    goto :goto_0
-
-    :cond_10
-    sget-object v0, Lcom/vk/core/ui/themes/VKTheme;->DARK:Lcom/vk/core/ui/themes/VKTheme;
+    move-result-object v0
 
     goto :goto_0
 
diff --git a/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali b/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali
index 4bbe93fce..b760b776e 100644
--- a/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali
+++ b/smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali
@@ -915,20 +915,10 @@
 
     move-result-object v0
 
-    invoke-static {}, Lru/vtosters/lite/utils/Themes;->amoled()Z
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getCurrentDarkTheme()Lcom/vk/core/ui/themes/VKTheme;
 
-    move-result v3
+    move-result-object v2
 
-    if-eqz v3, :cond_10
-
-    sget-object v2, Lcom/vk/core/ui/themes/VKTheme;->AMOLED:Lcom/vk/core/ui/themes/VKTheme;
-
-    goto :goto_0
-
-    :cond_10
-    sget-object v2, Lcom/vk/core/ui/themes/VKTheme;->DARK:Lcom/vk/core/ui/themes/VKTheme;
-
-    goto :goto_0
     if-ne v0, v2, :cond_5
 
     :cond_4