From c6a29636955ab3d2d7b2a6104dba2fc5637659a7 Mon Sep 17 00:00:00 2001
From: androidacy-user <opensource@androidacy.com>
Date: Sat, 29 Apr 2023 12:30:12 -0400
Subject: [PATCH] (misc) tweak UI

Signed-off-by: androidacy-user <opensource@androidacy.com>
---
 app/build.gradle.kts                          |  2 +-
 .../mmm/installer/InstallerInitializer.java   | 19 +++++++++++++-----
 app/src/main/res/layout/module_entry.xml      |  4 ++--
 app/src/main/res/values-v31/colors.xml        |  1 +
 app/src/main/res/values-v31/themes.xml        | 13 +++++++-----
 app/src/main/res/values/colors.xml            |  2 ++
 app/src/main/res/values/themes.xml            | 20 +++++++++----------
 7 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 80507d8..d076db6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -38,7 +38,7 @@ android {
         applicationId = "com.fox2code.mmm"
         minSdk = 24
         targetSdk = 33
-        versionCode = 67
+        versionCode = 68
         versionName = "2.0.1"
         vectorDrawables {
             useSupportLibrary = true
diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java
index 7106dbd..e772fbb 100644
--- a/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java
+++ b/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java
@@ -109,17 +109,26 @@ public class InstallerInitializer extends Shell.Initializer {
     private static String tryGetMagiskPath(boolean forceCheck) {
         String MAGISK_PATH = InstallerInitializer.MAGISK_PATH;
         int MAGISK_VERSION_CODE;
-        boolean HAS_RAMDISK = InstallerInitializer.HAS_RAMDISK;
+        boolean HAS_RAMDISK;
         if (MAGISK_PATH != null && !forceCheck) return MAGISK_PATH;
         ArrayList<String> output = new ArrayList<>();
         if (!Shell.cmd("magisk -V", "magisk --path").to(output).exec().isSuccess()) {
-            if (output.size() != 0) {
-                HAS_RAMDISK = "false".equals(output.get(0)) || "true".equalsIgnoreCase(System.getProperty("ro.build.ab_update"));
+            // log the output of each command
+            if (output.size() > 0) {
+                for (String line : output) {
+                    Timber.w("Could not run magisk: %s", line);
+                }
+            } else {
+                Timber.w("Could not run magisk");
             }
-            InstallerInitializer.HAS_RAMDISK = HAS_RAMDISK;
             return null;
         }
-        MAGISK_PATH = output.size() < 2 ? "" : output.get(1);
+        if (output.size() != 2) {
+            return null;
+        }
+        HAS_RAMDISK = "true".equalsIgnoreCase(System.getProperty("ro.build.ab_update"));
+        InstallerInitializer.HAS_RAMDISK = HAS_RAMDISK;
+        MAGISK_PATH = output.get(1);
         Timber.i("Magisk runtime path: %s", MAGISK_PATH);
         MAGISK_VERSION_CODE = Integer.parseInt(output.get(0));
         Timber.i("Magisk version code: %s", MAGISK_VERSION_CODE);
diff --git a/app/src/main/res/layout/module_entry.xml b/app/src/main/res/layout/module_entry.xml
index 264f306..424c279 100644
--- a/app/src/main/res/layout/module_entry.xml
+++ b/app/src/main/res/layout/module_entry.xml
@@ -14,9 +14,9 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/card_view"
-        style="?attr/materialCardViewElevatedStyle"
+        style="@style/Widget.Material3.CardView.Elevated"
         android:layout_width="match_parent"
-        android:padding="0dp"
+        android:padding="1dp"
         android:layout_height="wrap_content">
 
         <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
index 04caa4a..8dccdf5 100644
--- a/app/src/main/res/values-v31/colors.xml
+++ b/app/src/main/res/values-v31/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="gray_200">#C8C8C8</color>
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 75d49ac..f88236b 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -1,10 +1,10 @@
 <resources>
 
     <style name="Theme.MagiskModuleManager.Monet.Light" parent="Theme.Material3.DynamicColors.Light">
-        <item name="android:statusBarColor">@color/status_bar_color</item>
-        <item name="colorBackgroundFloating">@color/system_accent2_10</item>
+        <item name="android:statusBarColor">@color/status_bar_color_light</item>
+        <item name="colorBackgroundFloating">@color/system_accent1_50</item>
         <item name="android:windowBackground">@color/system_neutral1_10</item>
-        <item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
+        <item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
         <!-- fix bottom navigation bar color -->
         <item name="android:navigationBarColor">@color/system_accent2_100</item>
         <!-- fonts -->
@@ -14,6 +14,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
     </style>
 
     <style name="Widget.Material3.Chip.Choice.Light" parent="Widget.Material3.Chip.Assist">
@@ -26,7 +27,7 @@
         <item name="android:statusBarColor">@color/status_bar_color</item>
         <item name="colorBackgroundFloating">@color/system_neutral1_800</item>
         <item name="android:windowBackground">@color/system_neutral1_900</item>
-        <item name="chipStyle">@style/Widget.Material3.Chip.Choice.Dark</item>
+        <item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
         <!-- fonts -->
         <item name="android:fontFamily">@font/inter</item>
         <item name="font">@font/inter</item>
@@ -34,6 +35,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
     </style>
 
     <!-- Black monet theme, which is just dark monet theme with black background -->
@@ -52,7 +54,7 @@
         <item name="chipBackgroundColor">@color/system_accent2_700</item>
         <item name="chipSurfaceColor">@color/system_accent2_700</item>
         <!-- chips should be dark, not black -->
-        <item name="chipStyle">@style/Widget.Material.Chip.Choice.Black</item>
+        <item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
         <!-- fonts -->
         <item name="android:fontFamily">@font/inter</item>
         <item name="font">@font/inter</item>
@@ -60,6 +62,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
+        <item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
     </style>
 
     <style name="Widget.Material3.Chip.Choice.Dark" parent="Widget.Material3.Chip.Assist">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 564a867..75f50f3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="gray_200">#C8C8C8</color>
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
@@ -14,6 +15,7 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="status_bar_color">@color/black_transparent</color>
+    <color name="status_bar_color_light">@color/white_transparent</color>
     <color name="module_holder_div">@color/black_transparent</color>
     <!-- Icon -->
     <color name="launcher_icon_background">#FF9B08</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a533090..e45851b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -24,11 +24,10 @@
         <item name="android:activityCloseExitAnimation">@*android:anim/slide_out_right</item> -->
         <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/card_corner_radius</item>
-        <item name="dialogCornerRadius">@dimen/card_corner_radius</item>
         <item name="colorBackgroundFloating">@color/light_colorBackgroundFloating</item>
         <item name="backgroundColor">@color/light_backgroundColor</item>
-        <item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
+        <item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
+        <item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
         <!-- fonts -->
         <item name="android:fontFamily">@font/inter</item>
         <item name="font">@font/inter</item>
@@ -58,10 +57,10 @@
         <item name="android:textColor">@color/white</item>
         <item name="titleTextColor">@color/white</item>
         <!-- Fix action bar padding in transparent theme -->
-        <item name="android:actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
+        <item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
         <!-- Action bar -->
-        <item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
-        <item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
+        <item name="actionBarStyle">@style/Theme.Design.NoActionBar</item>
+        <item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
         <!-- fonts -->
         <item name="android:fontFamily">@font/inter</item>
         <item name="font">@font/inter</item>
@@ -95,10 +94,9 @@
         <item name="android:activityCloseExitAnimation">@*android:anim/slide_out_right</item> -->
         <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/card_corner_radius</item>
-        <item name="dialogCornerRadius">@dimen/card_corner_radius</item>
         <item name="colorBackgroundFloating">@color/dark_colorBackgroundFloating</item>
         <item name="backgroundColor">@color/dark_backgroundColor</item>
+        <item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
         <!-- fonts -->
         <item name="android:fontFamily">@font/inter</item>
         <item name="font">@font/inter</item>
@@ -110,10 +108,9 @@
 
     <!-- Black theme, which is just a dark theme with a black background -->
     <style name="Theme.MagiskModuleManager.Black" parent="Theme.MagiskModuleManager.Dark">
-        <item name="colorBackgroundFloating">@color/black</item>
+        <item name="colorBackgroundFloating">@color/gray_900</item>
         <item name="android:windowBackground">@color/black</item>
         <item name="boxBackgroundColor">@color/black</item>
-        <item name="cardBackgroundColor">@color/black</item>
         <item name="backgroundColor">@color/black</item>
         <item name="colorSurface">@color/black</item>
         <!-- Darker variants of the colors -->
@@ -127,7 +124,8 @@
         <item name="android:colorForeground">@color/white</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <!-- chips should be dark, not black -->
-        <item name="chipStyle">@style/Widget.Material.Chip.Choice.Dark</item>
+        <item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
+        <item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
         <!-- fonts -->
         <item name="android:fontFamily">@font/inter</item>
         <item name="font">@font/inter</item>