refactor: sort packages

cinit · Dec 17, 2021 · d6647dd · d6647dd
1 parent 2cad012
commit d6647dd
Show file tree

Hide file tree

Showing 38 changed files with 181 additions and 189 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
         android:required="false" />
 
     <application
-        android:name="cc.ioctl.nfcdevicehost.procedure.BaseApplicationDelegate"
+        android:name="cc.ioctl.nfcdevicehost.startup.BaseApplicationDelegate"
         android:allowBackup="true"
         android:appCategory="productivity"
         android:directBootAware="false"

diff --git a/app/src/main/cpp/libnciclient/ipc_handle_jni.cpp b/app/src/main/cpp/libnciclient/ipc_handle_jni.cpp
diff --git a/app/src/main/cpp/libnciclient/ipc_handle_jni.h b/app/src/main/cpp/libnciclient/ipc_handle_jni.h
diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/JumpEntryActivity.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/JumpEntryActivity.java
@@ -6,6 +6,8 @@
 
 import androidx.annotation.Nullable;
 
+import cc.ioctl.nfcdevicehost.activity.base.BaseActivity;
+
 /**
  * External file share/browser springboard entry point.
  * This activity is short-lived and only used to launch a target activity.

diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/MainUiFragmentActivity.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/MainUiFragmentActivity.java
@@ -22,10 +22,11 @@
 import java.io.File;
 import java.io.IOException;
 
-import cc.ioctl.nfcdevicehost.NativeInterface;
+import cc.ioctl.nfcdevicehost.util.NativeInterface;
 import cc.ioctl.nfcdevicehost.R;
-import cc.ioctl.nfcdevicehost.daemon.INciHostDaemon;
-import cc.ioctl.nfcdevicehost.daemon.IpcNativeHandler;
+import cc.ioctl.nfcdevicehost.activity.base.BaseActivity;
+import cc.ioctl.nfcdevicehost.ipc.daemon.INciHostDaemon;
+import cc.ioctl.nfcdevicehost.ipc.daemon.IpcNativeHandler;
 import cc.ioctl.nfcdevicehost.util.RootShell;
 import cc.ioctl.nfcdevicehost.util.ThreadManager;
 

diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/MipmapGenActivity.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/MipmapGenActivity.java
@@ -17,6 +17,7 @@
 import java.lang.reflect.Field;
 
 import cc.ioctl.nfcdevicehost.R;
+import cc.ioctl.nfcdevicehost.activity.base.BaseActivity;
 
 @RequiresApi(api = Build.VERSION_CODES.O)
 public class MipmapGenActivity extends BaseActivity {

diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/SettingsActivity.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/SettingsActivity.java
@@ -7,6 +7,7 @@
 import androidx.preference.PreferenceFragmentCompat;
 
 import cc.ioctl.nfcdevicehost.R;
+import cc.ioctl.nfcdevicehost.activity.base.BaseActivity;
 
 public class SettingsActivity extends BaseActivity {
 

diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/ShadowSafTransientActivity.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/ShadowSafTransientActivity.java
@@ -12,6 +12,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import cc.ioctl.nfcdevicehost.activity.base.BaseActivity;
+
 /**
  * Transparent and transient activity that is used to access the SAF API without overriding the
  * onActivityResult() method. This activity is used by {@link cc.ioctl.nfcdevicehost.util.SafUtils}.

diff --git a/app/src/main/java/cc/ioctl/nfcdevicehost/activity/SidebandHostActivity.java b/app/src/main/java/cc/ioctl/nfcdevicehost/activity/SidebandHostActivity.java
@@ -11,6 +11,7 @@
 import androidx.appcompat.app.ActionBar;
 
 import cc.ioctl.nfcdevicehost.R;
+import cc.ioctl.nfcdevicehost.activity.base.BaseActivity;
 import cc.ioctl.nfcdevicehost.activity.ui.dump.HalDumpFileViewFragment;
 
 /**

diff --git a/...l/nfcdevicehost/activity/AppActivity.java → ...devicehost/activity/base/AppActivity.java b/...l/nfcdevicehost/activity/AppActivity.java → ...devicehost/activity/base/AppActivity.java
@@ -1,4 +1,4 @@
-package cc.ioctl.nfcdevicehost.activity;
+package cc.ioctl.nfcdevicehost.activity.base;
 
 import android.content.res.TypedArray;
 import android.graphics.Color;

diff --git a/.../nfcdevicehost/activity/BaseActivity.java → ...evicehost/activity/base/BaseActivity.java b/.../nfcdevicehost/activity/BaseActivity.java → ...evicehost/activity/base/BaseActivity.java
@@ -1,4 +1,4 @@
-package cc.ioctl.nfcdevicehost.activity;
+package cc.ioctl.nfcdevicehost.activity.base;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -14,8 +14,8 @@
 import java.lang.reflect.Field;
 
 import cc.ioctl.nfcdevicehost.activity.ui.startup.TransientInitActivity;
-import cc.ioctl.nfcdevicehost.procedure.MainApplicationImpl;
-import cc.ioctl.nfcdevicehost.procedure.StartupDirector;
+import cc.ioctl.nfcdevicehost.startup.MainApplicationImpl;
+import cc.ioctl.nfcdevicehost.startup.StartupDirector;
 
 /**
  * Late-onCreate feature for Activity