From 60dcb4fb87126a68ff691b7686ea876b1e0b3a0f Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 19 Feb 2023 15:38:57 +0300 Subject: [PATCH] fixes --- app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java | 3 ++- .../java/ru/vtosters/lite/ui/fragments/ThemesFragment.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java b/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java index fffbd7985..8514dc689 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java +++ b/app/src/main/java/ru/vtosters/lite/themes/ThemesManager.java @@ -8,6 +8,7 @@ import com.vtosters.lite.R; import ru.vtosters.lite.themes.loaders.ResourcesLoader; import ru.vtosters.lite.themes.utils.ArscEditor; import ru.vtosters.lite.utils.IOUtils; +import ru.vtosters.lite.utils.ThemesUtils; import java.io.*; import java.util.zip.ZipEntry; @@ -128,7 +129,7 @@ public class ThemesManager { Log.d("ThemesManager", "init paths"); initPaths(app); - if(hasTmpArchive()) { + if(hasTmpArchive() && !ThemesUtils.isMonetTheme()) { ResourcesLoader.init(app); ResourcesLoader.load(app, resTmpZipFile.getAbsolutePath(), assetsZipFile.getAbsolutePath(), false); } 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 8b9b79a89..5f199e407 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 @@ -127,7 +127,7 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment { newsfeedNotificationsPreference.setVisible(Preferences.milkshake()); - findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme() && ThemesUtils.isMilkshake()); + findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme()); var wp = findPreference("wallpapers"); wp.setIcon(recolorDrawable(getGlobalContext().getDrawable(R.drawable.ic_media_outline_28)));