Refactor with AS 3.5

2025-09-06 06:36:58 +00:00 · 2019-04-12 01:58:42 -04:00
parent a028cd5cec
commit a6395d35db
45 changed files with 155 additions and 135 deletions
@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.view.LayoutInflater;
 import android.view.View;

+import androidx.appcompat.app.AlertDialog;
+
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.net.ResponseListener;
@@ -11,7 +13,6 @@ import com.topjohnwu.net.ResponseListener;
 import java.io.InputStream;
 import java.util.Scanner;

-import androidx.appcompat.app.AlertDialog;
 import ru.noties.markwon.Markwon;
 import ru.noties.markwon.html.HtmlPlugin;
 import ru.noties.markwon.image.ImagesPlugin;
@@ -7,6 +7,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;

+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.app.TaskStackBuilder;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Config;
@@ -16,10 +20,6 @@ import com.topjohnwu.magisk.model.receiver.GeneralReceiver;
 import com.topjohnwu.magisk.ui.SplashActivity;
 import com.topjohnwu.magisk.utils.Utils;

-import androidx.core.app.NotificationCompat;
-import androidx.core.app.NotificationManagerCompat;
-import androidx.core.app.TaskStackBuilder;
-
 public class Notifications {

    public static NotificationManagerCompat mgr = NotificationManagerCompat.from(App.self);
@@ -5,13 +5,13 @@ import android.app.PendingIntent;
 import android.content.Intent;
 import android.widget.Toast;

+import androidx.core.app.NotificationCompat;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.net.DownloadProgressListener;

-import androidx.core.app.NotificationCompat;
-
 public class ProgressNotification implements DownloadProgressListener {

    private NotificationCompat.Builder builder;
@@ -10,6 +10,9 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;

+import androidx.annotation.StringRes;
+import androidx.cardview.widget.CardView;
+
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
@@ -20,8 +23,6 @@ import com.topjohnwu.superuser.Shell;

 import java.io.File;

-import androidx.annotation.StringRes;
-import androidx.cardview.widget.CardView;
 import butterknife.BindColor;
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -7,6 +7,8 @@ import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
 import android.os.Build;

+import androidx.annotation.RequiresApi;
+
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
@@ -17,8 +19,6 @@ import com.topjohnwu.superuser.Shell;

 import java.util.ArrayList;

-import androidx.annotation.RequiresApi;
-
 public class Shortcuts {

    public static void setup(Context context) {
@@ -5,12 +5,12 @@ import android.net.Uri;
 import android.view.View;
 import android.widget.TextView;

+import androidx.annotation.StringRes;
+
 import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Utils;

-import androidx.annotation.StringRes;
-
 public class SnackbarMaker {

    public static Snackbar make(Activity activity, CharSequence text, int duration) {
@@ -8,13 +8,14 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;

-import com.topjohnwu.magisk.R;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AlertDialog;
+
+import com.topjohnwu.magisk.R;
+
 import butterknife.BindView;

 public class CustomAlertDialog extends AlertDialog.Builder {
@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.widget.Toast;

+import androidx.annotation.NonNull;
+
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.tasks.MagiskInstaller;
 import com.topjohnwu.magisk.utils.RootUtils;
@@ -12,8 +14,6 @@ import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.internal.UiThreadHandler;
 import com.topjohnwu.superuser.io.SuFile;

-import androidx.annotation.NonNull;
-
 public class EnvFixDialog extends CustomAlertDialog {

    public EnvFixDialog(@NonNull Activity activity) {
@@ -11,13 +11,13 @@ import android.os.Build;
 import android.view.Gravity;
 import android.widget.Toast;

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
 import com.topjohnwu.magisk.utils.Utils;

-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-
@TargetApi(Build.VERSION_CODES.M)
 public class FingerprintAuthDialog extends CustomAlertDialog {

@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.widget.Toast;

+import androidx.appcompat.app.AlertDialog;
+
 import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Config;
@@ -19,8 +21,6 @@ import com.topjohnwu.net.Networking;
 import java.io.File;
 import java.util.List;

-import androidx.appcompat.app.AlertDialog;
-
 class InstallMethodDialog extends AlertDialog.Builder {

    InstallMethodDialog(BaseActivity activity, List<String> options) {
@@ -3,14 +3,14 @@ package com.topjohnwu.magisk.view.dialogs;
 import android.app.Activity;
 import android.text.TextUtils;

+import androidx.annotation.NonNull;
+
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.DownloadApp;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.view.MarkDownWindow;

-import androidx.annotation.NonNull;
-
 public class ManagerInstallDialog extends CustomAlertDialog {

    public ManagerInstallDialog(@NonNull Activity a) {
@@ -7,6 +7,8 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.widget.Toast;

+import androidx.annotation.NonNull;
+
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
@@ -19,8 +21,6 @@ import com.topjohnwu.superuser.Shell;

 import java.io.File;

-import androidx.annotation.NonNull;
-
 public class UninstallDialog extends CustomAlertDialog {

    public UninstallDialog(@NonNull Activity activity) {