From 8b69bdd30d56fafb72f0bd2658fba009009359bf Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Wed, 3 Feb 2021 20:59:23 +0800
Subject: [PATCH] Allow turning off black dark theme when md2 enabled (#61)

---
 .../lsposed/manager/ui/activity/BaseActivity.java      |  4 ++--
 .../lsposed/manager/ui/activity/SettingsActivity.java  |  4 ----
 app/src/main/res/values-night/styles.xml               | 10 ++++++++++
 app/src/main/res/values/attrs.xml                      |  1 -
 app/src/main/res/values/styles.xml                     |  2 --
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java
index e2e8d157..0b85cdc1 100644
--- a/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java
+++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/BaseActivity.java
@@ -44,7 +44,7 @@ public class BaseActivity extends AppCompatActivity {
     }
 
     public static boolean isBlackNightTheme() {
-        return preferences.getBoolean("black_dark_theme", false) || preferences.getBoolean("md2", true);
+        return preferences.getBoolean("black_dark_theme", false);
     }
 
     public String getTheme(Context context) {
@@ -107,7 +107,7 @@ public class BaseActivity extends AppCompatActivity {
         if (coreVersionStr != null) {
             Version managerVersion = new Version(BuildConfig.VERSION_NAME);
             Version coreVersion = new Version(coreVersionStr);
-            if (managerVersion.equals(coreVersion)) {
+            if (!managerVersion.equals(coreVersion)) {
                 new MaterialAlertDialogBuilder(this)
                         .setMessage(R.string.outdated_manager)
                         .setPositiveButton(R.string.ok, (dialog, id) -> {
diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java
index 4a803c2f..84e5f369 100644
--- a/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java
+++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/SettingsActivity.java
@@ -251,10 +251,6 @@ public class SettingsActivity extends BaseActivity {
         }
 
         private void updatePreference(boolean show) {
-            Preference black_dark_theme = findPreference("black_dark_theme");
-            if (black_dark_theme != null) {
-                black_dark_theme.setVisible(show);
-            }
             Preference transparent_status_bar = findPreference("transparent_status_bar");
             if (transparent_status_bar != null) {
                 transparent_status_bar.setVisible(show);
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index e48cb3fc..f79b5d52 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,4 +1,14 @@
 <resources>
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Dark" />
+
+    <style name="ThemeOverlay.Md2">
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorActionBar">@color/colorPrimaryDark</item>
+        <item name="android:colorBackground">@color/colorPrimaryDark</item>
+        <item name="android:windowBackground">@color/colorPrimaryDark</item>
+        <item name="listItemBackground">@drawable/item_background_md2</item>
+        <item name="roundBackground">@drawable/item_background_md2</item>
+        <item name="liftOnScroll">true</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a753f01f..085c329a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -4,7 +4,6 @@
     <attr name="listItemBackground" format="reference" />
     <attr name="roundBackground" format="reference" />
     <attr name="actionBarTheme" format="reference" />
-    <attr name="modulesHorizontalPadding" format="dimension" />
     <attr name="actionBarPopupTheme" format="reference" />
     <attr name="tabLayoutTheme" format="reference" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 88c55ab1..99d968c6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,6 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorActionBar">@color/colorActionBar</item>
-        <item name="modulesHorizontalPadding">8dp</item>
         <item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>
         <item name="android:colorBackground">@color/colorBackground</item>
         <item name="android:windowBackground">@color/colorBackground</item>
@@ -60,7 +59,6 @@
         <item name="colorActionBar">@color/colorActionBar_md2</item>
         <item name="android:colorBackground">@color/colorBackground_md2</item>
         <item name="android:windowBackground">@color/colorBackground_md2</item>
-        <item name="modulesHorizontalPadding">16dp</item>
         <item name="listItemBackground">@drawable/item_background_md2</item>
         <item name="roundBackground">@drawable/item_background_md2</item>
         <item name="liftOnScroll">true</item>