From b2626d388c1374bd9620636ca6f23ccea0a613c6 Mon Sep 17 00:00:00 2001
From: SuperDroidBond <superdroidbond@yahoo.com>
Date: Sat, 21 Aug 2021 15:11:42 +0530
Subject: [PATCH] Cherish[SQUASHED] System Charging Animation [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ChargingAnimation : change both Wired & Wiresless Charging animation [2/2]

ChargingAnimation: move option to Xtras

SDB: also add dependency with Charging Animation toggle

ChargingAnimations: add a few more animations [2/2]

ChargingAnimation : bring back the default one [2/2]
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml           | 19 +++++++++++++++++++
 res/values/cherish_strings.xml          |  9 +++++++++
 res/xml/cherish_settings_lockscreen.xml | 11 +++++++++++
 3 files changed, 39 insertions(+)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 8210118..a1d13c3 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1387,4 +1387,23 @@
         <item>4</item>
         <item>5</item>
     </string-array>
+
+    <!-- Charging animation style -->
+    <string-array name="charging_animation_style_entries" translatable="false">
+        <item>@string/default_charging_animation</item>
+        <item>@string/sdb_charging_animation</item>
+        <item>@string/meme_ui_animation</item>
+        <item>@string/explosion_charging_animation</item>
+        <item>@string/rainbow_charging_animation</item>
+        <item>@string/fire_charging_animation</item>
+    </string-array>
+
+    <string-array name="charging_animation_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index f80d158..3d858d2 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1420,4 +1420,13 @@
 
     <!-- Clock lottie animation size -->
     <string name="clock_lottie_animation_size_title">Animation size</string>
+
+    <!-- Charging animation style -->
+    <string name="charging_animation_style_title">System Charging Animation</string>
+    <string name="default_charging_animation">Android Default</string>
+    <string name="sdb_charging_animation">CherishOS Default</string>
+    <string name="meme_ui_animation">MIUI</string>
+    <string name="explosion_charging_animation">Explosion Animation</string>
+    <string name="rainbow_charging_animation">Rainbow Circle</string>
+    <string name="fire_charging_animation">Fire Circle</string>
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index aae9345..4de1cd1 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -32,6 +32,17 @@
         android:summary="@string/charging_animation_summary"
         android:defaultValue="true" />
 
+    <!-- Charging animation style -->
+        <com.cherish.settings.preferences.SystemSettingListPreference
+           android:key="charging_animation_style"
+           settings:iconSpaceReserved="false"
+           android:title="@string/charging_animation_style_title"
+           android:entries="@array/charging_animation_style_entries"
+           android:entryValues="@array/charging_animation_style_values"
+           android:summary="%s"
+	   android:dependency="charging_animation"
+           android:defaultValue="1" />
+
     <com.cherish.settings.preferences.SystemSettingListPreference
         android:key="lockscreen_charging_animation_style"
         android:icon="@drawable/ic_flash"