From 34b5dd698a2a9863803882aa252a9f59b12975a9 Mon Sep 17 00:00:00 2001
From: DennySPB <dennyspb@gmail.com>
Date: Fri, 17 Dec 2021 02:19:21 +0800
Subject: [PATCH] Cherish: Add volte and vowifi options
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          | 69 ++++++++++++++++++++++++++
 res/values/cherish_strings.xml         | 39 +++++++++++++--
 res/xml/cherish_settings_statusbar.xml | 35 +++++++++++--
 3 files changed, 134 insertions(+), 9 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index eee11f5..06b4f9b 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -140,5 +140,74 @@
         <item>0</item>
         <item>1</item>
     </string-array>
+	
+	<!-- VoLTE Icon Type -->
+    <string-array name="volte_icon_type_entries" translatable="false">
+        <item>@string/volte_icon_vivo</item>
+        <item>@string/volte_icon_margaritov2</item>
+        <item>@string/volte_icon_margaritov</item>
+        <item>@string/volte_icon_asus</item>
+        <item>@string/volte_icon_hd</item>
+        <item>@string/volte_icon_hd2</item>
+        <item>@string/volte_icon_miui</item>
+        <item>@string/volte_icon_emui</item>
+        <item>@string/volte_icon_oos</item>
+        <item>@string/volte_icon_volte</item>
+        <item>@string/volte_icon_vo</item>
+    </string-array>
+
+    <string-array name="volte_icon_type_values" translatable="false">
+        <item>10</item>
+        <item>9</item>
+        <item>8</item>
+        <item>4</item>
+        <item>3</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>2</item>
+        <item>1</item>
+        <item>0</item>
+    </string-array>
+
+    <!-- VoWiFi Icon -->
+    <string-array name="vowifi_icon_entries" translatable="false">
+        <item>@string/vowifi_icon_disabled</item>
+        <item>@string/vowifi_icon_enabled</item>
+        <item>@string/vowifi_icon_enabled_volte_disabled</item>
+    </string-array>
+
+    <string-array name="vowifi_icon_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <!-- VoWiFi icon style -->
+    <string-array name="vowifi_icon_style_entries" translatable="false">
+        <item>@string/vowifi_icon_default</item>
+        <item>@string/vowifi_icon_oneplus</item>
+        <item>@string/vowifi_icon_moto</item>
+        <item>@string/vowifi_icon_asus</item>
+        <item>@string/vowifi_icon_emui</item>
+        <item>@string/vowifi_icon_simple1</item>
+        <item>@string/vowifi_icon_simple2</item>
+        <item>@string/vowifi_icon_simple3</item>
+        <item>@string/vowifi_icon_vivo</item>
+        <item>@string/vowifi_icon_margaritov</item>
+    </string-array>
+
+    <string-array name="vowifi_icon_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+    </string-array>
 
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 3748cb9..a0d2521 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -178,10 +178,6 @@
 	<!-- 4G icon -->
     <string name="show_fourg_icon_title">4G icon</string>
     <string name="show_fourg_icon_summary">Display 4G icon in signal icon instead LTE</string>
-	
-	<!-- Show VoLTE icon on statusbar -->
-    <string name="volte_icon_title">VoLTE icon</string>
-    <string name="volte_icon_summary">Display VoLTE icon</string>
 
 	<!-- Volume swap buttons -->
     <string name="swap_volume_buttons_title">Reorient</string>
@@ -281,5 +277,40 @@
     <!-- Roaming indicator icon -->
     <string name="roaming_indicator_icon_title">Roaming indicator</string>
     <string name="roaming_indicator_icon_summary">Display roaming indicator in signal icon when in roaming mode</string>
+	
+	<!-- Show VoLTE icon on statusbar -->
+    <string name="volte_switch_title">VoLTE icon</string>
+    <string name="volte_switch_summary">Display VoLTE icon</string>
+    <string name="volte_icon_title">VoLTE icon</string>
+    <string name="volte_icon_summary">Display VoLTE icon</string>
+    <string name="volte_icon_style_title">Select VoLTE Icon</string>
+    <string name="volte_icon_asus">VoLTE Asus Icon</string>
+    <string name="volte_icon_vo">Vo Only Icon</string>
+    <string name="volte_icon_volte">VoLTE Icon</string>
+    <string name="volte_icon_oos">VoLTE OOS Icon</string>
+    <string name="volte_icon_hd">HD Icon</string>
+    <string name="volte_icon_hd2">HD CAF Icon</string>
+    <string name="volte_icon_miui">MIUI 11 Icon</string>
+    <string name="volte_icon_emui">EMUI Icon</string>
+    <string name="volte_icon_margaritov">HD Filled Icon</string>
+    <string name="volte_icon_margaritov2">Margaritov VoLTE Icon</string>
+    <string name="volte_icon_vivo">Vivo Icon</string>
+
+    <!-- VoWiFi icon -->
+    <string name="vowifi_icon_title">VoWiFi icon</string>
+    <string name="vowifi_icon_enabled">VoWiFi icon enabled</string>
+    <string name="vowifi_icon_disabled">VoWiFi icon disabled</string>
+    <string name="vowifi_icon_enabled_volte_disabled">VoWiFi instead of VoLTE icon</string>
+    <string name="vowifi_icon_style_title">VoWiFi icon style</string>
+    <string name="vowifi_icon_default">Default Icon</string>
+    <string name="vowifi_icon_emui">EMUI Icon</string>
+    <string name="vowifi_icon_asus">Asus Icon</string>
+    <string name="vowifi_icon_oneplus">OOS Icon</string>
+    <string name="vowifi_icon_moto">Motorola Icon</string>
+    <string name="vowifi_icon_simple1">Simple1 Icon</string>
+    <string name="vowifi_icon_simple2">Simple2 Icon</string>
+    <string name="vowifi_icon_simple3">Simple3 Icon</string>
+    <string name="vowifi_icon_vivo">Vivo Icon</string>
+    <string name="vowifi_icon_margaritov">Margaritov Icon</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index d054666..049ade6 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -46,12 +46,37 @@
              android:title="@string/show_fourg_icon_title"
              android:summary="@string/show_fourg_icon_summary"
              android:defaultValue="false"/>
-			 
+		
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
-             android:key="volte_icon"
-             android:title="@string/volte_icon_title"
-             android:summary="@string/volte_icon_summary"
-             android:defaultValue="true"/>
+        android:key="show_volte_icon"
+        android:title="@string/volte_switch_title"
+        android:summary="@string/volte_switch_summary"
+        android:defaultValue="true" />
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+         android:key="volte_icon_style"
+         android:title="@string/volte_icon_style_title"
+         android:entries="@array/volte_icon_type_entries"
+         android:entryValues="@array/volte_icon_type_values"
+         android:summary="%s"
+         android:defaultValue="0"
+         android:dependency="show_volte_icon"/>
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+         android:key="vowifi_icon"
+         android:title="@string/vowifi_icon_title"
+         android:entries="@array/vowifi_icon_entries"
+         android:entryValues="@array/vowifi_icon_values"
+         android:summary="%s"
+         android:defaultValue="0"/>
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+         android:key="vowifi_icon_style"
+         android:title="@string/vowifi_icon_style_title"
+         android:entries="@array/vowifi_icon_style_entries"
+         android:entryValues="@array/vowifi_icon_style_values"
+         android:summary="%s"
+         android:defaultValue="0"/>
 			 
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
              android:key="roaming_indicator_icon"