From cfb0a3ba2a0c0212c50dfbf62d6b82f1b3e7f3b8 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 30 Jan 2019 23:23:49 -0500 Subject: [PATCH] Yet another restructuring --- app/src/full/java/a/g.java | 2 +- app/src/full/java/a/h.java | 2 +- app/src/full/java/a/j.java | 2 +- app/src/full/java/a/l.java | 2 +- app/src/full/java/a/w.java | 2 +- .../java/com/topjohnwu/magisk/AboutActivity.java | 4 ++-- app/src/full/java/com/topjohnwu/magisk/ClassMap.java | 8 ++++---- .../java/com/topjohnwu/magisk/SplashActivity.java | 4 ++-- .../topjohnwu/magisk/adapters/ModulesAdapter.java | 2 +- .../com/topjohnwu/magisk/adapters/PolicyAdapter.java | 6 +++--- .../com/topjohnwu/magisk/adapters/ReposAdapter.java | 6 +++--- .../com/topjohnwu/magisk/adapters/SuLogAdapter.java | 2 +- .../{services => components}/DelegateWorker.java | 2 +- .../DownloadModuleService.java | 4 ++-- .../{receivers => components}/GeneralReceiver.java | 6 +++--- .../{services => components}/UpdateCheckService.java | 4 ++-- .../{components => dialogs}/CustomAlertDialog.java | 2 +- .../magisk/{components => dialogs}/EnvFixDialog.java | 2 +- .../{components => dialogs}/InstallMethodDialog.java | 5 ++++- .../{components => dialogs}/MagiskInstallDialog.java | 4 +++- .../ManagerInstallDialog.java | 3 ++- .../{components => dialogs}/UninstallDialog.java | 3 ++- .../topjohnwu/magisk/fragments/MagiskFragment.java | 12 ++++++------ .../magisk/fragments/MagiskLogFragment.java | 2 +- .../{components => uicomponents}/AboutCardRow.java | 2 +- .../ExpandableViewHolder.java | 2 +- .../{components => uicomponents}/MarkDownWindow.java | 2 +- .../{components => uicomponents}/Notifications.java | 4 ++-- .../ProgressNotification.java | 2 +- .../{components => uicomponents}/SafetyNet.java | 3 ++- .../{components => uicomponents}/Shortcuts.java | 2 +- .../{components => uicomponents}/SnackbarMaker.java | 2 +- .../UpdateCardHolder.java | 2 +- .../java/com/topjohnwu/magisk/utils/AppUtils.java | 2 +- .../java/com/topjohnwu/magisk/utils/DownloadApp.java | 2 +- .../topjohnwu/magisk/utils/FingerprintHelper.java | 2 +- .../java/com/topjohnwu/magisk/utils/PatchAPK.java | 2 +- 37 files changed, 64 insertions(+), 56 deletions(-) rename app/src/full/java/com/topjohnwu/magisk/{services => components}/DelegateWorker.java (97%) rename app/src/full/java/com/topjohnwu/magisk/{services => components}/DownloadModuleService.java (97%) rename app/src/full/java/com/topjohnwu/magisk/{receivers => components}/GeneralReceiver.java (96%) rename app/src/full/java/com/topjohnwu/magisk/{services => components}/UpdateCheckService.java (89%) rename app/src/full/java/com/topjohnwu/magisk/{components => dialogs}/CustomAlertDialog.java (99%) rename app/src/full/java/com/topjohnwu/magisk/{components => dialogs}/EnvFixDialog.java (97%) rename app/src/full/java/com/topjohnwu/magisk/{components => dialogs}/InstallMethodDialog.java (94%) rename app/src/full/java/com/topjohnwu/magisk/{components => dialogs}/MagiskInstallDialog.java (93%) rename app/src/full/java/com/topjohnwu/magisk/{components => dialogs}/ManagerInstallDialog.java (91%) rename app/src/full/java/com/topjohnwu/magisk/{components => dialogs}/UninstallDialog.java (95%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/AboutCardRow.java (98%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/ExpandableViewHolder.java (98%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/MarkDownWindow.java (98%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/Notifications.java (98%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/ProgressNotification.java (98%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/SafetyNet.java (98%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/Shortcuts.java (98%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/SnackbarMaker.java (97%) rename app/src/full/java/com/topjohnwu/magisk/{components => uicomponents}/UpdateCardHolder.java (97%) diff --git a/app/src/full/java/a/g.java b/app/src/full/java/a/g.java index dcfb7f491..13771c547 100644 --- a/app/src/full/java/a/g.java +++ b/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; diff --git a/app/src/full/java/a/h.java b/app/src/full/java/a/h.java index 672e85503..5b8709277 100644 --- a/app/src/full/java/a/h.java +++ b/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 */ diff --git a/app/src/full/java/a/j.java b/app/src/full/java/a/j.java index 0e95284fb..bdf1407cb 100644 --- a/app/src/full/java/a/j.java +++ b/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 */ diff --git a/app/src/full/java/a/l.java b/app/src/full/java/a/l.java index 8cd9df563..2332c3374 100644 --- a/app/src/full/java/a/l.java +++ b/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 */ diff --git a/app/src/full/java/a/w.java b/app/src/full/java/a/w.java index b6a107c43..7be9efa37 100644 --- a/app/src/full/java/a/w.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/full/java/com/topjohnwu/magisk/AboutActivity.java index b73b85b0d..a4ac951e6 100644 --- a/app/src/full/java/com/topjohnwu/magisk/AboutActivity.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/ClassMap.java b/app/src/full/java/com/topjohnwu/magisk/ClassMap.java index a9e756bca..1e7090097 100644 --- a/app/src/full/java/com/topjohnwu/magisk/ClassMap.java +++ b/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.receivers.GeneralReceiver; -import com.topjohnwu.magisk.services.DownloadModuleService; -import com.topjohnwu.magisk.services.UpdateCheckService; +import com.topjohnwu.magisk.components.DownloadModuleService; +import com.topjohnwu.magisk.components.GeneralReceiver; +import com.topjohnwu.magisk.components.UpdateCheckService; +import com.topjohnwu.magisk.uicomponents.AboutCardRow; import java.util.HashMap; import java.util.Map; diff --git a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java b/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java index 98cb70ac8..7369b404b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/SplashActivity.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java index 662ef0cd7..24cd83fcb 100644 --- a/app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java index 6fdc06fca..c1c09bbde 100644 --- a/app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java index 130848fd2..15101fb27 100644 --- a/app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java +++ b/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.MarkDownWindow; +import com.topjohnwu.magisk.components.DownloadModuleService; 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; diff --git a/app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java b/app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java index 3bf0fbbc9..167e32c9b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/services/DelegateWorker.java b/app/src/full/java/com/topjohnwu/magisk/components/DelegateWorker.java similarity index 97% rename from app/src/full/java/com/topjohnwu/magisk/services/DelegateWorker.java rename to app/src/full/java/com/topjohnwu/magisk/components/DelegateWorker.java index b7bf20cfc..7e6d392fb 100644 --- a/app/src/full/java/com/topjohnwu/magisk/services/DelegateWorker.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/services/DownloadModuleService.java b/app/src/full/java/com/topjohnwu/magisk/components/DownloadModuleService.java similarity index 97% rename from app/src/full/java/com/topjohnwu/magisk/services/DownloadModuleService.java rename to app/src/full/java/com/topjohnwu/magisk/components/DownloadModuleService.java index eb0198f0a..b8413e944 100644 --- a/app/src/full/java/com/topjohnwu/magisk/services/DownloadModuleService.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java b/app/src/full/java/com/topjohnwu/magisk/components/GeneralReceiver.java similarity index 96% rename from app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java rename to app/src/full/java/com/topjohnwu/magisk/components/GeneralReceiver.java index c0d2ed9fe..43311d6ca 100644 --- a/app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java +++ b/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.components.Shortcuts; +import com.topjohnwu.magisk.uicomponents.Notifications; +import com.topjohnwu.magisk.uicomponents.Shortcuts; import com.topjohnwu.magisk.utils.DownloadApp; import com.topjohnwu.magisk.utils.SuConnector; import com.topjohnwu.superuser.Shell; diff --git a/app/src/full/java/com/topjohnwu/magisk/services/UpdateCheckService.java b/app/src/full/java/com/topjohnwu/magisk/components/UpdateCheckService.java similarity index 89% rename from app/src/full/java/com/topjohnwu/magisk/services/UpdateCheckService.java rename to app/src/full/java/com/topjohnwu/magisk/components/UpdateCheckService.java index 15b355a6b..416b04ab2 100644 --- a/app/src/full/java/com/topjohnwu/magisk/services/UpdateCheckService.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/CustomAlertDialog.java b/app/src/full/java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java similarity index 99% rename from app/src/full/java/com/topjohnwu/magisk/components/CustomAlertDialog.java rename to app/src/full/java/com/topjohnwu/magisk/dialogs/CustomAlertDialog.java index 62ce1538b..019ac189b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/CustomAlertDialog.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/EnvFixDialog.java b/app/src/full/java/com/topjohnwu/magisk/dialogs/EnvFixDialog.java similarity index 97% rename from app/src/full/java/com/topjohnwu/magisk/components/EnvFixDialog.java rename to app/src/full/java/com/topjohnwu/magisk/dialogs/EnvFixDialog.java index 4c639bb53..1f7874db9 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/EnvFixDialog.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java b/app/src/full/java/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java similarity index 94% rename from app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java rename to app/src/full/java/com/topjohnwu/magisk/dialogs/InstallMethodDialog.java index b7f46be4c..055391b98 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java similarity index 93% rename from app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java rename to app/src/full/java/com/topjohnwu/magisk/dialogs/MagiskInstallDialog.java index b1b437267..eec89bc81 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/dialogs/ManagerInstallDialog.java similarity index 91% rename from app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java rename to app/src/full/java/com/topjohnwu/magisk/dialogs/ManagerInstallDialog.java index 823dd897e..3e4776d86 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java b/app/src/full/java/com/topjohnwu/magisk/dialogs/UninstallDialog.java similarity index 95% rename from app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java rename to app/src/full/java/com/topjohnwu/magisk/dialogs/UninstallDialog.java index cdc2b94c4..dd0afc243 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java b/app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java index ed7f0f0a6..80a11f998 100644 --- a/app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java +++ b/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.components.MagiskInstallDialog; -import com.topjohnwu.magisk.components.ManagerInstallDialog; -import com.topjohnwu.magisk.components.SafetyNet; -import com.topjohnwu.magisk.components.UninstallDialog; -import com.topjohnwu.magisk.components.UpdateCardHolder; +import com.topjohnwu.magisk.dialogs.EnvFixDialog; +import com.topjohnwu.magisk.dialogs.MagiskInstallDialog; +import com.topjohnwu.magisk.dialogs.ManagerInstallDialog; +import com.topjohnwu.magisk.dialogs.UninstallDialog; 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; diff --git a/app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java b/app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java index fa65f27c3..c321ef336 100644 --- a/app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/AboutCardRow.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/AboutCardRow.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/components/AboutCardRow.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/AboutCardRow.java index 8c9b3701c..474cf9f94 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/AboutCardRow.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/ExpandableViewHolder.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/ExpandableViewHolder.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/components/ExpandableViewHolder.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/ExpandableViewHolder.java index da1b92846..624acd6e8 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/ExpandableViewHolder.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/MarkDownWindow.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/MarkDownWindow.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/components/MarkDownWindow.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/MarkDownWindow.java index b8e114ac0..7be9ed69f 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/MarkDownWindow.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/Notifications.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/Notifications.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/components/Notifications.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/Notifications.java index 7081adedc..6c13781f2 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/Notifications.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/ProgressNotification.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/ProgressNotification.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/components/ProgressNotification.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/ProgressNotification.java index cc056ee87..56ccef491 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/ProgressNotification.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/SafetyNet.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/SafetyNet.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/components/SafetyNet.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/SafetyNet.java index 2fb9b714b..ab77e30f4 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/SafetyNet.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/Shortcuts.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/Shortcuts.java similarity index 98% rename from app/src/full/java/com/topjohnwu/magisk/components/Shortcuts.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/Shortcuts.java index 31e80c4fe..33a087018 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/Shortcuts.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/SnackbarMaker.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/SnackbarMaker.java similarity index 97% rename from app/src/full/java/com/topjohnwu/magisk/components/SnackbarMaker.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/SnackbarMaker.java index 120f70861..8a57bfe2b 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/SnackbarMaker.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/components/UpdateCardHolder.java b/app/src/full/java/com/topjohnwu/magisk/uicomponents/UpdateCardHolder.java similarity index 97% rename from app/src/full/java/com/topjohnwu/magisk/components/UpdateCardHolder.java rename to app/src/full/java/com/topjohnwu/magisk/uicomponents/UpdateCardHolder.java index 7cdef7d8f..66422909c 100644 --- a/app/src/full/java/com/topjohnwu/magisk/components/UpdateCardHolder.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java b/app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java index 054b60e00..b8232e15e 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/AppUtils.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java b/app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java index f1fdb0ee4..f053166bb 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/DownloadApp.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java b/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java index 41119936a..3e9f69b92 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java +++ b/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; diff --git a/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java b/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java index b80abc12d..379b24358 100644 --- a/app/src/full/java/com/topjohnwu/magisk/utils/PatchAPK.java +++ b/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;