fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-07 03:05:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move activities and fragments to respective packages

Browse Source 
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
This commit is contained in:
agnostic-apollo
2021-03-24 05:13:00 +05:00
parent 1bdf9bf2e3
commit b856e16998
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@@ -89,7 +89,7 @@
</activity-alias> </activity-alias>
<activity <activity
android:name=".app.TermuxHelpActivity" android:name=".app.activities.HelpActivity"
android:exported="false" android:exported="false"
android:label="@string/application_name" android:label="@string/application_name"
android:parentActivityName=".app.TermuxActivity" android:parentActivityName=".app.TermuxActivity"
@@ -97,7 +97,7 @@
android:theme="@android:style/Theme.Material.Light.DarkActionBar" /> android:theme="@android:style/Theme.Material.Light.DarkActionBar" />
<activity <activity
android:name=".app.TermuxSettingsActivity" android:name=".app.activities.SettingsActivity"
android:label="@string/title_activity_termux_settings" android:label="@string/title_activity_termux_settings"
android:theme="@style/Theme.AppCompat.Light.DarkActionBar" /> android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />

6
app/src/main/java/com/termux/app/TermuxActivity.java
View File

@@ -32,6 +32,8 @@ import android.widget.Toast;
import com.termux.R; import com.termux.R;
import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY; 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.settings.preferences.TermuxAppSharedPreferences;
import com.termux.app.terminal.TermuxSessionsListViewController; import com.termux.app.terminal.TermuxSessionsListViewController;
import com.termux.app.terminal.io.TerminalToolbarViewPager; import com.termux.app.terminal.io.TerminalToolbarViewPager;
@@ -529,10 +531,10 @@ public final class TermuxActivity extends Activity implements ServiceConnection
showStylingDialog(); showStylingDialog();
return true; return true;
case CONTEXT_MENU_HELP_ID: case CONTEXT_MENU_HELP_ID:
startActivity(new Intent(this, TermuxHelpActivity.class)); startActivity(new Intent(this, HelpActivity.class));
return true; return true;
case CONTEXT_MENU_SETTINGS_ID: case CONTEXT_MENU_SETTINGS_ID:
startActivity(new Intent(this, TermuxSettingsActivity.class)); startActivity(new Intent(this, SettingsActivity.class));
return true; return true;
case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON: case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON:
toggleKeepScreenOn(); toggleKeepScreenOn();

4
app/src/main/java/com/termux/app/TermuxHelpActivity.java → app/src/main/java/com/termux/app/activities/HelpActivity.java
View File

@@ -1,4 +1,4 @@
package com.termux.app; package com.termux.app.activities;
import android.app.Activity; import android.app.Activity;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
@@ -13,7 +13,7 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
/** Basic embedded browser for viewing help pages. */ /** Basic embedded browser for viewing help pages. */
public final class TermuxHelpActivity extends Activity { public final class HelpActivity extends Activity {
WebView mWebView; WebView mWebView;

4
app/src/main/java/com/termux/app/TermuxSettingsActivity.java → app/src/main/java/com/termux/app/activities/SettingsActivity.java
View File

@@ -1,4 +1,4 @@
package com.termux.app; package com.termux.app.activities;
import android.os.Bundle; import android.os.Bundle;
@@ -8,7 +8,7 @@ import androidx.preference.PreferenceFragmentCompat;
import com.termux.R; import com.termux.R;
public class TermuxSettingsActivity extends AppCompatActivity { public class SettingsActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

3
app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java → app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java
View File

@@ -1,4 +1,4 @@
package com.termux.app.settings; package com.termux.app.fragments.settings;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@@ -11,7 +11,6 @@ import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import com.termux.R; import com.termux.R;
import com.termux.app.settings.preferences.TermuxPreferenceConstants;
import com.termux.app.settings.preferences.TermuxAppSharedPreferences; import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
import com.termux.app.utils.Logger; import com.termux.app.utils.Logger;

2
app/src/main/res/xml/root_preferences.xml
View File

@@ -3,6 +3,6 @@
<Preference <Preference
app:title="@string/debugging_preferences" app:title="@string/debugging_preferences"
app:summary="Preferences for debugging" app:summary="Preferences for debugging"
app:fragment="com.termux.app.settings.DebuggingPreferencesFragment"/> app:fragment="com.termux.app.fragments.settings.DebuggingPreferencesFragment"/>
</PreferenceScreen> </PreferenceScreen>