From aa1d254a497ad08e27272c7c71033f55990bf3fc Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Sun, 24 Apr 2022 17:43:02 +0300
Subject: [PATCH] Fixes + Added comments sorting

---
 .../main/java/ru/vtosters/lite/utils/Prefs.java    | 14 ++++++++++++++
 smali/res/layout/settings_community_comments.xml   |  4 ++--
 smali/res/layout/suggest_list_item.xml             |  2 +-
 smali/res/layout/welcome.xml                       |  6 +++---
 smali/res/values-ru/arrays.xml                     | 12 ++++++++++++
 smali/res/values/arrays.xml                        | 10 ++++++++++
 smali/res/xml/preferences_feed.xml                 |  7 +++++++
 .../com/vk/api/wall/WallGetComments.smali          |  4 ++++
 8 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Prefs.java b/app/src/main/java/ru/vtosters/lite/utils/Prefs.java
index e09fe7e0a..25ecc37c0 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Prefs.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Prefs.java
@@ -277,6 +277,20 @@ public class Prefs {
         return string.equals("amoled") ? "1" : "0";
     }
 
+    public static String getCommentsSort(String def) {
+        String string = Helper.GetPreferences().getString("commentssort", "");
+        if (string.isEmpty()) {
+            return def;
+        }
+        if (string.equals("new")) {
+            return "desc";
+        }
+        if (string.equals("old")) {
+            return "asc";
+        }
+        return def;
+    }
+
     public static String getMeToken() {
         return Helper.GetPreferences().getString("me_token", "");
     }
diff --git a/smali/res/layout/settings_community_comments.xml b/smali/res/layout/settings_community_comments.xml
index 5f5a82fbe..3284f3abc 100644
--- a/smali/res/layout/settings_community_comments.xml
+++ b/smali/res/layout/settings_community_comments.xml
@@ -37,7 +37,7 @@
 
                 <TextView
                     android:textSize="17.0dip"
-                    android:textColor="@color/main_text"
+                    android:textColor="?text_primary"
                     android:duplicateParentState="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
 
                 <TextView
                     android:textSize="17.0dip"
-                    android:textColor="@color/main_text"
+                    android:textColor="?text_primary"
                     android:layout_gravity="center_vertical"
                     android:duplicateParentState="true"
                     android:layout_width="wrap_content"
diff --git a/smali/res/layout/suggest_list_item.xml b/smali/res/layout/suggest_list_item.xml
index 385390dfb..db1bdad0c 100644
--- a/smali/res/layout/suggest_list_item.xml
+++ b/smali/res/layout/suggest_list_item.xml
@@ -30,7 +30,7 @@
 
     <TextView
         android:textSize="18.0dip"
-        android:textColor="@color/main_text"
+        android:textColor="?text_primary"
         android:id="@id/flist_item_text"
         android:duplicateParentState="false"
         android:layout_width="wrap_content"
diff --git a/smali/res/layout/welcome.xml b/smali/res/layout/welcome.xml
index 221ef271a..375ec4e31 100644
--- a/smali/res/layout/welcome.xml
+++ b/smali/res/layout/welcome.xml
@@ -53,7 +53,7 @@
 
                     <TextView
                         android:textSize="17.0dip"
-                        android:textColor="@color/main_text"
+                        android:textColor="?text_primary"
                         android:duplicateParentState="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -98,7 +98,7 @@
 
                     <TextView
                         android:textSize="17.0dip"
-                        android:textColor="@color/main_text"
+                        android:textColor="?text_primary"
                         android:duplicateParentState="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -141,7 +141,7 @@
 
                     <TextView
                         android:textSize="17.0dip"
-                        android:textColor="@color/main_text"
+                        android:textColor="?text_primary"
                         android:duplicateParentState="true"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/smali/res/values-ru/arrays.xml b/smali/res/values-ru/arrays.xml
index ba498cf5f..56aff6047 100644
--- a/smali/res/values-ru/arrays.xml
+++ b/smali/res/values-ru/arrays.xml
@@ -483,4 +483,16 @@
         <item>150 сообщений</item>
         <item>200 сообщений</item>
     </string-array>
+    <string-array name="darktheme_value">
+        <item>По умолчанию</item>
+        <item>Полностью чёрная</item>
+    </string-array>
+    <string-array name="lighttheme_value">
+        <item>По умолчанию</item>
+    </string-array>
+    <string-array name="commentssort_value">
+        <item>По умолчанию</item>
+        <item>От Новых к Старым</item>
+        <item>От Старых к Новым</item>
+    </string-array>
 </resources>
diff --git a/smali/res/values/arrays.xml b/smali/res/values/arrays.xml
index e9fa99df6..9e6464eed 100644
--- a/smali/res/values/arrays.xml
+++ b/smali/res/values/arrays.xml
@@ -676,4 +676,14 @@
         <item>default</item>
         <item>amoled</item>
     </string-array>
+    <string-array name="commentssort_value">
+        <item>Default</item>
+        <item>New to Old</item>
+        <item>Old to New</item>
+    </string-array>
+    <string-array name="commentssort">
+        <item>default</item>
+        <item>new</item>
+        <item>old</item>
+    </string-array>
 </resources>
diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml
index 61f6789fd..acaefe3a7 100644
--- a/smali/res/xml/preferences_feed.xml
+++ b/smali/res/xml/preferences_feed.xml
@@ -72,6 +72,13 @@
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlfeedwork">
+        <com.vtosters.lite.ui.SummaryListPreference
+            android:entries="@array/commentssort_value"
+            android:title="Сортировка комментариев"
+            android:key="commentssort"
+            android:defaultValue="default"
+            android:dialogTitle="Выберите значение"
+            android:entryValues="@array/commentssort" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:title="@string/vtlfeedreload"
             android:key="feedautoupdate"
diff --git a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali
index a57ae6903..05eed4e57 100644
--- a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali
+++ b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali
@@ -138,6 +138,10 @@
 
     .line 64
     :goto_1
+    invoke-static {p2}, Lru/vtosters/lite/utils/Prefs;->getCommentsSort(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
     invoke-virtual {p0, p1, p2}, Lcom/vk/api/wall/WallGetComments;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest;
 
     .line 66