From b856e16998a136bedc03a766728160f55914dfea Mon Sep 17 00:00:00 2001 From: agnostic-apollo Date: Wed, 24 Mar 2021 05:13:00 +0500 Subject: [PATCH] Move activities and fragments to respective packages Move com.termux.TermuxSettingsActivity to com.termux.app.activities.SettingsActivity Move com.termux.TermuxHepActivity to com.termux.app.activities.HelpActivity Move com.termux.settings.DebuggingPreferencesFragment to com.termux.app.fragments.settings.DebuggingPreferencesFragment --- app/src/main/AndroidManifest.xml | 4 ++-- app/src/main/java/com/termux/app/TermuxActivity.java | 6 ++++-- .../HelpActivity.java} | 4 ++-- .../SettingsActivity.java} | 4 ++-- .../settings/DebuggingPreferencesFragment.java | 3 +-- app/src/main/res/xml/root_preferences.xml | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) rename app/src/main/java/com/termux/app/{TermuxHelpActivity.java => activities/HelpActivity.java} (96%) rename app/src/main/java/com/termux/app/{TermuxSettingsActivity.java => activities/SettingsActivity.java} (92%) rename app/src/main/java/com/termux/app/{ => fragments}/settings/DebuggingPreferencesFragment.java (97%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 17d2c1b2..e986f0c4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -89,7 +89,7 @@ diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java index b86db958..e5e1ed90 100644 --- a/app/src/main/java/com/termux/app/TermuxActivity.java +++ b/app/src/main/java/com/termux/app/TermuxActivity.java @@ -32,6 +32,8 @@ import android.widget.Toast; import com.termux.R; import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY; +import com.termux.app.activities.HelpActivity; +import com.termux.app.activities.SettingsActivity; import com.termux.app.settings.preferences.TermuxAppSharedPreferences; import com.termux.app.terminal.TermuxSessionsListViewController; import com.termux.app.terminal.io.TerminalToolbarViewPager; @@ -529,10 +531,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection showStylingDialog(); return true; case CONTEXT_MENU_HELP_ID: - startActivity(new Intent(this, TermuxHelpActivity.class)); + startActivity(new Intent(this, HelpActivity.class)); return true; case CONTEXT_MENU_SETTINGS_ID: - startActivity(new Intent(this, TermuxSettingsActivity.class)); + startActivity(new Intent(this, SettingsActivity.class)); return true; case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON: toggleKeepScreenOn(); diff --git a/app/src/main/java/com/termux/app/TermuxHelpActivity.java b/app/src/main/java/com/termux/app/activities/HelpActivity.java similarity index 96% rename from app/src/main/java/com/termux/app/TermuxHelpActivity.java rename to app/src/main/java/com/termux/app/activities/HelpActivity.java index 0aa8a97a..fa32bfc4 100644 --- a/app/src/main/java/com/termux/app/TermuxHelpActivity.java +++ b/app/src/main/java/com/termux/app/activities/HelpActivity.java @@ -1,4 +1,4 @@ -package com.termux.app; +package com.termux.app.activities; import android.app.Activity; import android.content.ActivityNotFoundException; @@ -13,7 +13,7 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; /** Basic embedded browser for viewing help pages. */ -public final class TermuxHelpActivity extends Activity { +public final class HelpActivity extends Activity { WebView mWebView; diff --git a/app/src/main/java/com/termux/app/TermuxSettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java similarity index 92% rename from app/src/main/java/com/termux/app/TermuxSettingsActivity.java rename to app/src/main/java/com/termux/app/activities/SettingsActivity.java index 74604c96..7111a7b9 100644 --- a/app/src/main/java/com/termux/app/TermuxSettingsActivity.java +++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java @@ -1,4 +1,4 @@ -package com.termux.app; +package com.termux.app.activities; import android.os.Bundle; @@ -8,7 +8,7 @@ import androidx.preference.PreferenceFragmentCompat; import com.termux.R; -public class TermuxSettingsActivity extends AppCompatActivity { +public class SettingsActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java similarity index 97% rename from app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java rename to app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java index 9944cf61..d7a3aa60 100644 --- a/app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java +++ b/app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java @@ -1,4 +1,4 @@ -package com.termux.app.settings; +package com.termux.app.fragments.settings; import android.content.Context; import android.os.Bundle; @@ -11,7 +11,6 @@ import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceManager; import com.termux.R; -import com.termux.app.settings.preferences.TermuxPreferenceConstants; import com.termux.app.settings.preferences.TermuxAppSharedPreferences; import com.termux.app.utils.Logger; diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 3ea2b583..39c731eb 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -3,6 +3,6 @@ + app:fragment="com.termux.app.fragments.settings.DebuggingPreferencesFragment"/>