Skip to content

Commit 553913c

Browse files
agnostic-apolloagnostic-apollo
committed
Divide dialog utils
1 parent 6bca378 commit 553913c

File tree

7 files changed

+64
-49
lines changed

7 files changed

+64
-49
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import com.termux.app.terminal.TermuxTerminalViewClient;
4646
import com.termux.app.terminal.io.extrakeys.ExtraKeysView;
4747
import com.termux.app.settings.properties.TermuxAppSharedProperties;
48-
import com.termux.shared.interact.DialogUtils;
48+
import com.termux.shared.interact.TextInputDialogUtils;
4949
import com.termux.shared.logger.Logger;
5050
import com.termux.shared.termux.TermuxUtils;
5151
import com.termux.terminal.TerminalSession;
@@ -514,7 +514,7 @@ private void setNewSessionButtonView() {
514514
View newSessionButton = findViewById(R.id.new_session_button);
515515
newSessionButton.setOnClickListener(v -> mTermuxTerminalSessionClient.addNewSession(false, null));
516516
newSessionButton.setOnLongClickListener(v -> {
517-
DialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null,
517+
TextInputDialogUtils.textInput(TermuxActivity.this, R.string.title_create_named_session, null,
518518
R.string.action_create_named_session_confirm, text -> mTermuxTerminalSessionClient.addNewSession(false, text),
519519
R.string.action_new_session_failsafe, text -> mTermuxTerminalSessionClient.addNewSession(true, text),
520520
-1, null, null);

‎app/src/main/java/com/termux/app/TermuxInstaller.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.termux.R;
1414
import com.termux.app.utils.CrashUtils;
1515
import com.termux.shared.file.FileUtils;
16-
import com.termux.shared.interact.DialogUtils;
16+
import com.termux.shared.interact.MessageDialogUtils;
1717
import com.termux.shared.logger.Logger;
1818
import com.termux.shared.models.errors.Error;
1919
import com.termux.shared.termux.TermuxConstants;
@@ -60,7 +60,7 @@ static void setupBootstrapIfNeeded(final Activity activity, final Runnable whenD
6060
if (!isPrimaryUser) {
6161
String bootstrapErrorMessage = activity.getString(R.string.bootstrap_error_not_primary_user_message, TermuxConstants.TERMUX_PREFIX_DIR_PATH);
6262
Logger.logError(LOG_TAG, bootstrapErrorMessage);
63-
DialogUtils.exitAppWithErrorMessage(activity,
63+
MessageDialogUtils.exitAppWithErrorMessage(activity,
6464
activity.getString(R.string.bootstrap_error_title),
6565
bootstrapErrorMessage);
6666
return;

‎app/src/main/java/com/termux/app/terminal/TermuxTerminalSessionClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import com.termux.R;
1616
import com.termux.shared.shell.TermuxSession;
17-
import com.termux.shared.interact.DialogUtils;
17+
import com.termux.shared.interact.TextInputDialogUtils;
1818
import com.termux.app.TermuxActivity;
1919
import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
2020
import com.termux.shared.termux.TermuxConstants;
@@ -301,7 +301,7 @@ public void switchToSession(int index) {
301301
public void renameSession(final TerminalSession sessionToRename) {
302302
if (sessionToRename == null) return;
303303

304-
DialogUtils.textInput(mActivity, R.string.title_rename_session, sessionToRename.mSessionName, R.string.action_rename_session_confirm, text -> {
304+
TextInputDialogUtils.textInput(mActivity, R.string.title_rename_session, sessionToRename.mSessionName, R.string.action_rename_session_confirm, text -> {
305305
sessionToRename.mSessionName = text;
306306
termuxSessionListNotifyUpdated();
307307
}, -1, null, -1, null, null);

‎app/src/main/java/com/termux/filepicker/TermuxFileReceiverActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import android.util.Patterns;
1010

1111
import com.termux.R;
12-
import com.termux.shared.interact.DialogUtils;
12+
import com.termux.shared.interact.TextInputDialogUtils;
1313
import com.termux.shared.termux.TermuxConstants;
1414
import com.termux.shared.termux.TermuxConstants.TERMUX_APP.TERMUX_SERVICE;
1515
import com.termux.app.TermuxService;
@@ -118,7 +118,7 @@ void handleContentUri(final Uri uri, String subjectFromIntent) {
118118
}
119119

120120
void promptNameAndSave(final InputStream in, final String attachmentFileName) {
121-
DialogUtils.textInput(this, R.string.title_file_received, attachmentFileName, R.string.action_file_received_edit, text -> {
121+
TextInputDialogUtils.textInput(this, R.string.title_file_received, attachmentFileName, R.string.action_file_received_edit, text -> {
122122
File outFile = saveStreamWithName(in, text);
123123
if (outFile == null) return;
124124

‎termux-shared/src/main/java/com/termux/shared/interact/MessageDialogUtils.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.termux.shared.interact;
2+
3+
import android.app.Activity;
4+
import android.app.AlertDialog;
5+
import android.content.Context;
6+
import android.content.DialogInterface;
7+
import android.view.LayoutInflater;
8+
import android.view.View;
9+
import android.widget.TextView;
10+
11+
import com.termux.shared.R;
12+
13+
public class MessageDialogUtils {
14+
15+
/**
16+
* Show a message in a dialog
17+
*
18+
* @param context The {@link Context} to use to start the dialog. An {@link Activity} {@link Context}
19+
* must be passed, otherwise exceptions will be thrown.
20+
* @param titleText The title text of the dialog.
21+
* @param messageText The message text of the dialog.
22+
* @param onDismiss The {@link DialogInterface.OnDismissListener} to run when dialog is dismissed.
23+
*/
24+
public static void showMessage(Context context, String titleText, String messageText, final DialogInterface.OnDismissListener onDismiss) {
25+
26+
AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog)
27+
.setPositiveButton(android.R.string.ok, null);
28+
29+
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
30+
View view = inflater.inflate(R.layout.dialog_show_message, null);
31+
if (view != null) {
32+
builder.setView(view);
33+
34+
TextView titleView = view.findViewById(R.id.dialog_title);
35+
if (titleView != null)
36+
titleView.setText(titleText);
37+
38+
TextView messageView = view.findViewById(R.id.dialog_message);
39+
if (messageView != null)
40+
messageView.setText(messageText);
41+
}
42+
43+
if (onDismiss != null)
44+
builder.setOnDismissListener(onDismiss);
45+
46+
builder.show();
47+
}
48+
49+
public static void exitAppWithErrorMessage(Context context, String titleText, String messageText) {
50+
showMessage(context, titleText, messageText, dialog -> System.exit(0));
51+
}
52+
53+
}

‎termux-shared/src/main/java/com/termux/shared/interact/DialogUtils.java renamed to ‎termux-shared/src/main/java/com/termux/shared/interact/TextInputDialogUtils.java

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import com.termux.shared.R;
1818

19-
public final class DialogUtils {
19+
public final class TextInputDialogUtils {
2020

2121
public interface TextSetListener {
2222
void onTextSet(String text);
@@ -75,42 +75,4 @@ public static void textInput(Activity activity, int titleText, String initialTex
7575
dialogHolder[0].show();
7676
}
7777

78-
/**
79-
* Show a message in a dialog
80-
*
81-
* @param context The {@link Context} to use to start the dialog. An {@link Activity} {@link Context}
82-
* must be passed, otherwise exceptions will be thrown.
83-
* @param titleText The title text of the dialog.
84-
* @param messageText The message text of the dialog.
85-
* @param onDismiss The {@link DialogInterface.OnDismissListener} to run when dialog is dismissed.
86-
*/
87-
public static void showMessage(Context context, String titleText, String messageText, final DialogInterface.OnDismissListener onDismiss) {
88-
89-
AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.Theme_AppCompat_Light_Dialog)
90-
.setPositiveButton(android.R.string.ok, null);
91-
92-
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
93-
View view = inflater.inflate(R.layout.dialog_show_message, null);
94-
if (view != null) {
95-
builder.setView(view);
96-
97-
TextView titleView = view.findViewById(R.id.dialog_title);
98-
if (titleView != null)
99-
titleView.setText(titleText);
100-
101-
TextView messageView = view.findViewById(R.id.dialog_message);
102-
if (messageView != null)
103-
messageView.setText(messageText);
104-
}
105-
106-
if (onDismiss != null)
107-
builder.setOnDismissListener(onDismiss);
108-
109-
builder.show();
110-
}
111-
112-
public static void exitAppWithErrorMessage(Context context, String titleText, String messageText) {
113-
showMessage(context, titleText, messageText, dialog -> System.exit(0));
114-
}
115-
11678
}

‎termux-shared/src/main/java/com/termux/shared/packages/PackageUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import com.termux.shared.R;
1111
import com.termux.shared.data.DataUtils;
12-
import com.termux.shared.interact.DialogUtils;
12+
import com.termux.shared.interact.MessageDialogUtils;
1313
import com.termux.shared.logger.Logger;
1414
import com.termux.shared.termux.TermuxConstants;
1515

@@ -55,7 +55,7 @@ public static Context getContextForPackageOrExitApp(@NonNull Context context, St
5555
String errorMessage = context.getString(R.string.error_get_package_context_failed_message,
5656
packageName, TermuxConstants.TERMUX_GITHUB_REPO_URL);
5757
Logger.logError(LOG_TAG, errorMessage);
58-
DialogUtils.exitAppWithErrorMessage(context,
58+
MessageDialogUtils.exitAppWithErrorMessage(context,
5959
context.getString(R.string.error_get_package_context_failed_title),
6060
errorMessage);
6161
}

0 commit comments

Comments
 (0)