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

Replace heuristic reading with chat toggle
Gitea Smoke / smoke (push) Successful in 0s
Details
Gitea Android APK / build (push) Successful in 12m3s
Details

Browse Source
This commit is contained in:
Codex
2026-07-12 09:45:38 +00:00
parent c0904e6aaa
commit f1db46ecbe
1 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/neatstudio/tmuxandroid/MainActivity.java
+15 -42
View File
@@ -23,7 +23,6 @@ import android.os.Looper;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.InputType; import android.text.InputType;
import android.text.method.LinkMovementMethod;
import android.view.Gravity; import android.view.Gravity;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
import android.view.KeyEvent; import android.view.KeyEvent;
@@ -73,8 +72,7 @@ public final class MainActivity extends Activity {
private static final int STATUS_SUCCESS = 2; private static final int STATUS_SUCCESS = 2;
private static final int STATUS_ERROR = 3; private static final int STATUS_ERROR = 3;
private static final int TERMINAL_VIEW_CHAT = 0; private static final int TERMINAL_VIEW_CHAT = 0;
private static final int TERMINAL_VIEW_READING = 1; private static final int TERMINAL_VIEW_FULL = 1;
private static final int TERMINAL_VIEW_FULL = 2;
private static final long TERMINAL_RENDER_INTERVAL_MS = 80L; private static final long TERMINAL_RENDER_INTERVAL_MS = 80L;
private static final long[] SOCKET_RECONNECT_DELAYS_MS = {1000L, 2000L, 4000L, 8000L, 15000L}; private static final long[] SOCKET_RECONNECT_DELAYS_MS = {1000L, 2000L, 4000L, 8000L, 15000L};
private static final int COLOR_APP_BG = Color.rgb(18, 20, 24); private static final int COLOR_APP_BG = Color.rgb(18, 20, 24);
@@ -153,7 +151,6 @@ public final class MainActivity extends Activity {
private int lastActiveSessionCount = -1; private int lastActiveSessionCount = -1;
private TerminalScreenBuffer terminalScreen = new TerminalScreenBuffer(DEFAULT_TERMINAL_COLS, DEFAULT_TERMINAL_ROWS); private TerminalScreenBuffer terminalScreen = new TerminalScreenBuffer(DEFAULT_TERMINAL_COLS, DEFAULT_TERMINAL_ROWS);
private final StringBuilder queuedTerminalInput = new StringBuilder(); private final StringBuilder queuedTerminalInput = new StringBuilder();
private final Set<String> terminalExpandedBlocks = new HashSet<>();
private final Set<String> terminalExpandedMessages = new HashSet<>(); private final Set<String> terminalExpandedMessages = new HashSet<>();
private final List<ConversationMessage> terminalConversationMessages = new ArrayList<>(); private final List<ConversationMessage> terminalConversationMessages = new ArrayList<>();
private boolean terminalConnected; private boolean terminalConnected;
@@ -1613,7 +1610,6 @@ public final class MainActivity extends Activity {
terminalSelectionEnabled = false; terminalSelectionEnabled = false;
terminalFollowOutput = true; terminalFollowOutput = true;
terminalKeyPage = 0; terminalKeyPage = 0;
terminalExpandedBlocks.clear();
terminalExpandedMessages.clear(); terminalExpandedMessages.clear();
terminalConversationMessages.clear(); terminalConversationMessages.clear();
terminalLiveStatusText = null; terminalLiveStatusText = null;
@@ -1766,25 +1762,17 @@ public final class MainActivity extends Activity {
dp(13) dp(13)
)); ));
bar.addView(titleBlock, new LinearLayout.LayoutParams(0, dp(32), 1)); bar.addView(titleBlock, new LinearLayout.LayoutParams(0, dp(32), 1));
terminalReadingButton = terminalToolButton("聊", view -> showTerminalViewPicker()); terminalReadingButton = terminalToolButton("聊", view -> showTerminalView(
terminalReadingButton.setContentDescription("Choose chat or terminal view"); terminalViewMode == TERMINAL_VIEW_CHAT ? TERMINAL_VIEW_FULL : TERMINAL_VIEW_CHAT,
true
));
terminalReadingButton.setContentDescription("Toggle chat and terminal view");
styleTerminalReadingButton(); styleTerminalReadingButton();
bar.addView(terminalReadingButton); bar.addView(terminalReadingButton);
bar.addView(terminalToolButton("☰", view -> showTerminalActions(sessionName))); bar.addView(terminalToolButton("☰", view -> showTerminalActions(sessionName)));
return bar; return bar;
} }
private void showTerminalViewPicker() {
String[] items = {"Chat", "Chinese reading", "Full terminal"};
new AlertDialog.Builder(this)
.setTitle("Session view")
.setSingleChoiceItems(items, terminalViewMode, (dialog, which) -> {
showTerminalView(which, true);
dialog.dismiss();
})
.show();
}
private void showTerminalView(int mode, boolean announce) { private void showTerminalView(int mode, boolean announce) {
terminalViewMode = mode; terminalViewMode = mode;
if (terminalScroll == null || terminalText == null || terminalChatList == null) { if (terminalScroll == null || terminalText == null || terminalChatList == null) {
@@ -1799,10 +1787,9 @@ public final class MainActivity extends Activity {
)); ));
renderTerminalConversation(); renderTerminalConversation();
} else { } else {
boolean reading = mode == TERMINAL_VIEW_READING; terminalText.setHorizontallyScrolling(true);
terminalText.setHorizontallyScrolling(!reading); terminalText.setGravity(Gravity.BOTTOM | Gravity.START);
terminalText.setGravity((reading ? Gravity.TOP : Gravity.BOTTOM) | Gravity.START); terminalText.setMovementMethod(null);
terminalText.setMovementMethod(reading ? LinkMovementMethod.getInstance() : null);
terminalScroll.addView(terminalText, new ScrollView.LayoutParams( terminalScroll.addView(terminalText, new ScrollView.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT ViewGroup.LayoutParams.WRAP_CONTENT
@@ -1811,9 +1798,7 @@ public final class MainActivity extends Activity {
} }
styleTerminalReadingButton(); styleTerminalReadingButton();
if (announce) { if (announce) {
setStatus(mode == TERMINAL_VIEW_CHAT setStatus(mode == TERMINAL_VIEW_CHAT ? "Chat view" : "Full terminal mode");
? "Chat view"
: mode == TERMINAL_VIEW_READING ? "Chinese reading mode" : "Full terminal mode");
} }
} }
@@ -1821,11 +1806,10 @@ public final class MainActivity extends Activity {
if (terminalReadingButton == null) { if (terminalReadingButton == null) {
return; return;
} }
terminalReadingButton.setText(terminalViewMode == TERMINAL_VIEW_CHAT terminalReadingButton.setText(terminalViewMode == TERMINAL_VIEW_CHAT ? "聊" : "终");
? "聊" : terminalViewMode == TERMINAL_VIEW_READING ? "读" : "终"); terminalReadingButton.setTextColor(terminalViewMode == TERMINAL_VIEW_CHAT
terminalReadingButton.setTextColor(terminalViewMode != TERMINAL_VIEW_FULL
? Color.rgb(14, 38, 24) : COLOR_TEXT_MUTED); ? Color.rgb(14, 38, 24) : COLOR_TEXT_MUTED);
terminalReadingButton.setBackground(terminalViewMode != TERMINAL_VIEW_FULL terminalReadingButton.setBackground(terminalViewMode == TERMINAL_VIEW_CHAT
? rounded(COLOR_ACCENT, 7, COLOR_ACCENT, 1) ? rounded(COLOR_ACCENT, 7, COLOR_ACCENT, 1)
: buttonBackground()); : buttonBackground());
} }
@@ -3607,19 +3591,8 @@ public final class MainActivity extends Activity {
return; return;
} }
lastTerminalRenderMs = System.currentTimeMillis(); lastTerminalRenderMs = System.currentTimeMillis();
if (terminalViewMode == TERMINAL_VIEW_READING) { terminalText.setMovementMethod(null);
terminalText.setMovementMethod(LinkMovementMethod.getInstance()); terminalText.setText(terminalScreen.render());
terminalText.setHighlightColor(Color.TRANSPARENT);
terminalText.setText(terminalScreen.renderFocused(terminalExpandedBlocks, key -> {
if (!terminalExpandedBlocks.add(key)) {
terminalExpandedBlocks.remove(key);
}
renderTerminalNow();
}));
} else {
terminalText.setMovementMethod(null);
terminalText.setText(terminalScreen.render());
}
updateTerminalLivePanel(); updateTerminalLivePanel();
if (terminalViewMode != TERMINAL_VIEW_CHAT && terminalFollowOutput) { if (terminalViewMode != TERMINAL_VIEW_CHAT && terminalFollowOutput) {
terminalScroll.post(() -> terminalScroll.fullScroll(View.FOCUS_DOWN)); terminalScroll.post(() -> terminalScroll.fullScroll(View.FOCUS_DOWN));