From 07f5f38e53d78a804a3a3c0c6acb3caa7956ca6f Mon Sep 17 00:00:00 2001
From: SuperDroidBond <superdroidbond@yahoo.com>
Date: Fri, 11 Jun 2021 22:58:45 +0530
Subject: [PATCH] Cherish: Xtended System-wide Slider Styles [2/3]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/drawable/ic_seekbar.xml                   |  7 ++
 res/values/cherish_arrays.xml                 | 19 +++++
 res/values/cherish_strings.xml                |  9 +++
 res/xml/cherish_settings_theme.xml            | 10 +++
 .../settings/fragments/ThemeSettings.java     | 69 +++++++++++++++++++
 5 files changed, 114 insertions(+)
 create mode 100644 res/drawable/ic_seekbar.xml

diff --git a/res/drawable/ic_seekbar.xml b/res/drawable/ic_seekbar.xml
new file mode 100644
index 0000000..4770bb0
--- /dev/null
+++ b/res/drawable/ic_seekbar.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M2,11H9.17C9.58,9.83 10.69,9 12,9C13.31,9 14.42,9.83 14.83,11H22V13H14.83C14.42,14.17 13.31,15 12,15C10.69,15 9.58,14.17 9.17,13H2V11Z" />
+</vector>
\ No newline at end of file
diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index c38b25a..e39364e 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1355,4 +1355,23 @@
         <item>0</item>
         <item>1</item>
     </string-array>
+	
+	<!-- System-wide Sliders Styles -->
+    <string-array name="system_slider_style_entries" translatable="false">
+        <item>@string/system_slider_style_default</item>
+        <item>@string/system_slider_style_daniel</item>
+        <item>@string/system_slider_style_mememini</item>
+        <item>@string/system_slider_style_memeround</item>
+        <item>@string/system_slider_style_memeroundstroke</item>
+        <item>@string/system_slider_style_memestroke</item>
+    </string-array>
+
+    <string-array name="system_slider_style_values" translatable="false">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 4098be6..6a5e3e8 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1293,4 +1293,13 @@
 	<!-- Hide SB On Lockscreen -->
     <string name="hide_lockscreen_status_bar_title">Hide status bar</string>
     <string name="hide_lockscreen_status_bar_summary">Touch status bar to toggle visibility</string>
+	
+	<!-- System-wide Slider Styles -->
+    <string name="system_slider_style_title">System Slider styles</string>
+    <string name="system_slider_style_default">Default</string>
+    <string name="system_slider_style_daniel">Daniel</string>
+    <string name="system_slider_style_mememini">Meme mini</string>
+    <string name="system_slider_style_memeround">Meme round</string>
+    <string name="system_slider_style_memeroundstroke">Meme round stroke</string>
+    <string name="system_slider_style_memestroke">Meme stroke</string>
 </resources>
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 7b45cb1..0719e07 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -89,6 +89,16 @@
         android:entries="@array/brightness_slider_style_selector_entries"
         android:entryValues="@array/brightness_slider_style_selector_values"
         android:persistent="false" />
+
+        <!-- System-wide Slider Styles -->
+        <ListPreference
+            android:key="system_slider_style"
+            android:icon="@drawable/ic_seekbar"
+            android:title="@string/system_slider_style_title"
+            android:entries="@array/system_slider_style_entries"
+            android:entryValues="@array/system_slider_style_values"
+            android:summary="%s"
+            android:defaultValue="1" />
 		
 		<!-- Settings dashboard icon style -->
         <com.cherish.settings.preferences.SystemSettingIntListPreference
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 40c8976..6fffe61 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -58,6 +58,7 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
 public class ThemeSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
     private static final String BRIGHTNESS_SLIDER_STYLE = "brightness_slider_style";
+    private static final String SYSTEM_SLIDER_STYLE = "system_slider_style";
     private static final String UI_STYLE = "ui_style";
     private static final String PREF_PANEL_BG = "panel_bg";
     private static final String PREF_THEME_SWITCH = "theme_switch";
@@ -83,6 +84,7 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
     private ColorPickerPreference mGradientColor;
     private ListPreference mThemeSwitch;
     private ListPreference mBrightnessSliderStyle;
+    private ListPreference mSystemSliderStyle;
     private ListPreference mUIStyle;
     private ListPreference mPanelBg;
     private ListPreference mQsHeaderStyle;
@@ -216,6 +218,7 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
                 .asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
 
         setupAccentPref();
+        setSystemSliderPref();
         setupGradientPref();
 		setupNavbarSwitchPref();
         }
@@ -290,6 +293,53 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
                             true, mOverlayService);
             }
             mNavbarPicker.setSummary(mNavbarPicker.getEntry());
+        } else if (preference == mSystemSliderStyle) {
+            String slider_style = (String) objValue;
+            final Context context = getContext();
+            switch (slider_style) {
+                case "1":
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_DANIEL, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEMINII, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUND, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUNDSTROKE, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMESTROKE, false, mOverlayService);
+                   break;
+                case "2":
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_DANIEL, true, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEMINII, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUND, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUNDSTROKE, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMESTROKE, false, mOverlayService);
+                   break;
+                case "3":
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_DANIEL, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEMINII, true, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUND, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUNDSTROKE, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMESTROKE, false, mOverlayService);
+                   break;
+                case "4":
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_DANIEL, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEMINII, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUND, true, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUNDSTROKE, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMESTROKE, false, mOverlayService);
+                   break;
+                case "5":
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_DANIEL, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEMINII, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUND, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUNDSTROKE, true, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMESTROKE, false, mOverlayService);
+                   break;
+                case "6":
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_DANIEL, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEMINII, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUND, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMEROUNDSTROKE, false, mOverlayService);
+                    handleOverlays(ThemesUtils.SYSTEM_SLIDER_MEMESTROKE, true, mOverlayService);
+                   break;
+            }
         } else if (preference == mQsTileStyle) {
             int qsTileStyleValue = Integer.valueOf((String) objValue);
             Settings.System.putIntForUser(resolver,
@@ -337,6 +387,25 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
         return true;
     }
 
+    private void setSystemSliderPref() {
+        mSystemSliderStyle = (ListPreference) findPreference(SYSTEM_SLIDER_STYLE);
+        mSystemSliderStyle.setOnPreferenceChangeListener(this);
+        if (CherishUtils.isThemeEnabled("com.android.system.slider.memestroke")) {
+            mSystemSliderStyle.setValue("6");
+        } else if (CherishUtils.isThemeEnabled("com.android.system.slider.memeroundstroke")) {
+            mSystemSliderStyle.setValue("5");
+        } else if (CherishUtils.isThemeEnabled("com.android.system.slider.memeround")) {
+            mSystemSliderStyle.setValue("4");
+        } else if (CherishUtils.isThemeEnabled("com.android.system.slider.mememini")) {
+            mSystemSliderStyle.setValue("3");
+        } else if (CherishUtils.isThemeEnabled("com.android.system.slider.daniel")) {
+            mSystemSliderStyle.setValue("2");
+        } else {
+            mSystemSliderStyle.setValue("1");
+        }
+    }
+
+
     private void setupAccentPref() {
         mThemeColor = (ColorPickerPreference) findPreference(ACCENT_COLOR);
         String colorVal = SystemProperties.get(ACCENT_COLOR_PROP, "-1");