From 4da1ec3b76b0930e859fd57c9a09740d3af8b899 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 31 Aug 2022 13:48:45 +0300
Subject: [PATCH] some theme fixes

---
 app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java     | 6 +++---
 .../main/java/ru/vtosters/lite/ui/fragments/VTSettings.java | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java
index 712d680af..ad2341cc0 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java
@@ -45,8 +45,8 @@ public class ProxyHook {
         RadioButton rgVika = new RadioButton(new ContextThemeWrapper(ctx, com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
 
         rg.addView(rgDefault);
-        rg.addView(rgZaborona);
         rg.addView(rgVika);
+        rg.addView(rgZaborona);
         rg.addView(rgRandomProxy);
 
         rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, dp2px(14f));
@@ -62,10 +62,10 @@ public class ProxyHook {
         rgZaborona.setText(AndroidUtils.getString("proxy_enable") + " (Zaborona)");
         rgZaborona.setTextColor(getTextAttr());
 
-        rgRandomProxy.setText(AndroidUtils.getString("proxy_enable") + " (Random Proxy)");
+        rgRandomProxy.setText(AndroidUtils.getString("proxy_enable") + " (Random Socks Proxy)");
         rgRandomProxy.setTextColor(getTextAttr());
 
-        rgVika.setText(AndroidUtils.getString("proxy_enable") + " (Vika)");
+        rgVika.setText(AndroidUtils.getString("proxy_enable") + " (Vika Mobile)");
         rgVika.setTextColor(getTextAttr());
 
         rgZaborona.setChecked(isZaboronaEnabled());
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
index a2b3a2d00..f93d057e8 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
@@ -30,6 +30,7 @@ import static ru.vtosters.lite.utils.Preferences.superapp;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 import static ru.vtosters.lite.utils.ThemesUtils.getDarkTheme;
 import static ru.vtosters.lite.utils.ThemesUtils.getLightTheme;
+import static ru.vtosters.lite.utils.ThemesUtils.isDarkTheme;
 import static ru.vtosters.lite.utils.ThemesUtils.setTheme;
 import static ru.vtosters.lite.utils.VTVerifications.vtverif;
 
@@ -160,7 +161,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment {
 
         addPreferenceCategory(this, AndroidUtils.getString("vtsettdarktheme"));
 
-        addMaterialSwitchPreference(this, "isdark", AndroidUtils.getString("vtsettdarktheme"), "", "ic_palette_outline_28", false, (preference, o) -> {
+        addMaterialSwitchPreference(this, "", AndroidUtils.getString("vtsettdarktheme"), "", "ic_palette_outline_28", isDarkTheme(), (preference, o) -> {
             boolean value = (boolean) o;
 
             if (!value) { // inverted