From cf370d215c14a6a96edd2cacf7264d07729034d3 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Mon, 15 Mar 2021 20:06:13 +0800
Subject: New option: Default Search Result Tab. Move Show Avatar on the Left
 in the Navigation Drawer to Settings->Interface->Navigation Drawer.

---
 app/src/main/res/xml/interface_preferences.xml         | 13 ++++++++-----
 app/src/main/res/xml/navigation_drawer_preferences.xml |  5 +++++
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'app/src/main/res/xml')

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
@@ -6,6 +6,11 @@
         app:summary="@string/restart_app_see_changes"
         app:enabled="false" />
 
+    <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"
-- 
cgit v1.2.3