From 14f4cf3c36d28fd1c1e47e07d08e72bb6a44be34 Mon Sep 17 00:00:00 2001
From: AnkitGourav <Ankitgourav035@gmail.com>
Date: Fri, 16 Oct 2020 10:41:14 +0000
Subject: [PATCH] Cherish:add ability to show daily/monthly data usage [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-vi/cherish_strings.xml          |  8 +++++---
 res/values/cherish_arrays.xml              | 12 ++++++++++++
 res/values/cherish_strings.xml             |  8 +++++---
 res/xml/cherish_settings_quicksettings.xml | 14 ++++++++------
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/res/values-vi/cherish_strings.xml b/res/values-vi/cherish_strings.xml
index de7bb22..f50541f 100644
--- a/res/values-vi/cherish_strings.xml
+++ b/res/values-vi/cherish_strings.xml
@@ -758,7 +758,9 @@
     <string name="qs_footer_text_summary">Hiển thị văn bản ở dưới cùng của bảng cài đặt nhanh</string>
     <string name="qs_footer_text_string_title">Tùy chỉnh văn bản cuối trang</string>
     <string name="qs_footer_text_string_summary">Đặt mặc định là #KeeptheLove</string>
-    <!-- QS DataUsage Toggle -->
-    <string name="qs_datausage_title">Hiển thị mức sử dụng dữ liệu trong tiêu đề qs</string>
-    <string name="qs_datausage_subtitle">Hiển thị mức sử dụng dữ liệu trong tiêu đề cài đặt nhanh của sim được sử dụng cho dữ liệu</string>
+    <!-- QS Header data uasge -->
+    <string name="qs_datausage_title">Sử dụng dữ liệu trong QS Header</string>
+    <string name="qs_datausage_disabled">Đã tắt</string>
+    <string name="qs_datausage_daily">Sử dụng hàng ngày</string>
+    <string name="qs_datausage_monthly">Sử dụng hàng tháng</string>
 </resources>
diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 3e0705c..a051921 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -936,4 +936,16 @@
         <item>7</item>
         <item>8</item>
     </string-array>
+
+    <!-- QS Header data uasge -->
+    <string-array name="qs_datausage_entries" translatable="false">
+        <item>@string/qs_datausage_disabled</item> 
+        <item>@string/qs_datausage_daily</item> 
+        <item>@string/qs_datausage_monthly</item>
+    </string-array>
+    <string-array name="qs_datausage_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 051f010..84a55fc 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -865,8 +865,10 @@
     <string name="qs_footer_text_string_title">Customize footer text</string>
     <string name="qs_footer_text_string_summary">Set to empty for default #KeepTheLove</string> 
 
-    <!-- QS DataUsage Toggle -->
-    <string name="qs_datausage_title">Show data usage in qs header</string>
-    <string name="qs_datausage_subtitle">Shows data usage in quick settings header of sim used for data</string>
+    <!-- QS Header data uasge -->
+    <string name="qs_datausage_title">Data usage in QS Header</string>
+    <string name="qs_datausage_disabled">Disabled</string>
+    <string name="qs_datausage_daily">Daily usage</string>
+    <string name="qs_datausage_monthly">Monthly usage</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 6a6aeb0..911b08d 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -40,6 +40,14 @@
         android:summary="@string/qs_footer_text_string_summary"
         android:dependency="omni_footer_text_show"
         android:defaultValue="#KeeptheLove" />
+
+   <com.cherish.settings.preferences.SystemSettingListPreference 
+        android:key="qs_datausage" 
+        android:icon="@drawable/ic_data"
+        android:title="@string/qs_datausage_title" 
+        android:entries="@array/qs_datausage_entries"
+        android:entryValues="@array/qs_datausage_values"
+        android:defaultValue="0" />
 	
 		<!-- QS brightness slider -->
     <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
@@ -50,12 +58,6 @@
             android:fragment="com.cherish.settings.fragments.BrightnessSliderSettings"
             android:defaultValue="true" />
 
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference 
-        android:key="qs_datausage" 
-        android:icon="@drawable/ic_data"
-        android:title="@string/qs_datausage_title" 
-        android:summary="@string/qs_datausage_subtitle"
-        android:defaultValue="false" />
 
         <com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="quick_settings_vibrate"