From 49c21b2da749a6ec3632c43b5c3fb5dec509116e Mon Sep 17 00:00:00 2001
From: jhonboy121 <alfredmathew05@gmail.com>
Date: Sat, 27 Aug 2022 01:21:39 +0700
Subject: [PATCH] Cherish: Add some features for status bar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Statusbar icon [2/2]

Option to Display Data Disabled Indicator Icon [2/2]

Allow using 4G icon instead LTE [2/2]

Make roaming indicator optional [2/2]

old style mobile data indicators [2/2]

Co-authored-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml         | 25 +++++++++++++++--
 res/xml/cherish_settings_statusbar.xml | 38 ++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index d6da28a..5e01726 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -78,9 +78,6 @@
 	<!-- QS settings -->
     <string name="qs_title">Quick settings</string>
 
-	<!-- Status bar - icons -->
-    <string name="status_bar_icons_title">Status bar icons</string>
-
 	<!-- Lock screen visualizer -->
 	<string name="visualizer_title">Display music visualizer</string>
 
@@ -200,5 +197,27 @@
 	
 	<!-- NavBar Inverse -->
     <string name="navigation_bar_inverse_title">Invert 3 button navigation bar</string>
+	
+	<string name="status_bar_icons_category_title">Icons</string>
+	
+	<!-- Status bar - icon blocklist -->
+    <string name="status_bar_icons_title">Status bar icons</string>
+    <string name="status_bar_icons_summary">Choose which status bar icons can be shown</string>
+	
+	<!-- Data disabled icon -->
+    <string name="data_disabled_icon_title">Show data disabled icon</string>
+    <string name="data_disabled_icon_summary">Display the cross sign next to signal bar when data is disabled</string>
+	
+	<!-- Show old style mobile data icon -->
+    <string name="use_old_mobiletype_title">Use old style mobile data icons</string>
+    <string name="use_old_mobiletype_summary">Show mobile type icon on top of the signal indicator</string>
+	
+	<!-- Show LTE/4G switch -->
+    <string name="show_fourg_icon_title">Show 4G instead of LTE</string>
+    <string name="show_fourg_icon_summary">Replace LTE indicator with 4G</string>
+	
+	<!-- Roaming indicator icon -->
+    <string name="roaming_indicator_icon_title">Roaming indicator</string>
+    <string name="roaming_indicator_icon_summary">Display roaming indicator when in roaming mode</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index e09aa9e..ef9c0ed 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -20,5 +20,43 @@
         android:title="@string/network_traffic_title"
         android:summary="@string/network_traffic_summary"
         android:fragment="com.cherish.settings.fragments.NetworkTrafficSettings" />
+		
+	<PreferenceCategory
+        android:title="@string/status_bar_icons_category_title">
+		
+		<Preference
+            android:key="status_bar_icons"
+            android:title="@string/status_bar_icons_title"
+            android:summary="@string/status_bar_icons_summary">
+            <intent android:action="android.intent.action.MAIN"
+                 android:targetPackage="com.android.systemui"
+                 android:targetClass="com.android.systemui.tuner.StatusbarItemsActivity" />
+        </Preference>
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="data_disabled_icon"
+            android:title="@string/data_disabled_icon_title"
+            android:summary="@string/data_disabled_icon_summary"
+            android:defaultValue="true" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="use_old_mobiletype"
+            android:title="@string/use_old_mobiletype_title"
+            android:summary="@string/use_old_mobiletype_summary"
+            android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="show_fourg_icon"
+            android:title="@string/show_fourg_icon_title"
+            android:summary="@string/show_fourg_icon_summary"
+            android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="roaming_indicator_icon"
+            android:title="@string/roaming_indicator_icon_title"
+            android:summary="@string/roaming_indicator_icon_summary"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
 
 </PreferenceScreen>