Yet another restructuring

app/src/full/java/a/g.java

@@ -2,7 +2,7 @@ package a;
 
 import android.content.Context;
 
-import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.components.UpdateCheckService;
 
 import androidx.annotation.NonNull;
 import androidx.work.WorkerParameters;

app/src/full/java/a/h.java

@@ -1,6 +1,6 @@
 package a;
 
-import com.topjohnwu.magisk.receivers.GeneralReceiver;
+import com.topjohnwu.magisk.components.GeneralReceiver;
 
 public class h extends GeneralReceiver {
     /* stub */

app/src/full/java/a/j.java

@@ -1,6 +1,6 @@
 package a;
 
-import com.topjohnwu.magisk.services.DownloadModuleService;
+import com.topjohnwu.magisk.components.DownloadModuleService;
 
 public class j extends DownloadModuleService {
     /* stub */

app/src/full/java/a/l.java

@@ -3,7 +3,7 @@ package a;
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.topjohnwu.magisk.components.AboutCardRow;
+import com.topjohnwu.magisk.uicomponents.AboutCardRow;
 
 public class l extends AboutCardRow {
     /* stub */

app/src/full/java/a/w.java

@@ -2,7 +2,7 @@ package a;
 
 import android.content.Context;
 
-import com.topjohnwu.magisk.services.DelegateWorker;
+import com.topjohnwu.magisk.components.DelegateWorker;
 
 import java.lang.reflect.ParameterizedType;
 

app/src/full/java/com/topjohnwu/magisk/AboutActivity.java

@@ -5,9 +5,9 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 
-import com.topjohnwu.magisk.components.AboutCardRow;
 import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.components.MarkDownWindow;
+import com.topjohnwu.magisk.uicomponents.AboutCardRow;
+import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
 import com.topjohnwu.magisk.utils.AppUtils;
 
 import java.util.Locale;

app/src/full/java/com/topjohnwu/magisk/ClassMap.java

@@ -1,9 +1,9 @@
 package com.topjohnwu.magisk;
 
-import com.topjohnwu.magisk.components.AboutCardRow;
+import com.topjohnwu.magisk.components.DownloadModuleService;
-import com.topjohnwu.magisk.receivers.GeneralReceiver;
+import com.topjohnwu.magisk.components.GeneralReceiver;
-import com.topjohnwu.magisk.services.DownloadModuleService;
+import com.topjohnwu.magisk.components.UpdateCheckService;
-import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.uicomponents.AboutCardRow;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/full/java/com/topjohnwu/magisk/SplashActivity.java

@@ -6,10 +6,10 @@ import android.os.Bundle;
 import android.text.TextUtils;
 
 import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.components.Notifications;
-import com.topjohnwu.magisk.components.Shortcuts;
 import com.topjohnwu.magisk.tasks.CheckUpdates;
 import com.topjohnwu.magisk.tasks.UpdateRepos;
+import com.topjohnwu.magisk.uicomponents.Notifications;
+import com.topjohnwu.magisk.uicomponents.Shortcuts;
 import com.topjohnwu.magisk.utils.AppUtils;
 import com.topjohnwu.magisk.utils.LocaleManager;
 import com.topjohnwu.magisk.utils.Utils;

app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java

@@ -11,8 +11,8 @@ import android.widget.TextView;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.List;

app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java

@@ -12,11 +12,11 @@ import android.widget.TextView;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
-import com.topjohnwu.magisk.components.ExpandableViewHolder;
-import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.database.MagiskDB;
+import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
+import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
+import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
 
 import java.util.List;

app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java

@@ -15,12 +15,12 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.BaseActivity;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
+import com.topjohnwu.magisk.components.DownloadModuleService;
-import com.topjohnwu.magisk.components.MarkDownWindow;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.container.Repo;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.services.DownloadModuleService;
+import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
+import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java

@@ -10,9 +10,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.ExpandableViewHolder;
 import com.topjohnwu.magisk.container.SuLogEntry;
 import com.topjohnwu.magisk.database.MagiskDB;
+import com.topjohnwu.magisk.uicomponents.ExpandableViewHolder;
 
 import java.util.Collections;
 import java.util.HashSet;

app/src/full/java/com/topjohnwu/magisk/components/DelegateWorker.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.services;
+package com.topjohnwu.magisk.components;
 
 import android.content.Context;
 import android.net.Network;

app/src/full/java/com/topjohnwu/magisk/components/DownloadModuleService.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.services;
+package com.topjohnwu.magisk.components;
 
 import android.app.Service;
 import android.content.Intent;
@@ -10,8 +10,8 @@ import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.ProgressNotification;
 import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.uicomponents.ProgressNotification;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;

app/src/full/java/com/topjohnwu/magisk/components/GeneralReceiver.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.receivers;
+package com.topjohnwu.magisk.components;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -10,8 +10,8 @@ import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.SuRequestActivity;
-import com.topjohnwu.magisk.components.Notifications;
+import com.topjohnwu.magisk.uicomponents.Notifications;
-import com.topjohnwu.magisk.components.Shortcuts;
+import com.topjohnwu.magisk.uicomponents.Shortcuts;
 import com.topjohnwu.magisk.utils.DownloadApp;
 import com.topjohnwu.magisk.utils.SuConnector;
 import com.topjohnwu.superuser.Shell;

app/src/full/java/com/topjohnwu/magisk/components/UpdateCheckService.java

@@ -1,9 +1,9 @@
-package com.topjohnwu.magisk.services;
+package com.topjohnwu.magisk.components;
 
 import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Config;
-import com.topjohnwu.magisk.components.Notifications;
 import com.topjohnwu.magisk.tasks.CheckUpdates;
+import com.topjohnwu.magisk.uicomponents.Notifications;
 import com.topjohnwu.superuser.Shell;
 
 import androidx.annotation.NonNull;

app/src/full/java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.dialogs;
 
 import android.app.Activity;
 import android.content.DialogInterface;

app/src/full/java/com/topjohnwu/magisk/dialogs/EnvFixDialog.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.dialogs;
 
 import android.app.Activity;
 import android.app.ProgressDialog;

app/src/full/java/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.dialogs;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -10,6 +10,9 @@ import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.uicomponents.ProgressNotification;
+import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.net.Networking;
 

app/src/full/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java

@@ -1,10 +1,12 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.dialogs;
 
 import android.net.Uri;
 import android.text.TextUtils;
 
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
 import com.topjohnwu.magisk.utils.AppUtils;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;

app/src/full/java/com/topjohnwu/magisk/dialogs/ManagerInstallDialog.java

@@ -1,10 +1,11 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.dialogs;
 
 import android.app.Activity;
 import android.text.TextUtils;
 
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.uicomponents.MarkDownWindow;
 import com.topjohnwu.magisk.utils.DownloadApp;
 import com.topjohnwu.magisk.utils.Utils;
 

app/src/full/java/com/topjohnwu/magisk/dialogs/UninstallDialog.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.dialogs;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -12,6 +12,7 @@ import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.uicomponents.ProgressNotification;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;

app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java

@@ -15,13 +15,13 @@ import com.topjohnwu.magisk.MainActivity;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.components.EnvFixDialog;
+import com.topjohnwu.magisk.dialogs.EnvFixDialog;
-import com.topjohnwu.magisk.components.MagiskInstallDialog;
+import com.topjohnwu.magisk.dialogs.MagiskInstallDialog;
-import com.topjohnwu.magisk.components.ManagerInstallDialog;
+import com.topjohnwu.magisk.dialogs.ManagerInstallDialog;
-import com.topjohnwu.magisk.components.SafetyNet;
+import com.topjohnwu.magisk.dialogs.UninstallDialog;
-import com.topjohnwu.magisk.components.UninstallDialog;
-import com.topjohnwu.magisk.components.UpdateCardHolder;
 import com.topjohnwu.magisk.tasks.CheckUpdates;
+import com.topjohnwu.magisk.uicomponents.SafetyNet;
+import com.topjohnwu.magisk.uicomponents.UpdateCardHolder;
 import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;

app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java

@@ -14,7 +14,7 @@ import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.adapters.StringListAdapter;
 import com.topjohnwu.magisk.components.BaseFragment;
-import com.topjohnwu.magisk.components.SnackbarMaker;
+import com.topjohnwu.magisk.uicomponents.SnackbarMaker;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.internal.NOPList;

app/src/full/java/com/topjohnwu/magisk/uicomponents/AboutCardRow.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.content.Context;
 import android.content.res.TypedArray;

app/src/full/java/com/topjohnwu/magisk/uicomponents/ExpandableViewHolder.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.animation.ValueAnimator;
 import android.view.View;

app/src/full/java/com/topjohnwu/magisk/uicomponents/MarkDownWindow.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.app.Activity;
 import android.graphics.Bitmap;

app/src/full/java/com/topjohnwu/magisk/uicomponents/Notifications.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -13,7 +13,7 @@ import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.SplashActivity;
-import com.topjohnwu.magisk.receivers.GeneralReceiver;
+import com.topjohnwu.magisk.components.GeneralReceiver;
 import com.topjohnwu.magisk.utils.Utils;
 
 import androidx.core.app.NotificationCompat;

app/src/full/java/com/topjohnwu/magisk/uicomponents/ProgressNotification.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.app.Notification;
 import android.widget.Toast;

app/src/full/java/com/topjohnwu/magisk/uicomponents/SafetyNet.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.app.Activity;
 import android.content.Context;
@@ -13,6 +13,7 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
 import com.topjohnwu.magisk.utils.ISafetyNetHelper;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.superuser.Shell;

app/src/full/java/com/topjohnwu/magisk/uicomponents/Shortcuts.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.content.Context;
 import android.content.Intent;

app/src/full/java/com/topjohnwu/magisk/uicomponents/SnackbarMaker.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.app.Activity;
 import android.net.Uri;

app/src/full/java/com/topjohnwu/magisk/uicomponents/UpdateCardHolder.java

@@ -1,4 +1,4 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.uicomponents;
 
 import android.view.LayoutInflater;
 import android.view.View;

app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java

@@ -9,7 +9,7 @@ import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.components.UpdateCheckService;
 
 import java.util.concurrent.TimeUnit;
 

app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java

@@ -6,7 +6,7 @@ import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.ProgressNotification;
+import com.topjohnwu.magisk.uicomponents.ProgressNotification;
 import com.topjohnwu.net.Networking;
 import com.topjohnwu.net.ResponseListener;
 import com.topjohnwu.superuser.ShellUtils;

app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java

@@ -20,7 +20,7 @@ import com.topjohnwu.magisk.App;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.CustomAlertDialog;
+import com.topjohnwu.magisk.dialogs.CustomAlertDialog;
 
 import java.security.KeyStore;
 

app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java

@@ -8,7 +8,7 @@ import com.topjohnwu.magisk.BuildConfig;
 import com.topjohnwu.magisk.Config;
 import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.Notifications;
+import com.topjohnwu.magisk.uicomponents.Notifications;
 import com.topjohnwu.signing.JarMap;
 import com.topjohnwu.signing.SignAPK;
 import com.topjohnwu.superuser.ShellUtils;