From 86a013b619144557eb5fe8ddb1dc70971a928524 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 10 May 2022 22:34:56 +0300
Subject: [PATCH] Some color fixes + upped default app version

---
 .../main/java/ru/vtosters/lite/utils/Preferences.java | 11 +++++++----
 smali/res/layout-sw600dp/vkim_dialog_bar.xml          | 10 +++++-----
 smali/res/layout/vkim_dialog_bar.xml                  |  4 ++--
 smali/res/xml/preferences_activity.xml                |  8 ++++----
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
index b4c8e25c8..b47f6f66f 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -24,6 +24,9 @@ import java.util.Locale;
 public class Preferences {
     public static String VERSIONNAME = "Beta";
 
+    public static Integer VKBUILD = 12116; // 3439 orig
+    public static String VKVER = "7.24"; // 5.29 orig
+
     public static void init(Application application) {
         setupFilters();
         fixGapps();
@@ -313,13 +316,13 @@ public class Preferences {
     }
 
     public static String VKVersion() {
-        String string = getPreferences().getString("vkversion", "");
-        return !string.isEmpty() ? string : "5.29";
+        String string = getPreferences().getString("vkver", "");
+        return !string.isEmpty() ? string : VKVER;
     }
 
     public static int VKVersionBuild() {
-        String string = getPreferences().getString("vkversionbuild", "");
-        return !string.isEmpty() ? Integer.parseInt(string) : 3439;
+        String string = getPreferences().getString("vkbuild", "");
+        return !string.isEmpty() ? Integer.parseInt(string) : VKBUILD;
     }
 
     public static long VKVersionBuildLong() {
diff --git a/smali/res/layout-sw600dp/vkim_dialog_bar.xml b/smali/res/layout-sw600dp/vkim_dialog_bar.xml
index f6f2c1b4d..f0f0f1dea 100644
--- a/smali/res/layout-sw600dp/vkim_dialog_bar.xml
+++ b/smali/res/layout-sw600dp/vkim_dialog_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="#fffafbfc"
+<FrameLayout android:background="?tabbar_background"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -27,7 +27,7 @@
 
         <com.vk.im.ui.views.span.SpanPressableTextView
             android:textSize="14.0sp"
-            android:textColor="#ff71757a"
+            android:textColor="?text_primary"
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:layout_gravity="center_vertical"
@@ -56,13 +56,13 @@
             android:layout_height="48.0dip"
             android:src="@drawable/ic_cancel_24"
             android:scaleType="centerInside"
-            android:tint="@color/light_gray"
+            android:tint="?text_primary"
             android:contentDescription="@null" />
     </LinearLayout>
 
     <TextView
         android:textSize="14.0sp"
-        android:textColor="#ff71757a"
+        android:textColor="?text_primary"
         android:ellipsize="end"
         android:layout_gravity="start|center"
         android:id="@id/loading"
@@ -77,7 +77,7 @@
 
     <TextView
         android:textSize="14.0sp"
-        android:textColor="#ff71757a"
+        android:textColor="?text_primary"
         android:ellipsize="end"
         android:layout_gravity="start|center"
         android:id="@id/error"
diff --git a/smali/res/layout/vkim_dialog_bar.xml b/smali/res/layout/vkim_dialog_bar.xml
index 78ea033b5..f7de38f53 100644
--- a/smali/res/layout/vkim_dialog_bar.xml
+++ b/smali/res/layout/vkim_dialog_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="#fffafbfc"
+<FrameLayout android:background="?tabbar_background"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android"
@@ -64,7 +64,7 @@
             android:layout_marginTop="4.0dip"
             android:src="@drawable/ic_cancel_24"
             android:scaleType="centerInside"
-            android:tint="@color/light_gray"
+            android:tint="?text_primary"
             android:contentDescription="@null" />
     </LinearLayout>
 
diff --git a/smali/res/xml/preferences_activity.xml b/smali/res/xml/preferences_activity.xml
index bbcf46a67..4750add52 100644
--- a/smali/res/xml/preferences_activity.xml
+++ b/smali/res/xml/preferences_activity.xml
@@ -77,13 +77,13 @@
             android:summary="@string/benchapisummary"
             android:title="@string/benchapi" />
         <EditTextPreference
-            android:defaultValue="5.29"
-            android:key="vkversion"
+            android:defaultValue="7.24"
+            android:key="vkver"
             android:summary="Требуется перезапуск"
             android:title="Подмена версии ВК" />
         <EditTextPreference
-            android:defaultValue="3439"
-            android:key="vkversionbuild"
+            android:defaultValue="12116"
+            android:key="vkbuild"
             android:summary="Требуется перезапуск"
             android:title="Подмена версии билда ВК" />
     </PreferenceCategory>