Updated shit Filter

README.md

@@ -1,15 +1,30 @@
 # VTosters Lite
 О багах сообщать в issues, **просьба не создавать дубликаты и воспользоваться поиском**
+
+### Пул Реквесты
+
+Скрипты и код далеки от **идеала** и поэтому мы всегда готовы к новым предложениям в **Pull Requests**
+
 ### Компиляция
+
 Требуется установленная **Java** >11 версии
 
 Требуется установленная **Android Studio**
 
-Скрипты для сборки лежат в папке **scripts**
+Весь декомпилированный код клиента находится в ```/smali``` 
 
-Скрипт компиляции для Linux/Unix: ```./build.sh```
+Весь исходный код написанный на Java находится в ```/app```
 
-Скрипт компиляции для Windows: ```./build.bat```
+Все необходимые скрипты для компиляции APK, его подписывании и не только находятся в ```/scripts```
+
+Скрипт для Linux/Mac: ```./build.sh```
+
+Скрипт для Windows: ```./build.bat```
 
 ![](https://media.discordapp.net/attachments/762063967979175946/956927341450391562/unknown.png)
 
+### Проверка версии коммита
+
+С версии v0.0.4 доступна прямая проверка версии коммита внутри приложения
+
+![](https://media.discordapp.net/attachments/762063967979175946/957344234640408606/Screenshot_20220326-212257_VTLite__01.png)

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

@@ -166,6 +166,10 @@ public class Prefs {
         return BooleanFalse("default_ad_list");
     }
 
+    public static boolean shitposting() {
+        return BooleanFalse("shitposting");
+    }
+
     public static boolean dev() {
         return BooleanFalse("dev");
     }
@@ -234,10 +238,14 @@ public class Prefs {
     }
 
     public static String getBuildNumber() {
-        return Prefs.loadAssetTextAsString(Helper.GetContext(), "version.properties");
+        return Prefs.getBuild(Helper.GetContext(), "version.properties");
     }
 
-    public static String loadAssetTextAsString(Context context, String name) {
+    public static String getCommitLink() {
+        return "https://github.com/vtosters/lite/commit/" + Prefs.getBuild(Helper.GetContext(), "version.properties");
+    }
+
+    public static String getBuild(Context context, String name) {
         try {
             Scanner scanner = new Scanner(context.getAssets().open(name));
             while (scanner.hasNextLine()) {
@@ -326,7 +334,7 @@ public class Prefs {
     }
 
     public static boolean newfeed() {
-        return BooleanFalse("newfeed");
+        return BooleanTrue("newfeed");
     }
 
     public static boolean offline() {
@@ -451,6 +459,10 @@ public class Prefs {
         return BooleanTrue("voice");
     }
 
+    public static boolean newvideo() {
+        return BooleanTrue("newvideo");
+    }
+
     public static String widgetads() {
         return ads() ? "null" : "app_widget";
     }
@@ -500,6 +512,7 @@ public class Prefs {
         ReferalsPut();
         StandardFilterPut();
         ShortLinkPut();
+        IDontWantToReadIt();
         String string = Helper.GetPreferences().getString("spamfilters", "");
         if (!string.isEmpty()) {
             mFilters.addAll(Arrays.asList(string.split(", ")));
@@ -563,6 +576,25 @@ public class Prefs {
         }
     }
 
+    public static void IDontWantToReadIt() {
+        if (BooleanTrue("shitposting")) {
+            try {
+                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(Helper.GetContext().getAssets().open("IDontWantToReadIt.txt")));
+                while (true) {
+                    String readLine = bufferedReader.readLine();
+                    if (readLine != null) {
+                        mFilters.add(readLine);
+                    } else {
+                        bufferedReader.close();
+                        return;
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     public static String SSFSDomain() {
         String string = Helper.GetPreferences().getString("ssfscustom", "");
         if (!string.isEmpty()) {
@@ -592,6 +624,7 @@ public class Prefs {
         list.clear();
         list.add(new Items1());
         if (!oldabout()) {
+            list.add(new Items(21, R.string.opencommit));
             list.add(new Items(8, R.string.tgchannel));
             list.add(new Items(9, R.string.tgchat));
             list.add(new Items(16, R.string.vtfaq));

smali/assets/IDontWantToReadIt.txt

@@ -0,0 +1,187 @@
+Путин
+Путин
+Путину
+Путину
+Путина
+Путина
+Путинская
+путинская
+Байден
+байден
+Байдену
+байдену
+Обама
+обама
+Обаме
+обаме
+Обаму
+обаму
+Трамп
+трамп
+Трампу
+трампу
+Санкции
+санкции
+Санкций
+санкций
+Россия
+россия
+россии
+России
+МИДУ РФ
+миду рф
+МИД РФ
+мид рф
+Мид РФ
+Мид рф
+Российской
+российской
+Украина
+украина
+Украине
+украине
+Украины
+украины
+военные
+Военные 
+Специальная операция
+Специальная Операция
+специальная операция
+специальная Операция
+Спец. Операция
+Спец. операция
+спец. Операция
+Спец Операция
+спец операция
+Спец операция 
+Военная операция
+Военная Операция
+военная Операция
+военная операция
+спецоперация
+Спецоперация
+спецоперации
+Спецоперации
+спецоперацию
+Спецоперацию
+вторжение
+Вторжение
+ЛНР
+лнр
+ДНР
+днр
+Донбасс
+донбасс
+Луганск
+луганск
+Луганская
+луганская
+Донецк
+донецк
+Донецкая
+донецкая
+Навальным
+навальным
+Навальный
+навальный
+Навального
+навального
+ВСУ
+всу
+ВС РФ
+вс рф
+Шойгу
+шойгу
+Зеленский
+зеленский
+Зеленским
+зеленским
+Зеленскому
+зеленскому
+Зеленского
+зеленского
+евросоюз
+Евросоюз
+евросоюзу
+Евросоюзу
+ес
+ЕС
+Войск
+войск
+армия
+Армия
+Войне
+войне
+войны
+Войны
+войн
+Войн
+солдат
+Солдат
+солдаты
+Солдаты
+Вооруженные
+вооруженные
+нато
+НАТО
+Нато
+Песков
+песков
+Кремль
+кремль
+Кремлю
+кремлю
+денацификация
+Денацификация
+нацис
+Нацис
+нациз
+Нациз
+Медведев
+медведев
+денацифицировать
+Денацифицировать
+фашис
+Фашис
+фашиз
+Фашиз
+США
+сша
+Киев
+киев
+Харьков
+харьков
+Харьковская
+харьковская
+"Z"
+"V"
+«Z»
+«V»
+"з"
+"в"
+«з»
+«в»
+"z"
+"v"
+«z»
+«v»
+"З"
+"В"
+«З»
+«В»
+русня
+Русня
+хохол
+Хохол
+Хохлы
+хохлы
+ЛДНР
+лднр
+наказать Россию
+наказать россию
+наказать Русских
+наказать русских
+вооружение
+Вооружение
+пво
+ПВО

smali/assets/StandartFilter.txt

@@ -36,4 +36,16 @@ cпocоб зaрaбoтать
 смотри в Источнике
 Смотри в Источнике
 в источнике👇
-в источнике😳👇
+в источнике😳👇
+в Источник
+в источник
+В источник
+в источнике
+в Источнике
+В источнике
+в закрепленном комментарии
+в Закрепленном комментарии
+в закрепленном Комментарии
+В закрепленном комментарии
+В Закрепленном комментарии
+В закрепленном Комментарии

smali/res/layout-sw600dp/group_banned_user.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>

smali/res/layout-sw600dp/store_item.xml

@@ -3,7 +3,7 @@
   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/photo" android:layout_width="fill_parent" android:layout_height="188.0dip" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" app:actualImageScaleType="centerCrop" app:placeholderImage="@drawable/sticker_placeholder" />
     <com.vtosters.lite.ui.BadooTextView android:textSize="15.0sp" android:textColor="?text_primary" android:ellipsize="end" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="7.5dip" android:singleLine="true" android:layout_toLeftOf="@id/sticker_btn_wrap" android:layout_below="@id/photo" android:layout_alignParentLeft="true" app:typeface="Regular" />
-    <TextView android:textSize="12.0sp" android:textColor="#ffa6a6a6" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="-1.0dip" android:layout_marginBottom="9.5dip" android:singleLine="true" android:drawablePadding="10.0dip" android:layout_below="@id/title" android:layout_alignRight="@id/title" android:layout_alignParentLeft="true" app:typeface="Regular" />
+    <TextView android:textSize="12.0sp" android:textColor="?text_secondary" android:ellipsize="end" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10.0dip" android:layout_marginTop="-1.0dip" android:layout_marginBottom="9.5dip" android:singleLine="true" android:drawablePadding="10.0dip" android:layout_below="@id/title" android:layout_alignRight="@id/title" android:layout_alignParentLeft="true" app:typeface="Regular" />
     <FrameLayout android:id="@id/sticker_btn_wrap" android:background="@android:color/transparent" android:paddingLeft="12.0dip" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@id/sticker_gift" android:layout_below="@id/photo">
         <com.vtosters.lite.ui.BadooTextView android:id="@id/sticker_button" android:background="?tabbar_background" android:paddingTop="4.5dip" android:paddingBottom="8.5dip" android:layout_height="30.0dip" app:typeface="Medium" style="@style/VKUIButton.Green" />
         <ProgressBar android:layout_gravity="center" android:id="@id/sticker_progress" android:layout_width="20.0dip" android:layout_height="20.0dip" android:max="100" android:indeterminate="false" android:indeterminateOnly="false" />

smali/res/layout-v21/activity_story_settings.xml

@@ -8,7 +8,7 @@
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Сохранение" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_stories" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories_desc" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -20,7 +20,7 @@
                 <LinearLayout android:orientation="vertical" android:id="@id/ll_stories_privacy_holder" android:layout_width="fill_parent" android:layout_height="wrap_content" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_broadcast_group_cancomment" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_broadcast_group_cancomment_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -29,36 +29,36 @@
             <LinearLayout android:orientation="vertical" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:elevation="1.5dip">
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Общие" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:id="@id/ll_hidden_from_stories" android:background="@drawable/bg_settings_separator" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="?selectableItemBackground" android:layout_weight="1.0">
-                    <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
+                    <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
                     <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories_desc" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_broadcast_post" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_broadcast_post_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_story_live" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_story_live_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_animation_overlay" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_animations" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_hd_quality" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save_hd_quality" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
-                <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
+                <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

smali/res/layout-v21/dialog_bottom_sheet.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <View android:id="@id/touch_outside" android:layout_width="fill_parent" android:layout_height="fill_parent" android:soundEffectsEnabled="false" android:importantForAccessibility="no" />
     <RelativeLayout android:layout_gravity="center|top" android:id="@id/design_bottom_sheet" android:background="@android:color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_behavior="com.vk.core.ui.VkBottomSheetBehavior" style="?bottomSheetStyle">
-        <View android:id="@id/header_background" android:background="?tabbar_background" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="?actionBarSize" />
+        <View android:id="@id/header_background" android:background="?header_background" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="?actionBarSize" />
         <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="?header_background" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:elevation="3.0dip" android:outlineProvider="bounds" app:popupTheme="?actionBarPopupTheme" app:theme="?actionBarTheme" app:titleTextAppearance="@style/ToolbarTitle" style="?actionBarTheme"
           xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />
         <View android:id="@id/header_shadow" android:background="@drawable/picker_bg_attach_bottom_toolbar_shadow" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="8.0dip" android:layout_marginTop="54.0dip" android:rotation="180.0" />

smali/res/layout-xlarge/group_banned_user.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>

smali/res/layout/activity_story_settings.xml

@@ -8,7 +8,7 @@
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Сохранение" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_stories" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories_desc" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -20,7 +20,7 @@
                 <LinearLayout android:orientation="vertical" android:id="@id/ll_stories_privacy_holder" android:layout_width="fill_parent" android:layout_height="wrap_content" />
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_broadcast_group_cancomment" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_live_comments_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_broadcast_group_cancomment_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
@@ -29,36 +29,36 @@
             <LinearLayout android:orientation="vertical" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip">
                 <TextView android:textSize="13.0sp" android:textColor="@color/caption_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="14.0dip" android:text="Общие" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
                 <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:id="@id/ll_hidden_from_stories" android:background="@drawable/bg_settings_separator" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="?selectableItemBackground" android:layout_weight="1.0">
-                    <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
+                    <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories" />
                     <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/hidden_from_stories_desc" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_broadcast_post" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_wall_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_broadcast_post_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_publish_story_live" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_title" />
                         <TextView android:textSize="14.0sp" android:textColor="@color/subhead_gray" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_publish_story_text" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/ll_publish_story_live_switch" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_animation_overlay" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/sticker_settings_animation_title" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_animations" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
                 <LinearLayout android:orientation="horizontal" android:id="@id/ll_save_hd_quality" android:background="@drawable/bg_settings_separator" android:layout_width="fill_parent" android:layout_height="fill_parent" android:foreground="?selectableItemBackground">
                     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="wrap_content" android:layout_weight="1.0">
-                        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
+                        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stories_settings_hd_quality" />
                     </LinearLayout>
                     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save_hd_quality" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />
                 </LinearLayout>
-                <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
+                <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/tv_clear_masks_cache" android:background="@drawable/picker_white_ripple_bounded" android:padding="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/masks_clear_cache" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

smali/res/layout/apps_info_item.xml

@@ -9,7 +9,7 @@
         <com.vk.imageloader.view.VKCircleImageView android:id="@id/image0" android:paddingRight="4.0dip" android:layout_width="28.0dip" android:layout_height="28.0dip" app:placeholderImage="@drawable/placeholder_user_28" />
     </LinearLayout>
     <View android:id="@id/divider" android:background="@drawable/apps_info_playing_friends" android:layout_width="fill_parent" android:layout_height="0.5dip" />
-    <TextView android:textSize="15.0sp" android:textColor="#ff212121" android:id="@id/description" android:paddingLeft="16.0dip" android:paddingTop="12.0dip" android:paddingRight="16.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:lineSpacingExtra="7.0sp" android:fontFamily="@string/font_family_regular" />
+    <TextView android:textSize="15.0sp" android:textColor="?attr/text_primary" android:id="@id/description" android:paddingLeft="16.0dip" android:paddingTop="12.0dip" android:paddingRight="16.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:lineSpacingExtra="7.0sp" android:fontFamily="@string/font_family_regular" />
     <TextView android:textSize="15.0sp" android:textColor="@color/text_blue" android:id="@id/text_expand" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/post_show_full" android:fontFamily="@string/font_family_regular" />
     <com.vtosters.lite.ui.widget.GameScreenshotsRecyclerView android:id="@id/recycle" android:layout_width="fill_parent" android:layout_height="256.0dip" android:layout_marginTop="12.0dip" />
 </LinearLayout>

smali/res/layout/board_topic_row.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="#ff212121" 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="16.0dip" android:textColor="?attr/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" />
     <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" />

smali/res/layout/fragment_photo_view.xml

@@ -1,6 +1,6 @@
 <?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">
-    <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:navigationIcon="@drawable/ic_cancel_black" app:title="@string/avp_pick_photo_title" app:titleTextColor="@color/black" />
-    <com.vk.photogallery.PhotoGalleryView android:id="@id/gallery_view" android:background="?tabbar_background" android:padding="3.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="?actionBarSize" app:itemPadding="3.0dip" app:mediaType="photo" />
+    <android.support.v7.widget.Toolbar android:id="@id/toolbar" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:navigationIcon="@drawable/ic_cancel_black" app:title="@string/avp_pick_photo_title" app:titleTextColor="@color/black" />
+    <com.vk.photogallery.PhotoGalleryView android:id="@id/gallery_view" android:background="#ffffffff" android:padding="3.0dip" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="?actionBarSize" app:itemPadding="3.0dip" app:mediaType="photo" />
 </FrameLayout>

smali/res/layout/gift_send_checkbox.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Switch android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/gift_send_privacy_label"
+<Switch android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/privacy" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/gift_send_privacy_label"
   xmlns:android="http://schemas.android.com/apk/res/android" />

smali/res/layout/group_admin_info.xml

@@ -34,19 +34,19 @@
             <com.vtosters.lite.ui.CompoundRadioGroup android:orientation="vertical" android:id="@id/group_access_radiogroup" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/access_open" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_open" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_open" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/title_open" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_open" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_open" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_open_descr" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_open" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/access_closed" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_closed" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/title_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_closed" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_closed" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_closed_descr" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_closed" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/access_private" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_private" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_private" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_private_descr" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
             </com.vtosters.lite.ui.CompoundRadioGroup>

smali/res/layout/group_admin_item.xml

@@ -2,5 +2,5 @@
 <LinearLayout android:orientation="horizontal" android:paddingLeft="@dimen/post_side_padding" android:paddingRight="@dimen/post_side_padding" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:layout_gravity="center_vertical" android:id="@id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="32.0dip" android:tint="@color/light_gray" />
-    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="56.0dip" android:text="@string/group_info" />
+    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center_vertical" android:layout_gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="56.0dip" android:text="@string/group_info" />
 </LinearLayout>

smali/res/layout/group_admin_services_public.xml

@@ -3,15 +3,15 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip">
         <LinearLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip">
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_wall" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="8.0dip" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_enable_comments" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_links" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_links" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_photos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_service_photoalbums" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_videos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/videos" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_audios" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/audios" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_board" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/board" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_events" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/public_events" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_places" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/places" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
-            <CheckBox android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center|left" android:id="@id/group_service_contacts" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="8.0dip" android:text="@string/group_contacts" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_wall" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="8.0dip" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_enable_comments" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_links" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_links" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_photos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/group_service_photoalbums" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_videos" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/videos" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_audios" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/audios" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_board" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/board" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_events" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/public_events" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_places" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:text="@string/places" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
+            <CheckBox android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center|left" android:id="@id/group_service_contacts" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="8.0dip" android:text="@string/group_contacts" android:singleLine="true" android:drawableLeft="@android:color/transparent" android:drawablePadding="16.0dip" />
         </LinearLayout>
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>

smali/res/layout/group_banned_user.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>

smali/res/layout/group_edit_manager.xml

@@ -5,7 +5,7 @@
         <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
             <RelativeLayout android:paddingLeft="@dimen/post_side_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_width="64.0dip" android:layout_height="64.0dip" android:layout_marginRight="12.0dip" app:placeholderImage="@drawable/placeholder_user_72" />
-                <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
+                <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:ellipsize="end" android:id="@id/name" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="User Name" android:singleLine="true" android:layout_toRightOf="@id/photo" android:layout_alignTop="@id/photo" />
                 <TextView android:textSize="13.0dip" android:textColor="#ff8c8d8f" android:id="@id/description" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="3.0dip" android:text="Qwe qwe qwe description" android:layout_toRightOf="@id/photo" android:layout_below="@id/name" />
             </RelativeLayout>
         </FrameLayout>
@@ -14,19 +14,19 @@
             <com.vtosters.lite.ui.CompoundRadioGroup android:orientation="vertical" android:id="@id/group_access_radiogroup" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/moder" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_moder" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_moderator" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/title_moder" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_moderator" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_moder" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_moder_desc" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_moder" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/editor" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_editor" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_editor" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/title_editor" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_editor" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_editor" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_editor_desc" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_editor" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
                 <com.vtosters.lite.ui.CheckableRelativeLayout android:id="@id/admin" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="17.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="17.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
                     <RadioButton android:id="@android:id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="-4.0dip" android:layout_marginRight="16.0dip" />
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title_admin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_admin" android:layout_toRightOf="@android:id/checkbox" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/title_admin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/group_level_admin" android:layout_toRightOf="@android:id/checkbox" />
                     <TextView android:textSize="14.0dip" android:textColor="#ff78797a" android:id="@id/description_admin" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:text="@string/group_admin_desc" android:layout_toRightOf="@android:id/checkbox" android:layout_below="@id/title_admin" />
                 </com.vtosters.lite.ui.CheckableRelativeLayout>
             </com.vtosters.lite.ui.CompoundRadioGroup>

smali/res/layout/list_item_gift.xml

@@ -6,6 +6,6 @@
     <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:id="@id/date" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:singleLine="true" android:layout_toLeftOf="@id/actions" android:layout_below="@id/username" android:layout_alignLeft="@id/username" />
     <ImageView android:id="@id/actions" android:layout_marginLeft="@dimen/post_side_padding_menu" android:layout_marginTop="4.0dip" android:layout_marginRight="@dimen/post_side_padding_btn" android:src="@drawable/ic_card_actions" android:layout_alignParentTop="true" style="@style/UserMediumAction" />
     <com.vk.imageloader.view.VKImageView android:id="@id/gift" android:layout_width="176.0dip" android:layout_height="176.0dip" android:layout_marginBottom="4.0dip" android:layout_below="@id/photo" android:layout_centerHorizontal="true" />
-    <TextView android:textSize="15.0dip" android:textColor="#ff212121" android:gravity="center" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="6.0dip" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="5.0dip" android:layout_below="@id/gift" android:lineSpacingExtra="4.299988dip" />
+    <TextView android:textSize="15.0dip" android:textColor="?attr/text_primary" android:gravity="center" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="6.0dip" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="5.0dip" android:layout_below="@id/gift" android:lineSpacingExtra="4.299988dip" />
     <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:gravity="center" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/post_side_padding" android:layout_marginTop="-2.3299866dip" android:layout_marginRight="@dimen/post_side_padding" android:layout_marginBottom="5.0dip" android:text="@string/gifts_owner_privacy" android:layout_below="@id/title" />
 </RelativeLayout>

smali/res/layout/notifications_item_comment.xml

@@ -5,5 +5,5 @@
     <com.vk.imageloader.view.VKImageView android:id="@id/post_photo" android:layout_width="47.0dip" android:layout_height="47.0dip" android:layout_marginBottom="12.0dip" android:layout_alignParentTop="true" android:layout_alignParentRight="true" app:actualImageScaleType="centerCrop" app:placeholderImage="@drawable/photo_placeholder" app:roundedCornerRadius="2.0dip" />
     <com.vtosters.lite.ui.BadooTextView android:textSize="15.0dip" android:textColor="?accent" android:ellipsize="middle" android:id="@id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="12.0dip" android:maxLines="@integer/replies_max_lines" android:singleLine="false" android:layout_toLeftOf="@id/post_photo" android:layout_toRightOf="@id/photo" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" app:typeface="Medium" />
     <com.vtosters.lite.ui.LinkedTextView android:textSize="14.0dip" android:textColor="#ff000000" android:id="@id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_toLeftOf="@id/post_photo" android:layout_below="@id/title" android:layout_alignLeft="@id/title" android:lineSpacingExtra="4.0dip" />
-    <com.vtosters.lite.ui.BadooTextView android:textSize="14.0dip" android:textColor="#8a000000" android:textColorLink="?accent" android:ellipsize="marquee" android:id="@id/info" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:singleLine="true" android:layout_below="@id/subtitle" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
+    <com.vtosters.lite.ui.BadooTextView android:textSize="14.0dip" android:textColor="?attr/text_secondary" android:textColorLink="?accent" android:ellipsize="marquee" android:id="@id/info" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:singleLine="true" android:layout_below="@id/subtitle" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
 </RelativeLayout>

smali/res/layout/notifications_item_users.xml

@@ -5,6 +5,6 @@
     <com.vtosters.lite.ui.BadooTextView android:textSize="15.0dip" android:textColor="#ff737373" android:textColorLink="?accent" android:ellipsize="end" android:id="@id/title" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="12.0dip" android:maxLines="2" android:singleLine="false" android:layout_toLeftOf="@id/post_photo" android:layout_toRightOf="@id/photo" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" android:lineSpacingExtra="3.0dip" app:typeface="Regular" />
     <com.vk.imageloader.view.VKImageView android:id="@id/post_photo" android:layout_width="47.0dip" android:layout_height="47.0dip" android:layout_marginTop="2.0dip" android:layout_marginBottom="12.0dip" android:layout_alignParentTop="true" android:layout_alignParentRight="true" app:actualImageScaleType="centerCrop" app:placeholderImage="@drawable/photo_placeholder" app:roundedCornerRadius="2.0dip" />
     <com.vk.core.view.PhotoStripView android:id="@id/users" android:layout_width="fill_parent" android:layout_height="40.0dip" android:layout_marginTop="7.0dip" android:layout_marginBottom="7.0dip" android:src="@drawable/user_placeholder" android:layout_below="@id/title" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
-    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:ellipsize="marquee" android:id="@id/subtitle" android:paddingBottom="11.5dip" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_below="@id/users" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
+    <TextView android:textSize="14.0dip" android:textColor="?attr/text_secondary" android:ellipsize="marquee" android:id="@id/subtitle" android:paddingBottom="11.5dip" android:duplicateParentState="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_below="@id/users" android:layout_alignLeft="@id/title" android:layout_alignRight="@id/title" />
     <ImageView android:id="@id/action" android:layout_width="20.0dip" android:layout_height="20.0dip" android:layout_marginRight="-4.5dip" android:layout_marginBottom="-4.5dip" android:src="@drawable/ic_not_like_16" android:layout_alignRight="@id/photo" android:layout_alignBottom="@id/photo" />
 </RelativeLayout>

smali/res/layout/picker_activity_attach.xml

@@ -5,15 +5,15 @@
       xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
         <View android:id="@id/click_handler" android:layout_width="fill_parent" android:layout_height="fill_parent" />
         <com.vk.attachpicker.widget.ContentViewPager android:id="@id/pager" android:fitsSystemWindows="@bool/picker_transparent_status_bar" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="com.vk.core.ui.VkBottomSheetBehavior" />
-        <FrameLayout android:id="@id/fl_tabs_container" android:background="?tabbar_background" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="@dimen/picker_tab_panel_height">
+        <FrameLayout android:id="@id/fl_tabs_container" android:background="#ffffffff" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="@dimen/picker_tab_panel_height">
             <android.support.v7.widget.RecyclerView android:layout_gravity="center_horizontal" android:id="@id/rv_tabs" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:clipToPadding="false" android:layout_width="wrap_content" android:layout_height="fill_parent" />
-            <View android:id="@id/tabs_overlay" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+            <View android:id="@id/tabs_overlay" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="fill_parent" />
             <com.vk.attachpicker.widget.ToolbarContainer android:layout_gravity="bottom" android:id="@id/tc_toolbar_container" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="wrap_content" />
         </FrameLayout>
         <FrameLayout android:layout_gravity="bottom" android:id="@id/fl_bottom_button" android:layout_width="fill_parent" android:layout_height="56.0dip">
             <View android:background="@drawable/picker_bg_attach_bottom_toolbar_shadow" android:layout_width="fill_parent" android:layout_height="8.0dip" />
             <com.vk.attachpicker.widget.AttachCounterView android:layout_gravity="bottom" android:id="@id/acv_bottom_panel_counter" android:layout_width="fill_parent" android:layout_height="@dimen/picker_viewer_bottom_padding" />
-            <TextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="center" android:layout_gravity="bottom" android:id="@id/tv_bottom_panel_cancel" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="@dimen/picker_viewer_bottom_padding" android:text="@string/picker_cancel" android:singleLine="true" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
+            <TextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="center" android:layout_gravity="bottom" android:id="@id/tv_bottom_panel_cancel" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="@dimen/picker_viewer_bottom_padding" android:text="@string/picker_cancel" android:singleLine="true" android:textAllCaps="true" android:fontFamily="@string/font_family_medium" />
         </FrameLayout>
     </android.support.design.widget.CoordinatorLayout>
 </com.vk.core.view.FitSystemWindowsFrameLayout>

smali/res/layout/picker_attach_gallery_header.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="horizontal" android:id="@id/picker_attach_gallery_camera_layout" android:background="?tabbar_background" android:layout_width="fill_parent" android:layout_height="56.0dip"
+<LinearLayout android:orientation="horizontal" android:id="@id/picker_attach_gallery_camera_layout" android:background="#ffffffff" android:layout_width="fill_parent" android:layout_height="56.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <FrameLayout android:id="@id/picker_attach_gallery_photo_view" android:layout_width="0.0dip" android:layout_height="fill_parent" android:foreground="@drawable/picker_white_ripple_bounded" android:layout_weight="1.0">
         <com.vk.core.view.TintTextView android:layout_gravity="center" android:id="@id/picker_attach_gallery_photo_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picker_photo" android:drawableLeft="@drawable/ic_camera_24" android:drawablePadding="6.0dip" android:drawableStart="@drawable/ic_camera_24" android:fontFamily="@string/font_family_medium" app:drawableTint="?accent" style="@style/AttachPicker.Header.TextView" />

smali/res/layout/poll_edit.xml

@@ -13,7 +13,7 @@
             </LinearLayout>
             <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:id="@id/poll_anonym_wrap" android:paddingLeft="@dimen/poll_edit_padding" android:paddingRight="@dimen/poll_edit_padding" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="6.0dip">
                 <com.vtosters.lite.ui.BadooTextView android:textSize="14.0dip" android:textColor="?accent" android:id="@id/poll_anonym_header" android:paddingLeft="16.0dip" android:paddingTop="13.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/poll_settings" app:typeface="Medium" />
-                <Switch android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="end" android:id="@id/poll_anonym_switch" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/poll_anonym" />
+                <Switch android:textSize="16.0dip" android:textColor="?attr/text_primary" android:ellipsize="end" android:id="@id/poll_anonym_switch" android:paddingLeft="16.0dip" android:paddingTop="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="18.5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:checked="true" android:text="@string/poll_anonym" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>

smali/res/layout/profile_edit_info.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:orientation="vertical" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="24.0dip" android:paddingRight="@dimen/post_side_padding" android:paddingBottom="16.0dip" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content">
         <TextView android:textSize="14.0dip" android:textColor="#ff8c8d8f" android:id="@id/info_message" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="6.0dip" android:text="@string/edit_name_req_processing" />
-        <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/info_new_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="TextView" />
+        <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/info_new_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="TextView" />
         <TextView android:id="@id/info_cancel_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel_request" android:fontFamily="@string/font_family_medium" style="@style/secondary_button" />
     </LinearLayout>
 </LinearLayout>

smali/res/layout/radio_button_list_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckedTextView android:textSize="16.0dip" android:textColor="#ff212121" android:gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/standard_list_item_padding" android:layout_marginRight="@dimen/standard_list_item_padding" android:minHeight="56.0dip" android:drawableLeft="@drawable/radio_button" android:drawablePadding="16.0dip" />
+    <CheckedTextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:gravity="center_vertical" android:id="@id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/standard_list_item_padding" android:layout_marginRight="@dimen/standard_list_item_padding" android:minHeight="56.0dip" android:drawableLeft="@drawable/radio_button" android:drawablePadding="16.0dip" />
 </FrameLayout>

smali/res/layout/removable_chat_user.xml

@@ -4,7 +4,7 @@
     <com.vk.imageloader.view.VKCircleImageView android:id="@id/photo" android:layout_marginRight="0.0dip" android:layout_centerVertical="false" app:placeholderImage="@drawable/placeholder_user_72" style="@style/UserSmallPhoto" />
     <ImageView android:id="@id/flist_item_btn" android:background="@drawable/highlight" android:focusable="false" android:focusableInTouchMode="false" android:duplicateParentState="false" android:layout_width="48.0dip" android:layout_height="48.0dip" android:src="@drawable/ic_list_remove" android:scaleType="center" android:layout_alignParentRight="true" />
     <LinearLayout android:orientation="vertical" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/flist_item_btn" android:layout_toRightOf="@id/photo" android:layout_centerVertical="true">
-        <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="marquee" android:id="@android:id/text1" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
+        <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:ellipsize="marquee" android:id="@android:id/text1" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
         <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:id="@android:id/text2" android:paddingTop="1.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>
     <ImageView style="@style/Online.Small" />

smali/res/layout/sticker_settings_switch_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout android:background="@drawable/highlight" android:paddingLeft="@dimen/post_side_padding" android:paddingTop="14.0dip" android:paddingRight="13.0dip" android:paddingBottom="17.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/sticker_settings_autosuggest_title" android:layout_toLeftOf="@id/checkbox" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" />
-    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:text="@string/sticker_settings_autosuggest_subtitle" android:layout_toLeftOf="@id/checkbox" android:layout_below="@id/title" android:layout_alignParentLeft="true" android:lineSpacingExtra="3.0dip" />
+    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/sticker_settings_autosuggest_title" android:layout_toLeftOf="@id/checkbox" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" />
+    <TextView android:textSize="14.0dip" android:textColor="?attr/text_secondary" android:id="@id/subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="1.0dip" android:text="@string/sticker_settings_autosuggest_subtitle" android:layout_toLeftOf="@id/checkbox" android:layout_below="@id/title" android:layout_alignParentLeft="true" android:lineSpacingExtra="3.0dip" />
     <android.support.v7.widget.SwitchCompat android:id="@id/checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" />
 </RelativeLayout>

smali/res/layout/video_album_edit.xml

@@ -8,8 +8,8 @@
                 <EditText android:textSize="16.0dip" android:textColor="?text_primary" android:textColorHint="#ff909499" android:gravity="center_vertical" android:id="@id/title" android:background="@android:color/transparent" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="17.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="48.0dip" android:hint="@string/create_album_title" android:inputType="textCapSentences|textMultiLine" />
                 <View android:id="@id/divider" android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.51dip" />
                 <RelativeLayout android:id="@id/privacy" android:background="@drawable/highlight" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="14.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/create_album_privacy" />
-                    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/create_album_privacy" />
+                    <TextView android:textSize="14.0dip" android:textColor="?attr/text_secondary" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>

smali/res/layout/video_edit.xml

@@ -10,13 +10,13 @@
                 <EditText android:textSize="16.0dip" android:textColor="?text_primary" android:textColorHint="#ff909499" android:gravity="center_vertical" android:id="@id/subtitle" android:background="@android:color/transparent" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="16.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="17.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:minHeight="48.0dip" android:hint="@string/create_album_description" android:inputType="textCapSentences|textMultiLine" />
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.51dip" />
                 <RelativeLayout android:id="@id/privacy" android:background="@drawable/highlight" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="14.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy" />
-                    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/privacy_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy" />
+                    <TextView android:textSize="14.0dip" android:textColor="?attr/text_secondary" android:id="@id/privacy_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title" />
                 </RelativeLayout>
                 <View android:background="#26000000" android:layout_width="fill_parent" android:layout_height="0.51dip" />
                 <RelativeLayout android:id="@id/privacy_comment" android:background="@drawable/highlight" android:paddingLeft="@dimen/album_edit_padding" android:paddingTop="14.0dip" android:paddingRight="@dimen/album_edit_padding" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content">
-                    <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:id="@id/privacy_title_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy_comments" />
-                    <TextView android:textSize="14.0dip" android:textColor="#8a000000" android:id="@id/privacy_subtitle_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title_comment" />
+                    <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:id="@id/privacy_title_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/edit_video_privacy_comments" />
+                    <TextView android:textSize="14.0dip" android:textColor="?attr/text_secondary" android:id="@id/privacy_subtitle_comment" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="0.5dip" android:layout_below="@id/privacy_title_comment" />
                 </RelativeLayout>
             </LinearLayout>
         </LinearLayout>

smali/res/layout/view_story_blacklist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:orientation="horizontal" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:gravity="center_vertical" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:text="@string/hidden_from_stories" />
+    <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:gravity="center_vertical" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:text="@string/hidden_from_stories" />
 </FrameLayout>

smali/res/layout/view_story_setting.xml

@@ -2,7 +2,7 @@
 <LinearLayout android:orientation="horizontal" android:background="@drawable/picker_white_ripple_bounded" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:layout_gravity="center_vertical" android:orientation="vertical" android:padding="16.0dip" android:layout_width="0.0px" android:layout_height="90.0dip" android:layout_weight="1.0">
-        <TextView android:textSize="16.0sp" android:textColor="#ff212121" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
+        <TextView android:textSize="16.0sp" android:textColor="?attr/text_primary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories" />
         <TextView android:textSize="14.0sp" android:textColor="#89000000" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/save_stories_desc" />
     </LinearLayout>
     <android.support.v7.widget.SwitchCompat android:layout_gravity="center_vertical" android:id="@id/switch_save" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" />

smali/res/layout/vkim_new_chat_user_vh.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.vk.im.ui.views.avatars.AvatarView android:id="@id/vkim_avatar" android:layout_width="48.0dip" android:layout_height="48.0dip" android:layout_centerVertical="false" />
     <LinearLayout android:orientation="vertical" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toRightOf="@id/vkim_avatar" android:layout_centerVertical="true">
-        <TextView android:textSize="16.0dip" android:textColor="#ff212121" android:ellipsize="marquee" android:id="@id/vkim_username" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
+        <TextView android:textSize="16.0dip" android:textColor="?attr/text_primary" android:ellipsize="marquee" android:id="@id/vkim_username" android:duplicateParentState="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" />
         <TextView android:textSize="14.0dip" android:textColor="#ff909499" android:id="@id/vkim_subtitle" android:paddingTop="1.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" />
     </LinearLayout>
     <ImageView android:id="@id/online" android:layout_width="12.0dip" android:layout_height="16.0dip" android:layout_alignRight="@id/vkim_avatar" android:layout_alignBottom="@id/vkim_avatar" android:contentDescription="@null" />

smali/res/values-ru/strings.xml

@@ -4230,4 +4230,9 @@
     <string name="act_pm">Для личных сообщений</string>
     <string name="act_cnv">Для бесед</string>
     <string name="act_bot">Для ботов/групп</string>
+
+    <string name="vtloffline">Отправка статуса онлайн</string>
+    <string name="vtloffline2">Принудительно отправлять офлайн запросы</string>
+    <string name="benchapi">Бенчмарк апи</string>
+    <string name="opencommit">Открыть коммит</string>
 </resources>

smali/res/values/strings.xml

@@ -4354,4 +4354,9 @@ Does not affect vk.cc links"</string>
     <string name="act_pm">For Private messages</string>
     <string name="act_cnv">For Conversations</string>
     <string name="act_bot">For Bots/Groups</string>
+
+    <string name="vtloffline">Send online status</string>
+    <string name="vtloffline2">Force offline requests</string>
+    <string name="benchapi">Benchmark api</string>
+    <string name="opencommit">Open commit</string>
 </resources>

smali/res/xml/preferences_activity.xml

@@ -14,11 +14,11 @@
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/online_vtl">
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Отправка статуса онлайн" android:key="offline" android:summary="Отключение онлайна позволит вам оставаться в офлайне" android:defaultValue="true" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtloffline" android:key="offline" android:summary="Отключение онлайна позволит вам оставаться в офлайне" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/offline_vtl">
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Принудительный офлайн" android:key="setoffline" android:summary="Работает только при отключении отправки статуса онлайн\nОтправляет мгновенно в офлайн после отправки сообщений и прочих методов апи которые отправляют в онлайн\n\nМожет выглядеть как ненастоящий уход из сети" android:defaultValue="false" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtloffline2" android:key="setoffline" android:summary="Работает только при отключении отправки статуса онлайн\nОтправляет мгновенно в офлайн после отправки сообщений и прочих методов апи которые отправляют в онлайн\n\nМожет выглядеть как ненастоящий уход из сети" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/stories_vtl">
@@ -27,6 +27,6 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/privacy_vtl">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlawayphp" android:key="awayphp" android:summary="Слежка за пользователем для персонализации рекламы. Также проверка ссылок на блэклист от ВКонтакте и антивирус" android:defaultValue="true" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Бенчмарк апи" android:key="benchmark" android:summary="Тестирование скорости отправки запросов. Бесполезная функция для всех, кроме разработчиков ВКонтакте" android:defaultValue="false" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/benchapi" android:key="benchmark" android:summary="Тестирование скорости отправки запросов. Бесполезная функция для всех, кроме разработчиков ВКонтакте" android:defaultValue="false" />
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_debug.xml

@@ -11,7 +11,7 @@
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="VK Me MSG mode" android:key="vkme_msg" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Фикс некоторых покрасок Monet" android:key="color_grishka" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="VK Me theme" android:key="vkim_msg" android:defaultValue="false" />
-        <com.vtosters.lite.ui.SummaryListPreference android:entries="@array/language" android:title="Язык приложения" android:key="lang_value" android:defaultValue="system" android:dialogTitle="Выберите язык приложения" android:entryValues="@array/lang_value" />
+          <com.vtosters.lite.ui.SummaryListPreference android:entries="@array/language" android:title="Язык приложения" android:key="lang_value" android:defaultValue="system" android:dialogTitle="Выберите язык приложения" android:entryValues="@array/lang_value" />
     </PreferenceCategory>
     <PreferenceCategory android:title="Функции для разработчиков">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Режим разработчика" android:key="dev" android:summary="Форсирование аккаунта разработчика/тестера/работника и форсирование версии debug/deploy. Нужно только для расширенного дебагинга" android:defaultValue="false" />

smali/res/xml/preferences_feed.xml

@@ -14,6 +14,7 @@
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlsfilter" android:key="default_ad_list" android:summary="@string/vtlsfiltersummary" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlsfiltershort" android:key="shortlinkfilter" android:summary="@string/vtlsfiltershortsummary" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/vtlsfilterrefs" android:key="refsfilter" android:summary="@string/vtlsfilterrefssummary" android:defaultValue="false" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Я устал читать одинаковые новости" android:key="shitposting" android:summary="Фильтр очистки постов с РФ и действиями связанными на Украине" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlrecommend">

smali/res/xml/preferences_interface.xml

@@ -2,7 +2,7 @@
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory android:title="@string/interfacenewsfeed">
-        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/altnewsfeed" android:key="newfeed" android:summary="@string/altnewsfeedsum" android:defaultValue="false" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/altnewsfeed" android:key="newfeed" android:summary="@string/altnewsfeedsum" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/showstories" android:key="stories" android:summary="@string/showstoriessum" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfacenewsfeedswipe" android:key="swipe" android:summary="@string/interfacenewsfeedswipesum" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
@@ -17,9 +17,12 @@
     <PreferenceCategory android:title="@string/interfacevideo">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfacevideoext" android:key="isEnableExternalOpening" android:summary="@string/interfacevideoextsum" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfacevideorec" android:key="__dbg_disable_video_feed" android:summary="@string/interfacevideorecsum" android:defaultValue="false" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference android:title="Новый видео каталог" android:key="newvideo" android:defaultValue="true" />
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/menucutter" android:key="showmenu" android:summary="@string/menucuttersum" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/docknumbers" android:key="dockcounter" android:summary="@string/docknumberssum" android:defaultValue="true" />
+        <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
 </PreferenceScreen>

smali/smali/com/vk/about/AboutAppFragment$d.smali

@@ -238,6 +238,59 @@
     goto/16 :goto_0
 
     :cond_7
+
+
+    const v0, 0x15
+
+    invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+    move-result-object v0
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+    move-result v0
+
+    if-eqz v0, :cond_15
+
+    sget-object v1, Lcom/vk/common/links/LinkProcessor;->a:Lcom/vk/common/links/LinkProcessor$a;
+
+    iget-object p1, p0, Lcom/vk/about/AboutAppFragment$d;->a:Lcom/vk/about/AboutAppFragment;
+
+    invoke-virtual {p1}, Lcom/vk/about/AboutAppFragment;->p()Landroid/support/v4/app/FragmentActivity;
+
+    move-result-object p1
+
+    if-nez p1, :cond_16
+
+    invoke-static {}, Lkotlin/jvm/internal/Intrinsics;->a()V
+
+    :cond_16
+    const-string v0, "activity!!"
+
+    invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
+
+    move-object v2, p1
+
+    check-cast v2, Landroid/content/Context;
+
+    invoke-static {}, Lru/vtosters/lite/utils/Prefs;->getCommitLink()Ljava/lang/String;
+
+    move-result-object v3
+
+    const/4 v4, 0x0
+
+    const/4 v5, 0x4
+
+    const/4 v6, 0x0
+
+    invoke-static/range {v1 .. v6}, Lcom/vk/common/links/LinkProcessor$a;->a(Lcom/vk/common/links/LinkProcessor$a;Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;ILjava/lang/Object;)V
+
+    goto/16 :goto_0
+
+    :cond_15
+
+
+
     const v0, 0x12
 
     .line 51

smali/smali/com/vk/common/links/LinkProcessor1.smali

@@ -5596,7 +5596,9 @@
 
     move-result v0
 
-    const v0, 0x0
+    invoke-static {}, Lru/vtosters/lite/utils/Prefs;->newvideo()Z
+
+    move-result v0
 
     if-eqz v0, :cond_7b
 

smali/smali_classes3/com/airbnb/lottie/a/b/ScaleKeyframeAnimation.smali

@@ -156,8 +156,6 @@
     .line 16
     :cond_2
     :goto_0
-    return-object p1
-
     new-instance p1, Ljava/lang/IllegalStateException;
 
     const-string p2, "Missing values for keyframe."

smali/smali_classes4/com/vk/catalog/core/model/Block.smali

@@ -324,6 +324,18 @@
 
     move-result-object v2
 
+    # Log json
+
+    const-string v0, "BlockJson"
+
+    invoke-virtual {p1}, Lorg/json/JSONObject;->toString()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-static {v0, v1}, Landroid/util/Log;->w(Ljava/lang/String;Ljava/lang/String;)I
+
+    # end log
+
     const-string v0, "json.getString(ServerKeys.ID)"
 
     invoke-static {v2, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
@@ -359,9 +371,13 @@
     const-string v0, "total_count"
 
     .line 29
-    invoke-virtual {p1, v0}, Lorg/json/JSONObject;->getInt(Ljava/lang/String;)I
+    # Адский костыль, лучше пока не трогать и сделать вид что всё нормально
 
-    move-result v5
+    # invoke-virtual {p1, v0}, Lorg/json/JSONObject;->getInt(Ljava/lang/String;)I
+
+    # move-result v5
+
+    const/4 v5, 0x0
 
     const-string v0, "next_from"
 

smali/smali_classes4/com/vk/catalog/video/model/BlockVideoParser.smali

@@ -69,7 +69,9 @@
 .end method
 
 .method private final a(Lorg/json/JSONObject;)Lcom/vk/catalog/core/model/Block;
-    .locals 4
+    .locals 5
+
+    move-object v4, p1
 
     const-string v0, "action"
 
@@ -78,13 +80,6 @@
 
     move-result-object v0
 
-    const-string v1, "extra"
-
-    .line 26
-    invoke-virtual {v0, v1}, Lorg/json/JSONObject;->getJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
-
-    move-result-object v1
-
     const-string v2, "type"
 
     .line 27
@@ -161,7 +156,7 @@
 
     const-string v2, "owner_id"
 
-    invoke-virtual {v1, v2}, Lorg/json/JSONObject;->getInt(Ljava/lang/String;)I
+    invoke-virtual {v4, v2}, Lorg/json/JSONObject;->getInt(Ljava/lang/String;)I
 
     move-result v1
 

smali/smali_classes4/com/vk/menu/MenuFragment$c.smali

@@ -153,6 +153,10 @@
 
     move-result p2
 
+    invoke-static {}, Lru/vtosters/lite/utils/Prefs;->newvideo()Z
+
+    move-result p2
+
     if-eqz p2, :cond_0
 
     .line 895

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

@@ -47,7 +47,9 @@
     .line 28
     invoke-direct {p0}, Lcom/vk/api/sdk/internal/ApiCommand;-><init>()V
 
-    iput p1, p0, Lcom/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd;->a:I
+    const v0, 0x1
+
+    iput v0, 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;
 
@@ -226,19 +228,8 @@
 
     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
-
     const-string v2, "filter"
 
     .line 50
@@ -297,7 +288,7 @@
 
     move-result-object v0
 
-    const-string v1, "5.93"
+    const-string v1, "5.121"
 
     .line 56
     invoke-virtual {v0, v1}, Lcom/vk/api/internal/MethodCall$a;->c(Ljava/lang/String;)Lcom/vk/api/internal/MethodCall$a;