From d041df9805f4833b97c78a8db2d33190ca929960 Mon Sep 17 00:00:00 2001
From: fgerber <frederic.gerber@mydoli.ch>
Date: Mon, 8 Apr 2024 11:35:51 +0200
Subject: [PATCH] Adapt settings and icons

---
 app/src/main/res/drawable/group.xml        | 16 ++++++++
 app/src/main/res/drawable/zoomin.xml       | 12 ++++++
 app/src/main/res/xml/fragment_settings.xml | 48 +++++++++++-----------
 3 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/drawable/group.xml
 create mode 100644 app/src/main/res/drawable/zoomin.xml

diff --git a/app/src/main/res/drawable/group.xml b/app/src/main/res/drawable/group.xml
new file mode 100644
index 0000000..f2af1ac
--- /dev/null
+++ b/app/src/main/res/drawable/group.xml
@@ -0,0 +1,16 @@
+<vector
+android:height="24dp"
+android:viewportHeight="24"
+android:viewportWidth="24"
+android:width="24dp"
+xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<path android:fillColor="?attr/colorOnBackground" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M8,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M12,8m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M16,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/zoomin.xml b/app/src/main/res/drawable/zoomin.xml
new file mode 100644
index 0000000..c18a81e
--- /dev/null
+++ b/app/src/main/res/drawable/zoomin.xml
@@ -0,0 +1,12 @@
+<vector
+android:height="24dp"
+android:viewportHeight="24"
+android:viewportWidth="24"
+android:width="24dp"
+xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<path android:fillColor="?attr/colorOnBackground" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M12,10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/>
+
+</vector>
diff --git a/app/src/main/res/xml/fragment_settings.xml b/app/src/main/res/xml/fragment_settings.xml
index f10e31e..a9faaf6 100644
--- a/app/src/main/res/xml/fragment_settings.xml
+++ b/app/src/main/res/xml/fragment_settings.xml
@@ -4,23 +4,13 @@
     android:theme="@style/Theme.Beans">
 
     <ListPreference
-        app:defaultValue="@string/off"
+        app:defaultValue="@string/system"
         app:enabled="true"
-        app:entries="@array/entries_onoff"
-        app:entryValues="@array/entries_onoff"
-        app:icon="@drawable/edit"
-        app:key="@string/key_group"
-        app:title="@string/key_group"
-        app:useSimpleSummaryProvider="true" />
-
-    <ListPreference
-        app:defaultValue="@string/off"
-        app:enabled="true"
-        app:entries="@array/entries_onoff"
-        app:entryValues="@array/entries_onoff"
-        app:icon="@drawable/edit"
-        app:key="@string/key_regional"
-        app:title="@string/key_regional"
+        app:entries="@array/entries_theme"
+        app:entryValues="@array/entries_theme"
+        app:icon="@drawable/palette"
+        app:key="@string/key_theme"
+        app:title="@string/key_theme"
         app:useSimpleSummaryProvider="true" />
 
     <ListPreference
@@ -32,20 +22,32 @@
         app:key="@string/key_stats"
         app:title="@string/key_stats"
         app:useSimpleSummaryProvider="true" />
-    
+
     <ListPreference
-        app:defaultValue="@string/system"
+        app:defaultValue="@string/off"
         app:enabled="true"
-        app:entries="@array/entries_theme"
-        app:entryValues="@array/entries_theme"
-        app:icon="@drawable/palette"
-        app:key="@string/key_theme"
-        app:title="@string/key_theme"
+        app:allowDividerAbove="true"
+        app:entries="@array/entries_onoff"
+        app:entryValues="@array/entries_onoff"
+        app:icon="@drawable/group"
+        app:key="@string/key_group"
+        app:title="@string/key_group"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="@string/off"
+        app:enabled="true"
+        app:entries="@array/entries_onoff"
+        app:entryValues="@array/entries_onoff"
+        app:icon="@drawable/zoomin"
+        app:key="@string/key_regional"
+        app:title="@string/key_regional"
         app:useSimpleSummaryProvider="true" />
 
     <Preference
         android:summary="@string/foss_licenses"
         app:enabled="true"
+        app:allowDividerAbove="true"
         app:icon="@drawable/licenses"
         app:key="@string/licenses"
         app:title="@string/licenses" />