some theme upgrades

monet theme disabled
amoled theme switch
some fixes with vkui inj

app/src/main/java/ru/vtosters/lite/hooks/VKUIHook.java

@@ -18,6 +18,8 @@ import android.webkit.WebView;
 import com.vk.articles.preload.WebCachePreloader;
 import com.vtosters.lite.R;
 import com.vtosters.lite.data.ThemeTracker;
+import ru.vtosters.lite.themes.ThemesCore;
+import ru.vtosters.lite.utils.ThemesUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -77,22 +79,19 @@ public class VKUIHook {
     }
 
     public static void inject(WebView webView) {
-        String string = getPrefsValue("darktheme");
-
         if (getBoolValue("VKUI_INJ", true)) {
-
             if (!isLoaded) {
                 load();
             }
 
             StringBuilder sb = new StringBuilder();
 
-            if (true/*Themes.isAccentedCache()*/) {
+            if (ThemesCore.isCachedAccents()) {
                 sb.append("\n\n");
                 sb.append(loadedCSS);
             }
 
-            if (string.equals("amoled")) {
+            if (ThemesUtils.isAmoledTheme()) {
                 sb.append("\n\n");
                 sb.append(loadedCSSAmoled);
             }

app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java

@@ -1,19 +1,14 @@
 package ru.vtosters.lite.ui.fragments;
 
-import android.content.DialogInterface;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
-
 import androidx.preference.PreferenceCategory;
-
 import com.vk.core.dialogs.alert.VkAlertDialog;
 import com.vk.core.fragments.FragmentImpl;
 import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
-
-import ru.vtosters.lite.themes.ColorReferences;
 import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.palettes.PalettesManager;
 import ru.vtosters.lite.ui.dialogs.PalettesBottomSheetDialog;
@@ -37,62 +32,64 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
         accentColorPreference.setIcon(ThemesUtils.recolorDrawable(requireContext().getDrawable(R.drawable.bg_accent_circle)));
         accentColorPreference.setOnPreferenceClickListener(preference -> {
             changeAccent();
-            return false;
+            return true;
         });
 
         var navBarPreference = findPreference("navbar");
         navBarPreference.setOnPreferenceClickListener(preference -> {
             restart();
-            return false;
+            return true;
         });
 
         var milkshakePreference = findPreference("milkshake");
         milkshakePreference.setOnPreferenceClickListener(preference -> {
             restart();
-            return false;
+            return true;
         });
 
-        var darkThemePreference = findPreference("darktheme");
-        darkThemePreference.setOnPreferenceChangeListener((preference, o) -> {
-            restartDark(o.toString());
-            return false;
+        var amoledThemePreference = findPreference("amoledtheme");
+        amoledThemePreference.setOnPreferenceClickListener(preference -> {
+            restart();
+            return true;
         });
 
-        var lightThemePreference = findPreference("lighttheme");
-        lightThemePreference.setOnPreferenceChangeListener(((preference, o) -> {
-            restartLight(o.toString());
-            return false;
-        }));
+        var monetThemePreference = findPreference("monettheme");
+        monetThemePreference.setOnPreferenceClickListener(preference -> {
+            restart();
+            return true;
+        });
+        monetThemePreference.setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
 
         var iconManagerPreference = findPreference("iconmanager");
         iconManagerPreference.setOnPreferenceClickListener(preference -> {
             switchFragment(IconsFragment.class);
-            return false;
+            return true;
         });
 
         var dockbarTabTitlesPreference = findPreference("dockbar_tab_titles");
         dockbarTabTitlesPreference.setOnPreferenceClickListener(preference -> {
             restart();
-            return false;
+            return true;
         });
 
         var dockbarAccentPreference = findPreference("dockbar_accent");
         dockbarAccentPreference.setOnPreferenceClickListener(preference -> {
             restart();
-            return false;
+            return true;
         });
 
         var dockCounterPreference = findPreference("dockcounter");
         dockCounterPreference.setOnPreferenceClickListener(preference -> {
             restart();
-            return false;
+            return true;
         });
 
         var newsfeedNotificationsPreference = findPreference("newsfeed_notif");
         newsfeedNotificationsPreference.setOnPreferenceClickListener(preference -> {
             restart();
-            return false;
+            return true;
         });
+
         newsfeedNotificationsPreference.setVisible(Preferences.milkshake());
 
         if (AndroidUtils.isTablet()) {
@@ -157,23 +154,13 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
     void setAccentColor(int color) {
         ThemesUtils.setCustomAccentColor(color, false);
         ThemesCore.setThemedColors(color);
-        LifecycleUtils.restartApplicationWithTimer();
+        restart();
     }
 
     void restart() {
         LifecycleUtils.restartApplicationWithTimer();
     }
 
-    void restartLight(String value) {
-        AndroidUtils.edit().putString("lighttheme", value).commit();
-        LifecycleUtils.restartApplicationWithTimer();
-    }
-
-    void restartDark(String value) {
-        AndroidUtils.edit().putString("darktheme", value).commit();
-        LifecycleUtils.restartApplicationWithTimer();
-    }
-
     private void switchFragment(Class<? extends FragmentImpl> fragmentClz) {
         var intent = new Navigator(fragmentClz)
                 .b(requireContext())

app/src/main/java/ru/vtosters/lite/utils/Preferences.java

@@ -280,10 +280,6 @@ public class Preferences {
         return getBoolValue("systememoji", false);
     }
 
-    public static boolean vksans() {
-        return getBoolValue("vksans", false);
-    }
-
     public static boolean voice() {
         return getBoolValue("voice", true);
     }
@@ -293,10 +289,6 @@ public class Preferences {
         return customvalue.isEmpty() ? orig : Integer.parseInt(customvalue);
     }
 
-    public static boolean color_grishka() {
-        return getBoolValue("color_grishka", true);
-    }
-
     public static boolean vkme_notifs() {
         return getBoolValue("vkme_notifs", false);
     }

app/src/main/java/ru/vtosters/lite/utils/SSFSUtils.java

@@ -4,10 +4,8 @@ import com.vk.core.network.Network;
 
 import static ru.vtosters.lite.hooks.DateHook.getLocale;
 import static ru.vtosters.lite.proxy.ProxyUtils.isAnyProxyEnabled;
-import static ru.vtosters.lite.utils.About.getBuildNumber;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.dev;
-import static ru.vtosters.lite.utils.Preferences.vksans;
 import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 
 public class SSFSUtils {
@@ -37,17 +35,13 @@ public class SSFSUtils {
     }
 
     public static String getAmoledVKUI() {
-        return getPrefsValue("darktheme").equals("amoled") && isDarkTheme() ? "1" : "0";
+        return ThemesUtils.isAmoledTheme() && isDarkTheme() ? "1" : "0";
     }
 
     public static String getUserProxy() {
         return isAnyProxyEnabled() ? "1" : "0";
     }
 
-    public static String isVKSansEnabled() {
-        return vksans() ? "1" : "0";
-    }
-
     public static String isDEVModEnabled() {
         return dev() ? "1" : "0";
     }

app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java

@@ -95,6 +95,14 @@ public class ThemesUtils {
     public static boolean isDarkTheme() {
         return VKThemeHelper.r();
     }
+    
+    public static boolean isMonetTheme() {
+        return getBoolValue("monettheme", false) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;
+    }
+    
+    public static boolean isAmoledTheme() {
+        return getBoolValue("amoledtheme", false);
+    }
 
     public static int getAccentColor() {
         var accent = AndroidUtils.getPreferences().getInt("accent_color", getColorFromAttr(R.attr.accent));
@@ -236,10 +244,19 @@ public class ThemesUtils {
     }
 
     public static int getDarkThemeRes() {
-        if (getPrefsValue("darktheme").equals("amoled")) {
-            return isMilkshake() ? R.style.VkMilkAmoledStyle : R.style.VkAmoledStyle;
+        if (isMonetTheme()) {
+            if (isAmoledTheme()) {
+                return isMilkshake() ? getIdentifier("VkMilkAmoledMonetStyle", "style"): getIdentifier("VkAmoledMonetStyle", "style");
+            } else {
+                return isMilkshake() ? getIdentifier("VkMilkDarkMonetStyle", "style"): getIdentifier("VkDarkMonetStyle", "style");
+            }
+        } else {
+            if (isAmoledTheme()) {
+                return isMilkshake() ? R.style.VkMilkAmoledStyle : R.style.VkAmoledStyle;
+            } else {
+                return isMilkshake() ? R.style.VkMilkDarkStyle : R.style.VkDarkStyle;
+            }
         }
-        return isMilkshake() ? R.style.VkMilkDarkStyle : R.style.VkDarkStyle;
     } // Return needed res theme
 
     public static VKTheme getDarkTheme() {
@@ -254,10 +271,6 @@ public class ThemesUtils {
         return VKThemeHelper.d(attr);
     } // Get needed attr color
 
-    public static boolean isAndroidMonet() {
-        return color_grishka() && Build.VERSION.SDK_INT >= 31;
-    }
-
     public static void colorWriteBar(View view) {
         if (!navbar()) return;
         view.setBackgroundColor(getTabbarBackground());

smali/res/values-v31/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Vk.Theme.VkApp.client_light_generated" parent="@style/Vk.Theme.VkApp">
+    <style name="Vk.Theme.VkApp.client_light_monet_generated" parent="@style/Vk.Theme.VkApp">
         <item name="accent">@android:color/system_accent1_300</item>
         <item name="accent_alpha10">@android:color/system_accent1_300</item>
         <item name="action_sheet_action_foreground">@android:color/system_accent1_200</item>
@@ -29,14 +29,14 @@
         <item name="button_muted_foreground">@android:color/system_accent1_400</item>
         <item name="button_muted_foreground_disabled">#665181b8</item>
         <item name="button_outline_border">@android:color/system_accent1_300</item>
-        <item name="button_outline_border_disabled">#66528bcc</item>
+        <item name="button_outline_border_disabled">@android:color/system_accent1_300</item>
         <item name="button_outline_foreground">@android:color/system_accent1_300</item>
-        <item name="button_outline_foreground_disabled">#66528bcc</item>
+        <item name="button_outline_foreground_disabled">@android:color/system_accent1_300</item>
         <item name="button_primary_background">@android:color/system_accent1_400</item>
         <item name="button_primary_background_disabled">#665181b8</item>
         <item name="button_primary_foreground">@android:color/system_neutral1_100</item>
         <item name="button_primary_foreground_disabled">#66ffffff</item>
-        <item name="button_secondary_background">@color/black_blue45_alpha10</item>
+        <item name="button_secondary_background">?accent</item>
         <item name="button_secondary_background_disabled">#0a003973</item>
         <item name="button_secondary_foreground">@android:color/system_accent1_600</item>
         <item name="button_secondary_foreground_disabled">#6645678f</item>
@@ -45,7 +45,7 @@
         <item name="button_tertiary_foreground">@android:color/system_accent1_400</item>
         <item name="button_tertiary_foreground_disabled">#665181b8</item>
         <item name="cell_button_foreground">@android:color/system_accent1_300</item>
-        <item name="cell_button_foreground_disabled">#66528bcc</item>
+        <item name="cell_button_foreground_disabled">@android:color/system_accent1_300</item>
         <item name="content_placeholder_icon">@android:color/system_neutral1_300</item>
         <item name="content_placeholder_text">@android:color/system_neutral1_400</item>
         <item name="content_tint_background">@color/gray_A40</item>
@@ -69,7 +69,7 @@
         <item name="dynamic_violet">@color/violet</item>
         <item name="feed_recommended_friend_promo_background">@android:color/system_accent1_300</item>
         <item name="field_background">@android:color/system_neutral1_50</item>
-        <item name="field_border">@color/black_alpha12</item>
+        <item name="field_border">@android:color/system_neutral1_50</item>
         <item name="field_error_background">@color/pink_light</item>
         <item name="field_error_border">@color/red</item>
         <item name="field_text_placeholder">@android:color/system_neutral1_400</item>
@@ -78,8 +78,8 @@
         <item name="float_button_background_disabled">#66f5f5f5</item>
         <item name="float_button_background_highlighted">@android:color/system_neutral1_50</item>
         <item name="float_button_background_highlighted_disabled">#66ebedf0</item>
-        <item name="float_button_border">@color/black_alpha05</item>
-        <item name="float_button_border_disabled">#05000000</item>
+        <item name="float_button_border">@android:color/system_neutral1_50</item>
+        <item name="float_button_border_disabled">@android:color/system_neutral1_50</item>
         <item name="float_button_foreground">@android:color/system_neutral1_300</item>
         <item name="float_button_foreground_disabled">#6699a2ad</item>
         <item name="header_alternate_background">@android:color/system_neutral1_100</item>
@@ -90,11 +90,11 @@
         <item name="header_background_before_blur">@android:color/system_accent1_300</item>
         <item name="header_background_before_blur_alternate">@android:color/system_neutral1_100</item>
         <item name="header_search_field_background">@android:color/system_accent1_700</item>
-        <item name="header_search_field_tint">@color/blue_overlight_3</item>
-        <item name="header_tab_active_background">@color/blue_overlight_1_alpha32</item>
+        <item name="header_search_field_tint">?accent</item>
+        <item name="header_tab_active_background">?accent</item>
         <item name="header_tab_active_indicator">@android:color/system_neutral1_100</item>
         <item name="header_tab_active_text">@android:color/system_neutral1_100</item>
-        <item name="header_tab_inactive_text">@color/blue_overlight_2_alpha80</item>
+        <item name="header_tab_inactive_text">?accent</item>
         <item name="header_text">@android:color/system_neutral1_100</item>
         <item name="header_text_alternate">@color/black</item>
         <item name="header_text_secondary">@android:color/system_neutral1_100</item>
@@ -111,7 +111,7 @@
         <item name="icon_tertiary">@android:color/system_neutral1_200</item>
         <item name="im_attach_tint">@android:color/system_accent1_400</item>
         <item name="im_bubble_border_alternate">@android:color/system_neutral1_100</item>
-        <item name="im_bubble_border_alternate_highlighted">@color/gray_A150</item>
+        <item name="im_bubble_border_alternate_highlighted">@android:color/system_neutral1_100</item>
         <item name="im_bubble_button_background">@android:color/system_neutral1_50</item>
         <item name="im_bubble_button_background_disabled">#66f9f9f9</item>
         <item name="im_bubble_button_background_highlighted">@color/gray_A150</item>
@@ -140,25 +140,25 @@
         <item name="im_bubble_wallpaper_button_foreground_disabled">#66000000</item>
         <item name="im_bubble_wallpaper_expiring_border">@color/mint_A1_alpha12</item>
         <item name="im_bubble_wallpaper_incoming">@android:color/system_neutral1_100</item>
-        <item name="im_bubble_wallpaper_incoming_border">@color/black_blue45_alpha10</item>
+        <item name="im_bubble_wallpaper_incoming_border">?accent</item>
         <item name="im_bubble_wallpaper_incoming_highlighted">@android:color/system_neutral1_50</item>
         <item name="im_bubble_wallpaper_outgoing">@android:color/system_accent1_200</item>
-        <item name="im_bubble_wallpaper_outgoing_border">@color/black_blue45_alpha10</item>
+        <item name="im_bubble_wallpaper_outgoing_border">?accent</item>
         <item name="im_bubble_wallpaper_outgoing_highlighted">@android:color/system_accent1_300</item>
         <item name="im_forward_line_tint">@android:color/system_accent1_600</item>
         <item name="im_reply_separator">@android:color/system_accent1_400</item>
         <item name="im_service_message_text">@android:color/system_neutral1_400</item>
         <item name="im_text_name">@android:color/system_accent1_400</item>
-        <item name="im_toolbar_separator">@color/black_blue24</item>
+        <item name="im_toolbar_separator">?accent</item>
         <item name="im_toolbar_voice_msg_background">@android:color/system_neutral1_300</item>
-        <item name="image_border">@color/black_alpha8</item>
+        <item name="image_border">@android:color/system_neutral1_50</item>
         <item name="input_background">@android:color/system_neutral1_50</item>
         <item name="input_border">@android:color/system_neutral1_100</item>
         <item name="landing_background">@android:color/system_accent1_300</item>
         <item name="landing_field_background">@android:color/system_neutral1_100</item>
-        <item name="landing_field_border">@color/black_alpha12</item>
+        <item name="landing_field_border">@android:color/system_neutral1_400</item>
         <item name="landing_field_placeholder">@android:color/system_neutral1_400</item>
-        <item name="landing_login_button_background">@color/black_blue24_alpha24</item>
+        <item name="landing_login_button_background">@android:color/system_neutral1_100</item>
         <item name="landing_login_button_background_disabled">#18001c3d</item>
         <item name="landing_login_button_foreground">@android:color/system_neutral1_100</item>
         <item name="landing_login_button_foreground_disabled">#66ffffff</item>
@@ -173,7 +173,7 @@
         <item name="landing_snippet_border">@color/clear</item>
         <item name="landing_tertiary_button_background">@color/clear</item>
         <item name="landing_tertiary_button_background_disabled">#00000000</item>
-        <item name="landing_tertiary_button_foreground">@color/blue_overlight_2_alpha80</item>
+        <item name="landing_tertiary_button_foreground">?accent</item>
         <item name="landing_tertiary_button_foreground_disabled">#51c2deff</item>
         <item name="landing_text_primary">@android:color/system_neutral1_100</item>
         <item name="landing_text_secondary">@android:color/system_neutral1_100</item>
@@ -198,11 +198,11 @@
         <item name="panel_tab_active_background">@android:color/system_neutral1_50</item>
         <item name="panel_tab_active_text">@android:color/system_neutral1_600</item>
         <item name="panel_tab_inactive_text">@android:color/system_neutral1_500</item>
-        <item name="placeholder_icon_background">@color/black_blue24_alpha8</item>
+        <item name="placeholder_icon_background">?accent</item>
         <item name="placeholder_icon_background_opaque">@android:color/system_neutral1_50</item>
         <item name="placeholder_icon_foreground_primary">@android:color/system_neutral1_300</item>
         <item name="placeholder_icon_foreground_secondary">@android:color/system_neutral1_200</item>
-        <item name="placeholder_icon_tint">@color/black_blue24</item>
+        <item name="placeholder_icon_tint">?accent</item>
         <item name="poll_option_background">@android:color/system_accent1_600</item>
         <item name="search_bar_background">@android:color/system_neutral1_50</item>
         <item name="search_bar_field_background">@android:color/system_neutral1_100</item>
@@ -215,7 +215,7 @@
         <item name="separator_alternate">@android:color/system_neutral1_100</item>
         <item name="separator_common">@android:color/system_neutral1_100</item>
         <item name="snippet_background">@android:color/system_neutral1_100</item>
-        <item name="snippet_border">@color/black_alpha15</item>
+        <item name="snippet_border">@android:color/system_neutral1_200</item>
         <item name="snippet_icon_tertiary">@android:color/system_neutral1_200</item>
         <item name="splashscreen_icon">@android:color/system_neutral1_100</item>
         <item name="statusbar_alternate_legacy_background">@color/black_alpha20</item>
@@ -260,7 +260,7 @@
         <item name="writebar_icon">@android:color/system_neutral1_300</item>
     </style>
 
-    <style name="Vk.Theme.VkApp.bright_light_generated" parent="@style/Vk.Theme.VkApp">
+    <style name="Vk.Theme.VkApp.bright_light_monet_generated" parent="@style/Vk.Theme.VkApp">
         <item name="accent">@android:color/system_accent1_400</item>
         <item name="accent_alpha10">@android:color/system_accent1_400</item>
         <item name="action_sheet_action_foreground">@android:color/system_accent1_400</item>
@@ -321,7 +321,7 @@
         <item name="counter_secondary_background">@android:color/system_neutral1_200</item>
         <item name="counter_secondary_text">@android:color/system_neutral1_100</item>
         <item name="destructive">@color/red</item>
-        <item name="dynamic_blue">@color/blue</item>
+        <item name="dynamic_blue">?accent</item>
         <item name="dynamic_gray">@color/gray</item>
         <item name="dynamic_green">@color/green</item>
         <item name="dynamic_orange">@color/orange</item>
@@ -329,7 +329,7 @@
         <item name="dynamic_violet">@color/violet</item>
         <item name="feed_recommended_friend_promo_background">@android:color/system_accent1_300</item>
         <item name="field_background">@android:color/system_neutral1_50</item>
-        <item name="field_border">@color/black_alpha12</item>
+        <item name="field_border">@android:color/system_neutral1_50</item>
         <item name="field_error_background">@color/pink_light</item>
         <item name="field_error_border">@color/red</item>
         <item name="field_text_placeholder">@android:color/system_neutral1_400</item>
@@ -338,7 +338,7 @@
         <item name="float_button_background_disabled">#66f5f5f5</item>
         <item name="float_button_background_highlighted">@android:color/system_neutral1_50</item>
         <item name="float_button_background_highlighted_disabled">#66ebedf0</item>
-        <item name="float_button_border">@color/black_alpha05</item>
+        <item name="float_button_border">@android:color/system_neutral1_300</item>
         <item name="float_button_border_disabled">#05000000</item>
         <item name="float_button_foreground">@android:color/system_neutral1_300</item>
         <item name="float_button_foreground_disabled">#6699a2ad</item>
@@ -400,16 +400,16 @@
         <item name="im_bubble_wallpaper_button_foreground_disabled">#66000000</item>
         <item name="im_bubble_wallpaper_expiring_border">@color/mint_A1_alpha12</item>
         <item name="im_bubble_wallpaper_incoming">@android:color/system_neutral1_100</item>
-        <item name="im_bubble_wallpaper_incoming_border">@color/black_blue45_alpha10</item>
+        <item name="im_bubble_wallpaper_incoming_border">?accent</item>
         <item name="im_bubble_wallpaper_incoming_highlighted">@android:color/system_neutral1_50</item>
         <item name="im_bubble_wallpaper_outgoing">@android:color/system_accent1_200</item>
-        <item name="im_bubble_wallpaper_outgoing_border">@color/black_blue45_alpha10</item>
+        <item name="im_bubble_wallpaper_outgoing_border">?accent</item>
         <item name="im_bubble_wallpaper_outgoing_highlighted">@android:color/system_accent1_300</item>
         <item name="im_forward_line_tint">@android:color/system_accent1_600</item>
         <item name="im_reply_separator">@android:color/system_accent1_500</item>
         <item name="im_service_message_text">@android:color/system_neutral1_400</item>
         <item name="im_text_name">@android:color/system_accent1_500</item>
-        <item name="im_toolbar_separator">@color/black_blue24</item>
+        <item name="im_toolbar_separator">?accent</item>
         <item name="im_toolbar_voice_msg_background">@android:color/system_neutral1_300</item>
         <item name="image_border">@color/black_alpha8</item>
         <item name="input_background">@android:color/system_neutral1_50</item>
@@ -426,7 +426,7 @@
         <item name="landing_primary_button_background_disabled">#664986cc</item>
         <item name="landing_primary_button_foreground">@android:color/system_neutral1_100</item>
         <item name="landing_primary_button_foreground_disabled">#66ffffff</item>
-        <item name="landing_secondary_button_background">@color/black_blue45_alpha10</item>
+        <item name="landing_secondary_button_background">?accent</item>
         <item name="landing_secondary_button_background_disabled">#0a003973</item>
         <item name="landing_secondary_button_foreground">@android:color/system_accent1_400</item>
         <item name="landing_secondary_button_foreground_disabled">#663f8ae0</item>
@@ -458,11 +458,11 @@
         <item name="panel_tab_active_background">@android:color/system_neutral1_50</item>
         <item name="panel_tab_active_text">@android:color/system_neutral1_600</item>
         <item name="panel_tab_inactive_text">@android:color/system_neutral1_500</item>
-        <item name="placeholder_icon_background">@color/black_blue24_alpha8</item>
+        <item name="placeholder_icon_background">?accent</item>
         <item name="placeholder_icon_background_opaque">@android:color/system_neutral1_50</item>
         <item name="placeholder_icon_foreground_primary">@android:color/system_neutral1_300</item>
         <item name="placeholder_icon_foreground_secondary">@android:color/system_neutral1_200</item>
-        <item name="placeholder_icon_tint">@color/black_blue24</item>
+        <item name="placeholder_icon_tint">?accent</item>
         <item name="poll_option_background">@android:color/system_accent1_600</item>
         <item name="search_bar_background">@android:color/system_neutral1_100</item>
         <item name="search_bar_field_background">@android:color/system_neutral1_50</item>
@@ -520,9 +520,7 @@
         <item name="writebar_icon">@android:color/system_accent1_400</item>
     </style>
 
-
-
-    <style name="Vk.Theme.VkApp.client_dark_generated" parent="@style/Vk.Theme.VkApp">
+    <style name="Vk.Theme.VkApp.client_dark_monet_generated" parent="@style/Vk.Theme.VkApp">
         <item name="accent">@android:color/system_accent1_300</item>
         <item name="accent_alpha10">@android:color/system_accent1_300</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
@@ -600,8 +598,8 @@
         <item name="float_button_background_disabled">#66454647</item>
         <item name="float_button_background_highlighted">@android:color/system_neutral1_600</item>
         <item name="float_button_background_highlighted_disabled">#665d5f61</item>
-        <item name="float_button_border">@color/black_alpha12</item>
-        <item name="float_button_border_disabled">#0c000000</item>
+        <item name="float_button_border">@android:color/system_neutral1_300</item>
+        <item name="float_button_border_disabled">@android:color/system_neutral1_300</item>
         <item name="float_button_foreground">@android:color/system_neutral1_300</item>
         <item name="float_button_foreground_disabled">#66aaaeb3</item>
         <item name="header_alternate_background">@android:color/system_neutral1_800</item>
@@ -782,7 +780,7 @@
         <item name="writebar_icon">@android:color/system_neutral1_400</item>
     </style>
 
-    <style name="Vk.Theme.VkApp.space_gray_generated" parent="@style/Vk.Theme.VkApp">
+    <style name="Vk.Theme.VkApp.space_gray_monet_generated" parent="@style/Vk.Theme.VkApp">
         <item name="accent">@android:color/system_accent1_300</item>
         <item name="accent_alpha10">@android:color/system_accent1_300</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
@@ -1042,7 +1040,7 @@
         <item name="writebar_icon">@android:color/system_neutral1_400</item>
     </style>
 
-    <style name="Vk.Theme.VkApp.amoled_old_generated" parent="@style/Vk.Theme.VkApp">
+    <style name="Vk.Theme.VkApp.amoled_monet_old_generated" parent="@style/Vk.Theme.VkApp">
         <item name="accent">@android:color/system_accent1_100</item>
         <item name="accent_alpha10">@android:color/system_accent1_100</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
@@ -1302,7 +1300,7 @@
         <item name="writebar_icon">@android:color/system_neutral1_400</item>
     </style>
 
-    <style name="Vk.Theme.VkApp.amoled_generated" parent="@style/Vk.Theme.VkApp">
+    <style name="Vk.Theme.VkApp.amoled_monet_generated" parent="@style/Vk.Theme.VkApp">
         <item name="accent">@android:color/system_accent1_100</item>
         <item name="accent_alpha10">@android:color/system_accent1_100</item>
         <item name="action_sheet_action_foreground">@android:color/system_neutral1_100</item>
@@ -1562,7 +1560,7 @@
         <item name="writebar_icon">@android:color/system_neutral1_400</item>
     </style>
 
-    <style name="VkMilkLightStyle" parent="@style/VkMilkLightTheme">
+    <style name="VkMilkLightMonetStyle" parent="@style/VkMilkLightMonetTheme">
         <item name="android:textColorSecondary">@color/prefs_subtitle</item>
         <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
         <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
@@ -1619,7 +1617,7 @@
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="VkMilkLightTheme" parent="@style/Vk.Theme.VkApp.bright_light_generated">
+    <style name="VkMilkLightMonetTheme" parent="@style/Vk.Theme.VkApp.bright_light_monet_generated">
         <item name="android:buttonStyle">@style/ButtonStyle</item>
         <item name="android:progressBarStyle">@style/ProgressBar</item>
         <item name="android:seekBarStyle">@style/SolidSeekBar</item>
@@ -1721,7 +1719,7 @@
         <item name="vkapp_bottom_menu">@menu/bottom_navigation_milkshake</item>
     </style>
 
-    <style name="VkMilkDarkStyle" parent="@style/VkMilkDarkTheme">
+    <style name="VkMilkDarkMonetStyle" parent="@style/VkMilkDarkMonetTheme">
         <item name="android:textColorSecondary">@color/prefs_subtitle</item>
         <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
         <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
@@ -1776,7 +1774,7 @@
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="VkMilkDarkTheme" parent="@style/Vk.Theme.VkApp.space_gray_generated">
+    <style name="VkMilkDarkMonetTheme" parent="@style/Vk.Theme.VkApp.space_gray_monet_generated">
         <item name="android:buttonStyle">@style/ButtonStyle</item>
         <item name="android:progressBarStyle">@style/ProgressBar</item>
         <item name="android:seekBarStyle">@style/SolidSeekBar</item>
@@ -1878,7 +1876,7 @@
         <item name="vkapp_bottom_menu">@menu/bottom_navigation_milkshake</item>
     </style>
 
-    <style name="VkLightStyle" parent="@style/VkLightTheme">
+    <style name="VkLightMonetStyle" parent="@style/VkLightMonetTheme">
         <item name="android:textColorSecondary">@color/prefs_subtitle</item>
         <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
         <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
@@ -1920,7 +1918,7 @@
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="VkLightTheme" parent="@style/Vk.Theme.VkApp.client_light_generated">
+    <style name="VkLightMonetTheme" parent="@style/Vk.Theme.VkApp.client_light_monet_generated">
         <item name="android:buttonStyle">@style/ButtonStyle</item>
         <item name="android:progressBarStyle">@style/ProgressBar</item>
         <item name="android:seekBarStyle">@style/SolidSeekBar</item>
@@ -1980,7 +1978,7 @@
         <item name="vkim_msg_out_light_top_tail">@drawable/vkim_msg_out_def_top_tail</item>
     </style>
 
-    <style name="VkDarkStyle" parent="@style/VkDarkTheme">
+    <style name="VkDarkMonetStyle" parent="@style/VkDarkMonetTheme">
         <item name="android:textColorSecondary">@color/prefs_subtitle</item>
         <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
         <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
@@ -2022,7 +2020,164 @@
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="VkDarkTheme" parent="@style/Vk.Theme.VkApp.client_dark_generated">
+    <style name="VkMilkAmoledMonetStyle" parent="@style/VkMilkAmoledMonetTheme">
+        <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:forceDarkAllowed">false</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: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:navigationBarColor">?background_page</item>
+        <item name="android:actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
+        <item name="BuyMusicSubscriptionButtonStyle">@style/BuyMusicSubscriptionBtn</item>
+        <item name="actionBarPopupTheme">@style/Theme.AppCompat.Light</item>
+        <item name="actionBarTheme">@style/ActionBarTheme</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_back_outline_28</item>
+        <item name="appkitDefaultErrorText">@string/err_text</item>
+        <item name="appkitRetryButtonText">@string/retry</item>
+        <item name="is_messages_snippet">false</item>
+        <item name="newsfeed_action_color">?accent</item>
+        <item name="newsfeed_attach_subtitle_color">?text_secondary</item>
+        <item name="newsfeed_separator_height">@dimen/toolbar_separator_height</item>
+        <item name="newsfeed_separator_horizontal_margin">@dimen/post_side_padding</item>
+        <item name="notifications_header_padding_bottom">16.0dip</item>
+        <item name="notifications_header_padding_top">12.0dip</item>
+        <item name="preferenceTheme">@style/PreferenceThemeMilkshake</item>
+        <item name="searchViewCursorDrawable">@drawable/toolbar_blue_text_cursor_drawable</item>
+        <item name="searchViewTextColorHint">@color/toolbar_blue_searchViewTextColorHint</item>
+        <item name="tabBarBorderReference">@drawable/tab_bar_blue_border</item>
+        <item name="tabBarTheme">@style/TabBarTheme</item>
+        <item name="toolbar_font">@font/tt_commons_demi_bold</item>
+        <item name="toolbar_separator">@drawable/bg_toolbar_separator</item>
+        <item name="toolbar_shadow">@drawable/bg_toolbar_shadow_light</item>
+        <item name="toolbar_subtitle_textColor">?header_text_secondary</item>
+        <item name="toolbar_title_textColor">?header_text</item>
+        <item name="toolbar_title_textSize">23.0sp</item>
+        <item name="toolbar_title_textSize_max">23.0sp</item>
+        <item name="toolbar_title_textSize_min">16.0sp</item>
+        <item name="vkapp_menu_icon_size">28.0dip</item>
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="VkMilkAmoledMonetTheme" parent="@style/Vk.Theme.VkApp.amoled_monet_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</item>
+        <item name="android:colorControlHighlight">#33999999</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
+        <item name="appkitDefaultErrorText">@string/err_text</item>
+        <item name="appkitRetryButtonText">@string/retry</item>
+        <item name="discover_comments_color">?text_secondary</item>
+        <item name="discover_icon_color">?icon_outline_secondary</item>
+        <item name="im_avatars_combine">false</item>
+        <item name="im_bg_chat">?background_content</item>
+        <item name="im_bg_install_vkme_btn_bg">@drawable/bg_install_vkme_milkshake</item>
+        <item name="im_bg_modal_dialog">@drawable/bg_modal_dialog</item>
+        <item name="im_bg_sticky_date">@drawable/bg_sticky_date</item>
+        <item name="im_btn_accept_background">@color/azure_300_alpha10</item>
+        <item name="im_btn_accept_background_dark">@color/azure_300_alpha15</item>
+        <item name="im_btn_accept_foreground">@color/azure_A400</item>
+        <item name="im_btn_confirm_background">@color/blue_A400</item>
+        <item name="im_btn_confirm_background_dark">@color/blue_A500</item>
+        <item name="im_btn_confirm_background_disabled">@color/blue_A800</item>
+        <item name="im_btn_reject_background">@color/red_error_alpha10</item>
+        <item name="im_btn_reject_background_dark">@color/red_error_alpha15</item>
+        <item name="im_btn_reject_foreground">@color/red_error</item>
+        <item name="im_dialogs_item_style">@style/Vk.Theme.DialogItem.VkApp.Milkshake</item>
+        <item name="im_dropdown_arrow_tint">?header_tint</item>
+        <item name="im_dropdown_icon_color">?accent</item>
+        <item name="im_history_banner_bg_color">?header_background</item>
+        <item name="im_ic_annul">@drawable/ic_do_not_disturb_outline_28</item>
+        <item name="im_ic_attach">@drawable/ic_attach_outline_28</item>
+        <item name="im_ic_back">@drawable/ic_back_outline_28</item>
+        <item name="im_ic_back_toolbar">@drawable/vkim_ic_back_toolbar</item>
+        <item name="im_ic_bot_keyboard">@drawable/ic_keyboard_bots_outline_28</item>
+        <item name="im_ic_cancel">@drawable/ic_cancel_outline_28</item>
+        <item name="im_ic_chat_settings">?im_ic_info</item>
+        <item name="im_ic_clear_history">@drawable/ic_delete_outline_28</item>
+        <item name="im_ic_copy">@drawable/ic_copy_outline_28</item>
+        <item name="im_ic_delete">@drawable/ic_delete_outline_28</item>
+        <item name="im_ic_done">@drawable/ic_check_circle_outline_28</item>
+        <item name="im_ic_emoji">@drawable/ic_smile_outline_28</item>
+        <item name="im_ic_forward">@drawable/ic_forward_outline_28</item>
+        <item name="im_ic_group_profile">?im_ic_info</item>
+        <item name="im_ic_info">@drawable/ic_info_outline_28</item>
+        <item name="im_ic_invite_link">@drawable/ic_link_circle_outline_28</item>
+        <item name="im_ic_keyboard">@drawable/ic_keyboard_outline_28</item>
+        <item name="im_ic_leave_dialog">@drawable/ic_cancel_circle_outline_28</item>
+        <item name="im_ic_microphone">@drawable/ic_voice_outline_28</item>
+        <item name="im_ic_more_vertical">@drawable/ic_more_vertical_28</item>
+        <item name="im_ic_notifications_off">@drawable/ic_mute_outline_28</item>
+        <item name="im_ic_notifications_on">@drawable/ic_volume_outline_28</item>
+        <item name="im_ic_pin">@drawable/ic_pin_outline_28</item>
+        <item name="im_ic_pinned_msg_detach">@drawable/ic_unpin_outline_28</item>
+        <item name="im_ic_pinned_msg_hide">@drawable/ic_hide_outline_28</item>
+        <item name="im_ic_pinned_msg_show">@drawable/ic_view_outline_28</item>
+        <item name="im_ic_qr">@drawable/ic_qr_outline_28</item>
+        <item name="im_ic_receive_msgs_disable">@drawable/ic_do_not_disturb_outline_28</item>
+        <item name="im_ic_receive_msgs_enable">@drawable/ic_check_circle_outline_28</item>
+        <item name="im_ic_reply">@drawable/ic_reply_outline_28</item>
+        <item name="im_ic_report">@drawable/ic_report_outline_28</item>
+        <item name="im_ic_return_to_dialog">@drawable/ic_return_outline_28</item>
+        <item name="im_ic_search">@drawable/ic_search_outline_28</item>
+        <item name="im_ic_send_msg">@drawable/ic_send_28</item>
+        <item name="im_ic_share">@drawable/ic_share_outline_28</item>
+        <item name="im_ic_show_attaches">@drawable/ic_media_outline_28</item>
+        <item name="im_ic_user_profile">@drawable/user_outline_28</item>
+        <item name="im_ic_voip_call_audio">@drawable/ic_phone_outline_28</item>
+        <item name="im_ic_voip_call_video">@drawable/ic_videocam_28_outline</item>
+        <item name="im_ic_write_msg">@drawable/ic_write_outline_28_new</item>
+        <item name="im_ic_msgreload">@drawable/ic_camera_switch_outline_24</item>
+        <item name="im_ic_msgdl">@drawable/ic_download_outline_28</item>
+        <item name="im_msg_avatar_margin_top">3.0dip</item>
+        <item name="im_msg_box_margin_start_no_avatar">0.0dip</item>
+        <item name="im_msg_box_margin_start_with_avatar">8.0dip</item>
+        <item name="im_msg_part_button_bg">@drawable/vkim_msg_part_oval_btn_bg</item>
+        <item name="im_msg_part_label_contrast_bg">@drawable/vkim_msg_part_label_contrast_bg_new
+        </item>
+        <item name="im_msg_part_time_contrast_bg">@drawable/vkim_msg_part_time_contrast_bg_new
+        </item>
+        <item name="im_msg_part_time_sticker_bg">@drawable/vkim_msg_part_time_sticker_bg_new</item>
+        <item name="im_new_theme">true</item>
+        <item name="im_unread_line_divider">?separator_alpha</item>
+        <item name="newsfeed_dropdown">@drawable/ic_dropdown_outline_16</item>
+        <item name="newsfeed_dropdown_color">?accent</item>
+        <item name="newsfeed_dropdown_font">@font/roboto_regular</item>
+        <item name="newsfeed_dropdown_text_size">15.0sp</item>
+        <item name="newsfeed_post_date_color">?text_secondary</item>
+        <item name="newsfeed_post_title_color">?text_muted</item>
+        <item name="posting_input_background">@drawable/highlight_whats_new_input</item>
+        <item name="posting_whats_new_icon_gallery_width">44.0dip</item>
+        <item name="posting_whats_new_icon_live_width">44.0dip</item>
+        <item name="posting_whats_new_icon_padding_end">6.0dip</item>
+        <item name="posting_whats_new_icon_story_width">44.0dip</item>
+        <item name="posting_whats_new_padding_end">102.0dip</item>
+        <item name="posting_whats_new_padding_end_one_icon">58.0dip</item>
+        <item name="posting_whats_new_padding_horizontal">12.0dip</item>
+        <item name="tabBarIndicator">@drawable/tab_indicator_milkshake</item>
+        <item name="tabBarTextAllCaps">false</item>
+        <item name="tabBarTextSize">16.0sp</item>
+        <item name="vkapp_bottom_menu">@menu/bottom_navigation_milkshake</item>
+    </style>
+
+    <style name="VkDarkMonetTheme" parent="@style/Vk.Theme.VkApp.client_dark_monet_generated">
         <item name="android:buttonStyle">@style/ButtonStyle</item>
         <item name="android:progressBarStyle">@style/ProgressBar</item>
         <item name="android:seekBarStyle">@style/SolidSeekBar</item>
@@ -2052,7 +2207,7 @@
         <item name="vkapp_bottom_menu">@menu/bottom_navigation_menu</item>
     </style>
 
-    <style name="VkAmoledStyle" parent="@style/VkAmoledTheme">
+    <style name="VkAmoledMonetStyle" parent="@style/VkAmoledMonetTheme">
         <item name="android:textColorSecondary">@color/prefs_subtitle</item>
         <item name="android:textAppearanceMedium">@style/MaterialMediumText</item>
         <item name="android:textAppearanceSmall">@style/MaterialSmallText</item>
@@ -2094,7 +2249,7 @@
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="VkAmoledTheme" parent="@style/Vk.Theme.VkApp.amoled_old_generated">
+    <style name="VkAmoledMonetTheme" parent="@style/Vk.Theme.VkApp.amoled_monet_old_generated">
         <item name="android:buttonStyle">@style/ButtonStyle</item>
         <item name="android:progressBarStyle">@style/ProgressBar</item>
         <item name="android:seekBarStyle">@style/SolidSeekBar</item>

smali/res/xml/preferences_debug.xml

@@ -27,10 +27,6 @@
             android:key="podcastcatalog"
             android:title="@string/podcastcatalog_title" />
         <!-- <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="vksans"
-            android:title="@string/debug_experimental_vk_sans_font" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="opusmodule"
             android:title="@string/debug_experimental_opusmodule" />

smali/res/xml/preferences_themes.xml

@@ -13,24 +13,14 @@
             android:key="milkshake"
             android:summary="@string/milkshake_summ"
             android:title="@string/milkshake_title" />
-        <Preference
-            android:enabled="false"
-            android:summary="@string/appearance_theme_info_summary"
-            android:title="@string/appearance_theme_info" />
-        <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
-            android:dialogTitle="@string/appearance_theme_dialog_title"
-            android:entries="@array/darktheme_value"
-            android:entryValues="@array/darktheme"
-            android:key="darktheme"
-            android:title="@string/appearance_theme_dark_theme" />
-        <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="default"
-            android:dialogTitle="@string/appearance_theme_dialog_title"
-            android:entries="@array/lighttheme_value"
-            android:entryValues="@array/lighttheme"
-            android:key="lighttheme"
-            android:title="@string/appearance_theme_light_theme" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="amoledtheme"
+            android:title="Amoled Тема" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="monettheme"
+            android:title="Monet Тема" />
     </PreferenceCategory>
     <PreferenceCategory
         android:key="dockbarsett"