From 0ca85cf8884677afd1a99550a3967e29257fb7c3 Mon Sep 17 00:00:00 2001
From: Advaith Bhat <advaithbhat9@gmail.com>
Date: Fri, 16 Apr 2021 15:44:51 +0000
Subject: [PATCH] Cherish: Allow setting Custom statusbar Paddings [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aston-Martinn <advaithbhat9@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                |  4 +++
 res/xml/cherish_settings_misc.xml             | 18 +++++++++++++
 .../settings/fragments/MiscSettings.java      | 26 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index f1d46ee..b557b06 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1199,4 +1199,8 @@
 	<!-- Notification count -->
     <string name="status_bar_notif_count_title">Show notifications count</string>
     <string name="status_bar_notif_count_summary">Display the number of pending notifications</string>
+	
+	<!-- Custom statusbar paddings -->
+    <string name="custom_statusbar_padding_start">Padding (Start)</string>
+    <string name="custom_statusbar_padding_end">Padding (End)</string>
 </resources>
diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml
index f71e330..5b0c047 100644
--- a/res/xml/cherish_settings_misc.xml
+++ b/res/xml/cherish_settings_misc.xml
@@ -132,6 +132,24 @@
             settings:units="dp"
             android:persistent="false"
             android:dependency="sysui_rounded_fwvals" />
+			
+		<com.cherish.settings.preferences.CustomSeekBarPreference
+            android:key="custom_statusbar_padding_start"
+            android:title="@string/custom_statusbar_padding_start"
+            android:max="45"
+            settings:min="5"
+            settings:units="dp"
+            android:defaultValue="5"
+            android:persistent="false" />
+
+        <com.cherish.settings.preferences.CustomSeekBarPreference
+            android:key="custom_statusbar_padding_end"
+            android:title="@string/custom_statusbar_padding_end"
+            android:max="45"
+            settings:min="5"
+            android:defaultValue="5"
+            settings:units="dp"
+            android:persistent="false" />
 
             <!--com.cherish.settings.preferences.CustomSeekBarPreference
             android:key="sysui_rounded_content_padding"
diff --git a/src/com/cherish/settings/fragments/MiscSettings.java b/src/com/cherish/settings/fragments/MiscSettings.java
index 10d0eea..5379dac 100644
--- a/src/com/cherish/settings/fragments/MiscSettings.java
+++ b/src/com/cherish/settings/fragments/MiscSettings.java
@@ -43,8 +43,12 @@ public class MiscSettings extends SettingsPreferenceFragment implements
     private static final String SYSUI_ROUNDED_FWVALS = "sysui_rounded_fwvals";
     private static final String KEY_PULSE_BRIGHTNESS = "ambient_pulse_brightness";
     private static final String KEY_DOZE_BRIGHTNESS = "ambient_doze_brightness";
+	private static final String CUSTOM_STATUSBAR_PADDING_START = "custom_statusbar_padding_start";
+    private static final String CUSTOM_STATUSBAR_PADDING_END = "custom_statusbar_padding_end";
 
     private CustomSeekBarPreference mCornerRadius;
+    private CustomSeekBarPreference mCustomStatusbarPaddingStart;
+    private CustomSeekBarPreference mCustomStatusbarPaddingEnd;
     private CustomSeekBarPreference mContentPadding;
     private SecureSettingSwitchPreference mRoundedFwvals;
     private CustomSeekBarPreference mPulseBrightness;
@@ -75,6 +79,18 @@ public class MiscSettings extends SettingsPreferenceFragment implements
                 ((int) (resourceIdRadius / density)), UserHandle.USER_CURRENT);
         mCornerRadius.setValue(cornerRadius);
         mCornerRadius.setOnPreferenceChangeListener(this);
+		
+		mCustomStatusbarPaddingStart = (CustomSeekBarPreference) findPreference(CUSTOM_STATUSBAR_PADDING_START);
+        int customStatusbarPaddingStart = Settings.System.getIntForUser(ctx.getContentResolver(),
+                Settings.System.CUSTOM_STATUSBAR_PADDING_START, res.getIdentifier("com.android.systemui:dimen/status_bar_padding_start", null, null), UserHandle.USER_CURRENT);
+        mCustomStatusbarPaddingStart.setValue(customStatusbarPaddingStart);
+        mCustomStatusbarPaddingStart.setOnPreferenceChangeListener(this);
+
+        mCustomStatusbarPaddingEnd = (CustomSeekBarPreference) findPreference(CUSTOM_STATUSBAR_PADDING_END);
+        int customStatusbarPaddingEnd = Settings.System.getIntForUser(getActivity().getContentResolver(),
+                Settings.System.CUSTOM_STATUSBAR_PADDING_END, res.getIdentifier("com.android.systemui:dimen/status_bar_padding_end", null, null), UserHandle.USER_CURRENT);
+        mCustomStatusbarPaddingEnd.setValue(customStatusbarPaddingEnd);
+        mCustomStatusbarPaddingEnd.setOnPreferenceChangeListener(this);
 
         // Rounded Content Padding
         //mContentPadding = (CustomSeekBarPreference) findPreference(SYSUI_ROUNDED_CONTENT_PADDING);
@@ -145,6 +161,16 @@ public class MiscSettings extends SettingsPreferenceFragment implements
             int value = (Integer) objValue;
             Settings.System.putInt(getContentResolver(),
                     Settings.System.DOZE_BRIGHTNESS, value);
+            return true;
+		} else if (preference == mCustomStatusbarPaddingStart) {
+            int value = (Integer) objValue;
+            Settings.System.putIntForUser(getContext().getContentResolver(),
+                    Settings.System.CUSTOM_STATUSBAR_PADDING_START, value, UserHandle.USER_CURRENT);
+            return true;
+        } else if (preference == mCustomStatusbarPaddingEnd) {
+            int value = (Integer) objValue;
+            Settings.System.putIntForUser(getContext().getContentResolver(),
+                    Settings.System.CUSTOM_STATUSBAR_PADDING_END, value, UserHandle.USER_CURRENT);
             return true;
 		}
         return false;