tmux/tmux-browser-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Compact terminal input controls

Browse Source
This commit is contained in:
Codex
2026-07-10 15:54:51 +00:00
parent 01f2c66f48
commit 14fad912a8
1 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/neatstudio/tmuxandroid/MainActivity.java
+82 -79
View File
@@ -66,7 +66,7 @@ public final class MainActivity extends Activity {
private static final int MAX_TERMINAL_COLS = 140; private static final int MAX_TERMINAL_COLS = 140;
private static final int MIN_TERMINAL_ROWS = 8; private static final int MIN_TERMINAL_ROWS = 8;
private static final int MAX_TERMINAL_ROWS = 80; private static final int MAX_TERMINAL_ROWS = 80;
private static final int TERMINAL_KEYS_HEIGHT_DP = 92; private static final int TERMINAL_KEYS_HEIGHT_DP = 54;
private static final int STATUS_NORMAL = 0; private static final int STATUS_NORMAL = 0;
private static final int STATUS_BUSY = 1; private static final int STATUS_BUSY = 1;
private static final int STATUS_SUCCESS = 2; private static final int STATUS_SUCCESS = 2;
@@ -2074,8 +2074,8 @@ public final class MainActivity extends Activity {
inputField.setHintTextColor(COLOR_TEXT_DIM); inputField.setHintTextColor(COLOR_TEXT_DIM);
inputField.setHint("type command or text"); inputField.setHint("type command or text");
inputField.setSingleLine(false); inputField.setSingleLine(false);
inputField.setMinLines(1); inputField.setMinLines(3);
inputField.setMaxLines(2); inputField.setMaxLines(5);
inputField.setCursorVisible(true); inputField.setCursorVisible(true);
inputField.setFocusableInTouchMode(true); inputField.setFocusableInTouchMode(true);
inputField.setGravity(Gravity.TOP | Gravity.START); inputField.setGravity(Gravity.TOP | Gravity.START);
@@ -2679,7 +2679,7 @@ public final class MainActivity extends Activity {
private LinearLayout createAccessoryBar() { private LinearLayout createAccessoryBar() {
LinearLayout panel = new LinearLayout(this); LinearLayout panel = new LinearLayout(this);
panel.setOrientation(LinearLayout.VERTICAL); panel.setOrientation(LinearLayout.VERTICAL);
panel.setPadding(dp(6), dp(4), dp(6), dp(4)); panel.setPadding(dp(6), dp(3), dp(6), dp(3));
panel.setBackgroundColor(COLOR_PANEL); panel.setBackgroundColor(COLOR_PANEL);
LinearLayout tabs = terminalKeyRow(); LinearLayout tabs = terminalKeyRow();
@@ -2690,26 +2690,25 @@ public final class MainActivity extends Activity {
addAccessoryTab(tabs, "Sym", 3); addAccessoryTab(tabs, "Sym", 3);
panel.addView(tabs, new LinearLayout.LayoutParams( panel.addView(tabs, new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
dp(24) dp(18)
)); ));
LinearLayout firstRow = terminalKeyRow(); HorizontalScrollView keyScroller = new HorizontalScrollView(this);
LinearLayout secondRow = terminalKeyRow(); keyScroller.setHorizontalScrollBarEnabled(false);
addAccessoryPageKeys(firstRow, secondRow); keyScroller.setFillViewport(true);
LinearLayout.LayoutParams rowParams = new LinearLayout.LayoutParams( LinearLayout keyRow = terminalKeyRow();
addAccessoryPageKeys(keyRow);
keyScroller.addView(keyRow, new HorizontalScrollView.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.MATCH_PARENT
));
LinearLayout.LayoutParams keyParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
0, 0,
1 1
); );
rowParams.topMargin = dp(3); keyParams.topMargin = dp(2);
panel.addView(firstRow, rowParams); panel.addView(keyScroller, keyParams);
LinearLayout.LayoutParams secondParams = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
0,
1
);
secondParams.topMargin = dp(3);
panel.addView(secondRow, secondParams);
return panel; return panel;
} }
@@ -2720,64 +2719,64 @@ public final class MainActivity extends Activity {
return row; return row;
} }
private void addAccessoryPageKeys(LinearLayout firstRow, LinearLayout secondRow) { private void addAccessoryPageKeys(LinearLayout row) {
switch (terminalKeyPage) { switch (terminalKeyPage) {
case 1: case 1:
addSoftKey(firstRow, "Esc", "\u001b"); addSoftKey(row, "Esc", "\u001b");
addSoftKey(firstRow, "Tab", "\t"); addSoftKey(row, "Tab", "\t");
addSoftKey(firstRow, "C-c", "\u0003"); addSoftKey(row, "C-c", "\u0003");
addSoftKey(firstRow, "C-d", "\u0004"); addSoftKey(row, "C-d", "\u0004");
addSoftKey(firstRow, "C-z", "\u001a"); addSoftKey(row, "C-z", "\u001a");
addSoftKey(firstRow, "C-l", "\u000c"); addSoftKey(row, "C-l", "\u000c");
addSoftKey(secondRow, "C-r", "\u0012"); addSoftKey(row, "C-r", "\u0012");
addSoftKey(secondRow, "C-a", "\u0001"); addSoftKey(row, "C-a", "\u0001");
addSoftKey(secondRow, "C-e", "\u0005"); addSoftKey(row, "C-e", "\u0005");
addSoftKey(secondRow, "C-u", "\u0015"); addSoftKey(row, "C-u", "\u0015");
addSoftKey(secondRow, "C-k", "\u000b"); addSoftKey(row, "C-k", "\u000b");
addSoftKey(secondRow, "C-b", "\u0002"); addSoftKey(row, "C-b", "\u0002");
break; break;
case 2: case 2:
addSoftKey(firstRow, "←", "\u001b[D"); addSoftKey(row, "←", "\u001b[D");
addSoftKey(firstRow, "→", "\u001b[C"); addSoftKey(row, "→", "\u001b[C");
addSoftKey(firstRow, "↑", "\u001b[A"); addSoftKey(row, "↑", "\u001b[A");
addSoftKey(firstRow, "↓", "\u001b[B"); addSoftKey(row, "↓", "\u001b[B");
addSoftKey(firstRow, "Home", "\u001b[H"); addSoftKey(row, "Home", "\u001b[H");
addSoftKey(firstRow, "End", "\u001b[F"); addSoftKey(row, "End", "\u001b[F");
addSoftKey(secondRow, "Pg↑", "\u001b[5~"); addSoftKey(row, "Pg↑", "\u001b[5~");
addSoftKey(secondRow, "Pg↓", "\u001b[6~"); addSoftKey(row, "Pg↓", "\u001b[6~");
addComposerButton(secondRow, "Prev", () -> setTerminalKeyPage(terminalKeyPage - 1)); addComposerButton(row, "Prev", () -> setTerminalKeyPage(terminalKeyPage - 1));
addComposerButton(secondRow, "Next", () -> setTerminalKeyPage(terminalKeyPage + 1)); addComposerButton(row, "Next", () -> setTerminalKeyPage(terminalKeyPage + 1));
addSoftKey(secondRow, "Clear", "\u000c"); addSoftKey(row, "Clear", "\u000c");
addSoftKey(secondRow, "Detach", "\u0002d"); addSoftKey(row, "Detach", "\u0002d");
break; break;
case 3: case 3:
addTextKey(firstRow, "~", "~"); addTextKey(row, "~", "~");
addTextKey(firstRow, "/", "/"); addTextKey(row, "/", "/");
addTextKey(firstRow, "-", "-"); addTextKey(row, "-", "-");
addTextKey(firstRow, "_", "_"); addTextKey(row, "_", "_");
addTextKey(firstRow, ".", "."); addTextKey(row, ".", ".");
addTextKey(firstRow, "|", "|"); addTextKey(row, "|", "|");
addTextKey(secondRow, "&", "&"); addTextKey(row, "&", "&");
addTextKey(secondRow, ";", ";"); addTextKey(row, ";", ";");
addTextKey(secondRow, "$", "$"); addTextKey(row, "$", "$");
addTextKey(secondRow, "\"", "\""); addTextKey(row, "\"", "\"");
addTextKey(secondRow, "'", "'"); addTextKey(row, "'", "'");
addTextKey(secondRow, "Space", " "); addTextKey(row, "Space", " ");
break; break;
case 0: case 0:
default: default:
addComposerButton(firstRow, "←", () -> moveComposerCursor(-1)); addComposerButton(row, "←", () -> moveComposerCursor(-1));
addComposerButton(firstRow, "→", () -> moveComposerCursor(1)); addComposerButton(row, "→", () -> moveComposerCursor(1));
addSoftKey(firstRow, "↑", "\u001b[A"); addSoftKey(row, "↑", "\u001b[A");
addSoftKey(firstRow, "↓", "\u001b[B"); addSoftKey(row, "↓", "\u001b[B");
addSoftKey(firstRow, "Esc", "\u001b"); addSoftKey(row, "Esc", "\u001b");
addSoftKey(firstRow, "Tab", "\t"); addSoftKey(row, "Tab", "\t");
addSoftKey(secondRow, "Enter", TERMINAL_ENTER); addSoftKey(row, "Enter", TERMINAL_ENTER);
addSoftButton(secondRow, "Paste", view -> pasteClipboard()); addSoftButton(row, "Paste", view -> pasteClipboard());
addComposerButton(secondRow, "⌫", this::backspaceComposerText); addComposerButton(row, "⌫", this::backspaceComposerText);
addTextKey(secondRow, "NL", "\n"); addTextKey(row, "NL", "\n");
addComposerButton(secondRow, "Bottom", this::scrollTerminalBottom); addComposerButton(row, "Bottom", this::scrollTerminalBottom);
addComposerButton(secondRow, "Select", () -> { addComposerButton(row, "Select", () -> {
terminalSelectionEnabled = !terminalSelectionEnabled; terminalSelectionEnabled = !terminalSelectionEnabled;
if (terminalText != null) { if (terminalText != null) {
terminalText.setTextIsSelectable(terminalSelectionEnabled); terminalText.setTextIsSelectable(terminalSelectionEnabled);
@@ -3225,6 +3224,8 @@ public final class MainActivity extends Activity {
button.setPadding(dp(5), 0, dp(5), 0); button.setPadding(dp(5), 0, dp(5), 0);
button.setMinWidth(0); button.setMinWidth(0);
button.setMinimumWidth(0); button.setMinimumWidth(0);
button.setMinHeight(0);
button.setMinimumHeight(0);
return button; return button;
} }
@@ -3249,7 +3250,6 @@ public final class MainActivity extends Activity {
input.setTextColor(COLOR_TEXT); input.setTextColor(COLOR_TEXT);
input.setHintTextColor(COLOR_TEXT_DIM); input.setHintTextColor(COLOR_TEXT_DIM);
input.setTextSize(13); input.setTextSize(13);
input.setMinHeight(dp(38));
input.setPadding(dp(8), dp(5), dp(8), dp(5)); input.setPadding(dp(8), dp(5), dp(8), dp(5));
input.setBackground(inputBackground()); input.setBackground(inputBackground());
} }
@@ -3308,37 +3308,40 @@ public final class MainActivity extends Activity {
private void addSoftButton(LinearLayout row, String label, View.OnClickListener listener) { private void addSoftButton(LinearLayout row, String label, View.OnClickListener listener) {
Button button = toolbarButton(label, listener); Button button = toolbarButton(label, listener);
button.setTextSize(isArrowLabel(label) ? 15 : 9); button.setTextSize(isArrowLabel(label) ? 14 : 9);
button.setPadding(dp(2), 0, dp(2), 0); button.setPadding(dp(5), 0, dp(5), 0);
button.setMinWidth(0); button.setMinWidth(0);
button.setMinimumWidth(0); button.setMinimumWidth(0);
button.setMinHeight(0);
button.setMinimumHeight(0);
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
0, ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
1 0
); );
params.leftMargin = dp(2); params.leftMargin = dp(1);
params.rightMargin = dp(2); params.rightMargin = dp(1);
row.addView(button, params); row.addView(button, params);
} }
private void addAccessoryTab(LinearLayout row, String label, int page) { private void addAccessoryTab(LinearLayout row, String label, int page) {
Button button = toolbarButton(label, view -> setTerminalKeyPage(page)); Button button = toolbarButton(label, view -> setTerminalKeyPage(page));
boolean selected = terminalKeyPage == page; boolean selected = terminalKeyPage == page;
button.setTextSize(9); button.setTextSize(8);
button.setPadding(dp(2), 0, dp(2), 0); button.setPadding(dp(7), 0, dp(7), 0);
button.setMinWidth(0); button.setMinWidth(0);
button.setMinimumWidth(0); button.setMinimumWidth(0);
button.setMinHeight(0);
button.setMinimumHeight(0);
button.setTextColor(selected ? Color.rgb(14, 38, 24) : COLOR_TEXT_MUTED); button.setTextColor(selected ? Color.rgb(14, 38, 24) : COLOR_TEXT_MUTED);
button.setBackground(selected button.setBackground(selected
? rounded(COLOR_ACCENT, 7, COLOR_ACCENT, 1) ? rounded(COLOR_ACCENT, 7, COLOR_ACCENT, 1)
: rounded(COLOR_CARD_ALT, 7, COLOR_BORDER_SOFT, 1)); : rounded(COLOR_CARD_ALT, 7, COLOR_BORDER_SOFT, 1));
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
0, ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
1 0
); );
params.leftMargin = dp(2);
params.rightMargin = dp(2); params.rightMargin = dp(2);
row.addView(button, params); row.addView(button, params);
} }