Skip to content

Commit b856e16

Browse files
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
1 parent 1bdf9bf commit b856e16

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

app/src/main/AndroidManifest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@
8989
</activity-alias>
9090

9191
<activity
92-
android:name=".app.TermuxHelpActivity"
92+
android:name=".app.activities.HelpActivity"
9393
android:exported="false"
9494
android:label="@string/application_name"
9595
android:parentActivityName=".app.TermuxActivity"
9696
android:resizeableActivity="true"
9797
android:theme="@android:style/Theme.Material.Light.DarkActionBar" />
9898

9999
<activity
100-
android:name=".app.TermuxSettingsActivity"
100+
android:name=".app.activities.SettingsActivity"
101101
android:label="@string/title_activity_termux_settings"
102102
android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
103103

app/src/main/java/com/termux/app/TermuxActivity.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
import com.termux.R;
3434
import com.termux.app.TermuxConstants.TERMUX_APP.TERMUX_ACTIVITY;
35+
import com.termux.app.activities.HelpActivity;
36+
import com.termux.app.activities.SettingsActivity;
3537
import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
3638
import com.termux.app.terminal.TermuxSessionsListViewController;
3739
import com.termux.app.terminal.io.TerminalToolbarViewPager;
@@ -529,10 +531,10 @@ public boolean onContextItemSelected(MenuItem item) {
529531
showStylingDialog();
530532
return true;
531533
case CONTEXT_MENU_HELP_ID:
532-
startActivity(new Intent(this, TermuxHelpActivity.class));
534+
startActivity(new Intent(this, HelpActivity.class));
533535
return true;
534536
case CONTEXT_MENU_SETTINGS_ID:
535-
startActivity(new Intent(this, TermuxSettingsActivity.class));
537+
startActivity(new Intent(this, SettingsActivity.class));
536538
return true;
537539
case CONTEXT_MENU_TOGGLE_KEEP_SCREEN_ON:
538540
toggleKeepScreenOn();

app/src/main/java/com/termux/app/TermuxHelpActivity.java app/src/main/java/com/termux/app/activities/HelpActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.termux.app;
1+
package com.termux.app.activities;
22

33
import android.app.Activity;
44
import android.content.ActivityNotFoundException;
@@ -13,7 +13,7 @@
1313
import android.widget.RelativeLayout;
1414

1515
/** Basic embedded browser for viewing help pages. */
16-
public final class TermuxHelpActivity extends Activity {
16+
public final class HelpActivity extends Activity {
1717

1818
WebView mWebView;
1919

app/src/main/java/com/termux/app/TermuxSettingsActivity.java app/src/main/java/com/termux/app/activities/SettingsActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.termux.app;
1+
package com.termux.app.activities;
22

33
import android.os.Bundle;
44

@@ -8,7 +8,7 @@
88

99
import com.termux.R;
1010

11-
public class TermuxSettingsActivity extends AppCompatActivity {
11+
public class SettingsActivity extends AppCompatActivity {
1212

1313
@Override
1414
protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/termux/app/settings/DebuggingPreferencesFragment.java app/src/main/java/com/termux/app/fragments/settings/DebuggingPreferencesFragment.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.termux.app.settings;
1+
package com.termux.app.fragments.settings;
22

33
import android.content.Context;
44
import android.os.Bundle;
@@ -11,7 +11,6 @@
1111
import androidx.preference.PreferenceManager;
1212

1313
import com.termux.R;
14-
import com.termux.app.settings.preferences.TermuxPreferenceConstants;
1514
import com.termux.app.settings.preferences.TermuxAppSharedPreferences;
1615
import com.termux.app.utils.Logger;
1716

app/src/main/res/xml/root_preferences.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<Preference
44
app:title="@string/debugging_preferences"
55
app:summary="Preferences for debugging"
6-
app:fragment="com.termux.app.settings.DebuggingPreferencesFragment"/>
6+
app:fragment="com.termux.app.fragments.settings.DebuggingPreferencesFragment"/>
77

88
</PreferenceScreen>

0 commit comments

Comments
 (0)