From d48ab790a05bf24cd624b25ed6ebf0d69f879d87 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Wed, 12 May 2021 09:42:01 +0200
Subject: [PATCH] Removed a now useless option

---
 .../prefs/LauncherPreferences.java            | 58 +++++++++----------
 .../src/main/res/xml/pref_main.xml            |  6 --
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
index b6b82e15d..a4c84e579 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
@@ -8,21 +8,21 @@ public class LauncherPreferences
 {
     public static SharedPreferences DEFAULT_PREF;
     public static String PREF_RENDERER = "opengles2";
-    public static boolean PREF_VERTYPE_RELEASE = true;
-    public static boolean PREF_VERTYPE_SNAPSHOT = false;
-    public static boolean PREF_VERTYPE_OLDALPHA = false;
-    public static boolean PREF_VERTYPE_OLDBETA = false;
-    public static boolean PREF_FREEFORM = false;
-    public static boolean PREF_HIDE_SIDEBAR = false;
-    public static boolean PREF_IGNORE_NOTCH = false;
-    public static boolean PREF_BACK_TO_RIGHT_MOUSE = false;
-    public static boolean PREF_BUTTON_FLAT = false;
-    public static int PREF_NOTCH_SIZE = 0;
-    public static float PREF_BUTTONSIZE = 100f;
-    public static float PREF_MOUSESCALE = 100f;
-    public static int PREF_LONGPRESS_TRIGGER = 500;
-    public static String PREF_DEFAULTCTRL_PATH = Tools.CTRLDEF_FILE;
-    public static String PREF_CUSTOM_JAVA_ARGS;
+
+	public static boolean PREF_VERTYPE_RELEASE = true;
+	public static boolean PREF_VERTYPE_SNAPSHOT = false;
+	public static boolean PREF_VERTYPE_OLDALPHA = false;
+	public static boolean PREF_VERTYPE_OLDBETA = false;
+	public static boolean PREF_FREEFORM = false;
+	public static boolean PREF_HIDE_SIDEBAR = false;
+	public static boolean PREF_IGNORE_NOTCH = false;
+	public static boolean PREF_BACK_TO_RIGHT_MOUSE = false;
+	public static int PREF_NOTCH_SIZE = 0;
+	public static float PREF_BUTTONSIZE = 100f;
+	public static float PREF_MOUSESCALE = 100f;
+	public static int PREF_LONGPRESS_TRIGGER = 500;
+	public static String PREF_DEFAULTCTRL_PATH = Tools.CTRLDEF_FILE;
+	public static String PREF_CUSTOM_JAVA_ARGS;
     public static String PREF_CUSTOM_OPENGL_LIBNAME = "libgl4es_114.so";
     public static String PREF_LANGUAGE = "default";
     public static String PREF_VERSION_REPOS = "https://launchermeta.mojang.com/mc/game/version_manifest_v2.json";
@@ -33,20 +33,20 @@ public class LauncherPreferences
     public static String PREF_DEFAULT_RUNTIME;
     public static void loadPreferences() {
         PREF_RENDERER = DEFAULT_PREF.getString("renderer", "opengles2");
-        PREF_BUTTONSIZE = DEFAULT_PREF.getInt("buttonscale", 100);
-        PREF_MOUSESCALE = DEFAULT_PREF.getInt("mousescale", 100);
-        PREF_MOUSESPEED = ((float)DEFAULT_PREF.getInt("mousespeed",100))/100f;
-        PREF_FREEFORM = DEFAULT_PREF.getBoolean("freeform", false);
-        PREF_HIDE_SIDEBAR = DEFAULT_PREF.getBoolean("hideSidebar", false);
-        PREF_IGNORE_NOTCH = DEFAULT_PREF.getBoolean("ignoreNotch", false);
-        PREF_BACK_TO_RIGHT_MOUSE = DEFAULT_PREF.getBoolean("backToRightMouse", false);
-        PREF_BUTTON_FLAT = DEFAULT_PREF.getBoolean("flatButtonStyle", false);
-        PREF_VERTYPE_RELEASE = DEFAULT_PREF.getBoolean("vertype_release", true);
-        PREF_VERTYPE_SNAPSHOT = DEFAULT_PREF.getBoolean("vertype_snapshot", false);
-        PREF_VERTYPE_OLDALPHA = DEFAULT_PREF.getBoolean("vertype_oldalpha", false);
-        PREF_VERTYPE_OLDBETA = DEFAULT_PREF.getBoolean("vertype_oldbeta", false);
-        PREF_LONGPRESS_TRIGGER = DEFAULT_PREF.getInt("timeLongPressTrigger", 500);
-        PREF_DEFAULTCTRL_PATH = DEFAULT_PREF.getString("defaultCtrl", Tools.CTRLDEF_FILE);
+
+		PREF_BUTTONSIZE = DEFAULT_PREF.getInt("buttonscale", 100);
+		PREF_MOUSESCALE = DEFAULT_PREF.getInt("mousescale", 100);
+		PREF_MOUSESPEED = ((float)DEFAULT_PREF.getInt("mousespeed",100))/100f;
+		PREF_FREEFORM = DEFAULT_PREF.getBoolean("freeform", false);
+		PREF_HIDE_SIDEBAR = DEFAULT_PREF.getBoolean("hideSidebar", false);
+		PREF_IGNORE_NOTCH = DEFAULT_PREF.getBoolean("ignoreNotch", false);
+		PREF_BACK_TO_RIGHT_MOUSE = DEFAULT_PREF.getBoolean("backToRightMouse", false);
+		PREF_VERTYPE_RELEASE = DEFAULT_PREF.getBoolean("vertype_release", true);
+		PREF_VERTYPE_SNAPSHOT = DEFAULT_PREF.getBoolean("vertype_snapshot", false);
+		PREF_VERTYPE_OLDALPHA = DEFAULT_PREF.getBoolean("vertype_oldalpha", false);
+		PREF_VERTYPE_OLDBETA = DEFAULT_PREF.getBoolean("vertype_oldbeta", false);
+		PREF_LONGPRESS_TRIGGER = DEFAULT_PREF.getInt("timeLongPressTrigger", 500);
+		PREF_DEFAULTCTRL_PATH = DEFAULT_PREF.getString("defaultCtrl", Tools.CTRLDEF_FILE);
         PREF_LANGUAGE = DEFAULT_PREF.getString("language", "default");
         PREF_CHECK_LIBRARY_SHA = DEFAULT_PREF.getBoolean("checkLibraries",true);
         PREF_DISABLE_GESTURES = DEFAULT_PREF.getBoolean("disableGestures",false);
diff --git a/app_pojavlauncher/src/main/res/xml/pref_main.xml b/app_pojavlauncher/src/main/res/xml/pref_main.xml
index 2b5ded16a..ee23eaeb1 100644
--- a/app_pojavlauncher/src/main/res/xml/pref_main.xml
+++ b/app_pojavlauncher/src/main/res/xml/pref_main.xml
@@ -24,12 +24,6 @@
             app2:selectable="false"
             app2:icon="@drawable/tap_len" />
 
-        <androidx.preference.SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="flatButtonStyle"
-            android:summary="@string/mcl_setting_subtitle_flat_button_style"
-            android:title="@string/mcl_setting_title_flat_button_style"
-            app2:icon="@drawable/ic_flatstyle" />
 
         <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"