From 056d88955e92762c8a6aa9ddf0158530f739641b Mon Sep 17 00:00:00 2001
From: androidacy-user <opensource@androidacy.com>
Date: Fri, 9 Dec 2022 15:27:13 -0500
Subject: [PATCH] Bump version and add new(ish) theme

We feel this is stable enough to warrant a 1.x release so here's the version bump

Signed-off-by: androidacy-user <opensource@androidacy.com>
---
 app/build.gradle                              |  4 +--
 .../com/fox2code/mmm/MainApplication.java     |  9 +++--
 .../mmm/settings/SettingsActivity.java        | 34 +++++++++++++++++++
 app/src/main/res/values-cs/arrays.xml         |  1 +
 app/src/main/res/values-de/arrays.xml         |  1 +
 app/src/main/res/values-el/arrays.xml         |  1 +
 app/src/main/res/values-es-rMX/arrays.xml     |  1 +
 app/src/main/res/values-et/arrays.xml         |  1 +
 app/src/main/res/values-fr/arrays.xml         |  1 +
 app/src/main/res/values-id/arrays.xml         |  1 +
 app/src/main/res/values-it/arrays.xml         |  1 +
 app/src/main/res/values-ja/arrays.xml         |  1 +
 app/src/main/res/values-pl/arrays.xml         |  1 +
 app/src/main/res/values-pt-rBR/arrays.xml     |  1 +
 app/src/main/res/values-ro/arrays.xml         |  1 +
 app/src/main/res/values-ru/arrays.xml         |  1 +
 app/src/main/res/values-sk/arrays.xml         |  1 +
 app/src/main/res/values-tr/arrays.xml         |  1 +
 app/src/main/res/values-vi/arrays.xml         |  1 +
 app/src/main/res/values-zh-rCN/arrays.xml     |  3 +-
 app/src/main/res/values-zh-rTW/arrays.xml     |  1 +
 app/src/main/res/values/arrays.xml            |  4 +++
 app/src/main/res/values/strings.xml           |  1 +
 23 files changed, 67 insertions(+), 5 deletions(-)

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 @@
         <item>Dle systému</item>
         <item>Tmavá</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Světlá</item>
     </string-array>
 </resources>
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 @@
 		<item>Systemvorgabe</item>
 		<item>Dunkel</item>
 		<item>AMOLED Black</item>
+		<item>Transparent (light)</item>
 		<item>Hell</item>
 	</string-array>
 </resources>
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 @@
         <item>Προεπιλογή συστήματως</item>
         <item>Σκωτεινό</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Ανοιχτό</item>
     </string-array>
 </resources>
\ 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 @@
         <item>Sistema</item>
         <item>Oscuro</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Claro</item>
     </string-array>
 </resources>
\ 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 @@
         <item>Süsteem</item>
         <item>Tume</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Hele</item>
     </string-array>
 </resources>
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 @@
         <item>Système</item>
         <item>Sombre</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Clair</item>
     </string-array>
 </resources>
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 @@
         <item>Sistem</item>
         <item>Gelap</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Terang</item>
     </string-array>
 </resources>
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 @@
         <item>Sistema</item>
         <item>Scuro</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Chiaro</item>
     </string-array>
 </resources>
\ 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 @@
         <item>システムの設定を使用</item>
         <item>ダーク</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>ライト</item>
     </string-array>
 </resources>
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 @@
         <item comment="theme_values_names">Zgodny z systemem</item>
         <item comment="theme_values_names">Ciemny</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item comment="theme_values_names">Jasny</item>
     </string-array>
 </resources>
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 @@
         <item>Sistema</item>
         <item>Escuro</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Claro</item>
     </string-array>
 </resources>
\ 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 @@
         <item>Sistem</item>
         <item>Întunecată</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Luminoasă</item>
     </string-array>
 </resources>
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 @@
         <item>Как в системе</item>
         <item>Тёмная</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Светлая</item>
     </string-array>
 </resources>
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 @@
         <item>Podľa systému</item>
         <item>Tmavá</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Svetlá</item>
     </string-array>
 </resources>
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 @@
         <item>Sistem</item>
         <item>Koyu</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Açık</item>
     </string-array>
 </resources>
\ 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 @@
         <item>Hệ thống</item>
         <item>Tối</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Sáng</item>
     </string-array>
 </resources>
\ 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 @@
 <resources>
-<string-array name="theme_values_names">
+    <string-array name="theme_values_names">
         <item>跟随系统</item>
         <item>深色模式</item>
         <item>纯黑模式</item>
+        <item>Transparent (light)</item>
         <item>明亮模式</item>
     </string-array>
 </resources>
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 @@
         <item>跟隨系統</item>
         <item>深色主題</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>淺色主題</item>
     </string-array>
 </resources>
\ 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 @@
 <resources>
     <!-- If translating, please remove "theme_values" -->
+    <!-- Transparent dark theme has, erm, issues -->
     <string-array name="theme_values" translatable="false">
         <item>system</item>
         <item>dark</item>
         <item>black</item>
+        <item>transparent_light</item>
+        <!-- <item>transparent_dark</item> -->
         <item>light</item>
     </string-array>
 
@@ -11,6 +14,7 @@
         <item>System</item>
         <item>Dark</item>
         <item>AMOLED Black</item>
+        <item>Transparent (light)</item>
         <item>Light</item>
     </string-array>
     <string-array name="permission_notification_dont_ask_again">Don't prompt again</string-array>
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 @@
     <string name="download_full_app">Download full version</string>
     <string name="repo_update_failed">Some repos have failed to update</string>
     <string name="repo_update_failed_extended">Update of %1$s failed. Please try again later.</string>
+    <string name="monet_disabled_summary">Monet has been disabled because it causes issues with transparent themes. Please choose another theme to enable monet.</string>
 </resources>