Improved Amoled Theme

This reverts commit 07e1f1a1d3.

.gitignore

@@ -23,4 +23,5 @@ local.properties
 .idea/compiler.xml
 smali/assets/version.properties
 app/src/main/assets/version.properties
-smali/build/resources.zip
+smali/build/resources.zip
+*.idsig

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 {

app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java

@@ -64,7 +64,7 @@ public class VideoDownloader {
             DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
             request.setTitle(videoFile.toString());
-            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, videoFile.s + ".mp4");
+            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_MOVIES, videoFile.toString() + ".mp4");
             ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
         }));
         builder.show();

app/src/main/java/ru/vtosters/lite/ui/fragments/multiaccount/MultiAccountManager.java

@@ -72,7 +72,7 @@ public class MultiAccountManager {
     }
 
     public static void addAccount() {
-        Helper.GetPreferences().edit().putInt("account", getAccountPrefsCount() + 1).commit();
+        Helper.GetPreferences().edit().putInt("account", getAccountPrefsCount()).commit();
     }
 
     public static void deleteAccount(int i) {

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

@@ -1,8 +1,7 @@
 package ru.vtosters.lite.utils;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
 import static ru.vtosters.lite.utils.Proxy.setProxy;
+import static ru.vtosters.lite.utils.Themes.amoled;
 
 import android.app.Activity;
 import android.app.Application;
@@ -59,9 +58,9 @@ import ru.vtosters.lite.ui.fragments.dockbar.DockBarManager;
 import ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager;
 
 public class Prefs {
-    public static String VERSIONNAME = "2.0 DEV";
+    public static String VERSIONNAME = "2.0 Beta";
     private static List<String> mFilters;
-    private static List<Activity> activities = new ArrayList<>();
+    private static final List<Activity> activities = new ArrayList<>();
 
     public static boolean BooleanFalse(String key) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(Helper.GetContext());
@@ -274,16 +273,24 @@ public class Prefs {
         return !VKThemeHelper.d() ? "1" : "0";
     }
 
+    public static String getAmoledVKUI() {
+        return amoled() ? "1" : "0";
+    }
+
     public static String getMeToken() {
         return Helper.GetPreferences().getString("me_token", "");
     }
 
+    public static void setMeToken(String str) {
+        ru.vtosters.lite.utils.Helper.GetPreferences().edit().putString("me_token", str).apply();
+    }
+
     public static int getNavbarColor() {
         return VKThemeHelper.a((int) R.attr.tabbar_background);
     }
 
     public static String getSSFSLink() {
-        return SSFSDomain() + "?token=" + ru.vtosters.lite.utils.Helper.GetUserToken() + "&vt_dark=" + getDarkVKUI() + "&secret=" + ru.vtosters.lite.utils.Helper.GetUserSecret() + "&proxy=" + getUserProxy() + "&lang=" + getLocale() + "&vt=1&vtl=1&vksans=" + isVKSansEnabled() + "&vt_version=" + getBuildNumber() + "&vt_debug=" + isDEVModEnabled();
+        return SSFSDomain() + "?token=" + ru.vtosters.lite.utils.Helper.GetUserToken() + "&vt_dark=" + getDarkVKUI() + "&vt_amoled=" + getAmoledVKUI() + "&secret=" + ru.vtosters.lite.utils.Helper.GetUserSecret() + "&proxy=" + getUserProxy() + "&lang=" + getLocale() + "&vt=1&vtl=1&vksans=" + isVKSansEnabled() + "&vt_version=" + getBuildNumber() + "&vt_debug=" + isDEVModEnabled();
     }
 
     public static String getString(String key, String defValue) {
@@ -405,10 +412,6 @@ public class Prefs {
         return BooleanFalse("rightLikes");
     }
 
-    public static void setMeToken(String str) {
-        ru.vtosters.lite.utils.Helper.GetPreferences().edit().putString("me_token", str).apply();
-    }
-
     public static boolean setoffline() {
         return BooleanFalse("setoffline");
     }
@@ -473,10 +476,12 @@ public class Prefs {
         return ads() ? "null" : "app_widget";
     }
 
+    public static int getMsgCount() {
+        String customvalue = Helper.GetPreferences().getString("msgcount", "");
+        return customvalue.isEmpty() ? 30 : Integer.parseInt(customvalue);
+    }
+
     public static void setNavbarColor(Window window, int i) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && VKThemeHelper.d()) {
-            window.getDecorView().setSystemUiVisibility(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS | SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-        }
         if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             window.setNavigationBarColor(getNavbarColor());
         }

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

@@ -103,7 +103,7 @@ public class Proxy {
         switch (Helper.GetPreferences().getString("proxy", "")) {
             case "zaborona":
                 Properties properties = System.getProperties();
-                properties.setProperty("socksProxyHost", "socks.zaborona.help");
+                properties.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
                 properties.setProperty("socksProxyPort", "1488");
                 System.clearProperty("https.proxyHost");
                 System.clearProperty("https.proxyPort");

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,18 @@ 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 int getAmoledImTheme() {
+        return Helper.GetContext().getResources().getIdentifier("VkIm.Theme.VkApp.Amoled", "style", Helper.GetContext().getPackageName());
+    }
+
+    public static VKTheme getCurrentDarkTheme() {
+        return amoled() ? VKTheme.AMOLED : VKTheme.DARK;
+    }
+
     public static int getColorFromAttr(int attr) {
         return VKThemeHelper.a(attr);
     }
@@ -63,6 +76,10 @@ public class Themes {
         return ru.vtosters.lite.utils.Prefs.BooleanFalse("vkim_msg");
     }
 
+    public static boolean amoled() {
+        return ru.vtosters.lite.utils.Prefs.BooleanFalse("amoled");
+    }
+
     public static boolean vkme_msg() {
         return ru.vtosters.lite.utils.Prefs.BooleanFalse("vkme_msg");
     }

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

@@ -1,5 +1,7 @@
 package ru.vtosters.lite.utils;
 
+import static ru.vtosters.lite.utils.Themes.amoled;
+
 import android.util.Base64;
 import android.util.Log;
 import android.webkit.WebView;
@@ -50,7 +52,7 @@ public class VKUIInjector {
                 .replace("%background_content%", Themes.hex(Themes.getColorFromAttr(R.attr.background_content)))
                 .replace("%text_primary%", Themes.hex(Themes.getColorFromAttr(R.attr.text_primary)));
 
-        // loadedCSSAmoled = load("vt_ui_oled.css");
+        loadedCSSAmoled = load("vt_ui_oled.css");
         isLoaded = true;
     }
 
@@ -65,11 +67,13 @@ public class VKUIInjector {
             }
             StringBuilder sb = new StringBuilder();
             if (true/*Themes.isAccentedCache()*/) {
-                Log.d("VKUI", "Injecting Accent");
                 sb.append("\n\n");
                 sb.append(loadedCSS);
             }
-            Log.d("VKUI", "Final CSS: " + sb.toString());
+            if (amoled() == true) {
+                sb.append("\n\n");
+                sb.append(loadedCSSAmoled);
+            }
             inject(webView, Base64.encodeToString(sb.toString().getBytes(), 2));
         }
     }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0-alpha01'
+        classpath 'com.android.tools.build:gradle:7.2.0-rc01'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jan 28 23:46:30 MSK 2022
+#Fri Apr 22 13:33:27 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

smali/assets/vt_ui_oled.css

@@ -0,0 +1,92 @@
+/* vkui.css V2 by iTaysonLab */
+/* Articles */
+body.article_body.article_dark {
+    background-color: #000000 !important;
+}
+
+.article_dark .articleView__content {
+    border-top: #000000 !important;
+    background-color: #000000 !important;
+}
+
+.article_dark .article {
+    background-color: #000000 !important;
+    color: #FFFFFF !important;
+}
+
+.articleView__content_misc_block .articleView__content_views_info {
+    color: #FFFFFF !important;
+}
+
+.article_dark .article>h1 {
+    color: %textColorPrimary% !important;
+}
+
+.article__info_line {
+    color: #FFFFFF !important;
+}
+
+.Audio__duration, .r .ai_dur {
+    color: #FFFFFF !important;
+}
+
+.Audio__texts, .r .ai_label {
+    color: #FFFFFF !important;
+}
+
+.article_dark .ai_title {
+    color: #FFFFFF !important;
+}
+
+.article>figure figcaption:not(.article_ed__figcaption) {
+    color: #FFFFFF !important;
+}
+
+/* VK Support fixes */
+[scheme="client_dark"] .CatalogSearch__input, [scheme="space_gray"] .CatalogSearch__input {
+    background: #000000 !important;
+}
+
+/* Generic VKUI */
+body[scheme=space_gray] {
+    /* light background */
+    --attach_picker_tab_active_icon: #000000 !important;
+    --background_content: #000000 !important;
+    --button_bot_shadow: #000000 !important;
+    --button_primary_foreground: #000000 !important;
+    --content_tint_background: #000000 !important;
+    --counter_secondary_text: #000000 !important;
+    --loader_background: #000000 !important;
+    --overlay_status_background: #000000 !important;
+    --header_background: #19191a !important;
+    --header_alternate_background: #19191a !important;
+    --separator_alternate: #000000 !important;
+    --segmented_control_bar_background: #000000 !important;
+    --search_bar_background: #000000 !important;
+    /* background */
+    --background_page: #000000 !important;
+    --header_background_before_blur: #19191a !important;
+    --header_background_before_blur_alternate: #19191a !important;
+    /* lighter BG (text fields) */
+    --attach_picker_tab_inactive_background: #121212 !important;
+    --background_keyboard: #121212 !important;
+    --background_suggestions: #121212 !important;
+    --field_background: #121212 !important;
+    --im_bubble_incoming: #121212 !important;
+    --input_border: #121212 !important;
+    --modal_card_background: #121212 !important;
+    --separator_common: #121212 !important;
+    --snippet_background: #121212 !important;
+    --android_active_color: #121212 !important;
+    --switch_ios_off_border: #121212 !important;
+    /* third BG (buttons) */
+    --button_secondary_background: #212121 !important;
+    --header_search_field_background: #212121 !important;
+    --icon_tertiary: #212121 !important;
+    --im_bubble_outgoing: #212121 !important;
+    --input_background: #212121 !important;
+    --loader_track_fill: #212121 !important;
+    --search_bar_field_background: #212121 !important;
+    --selection_off_icon: #212121 !important;
+    --panel_tab_active_background: #212121 !important;
+}

smali/res/drawable-v21/vkui_bg_button_white.xml

@@ -5,7 +5,7 @@
         <ripple android:color="@color/overlay">
             <item>
                 <shape>
-                    <solid android:color="@color/white" />
+                    <solid android:color="?accent" />
                     <corners android:radius="@dimen/vkui_button_corner_big_radius" />
                 </shape>
             </item>
@@ -13,7 +13,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="@color/white_opacity40" />
+            <solid android:color="?accent" />
             <corners android:radius="@dimen/vkui_button_corner_big_radius" />
         </shape>
     </item>

smali/res/drawable/vkui_bg_button_white.xml

@@ -15,7 +15,7 @@
     </item>
     <item>
         <shape>
-            <solid android:color="@color/white" />
+            <solid android:color="?accent" />
             <corners android:radius="@dimen/vkui_button_corner_big_radius" />
         </shape>
     </item>

smali/res/layout/article_author_empty_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/icon" android:layout_width="64.0dip" android:layout_height="64.0dip" android:src="@drawable/ic_article_64" android:tint="@color/gray_300" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_article_64" />
-    <TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center" android:id="@id/text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/article_author_group_empty" android:singleLine="true" android:includeFontPadding="false" android:fontFamily="@font/roboto_regular" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/icon" app:layout_constraintWidth_default="wrap" />
+    <ImageView android:id="@id/icon" android:layout_width="64.0dip" android:layout_height="64.0dip" android:src="@drawable/ic_article_64" android:tint="?accent" android:layout_marginStart="8.0dip" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_article_64" />
+    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:id="@id/text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/article_author_group_empty" android:singleLine="true" android:includeFontPadding="false" android:fontFamily="@font/roboto_regular" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/icon" app:layout_constraintWidth_default="wrap" />
 </android.support.constraint.ConstraintLayout>

smali/res/layout/article_author_page_fragment.xml

@@ -2,20 +2,20 @@
 <android.support.design.widget.CoordinatorLayout android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View android:background="?tabbar_background" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-    <android.support.design.widget.AppBarLayout android:id="@id/app_bar_layout" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="238.0dip">
-        <android.support.design.widget.CollapsingToolbarLayout android:theme="@style/WhiteThemeActionBar" android:id="@id/collapsing_toolbar_layout" android:layout_width="fill_parent" android:layout_height="238.0dip" app:contentScrim="@color/white" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:statusBarScrim="@color/white_with_FixAndroidBug" app:titleEnabled="false">
+    <android.support.design.widget.AppBarLayout android:id="@id/app_bar_layout" android:background="?background_content" android:layout_width="fill_parent" android:layout_height="238.0dip">
+        <android.support.design.widget.CollapsingToolbarLayout android:theme="@style/WhiteThemeActionBar" android:id="@id/collapsing_toolbar_layout" android:layout_width="fill_parent" android:layout_height="238.0dip" app:contentScrim="?text_primary" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:statusBarScrim="?tabbar_background" app:titleEnabled="false">
             <LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/header_container" android:background="@drawable/scrim_bottom_4percent" android:layout_width="fill_parent" android:layout_height="238.0dip" app:layout_collapseMode="parallax" app:layout_collapseParallaxMultiplier="0.4">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/owner_image" android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_marginTop="32.0dip" />
-                <TextView android:textSize="20.0dip" android:textColor="@color/dark_grey" android:ellipsize="end" android:id="@id/owner_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="4.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
-                <TextView android:textSize="13.0dip" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/subscribers_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:singleLine="true" android:includeFontPadding="false" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_regular" />
-                <TextView android:textSize="14.0dip" android:textColor="@color/white" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/subscribe_button" android:layout_width="wrap_content" android:layout_height="30.0dip" android:layout_marginTop="8.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
+                <TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/owner_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="4.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
+                <TextView android:textSize="13.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/subscribers_count" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:singleLine="true" android:includeFontPadding="false" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_regular" />
+                <TextView android:textSize="14.0dip" android:textColor="?accent" android:ellipsize="end" android:gravity="center_vertical" android:id="@id/subscribe_button" android:layout_width="wrap_content" android:layout_height="30.0dip" android:layout_marginTop="8.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" android:layout_marginStart="32.0dip" android:layout_marginEnd="32.0dip" app:fontFamily="@font/roboto_medium" />
             </LinearLayout>
             <android.support.v7.widget.Toolbar android:theme="@style/WhiteThemeActionBar" android:id="@id/toolbar" android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_collapseMode="pin">
-                <TextView android:textSize="20.0dip" android:textColor="@color/attach_title" android:ellipsize="end" android:id="@id/custom_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:fontFamily="@font/roboto_medium" style="@style/ActionBarTitleStyle" />
+                <TextView android:textSize="20.0dip" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/custom_toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:fontFamily="@font/roboto_medium" style="@style/ActionBarTitleStyle" />
             </android.support.v7.widget.Toolbar>
         </android.support.design.widget.CollapsingToolbarLayout>
     </android.support.design.widget.AppBarLayout>
     <com.vk.articles.author_page.ui.ArticleAuthorPageRecyclerPaginatedView android:id="@id/list" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     <View android:id="@id/shadow" android:background="@drawable/bg_toolbar_shadow_dark" android:layout_width="fill_parent" android:layout_height="12.0dip" android:alpha="0.0" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-    <TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center" android:layout_gravity="center" android:id="@id/privacy_error" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/article_private_error" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="8.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
+    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:layout_gravity="center" android:id="@id/privacy_error" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/article_private_error" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="8.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" />
 </android.support.design.widget.CoordinatorLayout>

smali/res/layout/article_author_page_item_big.xml

@@ -2,8 +2,8 @@
 <android.support.constraint.ConstraintLayout android:background="@drawable/rounded_list_selector" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip" android:paddingEnd="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.imageloader.view.VKImageView android:id="@id/image" android:layout_width="0.0dip" android:layout_height="0.0dip" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toTopOf="@id/title" app:layout_constraintDimensionRatio="h,5:3" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:roundedCornerRadius="3.0dip" />
-    <TextView android:textSize="15.0sp" android:textColor="@color/black" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="10.0dip" android:maxLines="2" android:includeFontPadding="false" android:layout_marginEnd="8.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/image" />
-    <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
-    <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
+    <TextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="10.0dip" android:maxLines="2" android:includeFontPadding="false" android:layout_marginEnd="8.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/image" />
+    <TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
+    <TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
     <ImageView android:id="@id/fave" android:layout_width="44.0dip" android:layout_height="44.0dip" android:src="@drawable/fave_start_button" android:scaleType="center" app:layout_constraintEnd_toEndOf="@id/image" app:layout_constraintTop_toTopOf="@id/image" app:srcCompat="@drawable/fave_start_button" />
 </android.support.constraint.ConstraintLayout>

smali/res/layout/article_author_page_item_small.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout android:background="@drawable/rounded_list_selector" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="15.0sp" android:textColor="@color/black" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toStartOf="@id/image_container" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
-    <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
-    <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:layout_marginBottom="16.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
+    <TextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toTopOf="@id/subtitle" app:layout_constraintEnd_toStartOf="@id/image_container" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
+    <TextView android:textSize="14.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:maxLines="2" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toTopOf="@id/info" app:layout_constraintEnd_toEndOf="@id/title" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" />
+    <TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/info" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:layout_marginBottom="16.0dip" android:maxLines="1" android:includeFontPadding="false" app:fontFamily="@font/roboto_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/subtitle" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/subtitle" />
     <FrameLayout android:id="@id/image_container" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_weight="0.0" app:layout_constraintStart_toEndOf="@id/title" app:layout_constraintTop_toTopOf="parent">
         <com.vk.imageloader.view.VKImageView android:layout_gravity="center" android:id="@id/image" android:layout_width="105.0dip" android:layout_height="76.0dip" android:layout_margin="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" app:actualImageScaleType="centerCrop" app:roundedCornerRadius="3.0dip" />
         <ImageView android:layout_gravity="end|center|top" android:id="@id/fave" android:layout_width="44.0dip" android:layout_height="44.0dip" android:layout_margin="2.0dip" android:src="@drawable/fave_start_button" android:scaleType="center" app:srcCompat="@drawable/fave_start_button" />

smali/res/layout/article_author_subscribe_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="16.0sp" android:textColor="@color/subhead_gray" android:ellipsize="end" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="4" android:includeFontPadding="false" android:lineSpacingExtra="1.0sp" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_regular" />
-    <TextView android:textSize="15.0sp" android:textColor="@color/white" android:ellipsize="end" android:layout_gravity="center_horizontal" android:id="@id/button" android:paddingTop="9.0dip" android:paddingBottom="9.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_medium" style="@style/VKUIButton.Primary" />
+    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center_horizontal" android:layout_gravity="center_horizontal" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="4" android:includeFontPadding="false" android:lineSpacingExtra="1.0sp" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_regular" />
+    <TextView android:textSize="15.0sp" android:textColor="?accent" android:ellipsize="end" android:layout_gravity="center_horizontal" android:id="@id/button" android:paddingTop="9.0dip" android:paddingBottom="9.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:singleLine="true" android:includeFontPadding="false" android:drawablePadding="5.0dip" android:layout_marginStart="24.0dip" android:layout_marginEnd="24.0dip" app:fontFamily="@font/roboto_medium" style="@style/VKUIButton.Primary" />
 </merge>

smali/res/layout/article_list_sort_picker_item.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout android:layout_width="fill_parent" android:layout_height="44.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:ellipsize="end" android:gravity="center" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_all" android:singleLine="true" android:includeFontPadding="false" android:textAllCaps="true" android:layout_marginStart="16.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <TextView android:textSize="13.0sp" android:textColor="?text_primary" android:ellipsize="end" android:gravity="center" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_all" android:singleLine="true" android:includeFontPadding="false" android:textAllCaps="true" android:layout_marginStart="16.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
     <TextView android:textSize="14.0sp" android:textColor="?accent" android:ellipsize="end" android:gravity="center" android:id="@id/sort_type_text" android:background="@drawable/rounded_list_selector" android:layout_width="wrap_content" android:layout_height="0.0dip" android:text="@string/article_sort_time" android:singleLine="true" android:drawablePadding="4.0dip" android:paddingStart="6.0dip" android:paddingEnd="6.0dip" android:layout_marginEnd="6.0dip" app:fontFamily="@font/roboto_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>

smali/res/layout/board_topic_row.xml

@@ -2,12 +2,12 @@
 <RelativeLayout android:paddingTop="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:id="@id/board_topic_title" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
-    <TextView android:textSize="14.0dip" android:textColor="#ff8c8d8f" android:id="@id/board_topic_info" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_below="@id/board_topic_title" android:layout_alignLeft="@id/board_topic_title" android:layout_alignRight="@id/board_topic_title" />
+    <TextView android:textSize="14.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_info" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_below="@id/board_topic_title" android:layout_alignLeft="@id/board_topic_title" android:layout_alignRight="@id/board_topic_title" />
     <RelativeLayout android:id="@id/last_comment" android:background="@drawable/highlight" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="21.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_below="@id/board_topic_info" android:layout_alignLeft="@id/board_topic_info" android:layout_alignRight="@id/board_topic_info">
         <View android:id="@id/board_topic_divider" android:background="#26000000" android:layout_width="wrap_content" android:layout_height="0.5dip" android:layout_marginLeft="-16.0dip" android:layout_marginRight="-16.0dip" android:layout_marginBottom="12.0dip" />
         <com.vk.imageloader.view.VKCircleImageView android:id="@id/board_topic_photo" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_marginRight="12.0dip" android:layout_below="@id/board_topic_divider" app:placeholderImage="@drawable/photo_loading" />
-        <TextView android:textSize="15.0dip" android:textColor="?accent" android:id="@id/board_topic_l_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/board_topic_photo" android:layout_alignTop="@id/board_topic_photo" android:fontFamily="@string/font_family_medium" />
-        <com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="15.0dip" android:textColor="#dd000000" android:id="@id/board_topic_l_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:lines="1" android:layout_below="@id/board_topic_l_name" android:layout_alignLeft="@id/board_topic_l_name" />
-        <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/board_topic_l_updated" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:layout_below="@id/board_topic_l_text" android:layout_alignLeft="@id/board_topic_l_text" />
+        <TextView android:textSize="15.0dip" android:textColor="?text_primary" android:id="@id/board_topic_l_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/board_topic_photo" android:layout_alignTop="@id/board_topic_photo" android:fontFamily="@string/font_family_medium" />
+        <com.vtosters.lite.ui.CorrectlyMeasuringTextView android:textSize="15.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_l_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:lines="1" android:layout_below="@id/board_topic_l_name" android:layout_alignLeft="@id/board_topic_l_name" />
+        <TextView android:textSize="13.0dip" android:textColor="?text_secondary" android:id="@id/board_topic_l_updated" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:layout_below="@id/board_topic_l_text" android:layout_alignLeft="@id/board_topic_l_text" />
     </RelativeLayout>
 </RelativeLayout>

smali/res/layout/community_head_avatar.xml

@@ -2,8 +2,8 @@
 <FrameLayout android:paddingTop="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginStart="16.0dip" android:layout_marginEnd="112.0dip">
-        <com.vk.common.view.TextViewEllipsizeEnd android:textColor="?text_muted" android:ellipsize="end" android:id="@id/profile_name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:maxLines="2" style="@style/VKUIText.Title1" />
-        <TextView android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:maxLines="2" style="@style/VKUIText.New.Text" />
+        <com.vk.common.view.TextViewEllipsizeEnd android:textColor="?text_primary" android:ellipsize="end" android:id="@id/profile_name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:maxLines="2" style="@style/VKUIText.Title1" />
+        <TextView android:textColor="?text_primary" android:ellipsize="end" android:id="@id/label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:maxLines="2" style="@style/VKUIText.New.Text" />
         <TextView android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/secondary_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:maxLines="2" style="@style/VKUIText.New.Text" />
     </LinearLayout>
     <com.vk.profile.ui.community.CommunityBorderedImageView android:layout_gravity="end|center" android:id="@id/profile_photo" android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_marginEnd="16.0dip" />

smali/res/layout/holder_attach_spinner_dropdown_gallery_item.xml

@@ -2,6 +2,6 @@
 <FrameLayout android:layout_width="fill_parent" android:layout_height="64.0dip" android:paddingStart="8.0dip" android:paddingEnd="16.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.vk.imageloader.view.VKImageView android:layout_gravity="start|center" android:id="@id/holder_attach_gallery_album_image" android:layout_width="48.0dip" android:layout_height="48.0dip" />
-    <TextView android:textSize="16.0sp" android:textColor="?text_primary" android:layout_gravity="start|bottom|center" android:id="@id/holder_attach_gallery_album_title_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/newsfeed_newpost_holder_attach_gallery_album_title_bottom_space" android:singleLine="true" android:layout_marginStart="60.0dip" />
+    <TextView android:textSize="16.0sp" android:textColor="#ff78797a" android:layout_gravity="start|bottom|center" android:id="@id/holder_attach_gallery_album_title_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/newsfeed_newpost_holder_attach_gallery_album_title_bottom_space" android:singleLine="true" android:layout_marginStart="60.0dip" />
     <TextView android:textSize="14.0sp" android:textColor="#ff78797a" android:layout_gravity="start|center|top" android:id="@id/holder_attach_gallery_album_amount_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="32.0dip" android:singleLine="true" android:layout_marginStart="60.0dip" />
 </FrameLayout>

smali/res/layout/toolbar_search_expanded.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.vtosters.lite.ui.FullWidthLinearLayout android:theme="?actionBarTheme" android:gravity="center" android:orientation="horizontal" android:paddingRight="2.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <EditText android:textSize="16.0dip" android:textColorHint="?text_primary" android:id="@id/search_input" android:background="@null" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:hint="@string/search" android:singleLine="true" android:layout_weight="1.0" android:inputType="textFilter|textCapSentences|textNoSuggestions" android:imeOptions="actionSearch" android:textCursorDrawable="?searchViewCursorDrawable" />
+    <EditText android:textSize="16.0dip" android:textColorHint="?header_text" android:id="@id/search_input" android:background="@null" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:hint="@string/search" android:singleLine="true" android:layout_weight="1.0" android:inputType="textFilter|textCapSentences|textNoSuggestions" android:imeOptions="actionSearch" android:textCursorDrawable="?searchViewCursorDrawable" />
     <ImageView android:id="@id/search_clear" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_cancel_24" android:scaleType="center" android:tint="?icon_secondary" />
     <ImageView android:id="@id/search_voice" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_voice_24" android:scaleType="center" android:tint="?icon_secondary" />
     <ImageView android:id="@id/search_done" android:background="?accent" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_check_24" android:scaleType="center" android:tint="?icon_secondary" />

smali/res/layout/video_player_toolbar.xml

@@ -13,12 +13,12 @@
                 <View android:layout_gravity="end|center" android:id="@id/verified_bottom" android:background="@drawable/ic_verified_12" android:layout_width="12.0dip" android:layout_height="12.0dip" android:alpha="0.6" />
             </FrameLayout>
         </LinearLayout>
-        <ImageView android:id="@id/like" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_like_outline_24" android:scaleType="center" android:tint="?header_text" android:contentDescription="@string/like" />
-        <ImageView android:id="@id/share" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_share_outline_24" android:scaleType="center" android:tint="?header_text" android:contentDescription="@string/share" />
-        <ImageView android:id="@id/add" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_add_outline_24" android:scaleType="center" android:tint="?header_text" android:contentDescription="@string/add" />
-        <ImageView android:id="@id/subscribe" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_user_add_24" android:scaleType="center" android:tint="?header_text" android:contentDescription="@string/profile_subscribe" />
-        <ImageView android:id="@id/more" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="36.0dip" android:layout_height="48.0dip" android:src="@drawable/action_button_overflow_video" android:scaleType="center" android:tint="?header_text" android:contentDescription="@string/menu" />
-        <ImageView android:id="@id/cancel" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_cancel_24" android:scaleType="center" android:tint="?header_text" android:contentDescription="@string/close" />
+        <ImageView android:id="@id/like" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_like_outline_24" android:scaleType="center" android:tint="@color/white" android:contentDescription="@string/like" />
+        <ImageView android:id="@id/share" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_share_outline_24" android:scaleType="center" android:tint="@color/white" android:contentDescription="@string/share" />
+        <ImageView android:id="@id/add" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_add_outline_24" android:scaleType="center" android:tint="@color/white" android:contentDescription="@string/add" />
+        <ImageView android:id="@id/subscribe" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_user_add_24" android:scaleType="center" android:tint="@color/white" android:contentDescription="@string/profile_subscribe" />
+        <ImageView android:id="@id/more" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="36.0dip" android:layout_height="48.0dip" android:src="@drawable/action_button_overflow_video" android:scaleType="center" android:tint="@color/white" android:contentDescription="@string/menu" />
+        <ImageView android:id="@id/cancel" android:background="@drawable/picker_white_ripple_unbounded" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_cancel_24" android:scaleType="center" android:tint="@color/white" android:contentDescription="@string/close" />
     </LinearLayout>
     <Space android:layout_width="wrap_content" android:layout_height="20.0dip" android:layout_below="@id/toolbar" />
 </merge>

smali/res/layout/vkim_bot_keyboard.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="#ffdce1e6" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<FrameLayout android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <android.support.v7.widget.RecyclerView android:id="@id/vkim_bot_keyboard" android:padding="@dimen/vkim_bot_keyboard_margin" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:overScrollMode="never"
       xmlns:android="http://schemas.android.com/apk/res/android" />

smali/res/layout/vkim_dialog_actions_vc_by_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <View android:id="@id/dialog_actions_dim" android:background="?tabbar_background" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+    <View android:id="@id/dialog_actions_dim" android:background="@android:color/transparent" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
     <LinearLayout android:id="@id/dialog_actions_list_container" android:background="@drawable/vkim_bg_overlay" android:padding="16.0dip" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-8.0dip" android:layout_marginStart="-8.0dip" android:layout_marginEnd="-8.0dip" android:backgroundTint="?background_content">
         <com.vk.im.ui.views.dialog_actions.DialogActionsListView android:id="@id/dialog_actions_list_content" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:fadingEdge="none" android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content" app:vklib_alv_dividerColor="#1e000000" app:vklib_alv_dividerHeight="16.0dip" app:vklib_alv_dividerSize="0.5dip" app:vklib_alv_optionBackground="@drawable/vkim_ripple_dark" app:vklib_alv_optionIconLabelSpace="20.0dip" app:vklib_alv_optionIconTint="#ffaaaeb3" app:vklib_alv_optionLabelTextColor="?text_primary" app:vklib_alv_optionLabelTextSize="16.0sp" app:vklib_alv_optionPaddingEnd="20.0dip" app:vklib_alv_optionPaddingStart="20.0dip" />
     </LinearLayout>

smali/res/layout/vkim_history_attaches_view_pager.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <android.support.design.widget.AppBarLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
         <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_scrollFlags="enterAlways|scroll|snap" app:navigationIcon="@drawable/vkim_ic_back_theme_tinted" style="@style/VkIm.Toolbar.Style" />
-        <android.support.design.widget.TabLayout android:id="@id/vkim_tab_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabMode="scrollable" style="@style/VkIm.TabLayout" />
+        <android.support.design.widget.TabLayout android:id="@id/vkim_tab_layout" android:background="?header_background" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabMode="scrollable" style="@style/VkIm.TabLayout" />
     </android.support.design.widget.AppBarLayout>
     <android.support.v4.view.ViewPager android:id="@id/vkim_viewpager" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     <com.vk.core.view.AppBarShadowView style="@style/AppBarShadow" />

smali/res/menu/fave_change_tags_menu.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_write_24" android:id="@id/tags_change" android:title="@string/fave_tags_change" app:menuTint="?header_text" app:showAsAction="always" />
 </menu>

smali/res/menu/fave_tab_menu.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_tag_24" android:id="@id/tags" android:title="@string/fave_tag_icon_title" app:menuTint="?header_text" app:showAsAction="always" />
 </menu>

smali/res/menu/good.xml

@@ -2,7 +2,7 @@
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="@drawable/ic_market_28" android:id="@id/menu_cart" android:title="@string/market_cart" app:showAsAction="always" />
-    <item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?text_primary" />
-    <item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?text_primary" />
-    <item android:id="@id/report" android:title="@string/report_content" app:menuTint="?text_primary" />
+    <item android:id="@id/menu_fave_add_or_remove" android:title="" app:menuTint="?header_text" />
+    <item android:id="@id/copy_link" android:title="@string/copy_link" app:menuTint="?header_text" />
+    <item android:id="@id/report" android:title="@string/report_content" app:menuTint="?header_text" />
 </menu>

smali/res/menu/left_menu.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="?text_primary" />
-    <item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_newsfeed_24" android:id="@id/menu_newsfeed" android:title="@string/newsfeed" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_notification_24" android:id="@id/menu_feedback" android:title="@string/not_notifications" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_message_24" android:id="@id/menu_messages" android:title="@string/messages" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_search_24" android:id="@id/menu_search" android:title="@string/search" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_user_24" android:id="@id/menu_friends" android:title="@string/friends" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_users_24" android:id="@id/menu_groups" android:title="@string/menu_groups" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_camera_24" android:id="@id/menu_photos" android:title="@string/photos" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_music_24" android:id="@id/menu_audios" android:title="@string/music" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_video_24" android:id="@id/menu_videos" android:title="@string/videos" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_live_filter_24dp" android:id="@id/menu_lives" android:title="@string/sett_live" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_podcast_24" android:id="@id/menu_podcasts" android:title="@string/podcasts" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_games_24" android:id="@id/menu_games" android:title="@string/games" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_favorite_24" android:id="@id/menu_fave" android:title="@string/fave_title" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_menu_like_24" android:id="@id/menu_feed_likes" android:title="@string/sett_likes" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_document_24" android:id="@id/menu_documents" android:title="@string/docs" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_money_transfer_24" android:id="@id/menu_payments" android:title="@string/money_transfer_money_transfers" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_help_24" android:id="@id/menu_support" android:title="@string/help" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_money_circle_24" android:id="@id/menu_vk_pay" android:title="@string/vk_pay" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_services_24" android:id="@id/menu_vk_apps" android:title="@string/menu_apps" app:menuTint="?header_text" />
+    <item android:icon="@drawable/ic_settings_24" android:id="@id/menu_settings" android:title="@string/menu_settings" app:menuTint="?header_text" />
 </menu>

smali/res/menu/market.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_menu_search" android:id="@id/search" android:title="@string/search" android:showAsAction="always" app:menuTint="?header_text" app:showAsAction="always" />
 </menu>

smali/res/menu/price_filter.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_check_24" android:id="@id/ok" android:title="@string/ok" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_check_24" android:id="@id/ok" android:title="@string/ok" android:showAsAction="always" app:menuTint="?header_text" app:showAsAction="always" />
 </menu>

smali/res/menu/replies.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?text_primary" app:showAsAction="always" />
+    <item android:icon="@drawable/ic_settings_24" android:id="@id/filter" android:title="@string/filter" android:showAsAction="always" app:menuTint="?header_text" app:showAsAction="always" />
 </menu>

smali/res/menu/search.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?text_primary" />
+    <item android:icon="@drawable/ic_search_24" android:id="@id/search" android:title="@string/search" app:menuTint="?header_text" />
 </menu>

smali/res/menu/videos.xml

@@ -3,10 +3,10 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:icon="@drawable/ic_add_24" android:id="@id/add" android:title="@string/add" android:showAsAction="always" app:showAsAction="always">
         <menu>
-            <item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="?text_primary" />
-            <item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="?text_primary" />
-            <item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="?text_primary" />
-            <item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="?text_primary" />
+            <item android:icon="@drawable/ic_camera_24" android:id="@id/add_new_video" android:title="@string/add_video_new" app:menuTint="?header_text" />
+            <item android:icon="@drawable/ic_gallery_24" android:id="@id/add_existed" android:title="@string/add_video_existing" app:menuTint="?header_text" />
+            <item android:icon="@drawable/ic_link_24" android:id="@id/add_link" android:title="@string/video_add_link" app:menuTint="?header_text" />
+            <item android:icon="@drawable/ic_create_folder_24" android:id="@id/add_album" android:title="@string/create_album" app:menuTint="?header_text" />
         </menu>
     </item>
 </menu>

smali/res/values-ru/arrays.xml

@@ -474,4 +474,13 @@
         <item>Сторонний HTTPS</item>
         <item>Сторонний SOCKS</item>
     </string-array>
+    <string-array name="msgcount_value">
+        <item>По умолчанию</item>
+        <item>40 сообщений</item>
+        <item>50 сообщений</item>
+        <item>70 сообщений</item>
+        <item>100 сообщений</item>
+        <item>150 сообщений</item>
+        <item>200 сообщений</item>
+    </string-array>
 </resources>

smali/res/values-v21/styles.xml

@@ -11,7 +11,7 @@
     </style>
     <style name="ActionBarSpinner" parent="@android:style/Widget.Material.Spinner" />
     <style name="ActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#80ffffff</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">?header_text</item>
@@ -53,7 +53,7 @@
     </style>
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
         <item name="android:textSize">18.0dip</item>
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="Base.TextAppearance.AppCompat" parent="@android:style/TextAppearance.Material" />
     <style name="Base.TextAppearance.AppCompat.Body1" parent="@android:style/TextAppearance.Material.Body1" />
@@ -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>
@@ -423,13 +484,13 @@
         <item name="toolbarIconsColor">@color/toolbar_white_textColorSecondary</item>
     </style>
     <style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#b0ffffff</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>
     </style>
     <style name="GradientActionBarTitleStyle" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse">
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>

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>

smali/res/values/arrays.xml

@@ -644,4 +644,22 @@
         <item>https</item>
         <item>socks</item>
     </string-array>
+    <string-array name="msgcount_value">
+        <item>Default</item>
+        <item>40 messages</item>
+        <item>50 messages</item>
+        <item>70 messages</item>
+        <item>100 messages</item>
+        <item>150 messages</item>
+        <item>200 messages</item>
+    </string-array>
+    <string-array name="msgcount">
+        <item>30</item>
+        <item>40</item>
+        <item>50</item>
+        <item>70</item>
+        <item>100</item>
+        <item>150</item>
+        <item>200</item>
+    </string-array>
 </resources>

smali/res/values/styles.xml

@@ -17,7 +17,7 @@
         <item name="android:background">@drawable/spinner_ab_holo_dark</item>
     </style>
     <style name="ActionBarSubtitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#80ffffff</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="android:textColorPrimary">?header_text</item>
@@ -51,7 +51,7 @@
     </style>
     <style name="ActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
         <item name="android:textSize">18.0dip</item>
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
     </style>
     <style name="ActionButton" parent="@style/Widget.AppCompat.Light.ActionButton" />
     <style name="ActionButton.Blue" parent="@style/ActionButton">
@@ -1157,6 +1157,335 @@
         <item name="appkitDefaultErrorText">@string/err_text</item>
         <item name="appkitRetryButtonText">@string/retry</item>
     </style>
+
+    <style name="VkIm.Theme.VkApp.Amoled" parent="@style/VkIm.Theme.VkApp">
+        <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/gray_900</item>
+        <item name="header_background_before_blur">@color/black</item>
+        <item name="header_background_before_blur_alternate">@color/black</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_accent">@color/im_old_accent_muted</item>
+        <item name="im_accent_dark">@color/im_old_accent_muted</item>
+        <item name="im_alert">@color/red</item>
+        <item name="im_app_background_chat">?background_content</item>
+        <item name="im_app_background_navbar">@color/black</item>
+        <item name="im_app_background_navbar_light">false</item>
+        <item name="im_app_background_secondary">#ffebedf0</item>
+        <item name="im_app_background_statusbar">@color/muted_blue</item>
+        <item name="im_app_background_statusbar_light">false</item>
+        <item name="im_app_background_tabbar">#fffafafa</item>
+        <item name="im_app_icon">@color/im_old_accent</item>
+        <item name="im_app_icon_destructive">@color/red</item>
+        <item name="im_app_icon_inv">@color/white</item>
+        <item name="im_app_icon_secondary">@color/im_old_blue_gray_light</item>
+        <item name="im_app_icon_toolbar">@color/white</item>
+        <item name="im_app_swipe_background_end">#ff4cb8ff</item>
+        <item name="im_app_swipe_background_start">#ff3f7fe0</item>
+        <item name="im_app_toolbar_foreground">@color/white</item>
+        <item name="im_app_toolbar_foreground_end">@color/white</item>
+        <item name="im_app_toolbar_foreground_semitransparent">#80ffffff</item>
+        <item name="im_app_toolbar_foreground_start">@color/white</item>
+        <item name="im_app_toolbar_tabs_indicator">@color/white</item>
+        <item name="im_attach_tint">@color/sky_300</item>
+        <item name="im_btn_accept_background">@color/black</item>
+        <item name="im_btn_accept_background_dark">@color/black</item>
+        <item name="im_btn_accept_foreground">@color/white</item>
+        <item name="im_btn_confirm">@drawable/vkim_btn_confirm_default</item>
+        <item name="im_btn_confirm_background">@color/blue_300</item>
+        <item name="im_btn_confirm_background_dark">?accent</item>
+        <item name="im_btn_confirm_background_disabled">@color/blue_200_muted</item>
+        <item name="im_btn_reject_background">@color/black</item>
+        <item name="im_btn_reject_background_dark">@color/black</item>
+        <item name="im_btn_reject_foreground">@color/white</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/gray_750</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/gray_800</item>
+        <item name="im_bubble_incoming_alternate">@color/gray_800</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_750</item>
+        <item name="im_bubble_outgoing_alternate">@color/gray_750</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_conversation_error_icon">@color/red_error</item>
+        <item name="im_conversation_sending_icon">@color/im_old_accent</item>
+        <item name="im_conversation_unread_counter_background">@color/im_old_accent</item>
+        <item name="im_conversation_unread_counter_foreground">@color/white</item>
+        <item name="im_conversation_unread_counter_muted_background">#ffa9b0b8</item>
+        <item name="im_conversation_verified_icon">#ff67a5eb</item>
+        <item name="im_forward_line_tint">@color/white</item>
+        <item name="im_history_common_badge_background">#66000000</item>
+        <item name="im_history_common_badge_foreground">@color/white</item>
+        <item name="im_history_divider_background">@color/white</item>
+        <item name="im_history_divider_foreground">@color/im_old_blue_gray_medium</item>
+        <item name="im_history_divider_separator">#1e000000</item>
+        <item name="im_history_image_bubbleless_border">#1e000000</item>
+        <item name="im_history_incoming_attachment_icon">@color/im_old_accent_muted</item>
+        <item name="im_history_incoming_background">#ffebeced</item>
+        <item name="im_history_incoming_background_selected">#ffc2c7cc</item>
+        <item name="im_history_incoming_button">@color/im_old_accent</item>
+        <item name="im_history_incoming_foreground">@color/black</item>
+        <item name="im_history_incoming_foreground_caption">@color/im_old_gray_medium</item>
+        <item name="im_history_incoming_foreground_caption_inv">@color/white</item>
+        <item name="im_history_incoming_foreground_link">@color/im_old_accent_muted</item>
+        <item name="im_history_incoming_foreground_name">@color/im_old_accent_muted</item>
+        <item name="im_history_incoming_image_placeholder_background">#14000c1a</item>
+        <item name="im_history_incoming_snippet_placeholder_background">@color/im_old_accent_muted_14</item>
+        <item name="im_history_incoming_snippet_placeholder_icon">@color/im_old_accent_muted</item>
+        <item name="im_history_info_bar_background">#fffafbfc</item>
+        <item name="im_history_info_bar_border">#26000000</item>
+        <item name="im_history_live_badge_background">#ffff3347</item>
+        <item name="im_history_outgoing_attachment_icon">@color/im_old_accent_muted</item>
+        <item name="im_history_outgoing_background">#ffc2ddfc</item>
+        <item name="im_history_outgoing_background_selected">#ffa3bedc</item>
+        <item name="im_history_outgoing_button">@color/im_old_accent_muted</item>
+        <item name="im_history_outgoing_foreground">@color/black</item>
+        <item name="im_history_outgoing_foreground_caption">@color/im_old_gray_medium</item>
+        <item name="im_history_outgoing_foreground_link">@color/im_old_accent</item>
+        <item name="im_history_outgoing_foreground_name">@color/im_old_accent_muted</item>
+        <item name="im_history_outgoing_image_placeholder_background">#14000c1a</item>
+        <item name="im_history_outgoing_snippet_placeholder_background">@color/im_old_accent_muted_14</item>
+        <item name="im_history_outgoing_snippet_placeholder_icon">@color/im_old_accent_muted</item>
+        <item name="im_history_sending_icon">@color/im_old_accent</item>
+        <item name="im_history_sticker_badge_background">#e6ffffff</item>
+        <item name="im_history_sticker_badge_foreground">@color/im_old_gray_medium</item>
+        <item name="im_history_unread_icon">@color/im_old_accent</item>
+        <item name="im_is_vk_me">false</item>
+        <item name="im_item_foreground_caption">@color/im_old_gray_medium</item>
+        <item name="im_item_foreground_name">@color/im_old_accent_muted</item>
+        <item name="im_item_foreground_subhead">@color/im_old_gray_dark</item>
+        <item name="im_item_foreground_tertiary">@color/im_old_gray_light</item>
+        <item name="im_menu_foreground">@color/gray_800</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_tabbar_icon_active">@color/im_old_accent</item>
+        <item name="im_tabbar_icon_inactive">@color/im_old_blue_gray_light</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/gray_750</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/gray_900</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>
+    </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>
@@ -1636,13 +1965,13 @@
         <item name="android:fontFamily">@string/font_family_medium</item>
     </style>
     <style name="GradientActionBarSubtitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse">
-        <item name="android:textColor">#b0ffffff</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>
     </style>
     <style name="GradientActionBarTitleStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
-        <item name="android:textColor">?text_primary</item>
+        <item name="android:textColor">?header_text</item>
         <item name="android:shadowColor">#26000000</item>
         <item name="android:shadowDy">@integer/s1dip</item>
         <item name="android:shadowRadius">@integer/s2dip</item>
@@ -3619,6 +3948,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/gray_900</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/gray_900</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>

smali/res/xml/preferences_messages.xml

@@ -14,6 +14,7 @@
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">
+        <com.vtosters.lite.ui.SummaryListPreference android:entries="@array/msgcount_value" android:title="Количество загружаемых сообщений" android:key="msgcount" android:defaultValue="30" android:dialogTitle="Выберите количество" android:entryValues="@array/msgcount" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/convUsersOnline" android:key="convUsersOnline" android:summary="@string/convUsersOnlinesum" android:defaultValue="false" />
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_themes.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Amoled тема" android:summary="Для применения изменений поменяйте тему" android:key="amoled" android:defaultValue="false" />
     <PreferenceCategory android:title="@string/vticon">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vticonbtn" android:key="iconvk" android:summary="@string/vticonsummary" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />

smali/smali/com/vk/core/ui/themes/VKTheme.smali

@@ -18,6 +18,8 @@
 
 .field public static final enum DARK:Lcom/vk/core/ui/themes/VKTheme;
 
+.field public static final enum AMOLED:Lcom/vk/core/ui/themes/VKTheme;
+
 .field public static final enum DEFAULT_LIGHT:Lcom/vk/core/ui/themes/VKTheme;
 
 
@@ -31,7 +33,7 @@
 .method static constructor <clinit>()V
     .locals 14
 
-    const/4 v0, 0x2
+    const/4 v0, 0x3
 
     new-array v0, v0, [Lcom/vk/core/ui/themes/VKTheme;
 
@@ -77,6 +79,29 @@
 
     aput-object v1, v0, v2
 
+    new-instance v1, Lcom/vk/core/ui/themes/VKTheme;
+
+    const-string v9, "AMOLED"
+
+    .line 292
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getAmoledTheme()I
+
+    move-result v13
+
+    const/4 v10, 0x2
+
+    const-wide/16 v11, 0x2
+
+    move-object v8, v1
+
+    invoke-direct/range {v8 .. v13}, Lcom/vk/core/ui/themes/VKTheme;-><init>(Ljava/lang/String;IJI)V
+
+    sput-object v1, Lcom/vk/core/ui/themes/VKTheme;->AMOLED:Lcom/vk/core/ui/themes/VKTheme;
+
+    const/4 v2, 0x2
+
+    aput-object v1, v0, v2
+
     sput-object v0, Lcom/vk/core/ui/themes/VKTheme;->$VALUES:[Lcom/vk/core/ui/themes/VKTheme;
 
     return-void

smali/smali/com/vk/core/ui/themes/VKThemeHelper.smali

@@ -351,7 +351,9 @@
 
     if-eqz v0, :cond_0
 
-    sget-object v0, Lcom/vk/core/ui/themes/VKTheme;->DARK:Lcom/vk/core/ui/themes/VKTheme;
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getCurrentDarkTheme()Lcom/vk/core/ui/themes/VKTheme;
+
+    move-result-object v0
 
     goto :goto_0
 

smali/smali/com/vk/im/engine/internal/api_parsers/IdApiParser.smali

@@ -134,25 +134,9 @@
 
     .line 23
     :cond_3
-    new-instance v0, Ljava/lang/IllegalArgumentException;
+    sget-object p0, Lcom/vk/im/engine/models/MemberType;->UNKNOWN:Lcom/vk/im/engine/models/MemberType;
 
-    new-instance v1, Ljava/lang/StringBuilder;
-
-    invoke-direct {v1}, Ljava/lang/StringBuilder;-><init>()V
-
-    const-string v2, "Unknown dialog id "
-
-    invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1, p0}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
-
-    invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
-    move-result-object p0
-
-    invoke-direct {v0, p0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
-
-    throw v0
+    return-object p0
 .end method
 
 .method private static e(I)I

smali/smali/com/vk/navigation/NavigationDelegateBottom$c.smali

@@ -109,7 +109,7 @@
 
     move-result-object p4
 
-    const-string v0, "scrollerField"
+    const-string v0, "m"
 
     .line 777
     invoke-static {p4, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
@@ -123,7 +123,7 @@
 
     move-result-object p1
 
-    const-string v0, "interpolator"
+    const-string v0, "f"
 
     .line 779
     invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V

smali/smali/com/vk/profile/ui/cover/CoverViewPager.smali

@@ -275,7 +275,7 @@
 
     move-result-object v1
 
-    const-string v2, "scroller"
+    const-string v2, "m"
 
     .line 112
     invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
@@ -289,7 +289,7 @@
 
     move-result-object v2
 
-    const-string v3, "interpolator"
+    const-string v3, "f"
 
     .line 114
     invoke-static {v2, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V

smali/smali_classes2/com/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy.smali

@@ -52,206 +52,5 @@
 
     const/4 v2, 0x0
 
-    if-ne v0, v1, :cond_0
-
-    .line 50
-    invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
-
-    move-result-object v0
-
-    const-string v1, "Twitter"
-
-    const-string v3, "AdvertisingInfoServiceStrategy cannot be called on the main thread"
-
-    invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V
-
-    return-object v2
-
-    .line 56
-    :cond_0
-    :try_start_0
-    iget-object v0, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
-
-    invoke-virtual {v0}, Landroid/content/Context;->getPackageManager()Landroid/content/pm/PackageManager;
-
-    move-result-object v0
-
-    const-string v1, "com.android.vending"
-
-    const/4 v3, 0x0
-
-    .line 57
-    invoke-virtual {v0, v1, v3}, Landroid/content/pm/PackageManager;->getPackageInfo(Ljava/lang/String;I)Landroid/content/pm/PackageInfo;
-    :try_end_0
-    .catch Landroid/content/pm/PackageManager$NameNotFoundException; {:try_start_0 .. :try_end_0} :catch_3
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_2
-
-    .line 71
-    new-instance v0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;
-
-    invoke-direct {v0, v2}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;-><init>(Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$1;)V
-
-    .line 72
-    new-instance v1, Landroid/content/Intent;
-
-    const-string v3, "com.google.android.gms.ads.identifier.service.START"
-
-    invoke-direct {v1, v3}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
-
-    const-string v3, "com.google.android.gms"
-
-    .line 73
-    invoke-virtual {v1, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
-
-    .line 75
-    :try_start_1
-    iget-object v3, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
-
-    const/4 v4, 0x1
-
-    invoke-virtual {v3, v1, v0, v4}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
-
-    move-result v1
-    :try_end_1
-    .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_1
-
-    if-eqz v1, :cond_1
-
-    .line 77
-    :try_start_2
-    new-instance v1, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;
-
-    .line 78
-    invoke-virtual {v0}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$a;->a()Landroid/os/IBinder;
-
-    move-result-object v3
-
-    invoke-direct {v1, v3, v2}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;-><init>(Landroid/os/IBinder;Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$1;)V
-
-    .line 79
-    new-instance v3, Lcom/twitter/sdk/android/core/internal/AdvertisingInfo;
-
-    invoke-virtual {v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;->a()Ljava/lang/String;
-
-    move-result-object v4
-
-    .line 80
-    invoke-static {v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;->a(Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy$b;)Z
-
-    move-result v1
-
-    invoke-direct {v3, v4, v1}, Lcom/twitter/sdk/android/core/internal/AdvertisingInfo;-><init>(Ljava/lang/String;Z)V
-    :try_end_2
-    .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_0
-    .catchall {:try_start_2 .. :try_end_2} :catchall_0
-
-    .line 86
-    :try_start_3
-    iget-object v1, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
-
-    invoke-virtual {v1, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-    :try_end_3
-    .catch Ljava/lang/Throwable; {:try_start_3 .. :try_end_3} :catch_1
-
-    return-object v3
-
-    :catchall_0
-    move-exception v1
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v1
-
-    .line 82
-    :try_start_4
-    invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
-
-    move-result-object v3
-
-    const-string v4, "Twitter"
-
-    const-string v5, "Exception in binding to Google Play Service to capture AdvertisingId"
-
-    invoke-interface {v3, v4, v5, v1}, Lcom/twitter/sdk/android/core/Logger;->b(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-    :try_end_4
-    .catchall {:try_start_4 .. :try_end_4} :catchall_0
-
-    .line 86
-    :try_start_5
-    iget-object v1, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
-
-    invoke-virtual {v1, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-
-    goto :goto_1
-
-    :goto_0
-    iget-object v3, p0, Lcom/twitter/sdk/android/core/internal/AdvertisingInfoServiceStrategy;->a:Landroid/content/Context;
-
-    invoke-virtual {v3, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-
-    throw v1
-
-    .line 89
-    :cond_1
-    invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
-
-    move-result-object v0
-
-    const-string v1, "Twitter"
-
-    const-string v3, "Could not bind to Google Play Service to capture AdvertisingId"
-
-    invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V
-    :try_end_5
-    .catch Ljava/lang/Throwable; {:try_start_5 .. :try_end_5} :catch_1
-
-    goto :goto_1
-
-    :catch_1
-    move-exception v0
-
-    .line 93
-    invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
-
-    move-result-object v1
-
-    const-string v3, "Twitter"
-
-    const-string v4, "Could not bind to Google Play Service to capture AdvertisingId"
-
-    invoke-interface {v1, v3, v4, v0}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    :goto_1
-    return-object v2
-
-    :catch_2
-    move-exception v0
-
-    .line 66
-    invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
-
-    move-result-object v1
-
-    const-string v3, "Twitter"
-
-    const-string v4, "Unable to determine if Google Play Services is available"
-
-    invoke-interface {v1, v3, v4, v0}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V
-
-    return-object v2
-
-    .line 60
-    :catch_3
-    invoke-static {}, Lcom/twitter/sdk/android/core/Twitter;->g()Lcom/twitter/sdk/android/core/Logger;
-
-    move-result-object v0
-
-    const-string v1, "Twitter"
-
-    const-string v3, "Unable to find Google Play Services package name"
-
-    invoke-interface {v0, v1, v3}, Lcom/twitter/sdk/android/core/Logger;->a(Ljava/lang/String;Ljava/lang/String;)V
-
     return-object v2
 .end method

smali/smali_classes2/com/vtosters/lite/fragments/SettingsListFragment$b$1.smali

@@ -89,6 +89,15 @@
     sget-object v1, Lcom/vk/im/ui/themes/ImTheme;->VKME_DARK:Lcom/vk/im/ui/themes/ImTheme;
 
     :cond_2
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->amoled()Z
+
+    move-result v3
+
+    if-eqz v3, :cond_3
+
+    sget-object v1, Lcom/vk/im/ui/themes/ImTheme;->VKAPP_AMOLED:Lcom/vk/im/ui/themes/ImTheme;
+
+    :cond_3
     invoke-virtual {v0, v1}, Lcom/vk/im/ui/themes/ImThemeHelper;->a(Lcom/vk/im/ui/themes/ImTheme;)V
 
     .line 190

smali/smali_classes3/com/facebook/internal/AttributionIdentifiers.smali

@@ -657,100 +657,8 @@
 .method private static d(Landroid/content/Context;)Lcom/facebook/internal/AttributionIdentifiers;
     .locals 5
 
-    .line 147
-    new-instance v0, Lcom/facebook/internal/AttributionIdentifiers$b;
+    const v1, 0x0
 
-    const/4 v1, 0x0
-
-    invoke-direct {v0, v1}, Lcom/facebook/internal/AttributionIdentifiers$b;-><init>(Lcom/facebook/internal/AttributionIdentifiers$1;)V
-
-    .line 148
-    new-instance v2, Landroid/content/Intent;
-
-    const-string v3, "com.google.android.gms.ads.identifier.service.START"
-
-    invoke-direct {v2, v3}, Landroid/content/Intent;-><init>(Ljava/lang/String;)V
-
-    const-string v3, "com.google.android.gms"
-
-    .line 149
-    invoke-virtual {v2, v3}, Landroid/content/Intent;->setPackage(Ljava/lang/String;)Landroid/content/Intent;
-
-    const/4 v3, 0x1
-
-    .line 150
-    invoke-virtual {p0, v2, v0, v3}, Landroid/content/Context;->bindService(Landroid/content/Intent;Landroid/content/ServiceConnection;I)Z
-
-    move-result v2
-
-    if-eqz v2, :cond_0
-
-    .line 152
-    :try_start_0
-    new-instance v2, Lcom/facebook/internal/AttributionIdentifiers$a;
-
-    invoke-virtual {v0}, Lcom/facebook/internal/AttributionIdentifiers$b;->a()Landroid/os/IBinder;
-
-    move-result-object v3
-
-    invoke-direct {v2, v3}, Lcom/facebook/internal/AttributionIdentifiers$a;-><init>(Landroid/os/IBinder;)V
-
-    .line 153
-    new-instance v3, Lcom/facebook/internal/AttributionIdentifiers;
-
-    invoke-direct {v3}, Lcom/facebook/internal/AttributionIdentifiers;-><init>()V
-
-    .line 154
-    invoke-virtual {v2}, Lcom/facebook/internal/AttributionIdentifiers$a;->a()Ljava/lang/String;
-
-    move-result-object v4
-
-    iput-object v4, v3, Lcom/facebook/internal/AttributionIdentifiers;->c:Ljava/lang/String;
-
-    .line 155
-    invoke-virtual {v2}, Lcom/facebook/internal/AttributionIdentifiers$a;->b()Z
-
-    move-result v2
-
-    iput-boolean v2, v3, Lcom/facebook/internal/AttributionIdentifiers;->e:Z
-    :try_end_0
-    .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
-    .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
-    .line 160
-    invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-
-    return-object v3
-
-    :catchall_0
-    move-exception v1
-
-    goto :goto_0
-
-    :catch_0
-    move-exception v2
-
-    :try_start_1
-    const-string v3, "android_id"
-
-    .line 158
-    invoke-static {v3, v2}, Lcom/facebook/internal/Utility;->a(Ljava/lang/String;Ljava/lang/Exception;)V
-    :try_end_1
-    .catchall {:try_start_1 .. :try_end_1} :catchall_0
-
-    .line 160
-    invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-
-    goto :goto_1
-
-    :goto_0
-    invoke-virtual {p0, v0}, Landroid/content/Context;->unbindService(Landroid/content/ServiceConnection;)V
-
-    .line 161
-    throw v1
-
-    :cond_0
-    :goto_1
     return-object v1
 .end method
 

smali/smali_classes3/com/vk/core/dialogs/snackbar/VkSnackbar.smali

@@ -915,7 +915,9 @@
 
     move-result-object v0
 
-    sget-object v2, Lcom/vk/core/ui/themes/VKTheme;->DARK:Lcom/vk/core/ui/themes/VKTheme;
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getCurrentDarkTheme()Lcom/vk/core/ui/themes/VKTheme;
+
+    move-result-object v2
 
     if-ne v0, v2, :cond_5
 

smali/smali_classes4/com/vk/im/ui/themes/ImTheme.smali

@@ -24,6 +24,8 @@
 
 .field public static final enum VKME_LIGHT:Lcom/vk/im/ui/themes/ImTheme;
 
+.field public static final enum VKAPP_AMOLED:Lcom/vk/im/ui/themes/ImTheme;
+
 
 # instance fields
 .field private final id:I
@@ -35,7 +37,7 @@
 .method static constructor <clinit>()V
     .locals 7
 
-    const/4 v0, 0x4
+    const/4 v0, 0x5
 
     new-array v0, v0, [Lcom/vk/im/ui/themes/ImTheme;
 
@@ -99,6 +101,28 @@
 
     aput-object v1, v0, v4
 
+
+    new-instance v1, Lcom/vk/im/ui/themes/ImTheme;
+
+    const-string v2, "VKAPP_AMOLED"
+
+    .line 58
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getAmoledImTheme()I
+
+    move-result v3
+
+    const/4 v4, 0x4
+
+    const/4 v5, 0x4
+
+    invoke-direct {v1, v2, v5, v4, v3}, Lcom/vk/im/ui/themes/ImTheme;-><init>(Ljava/lang/String;III)V
+
+    sput-object v1, Lcom/vk/im/ui/themes/ImTheme;->VKAPP_AMOLED:Lcom/vk/im/ui/themes/ImTheme;
+
+    aput-object v1, v0, v5
+
+
+
     sput-object v0, Lcom/vk/im/ui/themes/ImTheme;->$VALUES:[Lcom/vk/im/ui/themes/ImTheme;
 
     return-void

smali/smali_classes4/com/vk/stickers/Stickers.smali

@@ -2556,6 +2556,8 @@
 
     move-result v0
 
+    const v0, 0x0 ## nedofix anim stickers
+
     return v0
 .end method
 

smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali

@@ -47,12 +47,14 @@
     .line 28
     invoke-direct {p0}, Lcom/vk/api/sdk/internal/ApiCommand;-><init>()V
 
-    const v0, 0x1
-
-    iput v0, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->a:I
+    iput p1, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->a:I
 
     iput-object p2, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->b:Lcom/vk/im/engine/models/dialogs/DialogsFilter;
 
+    invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getMsgCount()I
+
+    move-result p3
+
     iput p3, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->c:I
 
     iput-object p4, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->d:Ljava/lang/String;
@@ -229,6 +231,20 @@
     move-result-object v1
 
 
+    const-string v2, "start_message_id"
+
+    .line 49
+    iget v3, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->a:I
+
+    invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v3
+
+    invoke-virtual {v1, v2, v3}, Lcom/vk/api/internal/MethodCall$a;->a(Ljava/lang/String;Ljava/lang/Object;)Lcom/vk/api/internal/MethodCall$a;
+
+    move-result-object v1
+
+
     .line 49
     const-string v2, "filter"
 
@@ -288,7 +304,7 @@
 
     move-result-object v0
 
-    const-string v1, "5.121"
+    const-string v1, "5.93"
 
     .line 56
     invoke-virtual {v0, v1}, Lcom/vk/api/internal/MethodCall$a;->c(Ljava/lang/String;)Lcom/vk/api/internal/MethodCall$a;