From 22b5cb2d31669132a31307e89bfb50aa622b6181 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 22 Mar 2022 08:07:43 +0100
Subject: [PATCH] Restructure labs settings

Change-Id: Ifee3a3a6a86e1ea42d99285cb5ba88f0f0018fcd
---
 vector/src/main/res/values/strings_sc.xml     |  5 +
 .../src/main/res/xml/vector_settings_labs.xml | 96 ++++++++++++-------
 2 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/vector/src/main/res/values/strings_sc.xml b/vector/src/main/res/values/strings_sc.xml
index 69a0882751..26dd0ef67d 100644
--- a/vector/src/main/res/values/strings_sc.xml
+++ b/vector/src/main/res/values/strings_sc.xml
@@ -178,4 +178,9 @@
     <string name="settings_sc_dbg_timeline_chunks">Debug timeline consistency</string>
     <string name="settings_sc_dbg_show_display_index">Show displayIndex in timeline</string>
     <string name="settings_sc_dbg_show_read_tracking">Show read tracking</string>
+
+    <!-- SC labs -->
+    <string name="settings_upstream_labs">Element features</string>
+    <string name="settings_labs_room_list">Room list</string>
+    <string name="settings_labs_timeline">Timeline</string>
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_labs.xml b/vector/src/main/res/xml/vector_settings_labs.xml
index f43c75a81b..f2403593c3 100644
--- a/vector/src/main/res/xml/vector_settings_labs.xml
+++ b/vector/src/main/res/xml/vector_settings_labs.xml
@@ -10,6 +10,64 @@
         android:key="labs_warning"
         android:summary="@string/room_settings_labs_warning_message" />
 
+
+    <!-- SC additions -->
+
+    <im.vector.app.core.preference.VectorSwitchPreference
+        android:defaultValue="false"
+        android:key="SYSTEM_DARK_THEME_PRE_TEN"
+        android:title="@string/settings_system_dark_theme_pre_ten"
+        android:summary="@string/settings_system_dark_theme_pre_ten_summary" />
+
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_LABS_TIMELINE"
+        android:title="@string/settings_labs_timeline">
+
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_OPEN_CHATS_AT_FIRST_UNREAD"
+            android:title="@string/settings_open_chats_at_first_unread"
+            android:summary="@string/settings_open_chats_at_first_unread_summary" />
+
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_ALLOW_URL_PREVIEW_IN_ENCRYPTED_ROOM_KEY"
+            android:title="@string/url_previews_in_encrypted_rooms"
+            android:summary="@string/url_previews_in_encrypted_rooms_summary" />
+
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="true"
+            android:key="SETTINGS_VOICE_MESSAGE"
+            android:title="@string/settings_show_voice_message_recorder_ui"
+            android:summary="@string/settings_show_voice_message_recorder_ui_summary" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_LABS_ROOM_OVERVIEW"
+        android:title="@string/settings_labs_room_list">
+
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="true"
+            android:key="SETTINGS_LABS_ALLOW_MARK_UNREAD"
+            android:title="@string/labs_mark_rooms_unread"
+            android:summary="@string/labs_mark_rooms_unread_summary" />
+
+        <im.vector.app.core.preference.VectorSwitchPreference
+            android:defaultValue="false"
+            android:key="SETTINGS_ENABLE_SPACE_PAGER"
+            android:title="@string/settings_enable_space_pager"
+            android:summary="@string/settings_enable_space_pager_summary" />
+
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
+
+    <!-- Upstream -->
+
+    <im.vector.app.core.preference.VectorPreferenceCategory
+        android:key="SETTINGS_LABS_PREFERENCE_KEY"
+        android:title="@string/settings_upstream_labs">
+
     <!--<im.vector.app.core.preference.VectorSwitchPreference-->
     <!--android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"-->
     <!--android:title="@string/room_settings_labs_end_to_end" />-->
@@ -34,52 +92,16 @@
     <!--android:summary="@string/settings_labs_enable_send_voice_summary"-->
     <!--android:title="@string/settings_labs_enable_send_voice" />-->
 
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_OPEN_CHATS_AT_FIRST_UNREAD"
-        android:title="@string/settings_open_chats_at_first_unread"
-        android:summary="@string/settings_open_chats_at_first_unread_summary" />
-
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SYSTEM_DARK_THEME_PRE_TEN"
-        android:title="@string/settings_system_dark_theme_pre_ten"
-        android:summary="@string/settings_system_dark_theme_pre_ten_summary" />
-
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_ALLOW_URL_PREVIEW_IN_ENCRYPTED_ROOM_KEY"
-        android:title="@string/url_previews_in_encrypted_rooms"
-        android:summary="@string/url_previews_in_encrypted_rooms_summary" />
-
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="true"
-        android:key="SETTINGS_LABS_ALLOW_MARK_UNREAD"
-        android:title="@string/labs_mark_rooms_unread"
-        android:summary="@string/labs_mark_rooms_unread_summary" />
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="true"
         android:key="SETTINGS_LABS_ENABLE_SWIPE_TO_REPLY"
         android:title="@string/labs_swipe_to_reply_in_timeline" />
 
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="true"
-        android:key="SETTINGS_VOICE_MESSAGE"
-        android:title="@string/settings_show_voice_message_recorder_ui"
-        android:summary="@string/settings_show_voice_message_recorder_ui_summary" />
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_UNREAD_NOTIFICATIONS_AS_TAB"
         android:title="@string/labs_show_unread_notifications_as_tab" />
 
-    <im.vector.app.core.preference.VectorSwitchPreference
-        android:defaultValue="false"
-        android:key="SETTINGS_ENABLE_SPACE_PAGER"
-        android:title="@string/settings_enable_space_pager"
-        android:summary="@string/settings_enable_space_pager_summary" />
-
     <im.vector.app.core.preference.VectorSwitchPreference
         android:defaultValue="false"
         android:key="SETTINGS_LABS_ENABLE_LATEX_MATHS"
@@ -104,4 +126,6 @@
         android:key="SETTINGS_LABS_RENDER_LOCATIONS_IN_TIMELINE"
         android:title="@string/labs_render_locations_in_timeline" />
 
+    </im.vector.app.core.preference.VectorPreferenceCategory>
+
 </androidx.preference.PreferenceScreen>