New option: Default Search Result Tab. Move Show Avatar on the Left in the Navigation Drawer to Settings->Interface->Navigation Drawer.

4 files changed, 27 insertions, 6 deletions

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index cb475059..2c65f6e0 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -409,4 +409,16 @@
         <item>ALL</item>
     </string-array>
 
+    <string-array name="settings_default_search_result_tab">
+        <item>@string/posts</item>
+        <item>@string/subreddits</item>
+        <item>@string/users</item>
+    </string-array>
+
+    <string-array name="settings_default_search_result_tab_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 70f5f6eb..e6a546f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -542,7 +542,7 @@
     <string name="settings_hide_subreddit_and_user_prefix">Hide Subreddit and User Prefix</string>
     <string name="settings_hide_the_number_of_votes">Hide the Number of Votes</string>
     <string name="settings_hide_the_number_of_comments">Hide the Number of Comments</string>
-    <string name="settings_show_avatar_on_the_right_in_the_navigation_drawer">Show Avatar on the Left in the Navigation Drawer</string>
+    <string name="settings_show_avatar_on_the_right">Show Avatar on the Left</string>
     <string name="settings_backup_settings_title">Backup Settings</string>
     <string name="settings_restore_settings_title">Restore Settings</string>
     <string name="settings_credits_love_animation_title">Love Animation</string>
@@ -555,6 +555,7 @@
     <string name="settings_collapse_subscribed_subreddits_section_title">Collapse Subscribed Subreddits Section</string>
     <string name="settings_hide_favorite_subreddits_sections_title">Hide Favorite Subreddits Section</string>
     <string name="settings_hide_subscribed_subreddits_sections_title">Hide Subscribed Subreddits Section</string>
+    <string name="settings_default_search_result_tab">Default Search Result Tab</string>
 
     <string name="no_link_available">Cannot get the link</string>
 
diff --git a/app/src/main/res/xml/interface_preferences.xml b/app/src/main/res/xml/interface_preferences.xml
index 1d45da42..6387a850 100644
--- a/app/src/main/res/xml/interface_preferences.xml
+++ b/app/src/main/res/xml/interface_preferences.xml
@@ -33,15 +33,18 @@
         app:title="@string/settings_enable_bottom_app_bar_title"
         app:summary="@string/settings_enable_bottom_app_bar_summary" />
 
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="show_avatar_on_the_right_in_the_navigation_drawer"
-        app:title="@string/settings_show_avatar_on_the_right_in_the_navigation_drawer" />
-
     <Preference
         app:title="@string/settings_time_format_title"
         app:fragment="ml.docilealligator.infinityforreddit.settings.TimeFormatPreferenceFragment" />
 
+    <ListPreference
+        app:defaultValue="0"
+        app:entries="@array/settings_default_search_result_tab"
+        app:entryValues="@array/settings_default_search_result_tab_values"
+        app:key="default_search_result_tab"
+        app:title="@string/settings_default_search_result_tab"
+        app:useSimpleSummaryProvider="true" />
+
     <SwitchPreference
         app:defaultValue="false"
         app:key="hide_subreddit_description"
diff --git a/app/src/main/res/xml/navigation_drawer_preferences.xml b/app/src/main/res/xml/navigation_drawer_preferences.xml
index 12873fa3..3fb31b88 100644
--- a/app/src/main/res/xml/navigation_drawer_preferences.xml
+++ b/app/src/main/res/xml/navigation_drawer_preferences.xml
@@ -8,6 +8,11 @@
 
     <SwitchPreference
         app:defaultValue="false"
+        app:key="show_avatar_on_the_right"
+        app:title="@string/settings_show_avatar_on_the_right" />
+
+    <SwitchPreference
+        app:defaultValue="false"
         app:key="collapse_account_section"
         app:title="@string/settings_collapse_account_section_title" />