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

Move terminal key pager into composer
Gitea Smoke / smoke (push) Successful in 0s
Details
Gitea Android APK / build (push) Successful in 11m57s
Details

Browse Source
This commit is contained in:
Codex
2026-07-09 00:19:35 +00:00
parent bbd6fe3f5f
commit df29546ff9
1 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/neatstudio/tmuxandroid/MainActivity.java
+35 -13
View File
@@ -115,6 +115,7 @@ public final class MainActivity extends Activity {
private TextView terminalText; private TextView terminalText;
private ScrollView terminalScroll; private ScrollView terminalScroll;
private EditText inputField; private EditText inputField;
private Button terminalKeyPageButton;
private View terminalComposerBar; private View terminalComposerBar;
private LinearLayout terminalGroupRow; private LinearLayout terminalGroupRow;
private String activeSessionName; private String activeSessionName;
@@ -1456,6 +1457,14 @@ public final class MainActivity extends Activity {
row.setOrientation(LinearLayout.HORIZONTAL); row.setOrientation(LinearLayout.HORIZONTAL);
row.setGravity(Gravity.BOTTOM); row.setGravity(Gravity.BOTTOM);
terminalKeyPageButton = terminalPageButton();
LinearLayout.LayoutParams pageParams = new LinearLayout.LayoutParams(
dp(70),
dp(48)
);
pageParams.rightMargin = dp(6);
row.addView(terminalKeyPageButton, pageParams);
inputField = new EditText(this); inputField = new EditText(this);
inputField.setTextColor(COLOR_TEXT); inputField.setTextColor(COLOR_TEXT);
inputField.setHintTextColor(COLOR_TEXT_DIM); inputField.setHintTextColor(COLOR_TEXT_DIM);
@@ -2056,10 +2065,7 @@ public final class MainActivity extends Activity {
LinearLayout firstRow = terminalKeyRow(); LinearLayout firstRow = terminalKeyRow();
LinearLayout secondRow = terminalKeyRow(); LinearLayout secondRow = terminalKeyRow();
addAccessoryButton(firstRow, "<", view -> setTerminalKeyPage(terminalKeyPage - 1));
addPageLabel(firstRow);
addAccessoryPageKeys(firstRow, secondRow); addAccessoryPageKeys(firstRow, secondRow);
addAccessoryButton(firstRow, ">", view -> setTerminalKeyPage(terminalKeyPage + 1));
pad.addView(firstRow, new LinearLayout.LayoutParams( pad.addView(firstRow, new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT,
0, 0,
@@ -2085,16 +2091,6 @@ public final class MainActivity extends Activity {
return row; return row;
} }
private void addPageLabel(LinearLayout row) {
TextView label = new TextView(this);
label.setText(accessoryPageName());
label.setTextColor(COLOR_TEXT_DIM);
label.setTextSize(11);
label.setGravity(Gravity.CENTER);
label.setTypeface(Typeface.DEFAULT_BOLD);
row.addView(label, new LinearLayout.LayoutParams(dp(44), ViewGroup.LayoutParams.MATCH_PARENT));
}
private void addAccessoryPageKeys(LinearLayout topRow, LinearLayout bottomRow) { private void addAccessoryPageKeys(LinearLayout topRow, LinearLayout bottomRow) {
switch (terminalKeyPage) { switch (terminalKeyPage) {
case 1: case 1:
@@ -2393,6 +2389,7 @@ public final class MainActivity extends Activity {
private void setTerminalKeyPage(int page) { private void setTerminalKeyPage(int page) {
terminalKeyPage = (page + 4) % 4; terminalKeyPage = (page + 4) % 4;
updateTerminalPageButton();
if (activeSessionName != null) { if (activeSessionName != null) {
renderTerminalControlsOnly(); renderTerminalControlsOnly();
} }
@@ -2557,6 +2554,31 @@ public final class MainActivity extends Activity {
return button; return button;
} }
private Button terminalPageButton() {
Button button = toolbarButton("", view -> setTerminalKeyPage(terminalKeyPage + 1));
button.setTextSize(10);
button.setPadding(dp(5), 0, dp(5), 0);
button.setMinWidth(dp(70));
button.setMinimumWidth(dp(70));
button.setOnLongClickListener(view -> {
view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
setTerminalKeyPage(terminalKeyPage - 1);
return true;
});
updateTerminalPageButton(button);
return button;
}
private void updateTerminalPageButton() {
updateTerminalPageButton(terminalKeyPageButton);
}
private void updateTerminalPageButton(Button button) {
if (button != null) {
button.setText("‹ " + accessoryPageName() + " ›");
}
}
private void styleInput(EditText input) { private void styleInput(EditText input) {
input.setTextColor(COLOR_TEXT); input.setTextColor(COLOR_TEXT);
input.setHintTextColor(COLOR_TEXT_DIM); input.setHintTextColor(COLOR_TEXT_DIM);