diff --git a/app/src/main/java/com/fox2code/mmm/MainApplication.java b/app/src/main/java/com/fox2code/mmm/MainApplication.java
index c3f4885..ef2f8ac 100644
--- a/app/src/main/java/com/fox2code/mmm/MainApplication.java
+++ b/app/src/main/java/com/fox2code/mmm/MainApplication.java
@@ -235,8 +235,10 @@ public class MainApplication extends FoxApplication implements androidx.work.Con
themeResId = monet ? R.style.Theme_MagiskModuleManager_Monet_Light : R.style.Theme_MagiskModuleManager_Light;
break;
case "transparent_light":
- themeResId = monet ? R.style.Theme_MagiskModuleManager_Transparent_Monet_Light :
- R.style.Theme_MagiskModuleManager_Transparent_Light;
+ if (monet) {
+ Log.w("MainApplication", "Monet is not supported for transparent theme");
+ }
+ themeResId = R.style.Theme_MagiskModuleManager_Transparent_Light;
break;
}
this.setManagerThemeResId(themeResId);
diff --git a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java
index b335035..78af378 100644
--- a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java
+++ b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java
@@ -126,12 +126,19 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
// If transparent theme(s) are set, disable monet
if (themePreference.getValue().equals("transparent_light")) {
if (BuildConfig.DEBUG) {
- Log.d(TAG, "Transparent theme is set, disabling blur");
+ Log.d(TAG, "Transparent theme is set, disabling monet");
}
+ findPreference("pref_enable_monet").setEnabled(false);
+ // Toggle monet off
+ ((TwoStatePreference) findPreference("pref_enable_monet")).setChecked(false);
+ SharedPreferences.Editor editor =
+ getPreferenceManager().getSharedPreferences().edit();
+ editor.putBoolean("pref_enable_monet", false).apply();
+ // Set summary
+ findPreference("pref_enable_monet").setSummary(R.string.monet_disabled_summary);
// Same for blur
findPreference("pref_enable_blur").setEnabled(false);
((TwoStatePreference) findPreference("pref_enable_blur")).setChecked(false);
- SharedPreferences.Editor editor = getPreferenceManager().getSharedPreferences().edit();
editor.putBoolean("pref_enable_blur", false).apply();
findPreference("pref_enable_blur").setSummary(R.string.blur_disabled_summary);
}
@@ -152,8 +159,12 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
// If theme contains "transparent" then disable monet
if (newValue.toString().contains("transparent")) {
if (BuildConfig.DEBUG) {
- Log.d(TAG, "Transparent theme is being set, disabling blur");
+ Log.d(TAG, "Transparent theme is being set, disabling monet");
}
+ findPreference("pref_enable_monet").setEnabled(false);
+ ((TwoStatePreference) findPreference("pref_enable_monet")).setChecked(false);
+ editor.putBoolean("pref_enable_monet", false).apply();
+ findPreference("pref_enable_monet").setSummary(R.string.monet_disabled_summary);
// Same for blur
findPreference("pref_enable_blur").setEnabled(false);
((TwoStatePreference) findPreference("pref_enable_blur")).setChecked(false);
diff --git a/app/src/main/res/values-v26/themes.xml b/app/src/main/res/values-v26/themes.xml
new file mode 100644
index 0000000..048aff5
--- /dev/null
+++ b/app/src/main/res/values-v26/themes.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index b66c825..3bf41aa 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -1,4 +1,4 @@
-
+
-
+