From d817ccd292b68a6204abb5b1a6b5f3e06c692a21 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 25 Dec 2022 16:03:31 +0300 Subject: [PATCH] disabled monet for nonmilk --- .../java/ru/vtosters/lite/ui/fragments/ThemesFragment.java | 2 ++ app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java index d536ed17d..0a7513c6e 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java @@ -94,6 +94,8 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment { findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme()); + findPreference("monettheme").setVisible(!ThemesUtils.isMilkshake()); // TODO make nonmilk monet theme better that sh*t + if (AndroidUtils.isTablet()) { PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett"); dockbarSettingsPreferenceCategory.setVisible(false); diff --git a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java index d8bce00d0..fe550f8fc 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java @@ -93,7 +93,8 @@ public class ThemesUtils { } public static boolean isMonetTheme() { - return getBoolValue("monettheme", false) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S; + return getBoolValue("monettheme", false) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S + && isMilkshake(); // TODO make nonmilk monet theme better that sh*t } public static boolean isAmoledTheme() {