From a90d96b00f0e9d097e76d186b9c4072c365ce957 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 26 Dec 2022 12:14:25 +0300 Subject: [PATCH] disabled accents in nonmilk + enabled monet for nonmilk --- .../java/ru/vtosters/lite/ui/fragments/ThemesFragment.java | 4 +--- app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) 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 f419d937f..8f2ed45d8 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 @@ -92,9 +92,7 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment { newsfeedNotificationsPreference.setVisible(Preferences.milkshake()); - findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme()); - - findPreference("monettheme").setVisible(ThemesUtils.isMilkshake()); // TODO make nonmilk monet theme better that sh*t + findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme() && ThemesUtils.isMilkshake()); if (AndroidUtils.isTablet()) { PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett"); 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 2c53f1d2d..695c9c9c9 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java @@ -93,8 +93,7 @@ public class ThemesUtils { } public static boolean isMonetTheme() { - return getBoolValue("monettheme", false) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S - && isMilkshake(); // TODO make nonmilk monet theme better that sh*t + return getBoolValue("monettheme", false) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S; } public static boolean isAmoledTheme() {