feat: Updated project structure

Innovative-CST · Aug 20, 2023 · 6094037 · 6094037 · SyntaxGalaxy · Aug 20, 2023
1 parent 52ed7b0
commit 6094037
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 54 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,38 +21,38 @@
         android:theme="@style/AppTheme"
         android:forceDarkAllowed="false">
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".ui.activities.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.DebugActivity"
+            android:name=".ui.activities.DebugActivity"
             android:exported="true" />
         <activity
-            android:name=".activity.FileManagerActivity"
+            android:name=".ui.activities.FileManagerActivity"
             android:exported="true" />
         <activity
             android:configChanges="uiMode"
             android:windowSoftInputMode="adjustResize"
-            android:name=".activity.CodeEditorActivity"
+            android:name=".ui.activities.CodeEditorActivity"
             android:exported="true" />
         <activity
-            android:name=".activity.ContributorsActivity"
+            android:name=".ui.activities.ContributorsActivity"
             android:exported="true" />
         <activity
-            android:name=".activity.SettingActivity"
+            android:name=".ui.activities.SettingActivity"
             android:exported="true" />
         <activity
-            android:name=".activity.MarkdownViewer"
+            android:name=".ui.activities.MarkdownViewer"
             android:exported="true" />
         <activity
-            android:name=".activity.LicenseActivity"
+            android:name=".ui.activities.LicenseActivity"
             android:exported="true" />
         <activity
-            android:name=".activity.WebViewActivity"
+            android:name=".ui.activities.WebViewActivity"
             android:exported="true" />
     </application>
 

diff --git a/app/src/main/java/android/code/editor/MyApplication.java b/app/src/main/java/android/code/editor/MyApplication.java
@@ -20,7 +20,7 @@
 import android.app.AlarmManager;
 import android.app.Application;
 import android.app.PendingIntent;
-import android.code.editor.activity.DebugActivity;
+import android.code.editor.ui.activities.DebugActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Process;

diff --git a/...e/editor/files/utils/FileTypeHandler.java → ...code/editor/handlers/FileTypeHandler.java b/...e/editor/files/utils/FileTypeHandler.java → ...code/editor/handlers/FileTypeHandler.java
@@ -15,10 +15,10 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.files.utils;
+package android.code.editor.handlers;
 
-import android.code.editor.activity.CodeEditorActivity;
-import android.code.editor.activity.FileManagerActivity;
+import android.code.editor.ui.activities.CodeEditorActivity;
+import android.code.editor.ui.activities.FileManagerActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.view.View;

diff --git a/...id/code/editor/activity/BaseActivity.java → ...de/editor/ui/activities/BaseActivity.java b/...id/code/editor/activity/BaseActivity.java → ...de/editor/ui/activities/BaseActivity.java
@@ -15,9 +15,9 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
-import android.code.editor.ui.MaterialColorHelper;
+import android.code.editor.utils.MaterialColorHelper;
 import android.code.editor.utils.Setting;
 import android.content.res.Configuration;
 import android.content.res.Resources;

diff --git a/...e/editor/activity/CodeEditorActivity.java → ...tor/ui/activities/CodeEditorActivity.java b/...e/editor/activity/CodeEditorActivity.java → ...tor/ui/activities/CodeEditorActivity.java
@@ -15,14 +15,14 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
-import android.code.editor.adapters.viewholders.FileTabAdapter;
-import android.code.editor.adapters.viewholders.FileTreeViewHolder;
 import android.code.editor.common.utils.FileUtils;
 import android.code.editor.databinding.ActivityCodeEditorBinding;
-import android.code.editor.files.utils.FileTypeHandler;
+import android.code.editor.handlers.FileTypeHandler;
+import android.code.editor.ui.adapters.FileTabAdapter;
+import android.code.editor.ui.viewholders.FileTreeViewHolder;
 import android.code.editor.utils.LanguageModeHandler;
 import android.code.editor.utils.Setting;
 import android.content.Context;

diff --git a/...editor/activity/ContributorsActivity.java → ...r/ui/activities/ContributorsActivity.java b/...editor/activity/ContributorsActivity.java → ...r/ui/activities/ContributorsActivity.java
@@ -15,11 +15,11 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
-import android.code.editor.utils.sketchware.RequestNetwork;
-import android.code.editor.utils.sketchware.RequestNetworkController;
+import android.code.editor.utils.RequestNetwork;
+import android.code.editor.utils.RequestNetworkController;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;

diff --git a/...d/code/editor/activity/DebugActivity.java → ...e/editor/ui/activities/DebugActivity.java b/...d/code/editor/activity/DebugActivity.java → ...e/editor/ui/activities/DebugActivity.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
 import android.content.ClipData;

diff --git a/.../editor/activity/FileManagerActivity.java → ...or/ui/activities/FileManagerActivity.java b/.../editor/activity/FileManagerActivity.java → ...or/ui/activities/FileManagerActivity.java
@@ -15,15 +15,15 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
 import android.code.editor.common.utils.FileUtils;
-import android.code.editor.files.utils.FileIcon;
-import android.code.editor.files.utils.FileTypeHandler;
-import android.code.editor.utils.FileManagerActivity.FileCreatorDialog;
-import android.code.editor.utils.FileManagerActivity.FolderCreatorDialog;
-import android.code.editor.utils.FileManagerActivity.ProjectCreatorDialog;
+import android.code.editor.handlers.FileTypeHandler;
+import android.code.editor.ui.dialogs.FileCreatorDialog;
+import android.code.editor.ui.dialogs.FolderCreatorDialog;
+import android.code.editor.ui.dialogs.ProjectCreatorDialog;
+import android.code.editor.utils.FileIcon;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;

diff --git a/...code/editor/activity/LicenseActivity.java → ...editor/ui/activities/LicenseActivity.java b/...code/editor/activity/LicenseActivity.java → ...editor/ui/activities/LicenseActivity.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
 import android.code.editor.common.utils.FileUtils;

diff --git a/...id/code/editor/activity/MainActivity.java → ...de/editor/ui/activities/MainActivity.java b/...id/code/editor/activity/MainActivity.java → ...de/editor/ui/activities/MainActivity.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.Manifest;
 import android.app.Activity;

diff --git a/.../code/editor/activity/MarkdownViewer.java → .../editor/ui/activities/MarkdownViewer.java b/.../code/editor/activity/MarkdownViewer.java → .../editor/ui/activities/MarkdownViewer.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
 import android.os.Bundle;

diff --git a/...code/editor/activity/SettingActivity.java → ...editor/ui/activities/SettingActivity.java b/...code/editor/activity/SettingActivity.java → ...editor/ui/activities/SettingActivity.java
@@ -15,10 +15,10 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
-import android.code.editor.ui.MaterialColorHelper;
+import android.code.editor.utils.MaterialColorHelper;
 import android.code.editor.utils.RadioOptionChooser;
 import android.code.editor.utils.Setting;
 import android.content.Context;

diff --git a/...code/editor/activity/WebViewActivity.java → ...editor/ui/activities/WebViewActivity.java b/...code/editor/activity/WebViewActivity.java → ...editor/ui/activities/WebViewActivity.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.activity;
+package android.code.editor.ui.activities;
 
 import android.code.editor.R;
 import android.code.editor.utils.Setting;

diff --git a/.../adapters/viewholders/FileTabAdapter.java → ...de/editor/ui/adapters/FileTabAdapter.java b/.../adapters/viewholders/FileTabAdapter.java → ...de/editor/ui/adapters/FileTabAdapter.java
@@ -15,11 +15,11 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.adapters.viewholders;
+package android.code.editor.ui.adapters;
 
 import android.code.editor.R;
-import android.code.editor.activity.CodeEditorActivity;
 import android.code.editor.common.utils.FileUtils;
+import android.code.editor.ui.activities.CodeEditorActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/...ileManagerActivity/FileCreatorDialog.java → .../editor/ui/dialogs/FileCreatorDialog.java b/...ileManagerActivity/FileCreatorDialog.java → .../editor/ui/dialogs/FileCreatorDialog.java
@@ -15,10 +15,10 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.utils.FileManagerActivity;
+package android.code.editor.ui.dialogs;
 
 import android.code.editor.R;
-import android.code.editor.activity.FileManagerActivity;
+import android.code.editor.ui.activities.FileManagerActivity;
 import android.code.editor.common.utils.FileUtils;
 import android.content.Context;
 import android.text.Editable;

diff --git a/...eManagerActivity/FolderCreatorDialog.java → ...ditor/ui/dialogs/FolderCreatorDialog.java b/...eManagerActivity/FolderCreatorDialog.java → ...ditor/ui/dialogs/FolderCreatorDialog.java
@@ -15,11 +15,11 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.utils.FileManagerActivity;
+package android.code.editor.ui.dialogs;
 
 import android.code.editor.R;
-import android.code.editor.activity.FileManagerActivity;
 import android.code.editor.common.utils.FileUtils;
+import android.code.editor.ui.activities.FileManagerActivity;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.ViewGroup;

diff --git a/...ManagerActivity/ProjectCreatorDialog.java → ...itor/ui/dialogs/ProjectCreatorDialog.java b/...ManagerActivity/ProjectCreatorDialog.java → ...itor/ui/dialogs/ProjectCreatorDialog.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.utils.FileManagerActivity;
+package android.code.editor.ui.dialogs;
 
 import android.code.editor.R;
 import android.code.editor.common.utils.FileUtils;

diff --git a/...pters/viewholders/FileTreeViewHolder.java → ...or/ui/viewholders/FileTreeViewHolder.java b/...pters/viewholders/FileTreeViewHolder.java → ...or/ui/viewholders/FileTreeViewHolder.java
@@ -15,13 +15,13 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.adapters.viewholders;
+package android.code.editor.ui.viewholders;
 
 import android.code.editor.R;
-import android.code.editor.activity.CodeEditorActivity;
 import android.code.editor.common.utils.FileUtils;
-import android.code.editor.files.utils.FileIcon;
-import android.code.editor.files.utils.FileTypeHandler;
+import android.code.editor.utils.FileIcon;
+import android.code.editor.handlers.FileTypeHandler;
+import android.code.editor.ui.activities.CodeEditorActivity;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/...oid/code/editor/files/utils/FileIcon.java → ...a/android/code/editor/utils/FileIcon.java b/...oid/code/editor/files/utils/FileIcon.java → ...a/android/code/editor/utils/FileIcon.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.files.utils;
+package android.code.editor.utils;
 
 import android.code.editor.R;
 import android.code.editor.common.utils.FileUtils;

diff --git a/...d/code/editor/ui/MaterialColorHelper.java → ...ode/editor/utils/MaterialColorHelper.java b/...d/code/editor/ui/MaterialColorHelper.java → ...ode/editor/utils/MaterialColorHelper.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.ui;
+package android.code.editor.utils;
 
 import android.code.editor.R;
 import android.code.editor.utils.Setting;

diff --git a/app/src/main/java/android/code/editor/utils/RadioOptionChooser.java b/app/src/main/java/android/code/editor/utils/RadioOptionChooser.java
@@ -18,8 +18,8 @@
 package android.code.editor.utils;
 
 import android.code.editor.R;
-import android.code.editor.activity.SettingActivity;
-import android.code.editor.activity.WebViewActivity;
+import android.code.editor.ui.activities.SettingActivity;
+import android.code.editor.ui.activities.WebViewActivity;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/...itor/utils/sketchware/RequestNetwork.java → ...oid/code/editor/utils/RequestNetwork.java b/...itor/utils/sketchware/RequestNetwork.java → ...oid/code/editor/utils/RequestNetwork.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.utils.sketchware;
+package android.code.editor.utils;
 
 import android.app.Activity;
 import java.util.HashMap;

diff --git a/.../sketchware/RequestNetworkController.java → ...ditor/utils/RequestNetworkController.java b/.../sketchware/RequestNetworkController.java → ...ditor/utils/RequestNetworkController.java
@@ -15,7 +15,7 @@
  *   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package android.code.editor.utils.sketchware;
+package android.code.editor.utils;
 
 import com.google.gson.Gson;
 import java.io.IOException;

diff --git a/app/src/main/java/android/code/editor/utils/Setting.java b/app/src/main/java/android/code/editor/utils/Setting.java
@@ -17,9 +17,9 @@
 
 package android.code.editor.utils;
 
-import android.code.editor.activity.WebViewActivity;
 import android.code.editor.common.utils.FileUtils;
-import android.code.editor.ui.MaterialColorHelper;
+import android.code.editor.ui.activities.WebViewActivity;
+import android.code.editor.utils.MaterialColorHelper;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;