Immersive Interface is now available on Android 8.0. Add ThemePreferenceFragment. Fix theme database.

6 files changed, 26 insertions, 13 deletions

diff --git a/app/src/main/res/drawable-night/ic_outline_color_lens_24px.xml b/app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml
index 6fa0d26f..6fa0d26f 100644
--- a/app/src/main/res/drawable-night/ic_outline_color_lens_24px.xml
+++ b/app/src/main/res/drawable-night/ic_outline_color_lens_24dp.xml
diff --git a/app/src/main/res/drawable/ic_outline_color_lens_24px.xml b/app/src/main/res/drawable/ic_outline_color_lens_24dp.xml
index d1bc2624..d1bc2624 100644
--- a/app/src/main/res/drawable/ic_outline_color_lens_24px.xml
+++ b/app/src/main/res/drawable/ic_outline_color_lens_24dp.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb88ae16..45f7b7e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -459,4 +459,7 @@
     <string name="cannot_get_storage">Cannot access the app storage</string>
     <string name="save_image_before_sharing">Saving the image. Please wait.</string>
     <string name="save_gif_before_sharing">Saving the gif. Please wait.</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/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index c62ecbac..7b21020e 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -2,19 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <ListPreference
-        app:defaultValue="2"
-        app:entryValues="@array/settings_theme_values"
-        app:key="theme"
-        app:icon="@drawable/ic_outline_color_lens_24px"
-        app:title="@string/settings_theme_title"
-        app:useSimpleSummaryProvider="true" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="amoled_dark"
-        app:title="@string/settings_amoled_dark_title" />
-
     <Preference
         app:title="@string/settings_font_size_title"
         app:icon="@drawable/ic_font_size_24dp"
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index d95e675f..3afc2f8b 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -13,6 +13,11 @@
         app:fragment="ml.docilealligator.infinityforreddit.Settings.InterfacePreferenceFragment" />
 
     <Preference
+        app:title="@string/settings_theme_title"
+        app:icon="@drawable/ic_outline_color_lens_24dp"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.ThemePreferenceFragment" />
+
+    <Preference
         app:icon="@drawable/ic_gesture_24dp"
         app:title="@string/settings_gestures_and_buttons_title"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.GesturesAndButtonsPreferenceFragment" />
diff --git a/app/src/main/res/xml/theme_preferences.xml b/app/src/main/res/xml/theme_preferences.xml
new file mode 100644
index 00000000..038485e0
--- /dev/null
+++ b/app/src/main/res/xml/theme_preferences.xml
@@ -0,0 +1,18 @@
+<?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">
+    
+    <ListPreference
+        app:defaultValue="2"
+        app:entryValues="@array/settings_theme_values"
+        app:key="theme"
+        app:icon="@drawable/ic_outline_color_lens_24dp"
+        app:title="@string/settings_theme_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="amoled_dark"
+        app:title="@string/settings_amoled_dark_title" />
+
+</PreferenceScreen>
\ No newline at end of file