aiden
/
MagiskModuleManager
mirror of https://github.com/Androidacy/MagiskModuleManager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix previous PR + minor UI tweaks.

Browse Source
pull/27/head
Fox2Code 3 years ago
parent 5e2535e6c6
commit 3eb1744a78
11 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle
Unescape Escape View File

@ -97,7 +97,7 @@ dependencies {
// Utils
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
implementation 'com.squareup.okhttp3:okhttp-brotli:4.9.3'
implementation 'com.github.topjohnwu.libsu:io:5.0.0'
implementation 'com.github.topjohnwu.libsu:io:5.0.1'
// Markdown
implementation "io.noties.markwon:core:4.6.2"

3
app/src/main/java/com/fox2code/mmm/MainActivity.java
Unescape Escape View File

@ -20,7 +20,6 @@ import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
import android.widget.TextView;
import android.widget.Toast;
import com.fox2code.mmm.compat.CompatActivity;
import com.fox2code.mmm.compat.CompatDisplay;
@ -33,9 +32,7 @@ import com.fox2code.mmm.repo.RepoManager;
import com.fox2code.mmm.settings.SettingsActivity;
import com.fox2code.mmm.utils.Http;
import com.fox2code.mmm.utils.IntentHelper;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.progressindicator.LinearProgressIndicator;
import com.topjohnwu.superuser.Shell;
import eightbitlab.com.blurview.BlurView;
import eightbitlab.com.blurview.RenderScriptBlur;

4
app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
Unescape Escape View File

@ -15,7 +15,7 @@ import android.widget.Toast;
import androidx.recyclerview.widget.RecyclerView;
import com.fox2code.mmm.ActionButtonType;
import com.fox2code.mmm.module.ActionButtonType;
import com.fox2code.mmm.AppUpdateManager;
import com.fox2code.mmm.BuildConfig;
import com.fox2code.mmm.Constants;
@ -647,6 +647,7 @@ public class InstallerActivity extends CompatActivity {
return true;
});
} else if (success) {
this.rebootFloatingButton.setVisibility(View.VISIBLE);
final Intent intent = this.getIntent();
final String config = MainApplication.checkSecret(intent) ?
intent.getStringExtra(Constants.EXTRA_INSTALL_CONFIG) : null;
@ -658,7 +659,6 @@ public class InstallerActivity extends CompatActivity {
IntentHelper.openConfig(this, config);
return true;
});
this.rebootFloatingButton.setVisibility(View.VISIBLE);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Config package \"" +
configPkg + "\" missing for installer view");

4
app/src/main/java/com/fox2code/mmm/ActionButtonType.java → app/src/main/java/com/fox2code/mmm/module/ActionButtonType.java
Unescape Escape View File

@ -1,4 +1,4 @@
package com.fox2code.mmm;
package com.fox2code.mmm.module;
import android.content.Context;
import android.text.Spanned;
@ -11,6 +11,8 @@ import android.widget.Toast;
import androidx.annotation.DrawableRes;
import androidx.appcompat.app.AlertDialog;
import com.fox2code.mmm.MainApplication;
import com.fox2code.mmm.R;
import com.fox2code.mmm.androidacy.AndroidacyUtil;
import com.fox2code.mmm.compat.CompatActivity;
import com.fox2code.mmm.compat.CompatDisplay;

1
app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java
Unescape Escape View File

@ -8,7 +8,6 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import com.fox2code.mmm.ActionButtonType;
import com.fox2code.mmm.MainApplication;
import com.fox2code.mmm.NotificationType;
import com.fox2code.mmm.R;

3
app/src/main/java/com/fox2code/mmm/module/ModuleViewAdapter.java
Unescape Escape View File

@ -18,7 +18,6 @@ import androidx.annotation.StringRes;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.RecyclerView;
import com.fox2code.mmm.ActionButtonType;
import com.fox2code.mmm.MainApplication;
import com.fox2code.mmm.NotificationType;
import com.fox2code.mmm.R;
@ -326,8 +325,6 @@ public final class ModuleViewAdapter extends RecyclerView.Adapter<ModuleViewAdap
// Fix card background being invisible on light theme
if (bgColor == Color.WHITE) {
bgColor = 0xFFF8F8F8;
} else {
bgColor = 0xFF1E1E1E;
}
this.titleText.setTextColor(fgColor);
this.buttonAction.setColorFilter(fgColor);

1
app/src/main/java/com/fox2code/mmm/utils/Files.java
Unescape Escape View File

@ -1,7 +1,6 @@
package com.fox2code.mmm.utils;
import android.os.Build;
import android.util.Log;
import androidx.annotation.NonNull;

13
app/src/main/res/layout/installer_wrap.xml
Unescape Escape View File

@ -26,4 +26,17 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/install_terminal_reboot_fab"
android:text="@string/install_terminal_reboot_now"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textColor="@android:color/white"
app:iconTint="@android:color/white"
app:icon="@drawable/ic_reboot_24"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/module_entry.xml
Unescape Escape View File

@ -43,6 +43,7 @@
android:id="@+id/switch_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent" />
@ -55,7 +56,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/button_action" />
app:layout_constraintRight_toRightOf="parent" />
<TextView
android:id="@+id/credit_text"

8
app/src/main/res/values/themes.xml
Unescape Escape View File

@ -1,8 +1,8 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.MagiskModuleManager.Light" parent="Theme.MaterialComponents.Light">
<item name="android:isLightTheme"
tools:targetApi="q">false</item>
<item name="isLightTheme">false</item>
tools:targetApi="q">true</item>
<item name="isLightTheme">true</item>
<!-- Primary brand color. -->
<item name="colorPrimary">@color/orange_200</item>
<item name="colorPrimaryVariant">@color/white</item>
@ -26,6 +26,8 @@
<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">#FFFFFFFF</item>
<item name="backgroundColor">#FFFFFFFF</item>
</style>
<style name="Theme.MagiskModuleManager.Transparent.Light" parent="Theme.MagiskModuleManager.Light">
@ -69,6 +71,8 @@
<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">#FF1E1E1E</item>
<item name="backgroundColor">#FF111111</item>
</style>
<!-- Base application theme. -->

3
gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
distributionSha256Sum=9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66

Write Preview
Loading…
Cancel
Save