From 95db18de9a0def9f743393ca6d52509dfb62c147 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Sat, 2 May 2020 19:55:34 +0400
Subject: [PATCH] removed theme settings for android 6 and lower

---
 app/src/main/AndroidManifest.xml              |  3 +--
 .../manager/ui/fragments/SettingsFragment.kt  |  9 +++++++
 app/src/main/res/xml/preferences.xml          | 26 +++++--------------
 app/src/main/res/xml/theme_preference.xml     | 21 +++++++++++++++
 4 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/xml/theme_preference.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1abbdfe7..a2845d44 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,8 +31,7 @@
         </activity>
         <activity
             android:name=".ui.MainActivity"
-            android:label="@string/app_name"
-            android:theme="@style/LightTheme"/>
+            android:label="@string/app_name" />
 
         <meta-data
             android:name="preloaded_fonts"
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
index 4139043d..0bea3720 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
@@ -1,6 +1,7 @@
 package com.vanced.manager.ui.fragments
 
 import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
@@ -15,6 +16,14 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
+
+        //Fuck Android 6 and 5 users! Because theme is not working
+        //we can't display preference for them.
+        // They should've upgraded to something newer
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            setPreferencesFromResource(R.xml.theme_preference, rootKey)
+        }
+
         activity?.title = getString(R.string.title_settings)
         setHasOptionsMenu(true)
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 79906cc6..8ebdbf29 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,35 +3,21 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <Preference
-        android:key="update_check"
-        android:title="@string/check_updates"
-        android:icon="@drawable/ic_cloud_upload_black_24dp"/>
-
-    <PreferenceCategory
-        android:title="@string/category_interface"
-        app:iconSpaceReserved="false">
-
-        <ListPreference
-            android:icon="@drawable/ic_brush_black_24dp"
-            android:key="theme_mode"
-            android:title="@string/theme"
-            android:summary="@string/theme_summary"
-            android:entries="@array/theme_modes"
-            android:entryValues="@array/theme_modes_values"
-            android:defaultValue="LIGHT"/>
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:title="@string/category_manager"
         app:iconSpaceReserved="false">
 
+        <Preference
+            android:key="update_check"
+            android:title="@string/check_updates"
+            android:icon="@drawable/ic_cloud_upload_black_24dp"/>
+
         <SwitchPreference
             android:title="@string/push_notifications"
             android:key="push_notifications_status"
             android:summary="@string/push_notifications_summary"
             android:icon="@drawable/ic_notifications_black_24dp"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/theme_preference.xml b/app/src/main/res/xml/theme_preference.xml
new file mode 100644
index 00000000..c0c4c0ea
--- /dev/null
+++ b/app/src/main/res/xml/theme_preference.xml
@@ -0,0 +1,21 @@
+<?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">
+
+    <PreferenceCategory
+        android:title="@string/category_interface"
+        app:iconSpaceReserved="false">
+
+        <ListPreference
+            android:icon="@drawable/ic_brush_black_24dp"
+            android:key="theme_mode"
+            android:title="@string/theme"
+            android:summary="@string/theme_summary"
+            android:entries="@array/theme_modes"
+            android:entryValues="@array/theme_modes_values"
+            android:defaultValue="LIGHT"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file