Skip to content

Commit c6a2963

Browse files
androidacy-userandroidacy-user
committed
(misc) tweak UI
Signed-off-by: androidacy-user <opensource@androidacy.com>
1 parent b9b4b6d commit c6a2963

7 files changed

Lines changed: 37 additions & 24 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
applicationId = "com.fox2code.mmm"
3939
minSdk = 24
4040
targetSdk = 33
41-
versionCode = 67
41+
versionCode = 68
4242
versionName = "2.0.1"
4343
vectorDrawables {
4444
useSupportLibrary = true

‎app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,26 @@ public void run() {
109109
private static String tryGetMagiskPath(boolean forceCheck) {
110110
String MAGISK_PATH = InstallerInitializer.MAGISK_PATH;
111111
int MAGISK_VERSION_CODE;
112-
boolean HAS_RAMDISK = InstallerInitializer.HAS_RAMDISK;
112+
boolean HAS_RAMDISK;
113113
if (MAGISK_PATH != null && !forceCheck) return MAGISK_PATH;
114114
ArrayList<String> output = new ArrayList<>();
115115
if (!Shell.cmd("magisk -V", "magisk --path").to(output).exec().isSuccess()) {
116-
if (output.size() != 0) {
117-
HAS_RAMDISK = "false".equals(output.get(0)) || "true".equalsIgnoreCase(System.getProperty("ro.build.ab_update"));
116+
// log the output of each command
117+
if (output.size() > 0) {
118+
for (String line : output) {
119+
Timber.w("Could not run magisk: %s", line);
120+
}
121+
} else {
122+
Timber.w("Could not run magisk");
118123
}
119-
InstallerInitializer.HAS_RAMDISK = HAS_RAMDISK;
120124
return null;
121125
}
122-
MAGISK_PATH = output.size() < 2 ? "" : output.get(1);
126+
if (output.size() != 2) {
127+
return null;
128+
}
129+
HAS_RAMDISK = "true".equalsIgnoreCase(System.getProperty("ro.build.ab_update"));
130+
InstallerInitializer.HAS_RAMDISK = HAS_RAMDISK;
131+
MAGISK_PATH = output.get(1);
123132
Timber.i("Magisk runtime path: %s", MAGISK_PATH);
124133
MAGISK_VERSION_CODE = Integer.parseInt(output.get(0));
125134
Timber.i("Magisk version code: %s", MAGISK_VERSION_CODE);

‎app/src/main/res/layout/module_entry.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
<com.google.android.material.card.MaterialCardView
1616
android:id="@+id/card_view"
17-
style="?attr/materialCardViewElevatedStyle"
17+
style="@style/Widget.Material3.CardView.Elevated"
1818
android:layout_width="match_parent"
19-
android:padding="0dp"
19+
android:padding="1dp"
2020
android:layout_height="wrap_content">
2121

2222
<androidx.constraintlayout.widget.ConstraintLayout

‎app/src/main/res/values-v31/colors.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<color name="gray_200">#C8C8C8</color>
34
<color name="purple_200">#FFBB86FC</color>
45
<color name="purple_500">#FF6200EE</color>
56
<color name="purple_700">#FF3700B3</color>

‎app/src/main/res/values-v31/themes.xml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<resources>
22

33
<style name="Theme.MagiskModuleManager.Monet.Light" parent="Theme.Material3.DynamicColors.Light">
4-
<item name="android:statusBarColor">@color/status_bar_color</item>
5-
<item name="colorBackgroundFloating">@color/system_accent2_10</item>
4+
<item name="android:statusBarColor">@color/status_bar_color_light</item>
5+
<item name="colorBackgroundFloating">@color/system_accent1_50</item>
66
<item name="android:windowBackground">@color/system_neutral1_10</item>
7-
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
7+
<item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
88
<!-- fix bottom navigation bar color -->
99
<item name="android:navigationBarColor">@color/system_accent2_100</item>
1010
<!-- fonts -->
@@ -14,6 +14,7 @@
1414
<item name="windowNoTitle">true</item>
1515
<item name="android:windowActionBar">false</item>
1616
<item name="android:windowNoTitle">true</item>
17+
<item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
1718
</style>
1819

1920
<style name="Widget.Material3.Chip.Choice.Light" parent="Widget.Material3.Chip.Assist">
@@ -26,14 +27,15 @@
2627
<item name="android:statusBarColor">@color/status_bar_color</item>
2728
<item name="colorBackgroundFloating">@color/system_neutral1_800</item>
2829
<item name="android:windowBackground">@color/system_neutral1_900</item>
29-
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Dark</item>
30+
<item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
3031
<!-- fonts -->
3132
<item name="android:fontFamily">@font/inter</item>
3233
<item name="font">@font/inter</item>
3334
<item name="windowActionBar">false</item>
3435
<item name="windowNoTitle">true</item>
3536
<item name="android:windowActionBar">false</item>
3637
<item name="android:windowNoTitle">true</item>
38+
<item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
3739
</style>
3840

3941
<!-- Black monet theme, which is just dark monet theme with black background -->
@@ -52,14 +54,15 @@
5254
<item name="chipBackgroundColor">@color/system_accent2_700</item>
5355
<item name="chipSurfaceColor">@color/system_accent2_700</item>
5456
<!-- chips should be dark, not black -->
55-
<item name="chipStyle">@style/Widget.Material.Chip.Choice.Black</item>
57+
<item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
5658
<!-- fonts -->
5759
<item name="android:fontFamily">@font/inter</item>
5860
<item name="font">@font/inter</item>
5961
<item name="windowActionBar">false</item>
6062
<item name="windowNoTitle">true</item>
6163
<item name="android:windowActionBar">false</item>
6264
<item name="android:windowNoTitle">true</item>
65+
<item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
6366
</style>
6467

6568
<style name="Widget.Material3.Chip.Choice.Dark" parent="Widget.Material3.Chip.Assist">

‎app/src/main/res/values/colors.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<color name="gray_200">#C8C8C8</color>
34
<color name="purple_200">#FFBB86FC</color>
45
<color name="purple_500">#FF6200EE</color>
56
<color name="purple_700">#FF3700B3</color>
@@ -14,6 +15,7 @@
1415
<color name="black">#FF000000</color>
1516
<color name="white">#FFFFFFFF</color>
1617
<color name="status_bar_color">@color/black_transparent</color>
18+
<color name="status_bar_color_light">@color/white_transparent</color>
1719
<color name="module_holder_div">@color/black_transparent</color>
1820
<!-- Icon -->
1921
<color name="launcher_icon_background">#FF9B08</color>

‎app/src/main/res/values/themes.xml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@
2424
<item name="android:activityCloseExitAnimation">@*android:anim/slide_out_right</item> -->
2525
<item name="android:windowEnterAnimation">@android:anim/fade_in</item>
2626
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
27-
<item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/card_corner_radius</item>
28-
<item name="dialogCornerRadius">@dimen/card_corner_radius</item>
2927
<item name="colorBackgroundFloating">@color/light_colorBackgroundFloating</item>
3028
<item name="backgroundColor">@color/light_backgroundColor</item>
31-
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
29+
<item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
30+
<item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
3231
<!-- fonts -->
3332
<item name="android:fontFamily">@font/inter</item>
3433
<item name="font">@font/inter</item>
@@ -58,10 +57,10 @@
5857
<item name="android:textColor">@color/white</item>
5958
<item name="titleTextColor">@color/white</item>
6059
<!-- Fix action bar padding in transparent theme -->
61-
<item name="android:actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
60+
<item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
6261
<!-- Action bar -->
63-
<item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
64-
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
62+
<item name="actionBarStyle">@style/Theme.Design.NoActionBar</item>
63+
<item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
6564
<!-- fonts -->
6665
<item name="android:fontFamily">@font/inter</item>
6766
<item name="font">@font/inter</item>
@@ -95,10 +94,9 @@
9594
<item name="android:activityCloseExitAnimation">@*android:anim/slide_out_right</item> -->
9695
<item name="android:windowEnterAnimation">@android:anim/fade_in</item>
9796
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
98-
<item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/card_corner_radius</item>
99-
<item name="dialogCornerRadius">@dimen/card_corner_radius</item>
10097
<item name="colorBackgroundFloating">@color/dark_colorBackgroundFloating</item>
10198
<item name="backgroundColor">@color/dark_backgroundColor</item>
99+
<item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
102100
<!-- fonts -->
103101
<item name="android:fontFamily">@font/inter</item>
104102
<item name="font">@font/inter</item>
@@ -110,10 +108,9 @@
110108

111109
<!-- Black theme, which is just a dark theme with a black background -->
112110
<style name="Theme.MagiskModuleManager.Black" parent="Theme.MagiskModuleManager.Dark">
113-
<item name="colorBackgroundFloating">@color/black</item>
111+
<item name="colorBackgroundFloating">@color/gray_900</item>
114112
<item name="android:windowBackground">@color/black</item>
115113
<item name="boxBackgroundColor">@color/black</item>
116-
<item name="cardBackgroundColor">@color/black</item>
117114
<item name="backgroundColor">@color/black</item>
118115
<item name="colorSurface">@color/black</item>
119116
<!-- Darker variants of the colors -->
@@ -127,7 +124,8 @@
127124
<item name="android:colorForeground">@color/white</item>
128125
<item name="android:colorBackgroundCacheHint">@null</item>
129126
<!-- chips should be dark, not black -->
130-
<item name="chipStyle">@style/Widget.Material.Chip.Choice.Dark</item>
127+
<item name="android:actionBarStyle">@style/Theme.Design.NoActionBar</item>
128+
<item name="chipStyle">@style/Widget.Material3.Chip.Assist.Elevated</item>
131129
<!-- fonts -->
132130
<item name="android:fontFamily">@font/inter</item>
133131
<item name="font">@font/inter</item>

0 commit comments

Comments
 (0)