From 98e5bfb2bb3175771cb8fea8382992571aab83c3 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 8 Jun 2022 18:41:03 +0300
Subject: [PATCH] init rounded theme

---
 app/src/main/java/ru/vtosters/lite/utils/Preferences.java | 4 ++--
 app/src/main/java/ru/vtosters/lite/utils/Themes.java      | 6 +++---
 smali/res/xml/preferences_debug.xml                       | 4 ----
 smali/res/xml/preferences_messages.xml                    | 4 ++++
 4 files changed, 9 insertions(+), 9 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 3b421f56b..dddabbaeb 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -330,8 +330,8 @@ public class Preferences {
         return getBoolValue("vkme_msg", false);
     }
 
-    public static boolean vkme_theme() {
-        return getBoolValue("vkme_theme", false);
+    public static boolean roundedmsgs() {
+        return getBoolValue("roundedmsgs", false);
     }
 
     public static boolean donaterecomm() {
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
index eacbe293d..d7958c93b 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -9,7 +9,7 @@ import static ru.vtosters.lite.utils.Preferences.color_grishka;
 import static ru.vtosters.lite.utils.Preferences.isBGStickersEnabled;
 import static ru.vtosters.lite.utils.Preferences.navbar;
 import static ru.vtosters.lite.utils.Preferences.systemtheme;
-import static ru.vtosters.lite.utils.Preferences.vkme_theme;
+import static ru.vtosters.lite.utils.Preferences.roundedmsgs;
 import static ru.vtosters.lite.utils.Preferences.vksans;
 
 import android.content.Context;
@@ -120,7 +120,7 @@ public class Themes {
             case "amoled":
                 return ImTheme.VKAPP_AMOLED;
             default:
-                return vkme_theme() ? ImTheme.VKME_DARK : ImTheme.VKAPP_DARK;
+                return roundedmsgs() ? ImTheme.VKME_DARK : ImTheme.VKAPP_DARK;
         }
     } // Return needed theme for theme changer
 
@@ -134,7 +134,7 @@ public class Themes {
     public static ImTheme getImLightTheme() {
         switch (getPrefsValue("lighttheme")) {
             default:
-                return vkme_theme() ? ImTheme.VKME_LIGHT : ImTheme.VKAPP_LIGHT;
+                return roundedmsgs() ? ImTheme.VKME_LIGHT : ImTheme.VKAPP_LIGHT;
         }
     } // Return needed theme for theme changer
 
diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml
index ab22b307c..add370211 100644
--- a/smali/res/xml/preferences_debug.xml
+++ b/smali/res/xml/preferences_debug.xml
@@ -10,10 +10,6 @@
         android:key="devmenu"
         android:title="@string/debug_show_settings_item" />
     <PreferenceCategory android:title="@string/debug_experimental">
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="vkme_theme"
-            android:title="VKME Тема сообщений" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="usevkui"
diff --git a/smali/res/xml/preferences_messages.xml b/smali/res/xml/preferences_messages.xml
index d15459a83..1e893cac6 100644
--- a/smali/res/xml/preferences_messages.xml
+++ b/smali/res/xml/preferences_messages.xml
@@ -16,6 +16,10 @@
             android:key="voice"
             android:summary="@string/vtlvoicesummary"
             android:title="@string/vtlvoice" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="roundedmsgs"
+            android:title="Круглые сообщения" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfaceemoji">