From a36d3de4ec354f0395fd71316eaa9c4cefd1a5fa Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Fri, 28 Jun 2019 07:44:57 +0200
Subject: [PATCH 1/2] rework settings layout

I reworked setting layout based on what people actually want to change. My testing has a small sample size. But for now basically all people were interested in quest list - at least viewing it. Some also in changing. Some even started given unprompted advice to make it far more prominent.

So it is moved higher while some settings much less likely/useful to change were downgraded into advanced settings.

in UX testing multiple people that reached settings menu declared that quest selection should not be hidden in advanced settings

I also shown quest list to some people after UX testing session and reactions where mix of
- why I was not aware that X is disabled? I am very interested in this topic.
- it is interesting
- it is amazing
- I really like icon X (often for the underground buldings)
- I was not aware that there are some many question types
- it should be displayed on first startup (I am pretty sure that it would have more negatives than positives).

Also some people using SC declared that it should be less hidden.

So it is promoted higher, out of advanced settings, visible without scrolling settings list.

I also downgraded cache size into advanced, in normal operation there is no need to change it.

I removed separate single element theme and cache group as unnecessary.
---
 app/src/main/res/xml/preferences.xml | 59 +++++++++++-----------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index eae8c70aa8..47d1c6c561 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -26,34 +26,14 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:title="@string/pref_category_cache">
-
-        <de.westnordost.streetcomplete.settings.NumberPickerPreference
-            android:key="map.tilecache"
-            android:title="@string/pref_title_map_cache"
-            android:summary="@string/pref_tilecache_size_summary"
-            android:defaultValue="150"
-            android:persistent="true"
-            custom:minValue="50"
-            custom:maxValue="500"
-            custom:step="25"
-            android:dialogMessage="@string/pref_tilecache_size_message"
-            android:dialogLayout="@layout/dialog_number_picker_preference"
-            android:positiveButtonText="@android:string/ok"
-            android:negativeButtonText="@android:string/cancel"
-            />
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:key="display"
         android:title="@string/pref_category_display">
 
-        <SwitchPreference
-            android:key="display.keepScreenOn"
-            android:title="@string/pref_title_keep_screen_on"
-            android:persistent="true"
+        <Preference
+            android:key="quests"
+            android:title="@string/pref_title_quests"
+            android:widgetLayout="@layout/widget_image_next"
             />
 
         <SwitchPreference
@@ -64,11 +44,11 @@
             android:persistent="true"
             />
 
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="theme"
-        android:title="@string/pref_category_theme">
+        <SwitchPreference
+            android:key="display.keepScreenOn"
+            android:title="@string/pref_title_keep_screen_on"
+            android:persistent="true"
+            />
 
         <ListPreference
             android:key="theme.select"
@@ -79,7 +59,6 @@
             android:entryValues="@array/pref_entryvalues_theme_select"
             android:persistent="true"
             />
-
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -87,12 +66,6 @@
         android:title="@string/pref_category_advanced"
         >
 
-        <Preference
-            android:key="quests"
-            android:title="@string/pref_title_quests"
-            android:widgetLayout="@layout/widget_image_next"
-            />
-
         <Preference
             android:key="quests.invalidation"
             android:title="@string/pref_title_quests_invalidation"
@@ -104,6 +77,20 @@
             android:title="@string/pref_title_quests_restore_hidden"
             />
 
+        <de.westnordost.streetcomplete.settings.NumberPickerPreference
+            android:key="map.tilecache"
+            android:title="@string/pref_title_map_cache"
+            android:summary="@string/pref_tilecache_size_summary"
+            android:defaultValue="150"
+            android:persistent="true"
+            custom:minValue="50"
+            custom:maxValue="500"
+            custom:step="25"
+            android:dialogMessage="@string/pref_tilecache_size_message"
+            android:dialogLayout="@layout/dialog_number_picker_preference"
+            android:positiveButtonText="@android:string/ok"
+            android:negativeButtonText="@android:string/cancel"
+            />
     </PreferenceCategory>
 
 </PreferenceScreen>

From dcc69dd0bf07c4ea7aecc19cd331716005896c3f Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Fri, 28 Jun 2019 08:10:28 +0200
Subject: [PATCH 2/2] remove strings for removed categories

maybe it would be better to somehow disable them to not lose translations?
---
 app/src/main/res/values/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d02a3f9df..403b24507b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -142,7 +142,6 @@
     <string name="quest_sport_ice_hockey">"Ice hockey"</string>
     <string name="quest_sport_netball">"Netball"</string>
     <string name="quest_sport_rugby">"Rugby"</string>
-    <string name="pref_category_cache">"Cache"</string>
     <string name="pref_title_sync">"Auto-sync"</string>
     <string name="map_btn_zoom_out">"Zoom out"</string>
     <string name="map_btn_zoom_in">"Zoom in"</string>
@@ -643,7 +642,6 @@ Otherwise, you can download another keyboard in the app store. Popular keyboards
     <string name="quest_sidewalk_value_yes">sidewalk</string>
     <string name="quest_sidewalk_value_no">no sidewalk</string>
     <string name="quest_accessible_for_pedestrians_title_prohibited">Are pedestrians prohibited from walking on this road here?</string>
-    <string name="pref_category_theme">Theme</string>
     <string name="pref_title_theme_select">Select theme</string>
     <string name="theme_automatic">Auto</string>
     <string name="theme_light">Light</string>