Reorganize settings. Opening link in app is now available.

11 files changed, 119 insertions, 57 deletions

diff --git a/app/src/main/res/drawable-night/ic_gesture_24dp.xml b/app/src/main/res/drawable-night/ic_gesture_24dp.xml
new file mode 100644
index 00000000..4ad8e70e
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_gesture_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M4.59,6.89c0.7,-0.71 1.4,-1.35 1.71,-1.22 0.5,0.2 0,1.03 -0.3,1.52 -0.25,0.42 -2.86,3.89 -2.86,6.31 0,1.28 0.48,2.34 1.34,2.98 0.75,0.56 1.74,0.73 2.64,0.46 1.07,-0.31 1.95,-1.4 3.06,-2.77 1.21,-1.49 2.83,-3.44 4.08,-3.44 1.63,0 1.65,1.01 1.76,1.79 -3.78,0.64 -5.38,3.67 -5.38,5.37 0,1.7 1.44,3.09 3.21,3.09 1.63,0 4.29,-1.33 4.69,-6.1L21,14.88v-2.5h-2.47c-0.15,-1.65 -1.09,-4.2 -4.03,-4.2 -2.25,0 -4.18,1.91 -4.94,2.84 -0.58,0.73 -2.06,2.48 -2.29,2.72 -0.25,0.3 -0.68,0.84 -1.11,0.84 -0.45,0 -0.72,-0.83 -0.36,-1.92 0.35,-1.09 1.4,-2.86 1.85,-3.52 0.78,-1.14 1.3,-1.92 1.3,-3.28C8.95,3.69 7.31,3 6.44,3 5.12,3 3.97,4 3.72,4.25c-0.36,0.36 -0.66,0.66 -0.88,0.93l1.75,1.71zM13.88,18.55c-0.31,0 -0.74,-0.26 -0.74,-0.72 0,-0.6 0.73,-2.2 2.87,-2.76 -0.3,2.69 -1.43,3.48 -2.13,3.48z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_interface_24dp.xml b/app/src/main/res/drawable-night/ic_interface_24dp.xml
new file mode 100644
index 00000000..633b54cb
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_interface_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable-night/ic_outline_notifications_24px.xml b/app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml
index 43d52df4..43d52df4 100644
--- a/app/src/main/res/drawable-night/ic_outline_notifications_24px.xml
+++ b/app/src/main/res/drawable-night/ic_outline_notifications_24dp.xml
diff --git a/app/src/main/res/drawable/ic_gesture_24dp.xml b/app/src/main/res/drawable/ic_gesture_24dp.xml
new file mode 100644
index 00000000..f629ede8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_gesture_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M4.59,6.89c0.7,-0.71 1.4,-1.35 1.71,-1.22 0.5,0.2 0,1.03 -0.3,1.52 -0.25,0.42 -2.86,3.89 -2.86,6.31 0,1.28 0.48,2.34 1.34,2.98 0.75,0.56 1.74,0.73 2.64,0.46 1.07,-0.31 1.95,-1.4 3.06,-2.77 1.21,-1.49 2.83,-3.44 4.08,-3.44 1.63,0 1.65,1.01 1.76,1.79 -3.78,0.64 -5.38,3.67 -5.38,5.37 0,1.7 1.44,3.09 3.21,3.09 1.63,0 4.29,-1.33 4.69,-6.1L21,14.88v-2.5h-2.47c-0.15,-1.65 -1.09,-4.2 -4.03,-4.2 -2.25,0 -4.18,1.91 -4.94,2.84 -0.58,0.73 -2.06,2.48 -2.29,2.72 -0.25,0.3 -0.68,0.84 -1.11,0.84 -0.45,0 -0.72,-0.83 -0.36,-1.92 0.35,-1.09 1.4,-2.86 1.85,-3.52 0.78,-1.14 1.3,-1.92 1.3,-3.28C8.95,3.69 7.31,3 6.44,3 5.12,3 3.97,4 3.72,4.25c-0.36,0.36 -0.66,0.66 -0.88,0.93l1.75,1.71zM13.88,18.55c-0.31,0 -0.74,-0.26 -0.74,-0.72 0,-0.6 0.73,-2.2 2.87,-2.76 -0.3,2.69 -1.43,3.48 -2.13,3.48z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_interface_24dp.xml b/app/src/main/res/drawable/ic_interface_24dp.xml
new file mode 100644
index 00000000..5ec271dc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_interface_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_notifications_24px.xml b/app/src/main/res/drawable/ic_outline_notifications_24dp.xml
index 0c2c90a7..0c2c90a7 100644
--- a/app/src/main/res/drawable/ic_outline_notifications_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_notifications_24dp.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 44e93567..82681a40 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -293,6 +293,9 @@
     <string name="settings_theme_dark_theme_summary">Dark Theme</string>
     <string name="settings_theme_system_default_summary">Device default</string>
     <string name="settings_amoled_dark_title">Amoled Dark</string>
+    <string name="settings_interface_title">Interface</string>
+    <string name="settings_gestures_and_buttons_title">Gestures &amp; Buttons</string>
+    <string name="settings_open_link_in_app_title">Open Link In App</string>
     <string name="settings_immersive_interface_title">Immersive Interface</string>
     <string name="settings_enable_bottom_app_bar_title">Enable Bottom Navigation</string>
     <string name="settings_vote_buttons_on_the_right_title">Vote Buttons on the Right</string>
@@ -302,7 +305,7 @@
     <string name="settings_show_elapsed_time">Show Elapsed Time in Posts and Comments</string>
     <string name="settings_default_post_layout">Default Post Layout</string>
     <string name="settings_show_divider_in_compact_layout">Show Divider in Compact Layout</string>
-    <string name="swipe_to_go_back_from_post_detail">Swipe Right to Go Back From Comments</string>
+    <string name="settings_swipe_to_go_back_from_post_detail_title">Swipe Right to Go Back From Comments</string>
     <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string>
     <string name="settings_font_size_title">Font Size</string>
     <string name="settings_title_font_size_title">Title Font Size</string>
@@ -414,4 +417,7 @@
 
     <string name="save_comment">Save comment</string>
     <string name="unsave_comment">Unsave comment</string>
+
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
diff --git a/app/src/main/res/xml/gestures_and_buttons_preference.xml b/app/src/main/res/xml/gestures_and_buttons_preference.xml
new file mode 100644
index 00000000..2f15e6be
--- /dev/null
+++ b/app/src/main/res/xml/gestures_and_buttons_preference.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="swipe_to_go_back_from_post_detail"
+        app:title="@string/settings_swipe_to_go_back_from_post_detail_title" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="volume_keys_navigate_comments"
+        app:title="@string/settings_volume_keys_navigate_comments_title" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="volume_keys_navigate_posts"
+        app:title="@string/settings_volume_keys_navigate_posts_title" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
new file mode 100644
index 00000000..434a0173
--- /dev/null
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <Preference
+        app:title="@string/settings_font_size_title"
+        app:icon="@drawable/ic_font_size_24dp"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" />
+
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="immersive_interface"
+        app:title="@string/settings_immersive_interface_title"
+        app:isPreferenceVisible="false" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="bottom_app_bar"
+        app:title="@string/settings_enable_bottom_app_bar_title" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="vote_buttons_on_the_right"
+        app:title="@string/settings_vote_buttons_on_the_right_title" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="show_elapsed_time"
+        app:title="@string/settings_show_elapsed_time" />
+
+    <ListPreference
+        app:defaultValue="0"
+        android:entries="@array/settings_default_post_layout"
+        app:entryValues="@array/settings_default_post_layout_values"
+        app:key="default_post_layout"
+        app:title="@string/settings_default_post_layout"
+        app:useSimpleSummaryProvider="true" />
+
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="show_divider_in_compact_layout"
+        app:title="@string/settings_show_divider_in_compact_layout" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 395d10e1..f79b8234 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Preference
-        app:icon="@drawable/ic_outline_notifications_24px"
+        app:icon="@drawable/ic_outline_notifications_24dp"
         app:title="@string/settings_notification_master_title"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.NotificationPreferenceFragment" />
 
@@ -20,59 +20,21 @@
         app:key="amoled_dark"
         app:title="@string/settings_amoled_dark_title" />
 
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="immersive_interface"
-        app:title="@string/settings_immersive_interface_title"
-        app:isPreferenceVisible="false" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="bottom_app_bar"
-        app:title="@string/settings_enable_bottom_app_bar_title" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="vote_buttons_on_the_right"
-        app:title="@string/settings_vote_buttons_on_the_right_title" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="show_elapsed_time"
-        app:title="@string/settings_show_elapsed_time" />
-
-    <ListPreference
-        app:defaultValue="0"
-        android:entries="@array/settings_default_post_layout"
-        app:entryValues="@array/settings_default_post_layout_values"
-        app:key="default_post_layout"
-        app:title="@string/settings_default_post_layout"
-        app:useSimpleSummaryProvider="true" />
-
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="show_divider_in_compact_layout"
-        app:title="@string/settings_show_divider_in_compact_layout" />
-
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="swipe_to_go_back_from_post_detail"
-        app:title="@string/swipe_to_go_back_from_post_detail" />
-
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="swipe_to_go_back_from_post_detail"
-        app:title="@string/swipe_to_go_back_from_post_detail" />
+    <Preference
+        app:icon="@drawable/ic_interface_24dp"
+        app:title="@string/settings_interface_title"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.InterfacePreferenceFragment" />
 
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="volume_keys_navigate_comments"
-        app:title="@string/settings_volume_keys_navigate_comments_title" />
+    <Preference
+        app:icon="@drawable/ic_gesture_24dp"
+        app:title="@string/settings_gestures_and_buttons_title"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.GesturesAndButtonsPreferenceFragment" />
 
     <SwitchPreference
         app:defaultValue="false"
-        app:key="volume_keys_navigate_posts"
-        app:title="@string/settings_volume_keys_navigate_posts_title" />
+        app:icon="@drawable/ic_link"
+        app:key="open_link_in_app"
+        app:title="@string/settings_open_link_in_app_title" />
 
     <SwitchPreference
         app:defaultValue="false"
@@ -80,11 +42,6 @@
         android:icon="@drawable/ic_mute_preferences_24dp"
         app:title="@string/settings_mute_video_title" />
 
-    <Preference
-        app:title="@string/settings_font_size_title"
-        app:icon="@drawable/ic_font_size_24dp"
-        app:fragment="ml.docilealligator.infinityforreddit.Settings.FontSizePreferenceFragment" />
-
     <ListPreference
         app:defaultValue="2.5"
         android:entries="@array/settings_lazy_mode_interval"
diff --git a/app/src/main/res/xml/notification_preferences.xml b/app/src/main/res/xml/notification_preferences.xml
index 93956533..8ef76485 100644
--- a/app/src/main/res/xml/notification_preferences.xml
+++ b/app/src/main/res/xml/notification_preferences.xml
@@ -5,7 +5,7 @@
     <SwitchPreference
         app:defaultValue="true"
         app:key="enable_notification"
-        app:icon="@drawable/ic_outline_notifications_24px"
+        app:icon="@drawable/ic_outline_notifications_24dp"
         app:title="@string/settings_notification_enable_notification_title"/>
 
     <ListPreference