Improved dark theme

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

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

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

@@ -1,7 +1,5 @@
 package ru.vtosters.lite.utils;
 
-import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
 import static ru.vtosters.lite.utils.Proxy.setProxy;
 
 import android.app.Activity;
@@ -61,7 +59,7 @@ import ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager;
 public class Prefs {
     public static String VERSIONNAME = "2.0 Beta";
     private static List<String> mFilters;
-    private static List<Activity> activities = new ArrayList<>();
+    private static final List<Activity> activities = new ArrayList<>();
 
     public static boolean BooleanFalse(String key) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(Helper.GetContext());
@@ -278,6 +276,10 @@ public class Prefs {
         return Helper.GetPreferences().getString("me_token", "");
     }
 
+    public static void setMeToken(String str) {
+        ru.vtosters.lite.utils.Helper.GetPreferences().edit().putString("me_token", str).apply();
+    }
+
     public static int getNavbarColor() {
         return VKThemeHelper.a((int) R.attr.tabbar_background);
     }
@@ -405,10 +407,6 @@ public class Prefs {
         return BooleanFalse("rightLikes");
     }
 
-    public static void setMeToken(String str) {
-        ru.vtosters.lite.utils.Helper.GetPreferences().edit().putString("me_token", str).apply();
-    }
-
     public static boolean setoffline() {
         return BooleanFalse("setoffline");
     }
@@ -473,6 +471,11 @@ public class Prefs {
         return ads() ? "null" : "app_widget";
     }
 
+    public static int getMsgCount() {
+        String customvalue = Helper.GetPreferences().getString("msgcount", "");
+        return customvalue.isEmpty() ? 30 : Integer.parseInt(customvalue);
+    }
+
     public static void setNavbarColor(Window window, int i) {
         if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             window.setNavigationBarColor(getNavbarColor());

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

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

smali/res/drawable-v21/vkui_bg_button_white.xml

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

smali/res/drawable/vkui_bg_button_white.xml

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

smali/res/layout/video_player_toolbar.xml

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

smali/res/layout/vkim_bot_keyboard.xml

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

smali/res/layout/vkim_dialog_actions_vc_by_view.xml

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

smali/res/values-ru/arrays.xml

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

smali/res/values/arrays.xml

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

smali/res/xml/preferences_messages.xml

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

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

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