diff --git a/app/build.gradle b/app/build.gradle
index 4d527d0..22a55de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,8 +27,8 @@ android {
applicationId "com.fox2code.mmm"
minSdk 21
targetSdk 33
- versionCode 60
- versionName "0.6.8"
+ versionCode 61
+ versionName "1.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.release
}
diff --git a/app/src/main/java/com/fox2code/mmm/MainApplication.java b/app/src/main/java/com/fox2code/mmm/MainApplication.java
index be1fc27..ef2f8ac 100644
--- a/app/src/main/java/com/fox2code/mmm/MainApplication.java
+++ b/app/src/main/java/com/fox2code/mmm/MainApplication.java
@@ -234,6 +234,12 @@ public class MainApplication extends FoxApplication implements androidx.work.Con
case "light":
themeResId = monet ? R.style.Theme_MagiskModuleManager_Monet_Light : R.style.Theme_MagiskModuleManager_Light;
break;
+ case "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);
}
@@ -319,8 +325,7 @@ public class MainApplication extends FoxApplication implements androidx.work.Con
SentryMain.initialize(this);
if (Objects.equals(BuildConfig.ANDROIDACY_CLIENT_ID, "")) {
- Log.w("MainApplication", "Androidacy client id is empty! Please set it in androidacy" +
- ".properties. Will not enable Androidacy.");
+ Log.w("MainApplication", "Androidacy client id is empty! Please set it in androidacy" + ".properties. Will not enable Androidacy.");
SharedPreferences.Editor editor = sharedPreferences.edit();
editor.putBoolean("pref_androidacy_repo_enabled", false);
editor.apply();
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 4466717..70301e6 100644
--- a/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java
+++ b/app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java
@@ -123,6 +123,20 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
return true;
});
ListPreference themePreference = findPreference("pref_theme");
+ // 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 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);
+ }
themePreference.setSummaryProvider(p -> themePreference.getEntry());
themePreference.setOnPreferenceClickListener(p -> {
// You need to reboot your device at least once to be able to access dev-mode
@@ -130,6 +144,26 @@ public class SettingsActivity extends FoxActivity implements LanguageActivity {
return false;
});
themePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+ if (BuildConfig.DEBUG) {
+ Log.d(TAG, "Theme changed, refreshing activity. New value: " + newValue);
+ }
+ // Immediately save
+ SharedPreferences.Editor editor =
+ getPreferenceManager().getSharedPreferences().edit();
+ editor.putString("pref_theme", (String) newValue).apply();
+ // If theme contains "transparent" then disable monet
+ if (newValue.toString().contains("transparent")) {
+ if (BuildConfig.DEBUG) {
+ 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);
+ } else {
+ findPreference("pref_enable_monet").setEnabled(true);
+ findPreference("pref_enable_monet").setSummary(null);
+ }
devModeStep = 0;
UiThreadHandler.handler.postDelayed(() -> {
MainApplication.getINSTANCE().updateTheme();
diff --git a/app/src/main/res/values-cs/arrays.xml b/app/src/main/res/values-cs/arrays.xml
index e425a54..8cff8f1 100644
--- a/app/src/main/res/values-cs/arrays.xml
+++ b/app/src/main/res/values-cs/arrays.xml
@@ -3,6 +3,7 @@
- Dle systému
- Tmavá
- AMOLED Black
+ - Transparent (light)
- Světlá
diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml
index 3df0c29..54da743 100644
--- a/app/src/main/res/values-de/arrays.xml
+++ b/app/src/main/res/values-de/arrays.xml
@@ -4,6 +4,7 @@
- Systemvorgabe
- Dunkel
- AMOLED Black
+ - Transparent (light)
- Hell
diff --git a/app/src/main/res/values-el/arrays.xml b/app/src/main/res/values-el/arrays.xml
index d953610..ac18184 100644
--- a/app/src/main/res/values-el/arrays.xml
+++ b/app/src/main/res/values-el/arrays.xml
@@ -3,6 +3,7 @@
- Προεπιλογή συστήματως
- Σκωτεινό
- AMOLED Black
+ - Transparent (light)
- Ανοιχτό
\ No newline at end of file
diff --git a/app/src/main/res/values-es-rMX/arrays.xml b/app/src/main/res/values-es-rMX/arrays.xml
index 08b4fe0..5248cbd 100644
--- a/app/src/main/res/values-es-rMX/arrays.xml
+++ b/app/src/main/res/values-es-rMX/arrays.xml
@@ -3,6 +3,7 @@
- Sistema
- Oscuro
- AMOLED Black
+ - Transparent (light)
- Claro
\ No newline at end of file
diff --git a/app/src/main/res/values-et/arrays.xml b/app/src/main/res/values-et/arrays.xml
index e27dae9..a509f66 100644
--- a/app/src/main/res/values-et/arrays.xml
+++ b/app/src/main/res/values-et/arrays.xml
@@ -3,6 +3,7 @@
- Süsteem
- Tume
- AMOLED Black
+ - Transparent (light)
- Hele
diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml
index f9319ba..b407b43 100644
--- a/app/src/main/res/values-fr/arrays.xml
+++ b/app/src/main/res/values-fr/arrays.xml
@@ -3,6 +3,7 @@
- Système
- Sombre
- AMOLED Black
+ - Transparent (light)
- Clair
diff --git a/app/src/main/res/values-id/arrays.xml b/app/src/main/res/values-id/arrays.xml
index e9685f6..944a65e 100644
--- a/app/src/main/res/values-id/arrays.xml
+++ b/app/src/main/res/values-id/arrays.xml
@@ -3,6 +3,7 @@
- Sistem
- Gelap
- AMOLED Black
+ - Transparent (light)
- Terang
diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml
index d43a2c2..30a7657 100644
--- a/app/src/main/res/values-it/arrays.xml
+++ b/app/src/main/res/values-it/arrays.xml
@@ -3,6 +3,7 @@
- Sistema
- Scuro
- AMOLED Black
+ - Transparent (light)
- Chiaro
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml
index fa16044..8229c0d 100644
--- a/app/src/main/res/values-ja/arrays.xml
+++ b/app/src/main/res/values-ja/arrays.xml
@@ -3,6 +3,7 @@
- システムの設定を使用
- ダーク
- AMOLED Black
+ - Transparent (light)
- ライト
diff --git a/app/src/main/res/values-pl/arrays.xml b/app/src/main/res/values-pl/arrays.xml
index f97f095..273c086 100644
--- a/app/src/main/res/values-pl/arrays.xml
+++ b/app/src/main/res/values-pl/arrays.xml
@@ -3,6 +3,7 @@
- Zgodny z systemem
- Ciemny
- AMOLED Black
+ - Transparent (light)
- Jasny
diff --git a/app/src/main/res/values-pt-rBR/arrays.xml b/app/src/main/res/values-pt-rBR/arrays.xml
index 9478cc2..b52106b 100644
--- a/app/src/main/res/values-pt-rBR/arrays.xml
+++ b/app/src/main/res/values-pt-rBR/arrays.xml
@@ -3,6 +3,7 @@
- Sistema
- Escuro
- AMOLED Black
+ - Transparent (light)
- Claro
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/arrays.xml b/app/src/main/res/values-ro/arrays.xml
index d8b9b1b..a0a80e8 100644
--- a/app/src/main/res/values-ro/arrays.xml
+++ b/app/src/main/res/values-ro/arrays.xml
@@ -5,6 +5,7 @@
- Sistem
- Întunecată
- AMOLED Black
+ - Transparent (light)
- Luminoasă
diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml
index 7829b4e..050de99 100644
--- a/app/src/main/res/values-ru/arrays.xml
+++ b/app/src/main/res/values-ru/arrays.xml
@@ -3,6 +3,7 @@
- Как в системе
- Тёмная
- AMOLED Black
+ - Transparent (light)
- Светлая
diff --git a/app/src/main/res/values-sk/arrays.xml b/app/src/main/res/values-sk/arrays.xml
index e32d923..c9dafec 100644
--- a/app/src/main/res/values-sk/arrays.xml
+++ b/app/src/main/res/values-sk/arrays.xml
@@ -3,6 +3,7 @@
- Podľa systému
- Tmavá
- AMOLED Black
+ - Transparent (light)
- Svetlá
diff --git a/app/src/main/res/values-tr/arrays.xml b/app/src/main/res/values-tr/arrays.xml
index 8ba5628..cdfda29 100644
--- a/app/src/main/res/values-tr/arrays.xml
+++ b/app/src/main/res/values-tr/arrays.xml
@@ -3,6 +3,7 @@
- Sistem
- Koyu
- AMOLED Black
+ - Transparent (light)
- Açık
\ No newline at end of file
diff --git a/app/src/main/res/values-vi/arrays.xml b/app/src/main/res/values-vi/arrays.xml
index 4e9f521..96fa5c1 100644
--- a/app/src/main/res/values-vi/arrays.xml
+++ b/app/src/main/res/values-vi/arrays.xml
@@ -4,6 +4,7 @@
- Hệ thống
- Tối
- AMOLED Black
+ - Transparent (light)
- Sáng
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
index ae31af5..d4d5e1a 100644
--- a/app/src/main/res/values-zh-rCN/arrays.xml
+++ b/app/src/main/res/values-zh-rCN/arrays.xml
@@ -1,8 +1,9 @@
-
+
- 跟随系统
- 深色模式
- 纯黑模式
+ - Transparent (light)
- 明亮模式
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
index 9924124..c7c54c4 100644
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -3,6 +3,7 @@
- 跟隨系統
- 深色主題
- AMOLED Black
+ - Transparent (light)
- 淺色主題
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 7b7a182..90b1dfa 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,9 +1,12 @@
+
- system
- dark
- black
+ - transparent_light
+
- light
@@ -11,6 +14,7 @@
- System
- Dark
- AMOLED Black
+ - Transparent (light)
- Light
Don't prompt again
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index abf3c1b..bba070e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -199,4 +199,5 @@
Download full version
Some repos have failed to update
Update of %1$s failed. Please try again later.
+ Monet has been disabled because it causes issues with transparent themes. Please choose another theme to enable monet.