From 8dbd03a32e844e33f3dddd4b26590d3fca3b34fd Mon Sep 17 00:00:00 2001
From: neobuddy89 <neobuddy89@gmail.com>
Date: Mon, 25 Jan 2021 23:25:05 +0530
Subject: [PATCH] Cherish: Allow setting custom symbol near text on charging
 [2/2]
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/values/cherish_arrays.xml                       | 13 +++++++++++++
 res/values/cherish_strings.xml                      |  7 +++++++
 res/xml/cherish_settings_statusbar_battery.xml      | 10 ++++++++++
 .../fragments/StatusbarBatterySettings.java         |  9 +++++++++
 4 files changed, 39 insertions(+)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index c5a45fb..5250f08 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1254,4 +1254,17 @@
         <item>1</item>
         <item>2</item>
     </string-array>
+	
+	<!-- Status bar - Battery custom charging symbol -->
+    <string-array name="text_charging_symbol_entries" translatable="false">
+        <item>@string/text_charging_symbol_default</item>
+        <item>@string/text_charging_symbol_flash</item>
+        <item>@string/text_charging_symbol_tilde</item>
+    </string-array>
+
+    <string-array name="text_charging_symbol_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 696115a..a335b6e 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1178,4 +1178,11 @@
 	
 	<!-- Power menu background opacity -->
     <string name="power_menu_alpha_title">Power menu opacity</string>
+	
+	<!-- Status bar - Battery custom charging symbol -->
+    <string name="text_charging_symbol_title">Custom charging symbol for text style</string>
+    <string name="text_charging_symbol_dialog">Custom charging symbol near battery percentage text</string>
+    <string name="text_charging_symbol_default">Disabled</string>
+    <string name="text_charging_symbol_flash">Flash</string>
+    <string name="text_charging_symbol_tilde">Tilde</string>
 </resources>
diff --git a/res/xml/cherish_settings_statusbar_battery.xml b/res/xml/cherish_settings_statusbar_battery.xml
index 157cdca..f1e9671 100644
--- a/res/xml/cherish_settings_statusbar_battery.xml
+++ b/res/xml/cherish_settings_statusbar_battery.xml
@@ -35,8 +35,18 @@
         android:dialogTitle="@string/battery_percentage_title"
         android:entries="@array/battery_percent_entries"
         android:entryValues="@array/battery_percent_values"
+        android:summary="%s"
         android:defaultValue="0" />
 		
+		<com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="text_charging_symbol"
+			android:title="@string/text_charging_symbol_title"
+			android:dialogTitle="@string/text_charging_symbol_dialog"
+			android:entries="@array/text_charging_symbol_entries"
+			android:entryValues="@array/text_charging_symbol_values"
+			android:summary="%s"
+			android:defaultValue="1" />
+		
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="status_bar_battery_text_charging"
         android:title="@string/battery_text_charging_title"
diff --git a/src/com/cherish/settings/fragments/fragments/StatusbarBatterySettings.java b/src/com/cherish/settings/fragments/fragments/StatusbarBatterySettings.java
index 709714d..118b0cc 100644
--- a/src/com/cherish/settings/fragments/fragments/StatusbarBatterySettings.java
+++ b/src/com/cherish/settings/fragments/fragments/StatusbarBatterySettings.java
@@ -36,6 +36,7 @@ import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
+import com.cherish.settings.preferences.SystemSettingListPreference;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,9 +47,11 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
 
     private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";
     private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
+    private static final String TEXT_CHARGING_SYMBOL = "text_charging_symbol";
 
     private ListPreference mBatteryPercent;
     private ListPreference mBatteryStyle;
+    private SystemSettingListPreference mChargingSymbol;
 
     private int mBatteryPercentValue;
 
@@ -79,6 +82,10 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
         mBatteryPercent.setOnPreferenceChangeListener(this);
         mBatteryPercent.setEnabled(
                 batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN);
+
+        mChargingSymbol = (SystemSettingListPreference) findPreference("text_charging_symbol");
+        mChargingSymbol.setEnabled(
+                batterystyle != BATTERY_STYLE_PORTRAIT && batterystyle != BATTERY_STYLE_HIDDEN);
     }
 
     @Override
@@ -93,6 +100,8 @@ public class StatusbarBatterySettings extends SettingsPreferenceFragment impleme
             mBatteryStyle.setSummary(mBatteryStyle.getEntries()[index]);
             mBatteryPercent.setEnabled(
                     batterystyle != BATTERY_STYLE_TEXT && batterystyle != BATTERY_STYLE_HIDDEN);
+            mChargingSymbol.setEnabled(
+                    batterystyle != BATTERY_STYLE_PORTRAIT && batterystyle != BATTERY_STYLE_HIDDEN);
             return true;
         } else if (preference == mBatteryPercent) {
             mBatteryPercentValue = Integer.parseInt((String) newValue);