From 54fb70053ca7616bc3ca124f324f1896ea7cf349 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 10 Oct 2023 07:54:59 +0200
Subject: [PATCH] Settings: use category for recording UI settings.

---
 src/main/res/values/strings.xml              |  3 +
 src/main/res/xml/settings_user_interface.xml | 65 ++++++++++----------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 238feea40..2d2e01645 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -373,6 +373,7 @@ limitations under the License.
     <string name="settings_chart_by_distance">By distance</string>
     <string name="settings_chart_by_time">By time</string>
     <!-- Settings Recording -->
+    <string name="settings_recording_title">Recording</string>
     <string name="settings_recording_customize_layout_title">Customize your recording layout</string>
     <string name="settings_recording_customize_layout_select_columns">Data fields per row</string>
     <string name="settings_recording_show_on_lockscreen_while_recording_title">Show statistics on lockscreen</string>
@@ -407,6 +408,8 @@ limitations under the License.
     <string name="settings_announcements_lap_speed_pace">Lap speed/pace</string>
 
     <!-- Custom Layout -->
+
+
     <string name="custom_layout_list_title">Layouts</string>
     <string name="custom_layout_list_edit_name">Type layout\'s name to add</string>
     <string name="custom_layout_list_edit_already_exists">Layout\'s name already exists</string>
diff --git a/src/main/res/xml/settings_user_interface.xml b/src/main/res/xml/settings_user_interface.xml
index f0d5375cd..080e8f8ed 100644
--- a/src/main/res/xml/settings_user_interface.xml
+++ b/src/main/res/xml/settings_user_interface.xml
@@ -12,41 +12,44 @@
         android:title="@string/settings_night_mode_title"
         app:useSimpleSummaryProvider="true" />
 
-    <Preference
-        app:key="@string/stats_custom_layout_key"
-        app:title="@string/settings_recording_customize_layout_title" />
-
-    <de.dennisguse.opentracks.settings.ResetDialogPreference
-        android:dialogMessage="@string/settings_layout_reset_confirm_message"
-        android:dialogTitle="@string/settings_layout_reset_confirm_title"
-        android:key="@string/settings_layout_reset_key"
-        android:negativeButtonText="@android:string/cancel"
-        android:persistent="false"
-        android:positiveButtonText="@android:string/ok"
-        android:title="@string/settings_layout_reset" />
-
-    <SwitchPreferenceCompat
-        android:defaultValue="@bool/stats_show_on_lockscreen_while_recording_default"
-        android:key="@string/stats_show_on_lockscreen_while_recording_key"
-        android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
-        android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
-
-    <SwitchPreferenceCompat
-        android:defaultValue="@bool/stats_keep_screen_on_while_recording_default"
-        android:key="@string/stats_keep_screen_on_while_recording_key"
-        android:summary="@string/settings_recording_keep_screen_on_while_recording_summary"
-        android:title="@string/settings_recording_keep_screen_on_while_recording_title" />
-
-    <SwitchPreferenceCompat
-        android:defaultValue="@bool/stats_fullscreen_while_recording_default"
-        android:key="@string/stats_fullscreen_while_recording_key"
-        android:summary="@string/settings_recording_fullscreen_on_while_recording_summary"
-        android:title="@string/settings_recording_fullscreen_on_while_recording_title" />
-
     <ListPreference
         android:defaultValue="@string/show_on_map_format_ask"
         android:key="@string/show_on_map_format_key"
         android:title="@string/select_show_on_map_behavior"
         app:useSimpleSummaryProvider="true" />
 
+    <PreferenceCategory app:title="@string/settings_recording_title">
+
+        <Preference
+            app:key="@string/stats_custom_layout_key"
+            app:title="@string/settings_recording_customize_layout_title" />
+
+        <de.dennisguse.opentracks.settings.ResetDialogPreference
+            android:dialogMessage="@string/settings_layout_reset_confirm_message"
+            android:dialogTitle="@string/settings_layout_reset_confirm_title"
+            android:key="@string/settings_layout_reset_key"
+            android:negativeButtonText="@android:string/cancel"
+            android:persistent="false"
+            android:positiveButtonText="@android:string/ok"
+            android:title="@string/settings_layout_reset" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="@bool/stats_show_on_lockscreen_while_recording_default"
+            android:key="@string/stats_show_on_lockscreen_while_recording_key"
+            android:summary="@string/settings_recording_show_on_lockscreen_while_recording_summary"
+            android:title="@string/settings_recording_show_on_lockscreen_while_recording_title" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="@bool/stats_keep_screen_on_while_recording_default"
+            android:key="@string/stats_keep_screen_on_while_recording_key"
+            android:summary="@string/settings_recording_keep_screen_on_while_recording_summary"
+            android:title="@string/settings_recording_keep_screen_on_while_recording_title" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="@bool/stats_fullscreen_while_recording_default"
+            android:key="@string/stats_fullscreen_while_recording_key"
+            android:summary="@string/settings_recording_fullscreen_on_while_recording_summary"
+            android:title="@string/settings_recording_fullscreen_on_while_recording_title" />
+    </PreferenceCategory>
+
 </PreferenceScreen>
\ No newline at end of file