From d40162caa11bbebf5e8fb912c449a5875d14bc08 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 5 Oct 2022 20:57:15 +0300 Subject: [PATCH] disabled auto theme for non milk users --- app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java | 2 +- app/src/main/java/ru/vtosters/lite/utils/Preferences.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 739db1880..bce95fd72 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -203,7 +203,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { addPreferenceCategory(this, AndroidUtils.getString("appearance_theme_use_system")); - if (Build.VERSION.SDK_INT >= 28) { + if (Build.VERSION.SDK_INT >= 28 && milkshake()) { addListPreferenceIcon( this, "currsystemtheme", diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 3ef384808..65c142f92 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -66,7 +66,7 @@ public class Preferences { } public static boolean systemtheme() { - return Build.VERSION.SDK_INT >= 28 && (getPreferences().getString("currsystemtheme", "system").equals("system") || getPreferences().getString("currsystemtheme", "system").isEmpty()); + return Build.VERSION.SDK_INT >= 28 && milkshake() && (getPreferences().getString("currsystemtheme", "system").equals("system") || getPreferences().getString("currsystemtheme", "system").isEmpty()); } public static boolean authorsrecomm() {