fix icons in dropdown menu in newsfeed

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

@@ -460,7 +460,7 @@ public class Prefs {
     }
 
     public static boolean newvideo() {
-        return BooleanTrue("newvideo");
+        return BooleanFalse("newvideo");
     }
 
     public static String widgetads() {

smali/res/layout/news_dropdown_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical" android:background="@drawable/bottom_divider_bg" android:padding="0.0dip" 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="@color/news_spinner_text" android:gravity="center_vertical" android:id="@android:id/text1" android:background="@drawable/highlight" android:clickable="true" android:layout_width="fill_parent" android:layout_height="48.0dip" android:drawablePadding="12.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" />
+    <CheckedTextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@android:id/text1" android:background="@drawable/highlight" android:clickable="true" android:layout_width="fill_parent" android:layout_height="48.0dip" android:drawablePadding="12.0dip" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" />
     <FrameLayout android:id="@id/wrapper" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="52.0dip" android:paddingEnd="16.0dip">
         <TextView android:textSize="16.0dip" android:textColor="?text_primary" android:gravity="center_vertical" android:id="@android:id/text2" android:focusable="false" android:clickable="false" android:layout_width="wrap_content" android:layout_height="48.0dip" android:layout_marginEnd="56.0dip" />
         <android.support.v7.widget.SwitchCompat android:gravity="center_vertical" android:layout_gravity="end" android:id="@android:id/checkbox" android:focusable="false" android:clickable="false" android:duplicateParentState="true" android:layout_width="wrap_content" android:layout_height="48.0dip" />

smali/res/layout/picker_activity_graffiti.xml

@@ -4,7 +4,7 @@
     <FrameLayout android:id="@id/fl_user_container" android:layout_width="fill_parent" android:layout_height="48.0dip">
         <LinearLayout android:layout_gravity="center" android:orientation="horizontal" android:id="@id/ll_user_container_inner" android:layout_width="wrap_content" android:layout_height="fill_parent">
             <ImageView android:layout_gravity="center_vertical" android:id="@id/iv_avatar" android:layout_width="32.0dip" android:layout_height="32.0dip" />
-            <TextView android:textSize="14.0sp" android:textColor="?text_primary" android:layout_gravity="center_vertical" android:id="@id/tv_username" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:singleLine="true" />
+            <TextView android:textSize="14.0sp" android:textColor="#8a000000" android:layout_gravity="center_vertical" android:id="@id/tv_username" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:singleLine="true" />
         </LinearLayout>
         <View android:layout_gravity="bottom" android:background="#1e000000" android:layout_width="fill_parent" android:layout_height="0.5dip" />
     </FrameLayout>

smali/res/layout/picker_attach_gallery_header.xml

@@ -2,10 +2,10 @@
 <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" />
+        <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="@color/accent_blue" style="@style/AttachPicker.Header.TextView" />
     </FrameLayout>
     <View android:id="@id/picker_attach_gallery_separator_view" android:background="@color/picker_grey_divider" android:layout_width="0.5dip" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" />
     <FrameLayout android:id="@id/picker_attach_gallery_video_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_video_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picker_video" android:drawableLeft="@drawable/ic_video_24" android:drawablePadding="6.0dip" android:drawableStart="@drawable/ic_video_24" android:fontFamily="@string/font_family_medium" app:drawableTint="?accent" style="@style/AttachPicker.Header.TextView" />
+        <com.vk.core.view.TintTextView android:layout_gravity="center" android:id="@id/picker_attach_gallery_video_text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/picker_video" android:drawableLeft="@drawable/ic_video_24" android:drawablePadding="6.0dip" android:drawableStart="@drawable/ic_video_24" android:fontFamily="@string/font_family_medium" app:drawableTint="@color/accent_blue" style="@style/AttachPicker.Header.TextView" />
     </FrameLayout>
 </LinearLayout>

smali/res/layout/picker_screen_image_editor.xml

@@ -23,7 +23,7 @@
             <com.vk.attachpicker.widget.EditorActionView android:id="@id/eav_crop" android:layout_width="0.0px" android:layout_height="fill_parent" android:layout_weight="1.0" app:eav_icon="@drawable/picker_ic_crop_rotate_24" app:eav_title="@string/picker_crop" />
             <com.vk.attachpicker.widget.EditorActionView android:id="@id/eav_auto" android:layout_width="0.0px" android:layout_height="fill_parent" android:layout_weight="1.0" app:eav_icon="@drawable/picker_ic_magic_24" app:eav_title="@string/picker_auto" />
         </LinearLayout>
-        <com.vk.attachpicker.widget.AnimatableTextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="center" android:id="@id/tv_attach" android:background="@drawable/picker_btn_white" android:layout_width="fill_parent" android:layout_height="@dimen/picker_bottom_button_height" android:layout_marginTop="@dimen/picker_image_editor_actions_height" android:text="@string/picker_done" android:textAllCaps="true" />
+        <com.vk.attachpicker.widget.AnimatableTextView android:textSize="16.0sp" android:textColor="@color/accent_blue" android:gravity="center" android:id="@id/tv_attach" android:background="@drawable/picker_btn_white" android:layout_width="fill_parent" android:layout_height="@dimen/picker_bottom_button_height" android:layout_marginTop="@dimen/picker_image_editor_actions_height" android:text="@string/picker_done" android:textAllCaps="true" />
         <View android:background="#ffe0e0e0" android:layout_width="fill_parent" android:layout_height="0.5dip" android:layout_marginTop="@dimen/picker_image_editor_actions_height" />
         <FrameLayout android:id="@id/fl_delete_area" android:background="#ddffffff" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginBottom="@dimen/picker_bottom_button_height">
             <ImageView android:layout_gravity="center" android:id="@id/iv_delete_icon" android:layout_width="96.0dip" android:layout_height="48.0dip" android:src="@drawable/picker_ic_delete_zone" />
@@ -31,7 +31,7 @@
         </FrameLayout>
     </FrameLayout>
     <FrameLayout android:layout_gravity="bottom" android:id="@id/fl_auto_panel" android:background="#ffffffff" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/picker_image_editor_bottom_panel">
-        <TextView android:textSize="16.0sp" android:textColor="?accent" android:gravity="bottom|center" android:layout_gravity="center_horizontal" android:id="@id/tv_auto_value" android:layout_width="100.0dip" android:layout_height="32.0dip" android:includeFontPadding="false" />
+        <TextView android:textSize="16.0sp" android:textColor="@color/accent_blue" android:gravity="bottom|center" android:layout_gravity="center_horizontal" android:id="@id/tv_auto_value" android:layout_width="100.0dip" android:layout_height="32.0dip" android:includeFontPadding="false" />
         <com.vk.attachpicker.widget.VkSeekBar android:layout_gravity="center_horizontal" android:id="@id/vsb_auto_value" android:paddingLeft="24.0dip" android:paddingRight="24.0dip" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_marginTop="24.0dip" />
         <com.vk.attachpicker.widget.EditorBottomPanel android:layout_gravity="bottom" android:id="@id/ebp_auto" android:layout_width="fill_parent" android:layout_height="@dimen/picker_bottom_button_height" app:ebp_title="@string/picker_auto_full" />
     </FrameLayout>

smali/res/values-ru/arrays.xml

@@ -467,8 +467,8 @@
     </string-array>
     <string-array name="proxy">
         <item>Без прокси</item>
-        <item>Проксирование API</item>
         <item>zaborona.help</item>
+        <item>Сторонний прокси для API</item>
         <item>Сторонний HTTP</item>
         <item>Сторонний HTTPS</item>
         <item>Сторонний SOCKS</item>

smali/res/values/arrays.xml

@@ -628,16 +628,16 @@
     </string-array>
     <string-array name="proxy">
         <item>No Proxy</item>
-        <item>API Proxy</item>
         <item>zaborona.help</item>
+        <item>Custom API proxy</item>
         <item>Custom HTTP</item>
         <item>Custom HTTPS</item>
         <item>Custom SOCKS</item>
     </string-array>
     <string-array name="proxy_value">
         <item>noproxy</item>
-        <item>apiproxy</item>
         <item>zaborona</item>
+        <item>apiproxy</item>
         <item>http</item>
         <item>https</item>
         <item>socks</item>

smali/res/values/styles.xml

@@ -126,7 +126,7 @@
     <style name="AttachPicker.Header" parent="@style/AttachPicker" />
     <style name="AttachPicker.Header.TextView" parent="@style/AttachPicker.Header">
         <item name="android:textSize">14.0sp</item>
-        <item name="android:textColor">?accent</item>
+        <item name="android:textColor">@color/accent_blue</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">true</item>

smali/res/xml/preferences_interface.xml

@@ -17,7 +17,7 @@
     <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.MaterialSwitchPreference android:title="Новый видео каталог" android:key="newvideo" android:defaultValue="false" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlother">

smali/smali_classes4/com/vtosters/lite/ui/a/NewsSpinnerAdapter.smali

@@ -234,11 +234,11 @@
 
     move-result-object v0
 
-    const v1, 0x7f0601b2
+    # const v1, 0x7f0601b2
 
-    invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColorStateList(I)Landroid/content/res/ColorStateList;
+    # invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColorStateList(I)Landroid/content/res/ColorStateList;
 
-    move-result-object v0
+    # move-result-object v0
 
     .line 121
     new-instance v1, Lcom/vk/core/d/RecoloredDrawable;
@@ -253,7 +253,11 @@
 
     move-result-object v2
 
-    invoke-direct {v1, v2, v0}, Lcom/vk/core/d/RecoloredDrawable;-><init>(Landroid/graphics/drawable/Drawable;Landroid/content/res/ColorStateList;)V
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getAccentColor()I
+
+    move-result v0
+
+    invoke-direct {v1, v2, v0}, Lcom/vk/core/d/RecoloredDrawable;-><init>(Landroid/graphics/drawable/Drawable;I)V
 
     .line 122
     iget-object v0, v9, Lcom/vtosters/lite/ui/a/NewsSpinnerAdapter$a;->b:Landroid/widget/CheckedTextView;