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

Compact action buttons across pages
Gitea Smoke / smoke (push) Successful in 2s
Details
Gitea Android APK / build (push) Failing after 1m1s
Details

Browse Source
This commit is contained in:
Codex
2026-07-15 15:15:09 +00:00
parent 412c69cc36
commit 650431e3d1
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/neatstudio/tmuxandroid/MainActivity.java
+26 -15
View File
@@ -1053,11 +1053,15 @@ public final class MainActivity extends Activity {
LinearLayout actions = new LinearLayout(this); LinearLayout actions = new LinearLayout(this);
actions.setOrientation(LinearLayout.HORIZONTAL); actions.setOrientation(LinearLayout.HORIZONTAL);
actions.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
Button copy = compactButton("Copy commands", view -> copyText("Server install", SERVER_INSTALL_COMMANDS)); Button copy = compactButton("Copy commands", view -> copyText("Server install", SERVER_INSTALL_COMMANDS));
actions.addView(copy, new LinearLayout.LayoutParams(0, dp(40), 1)); actions.addView(copy, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, dp(32)));
Button add = compactButton("Add server", view -> promptCustomServer()); Button add = compactButton("Add server", view -> promptCustomServer());
LinearLayout.LayoutParams addParams = new LinearLayout.LayoutParams(0, dp(40), 1); LinearLayout.LayoutParams addParams = new LinearLayout.LayoutParams(
addParams.leftMargin = dp(7); ViewGroup.LayoutParams.WRAP_CONTENT,
dp(32)
);
addParams.leftMargin = dp(5);
actions.addView(add, addParams); actions.addView(add, addParams);
panel.addView(actions, spacedMatchWrap(10, 0)); panel.addView(actions, spacedMatchWrap(10, 0));
@@ -1320,33 +1324,40 @@ public final class MainActivity extends Activity {
} }
private LinearLayout actionPanel(Button... buttons) { private LinearLayout actionPanel(Button... buttons) {
boolean compact = PAGE_TOOLS.equals(activeMainPage) || PAGE_UPDATE.equals(activeMainPage); final int columns = 3;
LinearLayout panel = new LinearLayout(this); LinearLayout panel = new LinearLayout(this);
panel.setOrientation(LinearLayout.VERTICAL); panel.setOrientation(LinearLayout.VERTICAL);
panel.setPadding(dp(compact ? 4 : 6), dp(compact ? 4 : 6), dp(compact ? 4 : 6), 0); panel.setPadding(dp(4), dp(4), dp(4), 0);
panel.setBackground(panelBackground()); panel.setBackground(panelBackground());
LinearLayout row = null; LinearLayout row = null;
for (int index = 0; index < buttons.length; index++) { for (int index = 0; index < buttons.length; index++) {
if (index % 2 == 0) { if (index % columns == 0) {
row = new LinearLayout(this); row = new LinearLayout(this);
row.setOrientation(LinearLayout.HORIZONTAL); row.setOrientation(LinearLayout.HORIZONTAL);
panel.addView(row, matchWrap()); panel.addView(row, matchWrap());
} }
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, dp(compact ? 32 : 38), 1); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(0, dp(32), 1);
params.leftMargin = dp(compact ? 2 : 3); params.leftMargin = dp(2);
params.rightMargin = dp(compact ? 2 : 3); params.rightMargin = dp(2);
params.bottomMargin = dp(compact ? 4 : 6); params.bottomMargin = dp(4);
if (compact) { buttons[index].setTextSize(9);
buttons[index].setTextSize(10); buttons[index].setPadding(dp(4), 0, dp(4), 0);
buttons[index].setPadding(dp(6), 0, dp(6), 0);
}
row.addView(buttons[index], params); row.addView(buttons[index], params);
} }
int remainder = buttons.length % columns;
if (row != null && remainder != 0) {
for (int index = remainder; index < columns; index++) {
LinearLayout.LayoutParams spacerParams = new LinearLayout.LayoutParams(0, dp(32), 1);
spacerParams.leftMargin = dp(2);
spacerParams.rightMargin = dp(2);
row.addView(new View(this), spacerParams);
}
}
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams( LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT
); );
params.bottomMargin = dp(compact ? 6 : 8); params.bottomMargin = dp(6);
panel.setLayoutParams(params); panel.setLayoutParams(params);
return panel; return panel;
} }