Rework card, add core to disable monet theme

Fix dark terminal option is enable able while the system dark mode is active

Author: DerGoogler

app/src/main/java/com/fox2code/mmm/MainApplication.java

@@ -116,6 +116,10 @@ public static boolean isDohEnabled() {
         return getSharedPreferences().getBoolean("pref_dns_over_https", true);
     }
 
+    public static boolean isMonetEnabled() {
+        return getSharedPreferences().getBoolean("pref_enable_monet", false);
+    }
+
     public static boolean isBlurEnabled() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
                 getSharedPreferences().getBoolean("pref_enable_blur", false);
@@ -282,7 +286,9 @@ public boolean isLightTheme() {
     public void onCreate() {
         super.onCreate();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            DynamicColors.applyToActivitiesIfAvailable(this);
+            if (MainApplication.isMonetEnabled()) {
+                DynamicColors.applyToActivitiesIfAvailable(this);
+            }
         }
         SharedPreferences sharedPreferences = MainApplication.getSharedPreferences();
         // We are only one process so it's ok to do this

app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java

@@ -10,6 +10,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
@@ -71,6 +72,7 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
         private final TextView titleText;
         private final TextView creditText;
         private final TextView descriptionText;
+        private final LinearLayout moduleOptionsHolder;
         private final TextView updateText;
         private final Chip[] actionsButtons;
         private final ArrayList<ActionButtonType> actionButtonsTypes;
@@ -87,6 +89,7 @@ public ViewHolder(@NonNull View itemView) {
             this.titleText = itemView.findViewById(R.id.title_text);
             this.creditText = itemView.findViewById(R.id.credit_text);
             this.descriptionText = itemView.findViewById(R.id.description_text);
+            this.moduleOptionsHolder = itemView.findViewById(R.id.module_options_holder);
             this.updateText = itemView.findViewById(R.id.updated_text);
             this.actionsButtons = new Chip[6];
             this.actionsButtons[0] = itemView.findViewById(R.id.button_action1);
@@ -182,6 +185,7 @@ public boolean update(ModuleHolder moduleHolder) {
                     this.switchMaterial.setVisibility(View.GONE);
                 }
                 this.creditText.setVisibility(View.VISIBLE);
+                this.moduleOptionsHolder.setVisibility(View.VISIBLE);
                 this.descriptionText.setVisibility(View.VISIBLE);
 
                 ModuleInfo moduleInfo = moduleHolder.getMainModuleInfo();

app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java

@@ -1,5 +1,6 @@
 package com.fox2code.mmm.settings;
 
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.widget.Toast;
@@ -82,11 +83,12 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 enableBlur.setEnabled(false);
             }
 
-            Preference disableMonet = findPreference("pref_disable_monet");
+            Preference disableMonet = findPreference("pref_enable_monet");
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
                 disableMonet.setSummary(R.string.require_android_12);
                 disableMonet.setEnabled(false);
             }
+
             Preference forceEnglish = findPreference("pref_force_english");
             forceEnglish.setOnPreferenceChangeListener((preference, newValue) -> {
                 CompatThemeWrapper compatThemeWrapper =
@@ -104,8 +106,18 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 Http.setDoh((Boolean) v);
                 return true;
             });
-            if ("dark".equals(themePreference.getValue())) {
-                findPreference("pref_force_dark_terminal").setEnabled(false);
+
+            int nightModeFlags =
+                    getContext().getResources().getConfiguration().uiMode &
+                            Configuration.UI_MODE_NIGHT_MASK;
+            switch (nightModeFlags) {
+                case Configuration.UI_MODE_NIGHT_YES:
+                    findPreference("pref_force_dark_terminal").setEnabled(false);
+                    break;
+                case Configuration.UI_MODE_NIGHT_NO:
+                case Configuration.UI_MODE_NIGHT_UNDEFINED:
+                    findPreference("pref_force_dark_terminal").setEnabled(true);
+                    break;
             }
             if (!MainApplication.isDeveloper()) {
                 findPreference("pref_disable_low_quality_module_filter").setVisible(false);