From 1e871dd5e0bde306a2e47fb60a9c80a9f490488f Mon Sep 17 00:00:00 2001
From: Felipe Erias <felipeerias@igalia.com>
Date: Thu, 30 Jan 2025 19:16:37 +0900
Subject: [PATCH] Reorganize Display options

Reorganize the items in the Display options in the Settings,
placing first the ones that are most likely to be useful.

New order:

  - homepage
  - curved display
  - center windows
  - start with passthrough
  - headlock
  - autoplay media
  - latin text autocomplete
  - tabs location
  - default window size
  - density
  - DPI
  - user agent
  - MSAA
---
 app/src/main/res/layout/options_display.xml | 70 ++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/src/main/res/layout/options_display.xml b/app/src/main/res/layout/options_display.xml
index 6d32707e01..02b40ffc9e 100644
--- a/app/src/main/res/layout/options_display.xml
+++ b/app/src/main/res/layout/options_display.xml
@@ -38,18 +38,40 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+                <com.igalia.wolvic.ui.views.settings.SingleEditSetting
+                    android:id="@+id/homepage_edit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:width="300dp"
+                    android:inputType="textWebEmailAddress"
+                    app:description="@string/developer_options_homepage"
+                    app:highlightedTextColor="@color/fog"
+                    app:hintTextColor="@color/iron_blur" />
+
                 <com.igalia.wolvic.ui.views.settings.SwitchSetting
                     android:id="@+id/curved_display_switch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:description="@string/developer_options_curved_display" />
 
+                <com.igalia.wolvic.ui.views.settings.SwitchSetting
+                    android:id="@+id/center_windows_switch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/developer_options_center_windows" />
+
                 <com.igalia.wolvic.ui.views.settings.SwitchSetting
                     android:id="@+id/startWithPassthroughSwitch"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:description="@string/display_options_start_with_passthrough" />
 
+                <com.igalia.wolvic.ui.views.settings.SwitchSetting
+                    android:id="@+id/headLockSwitch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:description="@string/display_options_head_lock" />
+
                 <com.igalia.wolvic.ui.views.settings.SwitchSetting
                     android:id="@+id/autoplaySwitch"
                     android:layout_width="match_parent"
@@ -63,20 +85,12 @@
                     app:description="@string/display_options_latin_auto_complete" />
 
                 <com.igalia.wolvic.ui.views.settings.RadioGroupSetting
-                    android:id="@+id/ua_radio"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:description="@string/developer_options_ua_mode"
-                    app:options="@array/developer_options_ua_modes"
-                    app:values="@array/developer_options_ua_mode_values" />
-
-                <com.igalia.wolvic.ui.views.settings.RadioGroupSetting
-                    android:id="@+id/msaa_radio"
+                    android:id="@+id/tabs_location_radio"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:description="@string/developer_options_msaa"
-                    app:options="@array/developer_options_msaa"
-                    app:values="@array/developer_options_msaa_mode_values" />
+                    app:description="@string/display_options_tabs_location"
+                    app:options="@array/display_options_tabs_location"
+                    app:values="@array/display_options_tabs_location_values" />
 
                 <com.igalia.wolvic.ui.views.settings.RadioGroupSetting
                     android:id="@+id/windows_size"
@@ -84,16 +98,6 @@
                     android:layout_height="wrap_content"
                     app:description="@string/settings_window_size" />
 
-                <com.igalia.wolvic.ui.views.settings.SingleEditSetting
-                    android:id="@+id/homepage_edit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:width="300dp"
-                    android:inputType="textWebEmailAddress"
-                    app:description="@string/developer_options_homepage"
-                    app:hintTextColor="@color/iron_blur"
-                    app:highlightedTextColor="@color/fog" />
-
                 <com.igalia.wolvic.ui.views.settings.SingleEditSetting
                     android:id="@+id/density_edit"
                     android:layout_width="match_parent"
@@ -116,25 +120,21 @@
                     app:hintTextColor="@color/iron_blur"
                     app:highlightedTextColor="@color/fog" />
 
-                <com.igalia.wolvic.ui.views.settings.SwitchSetting
-                    android:id="@+id/center_windows_switch"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:description="@string/developer_options_center_windows" />
-
-                <com.igalia.wolvic.ui.views.settings.SwitchSetting
-                    android:id="@+id/headLockSwitch"
+                <com.igalia.wolvic.ui.views.settings.RadioGroupSetting
+                    android:id="@+id/ua_radio"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:description="@string/display_options_head_lock" />
+                    app:description="@string/developer_options_ua_mode"
+                    app:options="@array/developer_options_ua_modes"
+                    app:values="@array/developer_options_ua_mode_values" />
 
                 <com.igalia.wolvic.ui.views.settings.RadioGroupSetting
-                    android:id="@+id/tabs_location_radio"
+                    android:id="@+id/msaa_radio"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:description="@string/display_options_tabs_location"
-                    app:options="@array/display_options_tabs_location"
-                    app:values="@array/display_options_tabs_location_values" />
+                    app:description="@string/developer_options_msaa"
+                    app:options="@array/developer_options_msaa"
+                    app:values="@array/developer_options_msaa_mode_values" />
 
             </LinearLayout>
         </com.igalia.wolvic.ui.views.CustomScrollView>