From 30d223cfe3c65b8f104245d58056087e7913adbd Mon Sep 17 00:00:00 2001
From: KingLucius <a.aelfattah5@gmail.com>
Date: Mon, 17 Jun 2024 04:01:14 +0300
Subject: [PATCH] feat(UI): Reorganize Settings (#1137)

- Accounts Section & Remove "account" from title.
- Security Section for Biometric that is hidden on TV.
- Move "send logs" to "Action" section.
---
 .../ui/settings/SettingsAccount.kt            |  6 +-
 app/src/main/res/values/strings.xml           |  3 +
 app/src/main/res/xml/settings_account.xml     | 66 +++++++++++--------
 app/src/main/res/xml/settings_updates.xml     | 14 ++--
 4 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
index 3ec47648..a8358d0d 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsAccount.kt
@@ -299,6 +299,9 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricAuthenticator.Biome
         hideKeyboard()
         setPreferencesFromResource(R.xml.settings_account, rootKey)
 
+        //Hides the security  category on TV as it's only Biometric for now
+        getPref(R.string.pref_category_security_key)?.hideOn(TV or EMULATOR)
+
         getPref(R.string.biometric_key)?.hideOn(TV or EMULATOR)?.setOnPreferenceClickListener {
             val ctx = context ?: return@setOnPreferenceClickListener false
 
@@ -328,8 +331,7 @@ class SettingsAccount : PreferenceFragmentCompat(), BiometricAuthenticator.Biome
 
         for ((key, api) in syncApis) {
             getPref(key)?.apply {
-                title =
-                    getString(R.string.login_format).format(api.name, getString(R.string.account))
+                title = api.name
                 setOnPreferenceClickListener {
                     val info = api.loginInfo()
                     if (info != null) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fad44ad4..d9317ccd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -441,6 +441,9 @@
     <string name="pref_category_android_tv_key" translatable="false" >pref_category_android_tv_key</string>
     <string name="pref_category_gestures">Gestures</string>
     <string name="pref_category_gestures_key" translatable="false">pref_category_gestures_key</string>
+    <string name="pref_category_security">Security</string>
+    <string name="pref_category_security_key" translatable="false">pref_category_security_key</string>
+    <string name="pref_category_accounts">Accounts</string>
     <string name="pref_category_player_features">Player features</string>
     <string name="pref_category_subtitles">Subtitles</string>
     <string name="pref_category_player_layout">Layout</string>
diff --git a/app/src/main/res/xml/settings_account.xml b/app/src/main/res/xml/settings_account.xml
index d1d18a0f..d165cd87 100644
--- a/app/src/main/res/xml/settings_account.xml
+++ b/app/src/main/res/xml/settings_account.xml
@@ -1,37 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <Preference
-        android:icon="@drawable/mal_logo"
-        android:key="@string/mal_key" />
+    <PreferenceCategory
+        android:title="@string/pref_category_accounts">
 
-    <Preference
-        android:icon="@drawable/ic_anilist_icon"
-        android:key="@string/anilist_key" />
+        <Preference
+            android:icon="@drawable/mal_logo"
+            android:key="@string/mal_key" />
 
-    <Preference
-        android:icon="@drawable/simkl_logo"
-        android:key="@string/simkl_key" />
+        <Preference
+            android:icon="@drawable/ic_anilist_icon"
+            android:key="@string/anilist_key" />
 
-    <Preference
-        android:icon="@drawable/open_subtitles_icon"
-        android:key="@string/opensubtitles_key" />
+        <Preference
+            android:icon="@drawable/simkl_logo"
+            android:key="@string/simkl_key" />
 
-    <Preference
-        android:icon="@drawable/subdl_logo_big"
-        android:key="@string/subdl_key" />
+        <Preference
+            android:icon="@drawable/open_subtitles_icon"
+            android:key="@string/opensubtitles_key" />
 
-    <SwitchPreference
-        android:defaultValue="false"
-        android:icon="@drawable/ic_outline_account_circle_24"
-        android:key="@string/skip_startup_account_select_key"
-        android:title="@string/skip_startup_account_select_pref" />
+        <Preference
+            android:icon="@drawable/subdl_logo_big"
+            android:key="@string/subdl_key" />
 
-    <SwitchPreferenceCompat
-        android:key="@string/biometric_key"
-        android:defaultValue="false"
-        android:summary="@string/biometric_setting_summary"
-        android:icon="@drawable/ic_fingerprint"
-        android:title="@string/biometric_setting" />
+        <SwitchPreference
+            android:defaultValue="false"
+            android:icon="@drawable/ic_outline_account_circle_24"
+            android:key="@string/skip_startup_account_select_key"
+            android:title="@string/skip_startup_account_select_pref" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_category_security"
+        app:key="@string/pref_category_security_key">
+
+        <SwitchPreferenceCompat
+            android:key="@string/biometric_key"
+            android:defaultValue="false"
+            android:summary="@string/biometric_setting_summary"
+            android:icon="@drawable/ic_fingerprint"
+            android:title="@string/biometric_setting" />
+
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_updates.xml b/app/src/main/res/xml/settings_updates.xml
index e3b36648..102f8ee4 100644
--- a/app/src/main/res/xml/settings_updates.xml
+++ b/app/src/main/res/xml/settings_updates.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@drawable/ic_baseline_bug_report_24"
-        android:key="acra.disable"
-        android:summaryOff="@string/bug_report_settings_off"
-        android:summaryOn="@string/bug_report_settings_on"
-        android:title="@string/pref_disable_acra" />
 
     <PreferenceCategory
         android:title="@string/pref_category_app_updates">
@@ -80,5 +73,12 @@
             android:icon="@drawable/ic_baseline_construction_24"
             android:title="@string/redo_setup_process"
             app:key="@string/redo_setup_key" />
+        <SwitchPreference
+            android:defaultValue="true"
+            android:icon="@drawable/ic_baseline_bug_report_24"
+            android:key="acra.disable"
+            android:summaryOff="@string/bug_report_settings_off"
+            android:summaryOn="@string/bug_report_settings_on"
+            android:title="@string/pref_disable_acra" />
     </PreferenceCategory>
 </PreferenceScreen>