Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ced6523c00 | ||
|
|
2e8a0a164f | ||
|
|
c4713dccbd | ||
|
|
981e94efc3 | ||
|
|
434cb67372 | ||
|
|
10e8139a32 |
@@ -1,4 +1,4 @@
|
||||
name: Gitea Android APK
|
||||
name: Gitea Android Compile Check
|
||||
|
||||
on: [push]
|
||||
|
||||
@@ -6,7 +6,7 @@ jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Build APK
|
||||
- name: Compile Android APK
|
||||
env:
|
||||
CLONE_TOKEN: ${{ secrets.TMUX_GITEA_TOKEN }}
|
||||
run: |
|
||||
@@ -62,6 +62,8 @@ jobs:
|
||||
|
||||
mkdir -p release
|
||||
APK_PATH="$(find app/build/outputs/apk -name '*.apk' | sort | tail -n 1)"
|
||||
cp "${APK_PATH}" release/tmux-android-gitea.apk
|
||||
ls -lh release/tmux-android-gitea.apk
|
||||
sha256sum release/tmux-android-gitea.apk
|
||||
cp "${APK_PATH}" release/tmux-android-gitea-compile-check.apk
|
||||
ls -lh release/tmux-android-gitea-compile-check.apk
|
||||
sha256sum release/tmux-android-gitea-compile-check.apk
|
||||
echo "Gitea-built APK is a compile check only."
|
||||
echo "Do not publish it as a release asset; release APKs are GitHub-built and mirrored byte-for-byte to Gitea."
|
||||
|
||||
@@ -26,6 +26,8 @@ APIs directly:
|
||||
display
|
||||
- mobile soft-key row for tmux-oriented input, including tmux prefix, detach,
|
||||
new window, previous/next window, Ctrl keys, arrows, page keys, and paste
|
||||
- terminal viewport resize based on the phone's visible text area, including
|
||||
keyboard height changes, so tmux output wraps at the same width the user sees
|
||||
- automatic update checks with Gitea first and GitHub fallback, plus manual
|
||||
source-specific checks
|
||||
- one-download-per-version APK cache, SHA-256 verification, and installer
|
||||
@@ -100,6 +102,15 @@ to reach GitHub reliably. GitHub remains an optional public source. This Gitea
|
||||
instance does not support the GitHub-style `/releases/latest/download/...` URL,
|
||||
so the app uses the Gitea Release API as the stable Gitea update entrypoint.
|
||||
|
||||
Release APKs must be identical on GitHub and Gitea. The canonical APK is the
|
||||
GitHub Release asset built by `.github/workflows/android.yml`; publish to Gitea
|
||||
by mirroring that same `tmux-android.apk` byte-for-byte and uploading a
|
||||
Gitea-specific `latest.json` whose `apkUrl` points at the Gitea asset but whose
|
||||
`versionCode`, `versionName`, and `sha256` match the GitHub manifest. Do not use
|
||||
a separately built Gitea APK as a release asset unless it is proven to have the
|
||||
same SHA-256 as the GitHub APK. This keeps Android signatures and update
|
||||
compatibility identical no matter which platform the phone can reach.
|
||||
|
||||
Plain branch builds only create Actions artifacts; they are useful for CI
|
||||
verification, but releases are the stable download/update channel.
|
||||
|
||||
|
||||
@@ -19,18 +19,16 @@ import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.Spanned;
|
||||
import android.text.InputType;
|
||||
import android.text.style.BackgroundColorSpan;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.text.style.StyleSpan;
|
||||
import android.view.Gravity;
|
||||
import android.view.HapticFeedbackConstants;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.WindowInsets;
|
||||
import android.view.WindowManager;
|
||||
import android.view.inputmethod.EditorInfo;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.HorizontalScrollView;
|
||||
@@ -55,9 +53,16 @@ import java.util.concurrent.Executors;
|
||||
public final class MainActivity extends Activity {
|
||||
private static final int IMAGE_PICK_REQUEST = 2001;
|
||||
private static final long AUTO_UPDATE_INTERVAL_MS = 6L * 60L * 60L * 1000L;
|
||||
private static final int TERMINAL_COLS = 96;
|
||||
private static final int TERMINAL_ROWS = 32;
|
||||
private static final int MAX_TERMINAL_CHARS = 40_000;
|
||||
private static final int DEFAULT_TERMINAL_COLS = 80;
|
||||
private static final int DEFAULT_TERMINAL_ROWS = 24;
|
||||
private static final int MIN_TERMINAL_COLS = 36;
|
||||
private static final int MAX_TERMINAL_COLS = 140;
|
||||
private static final int MIN_TERMINAL_ROWS = 8;
|
||||
private static final int MAX_TERMINAL_ROWS = 80;
|
||||
private static final int STATUS_NORMAL = 0;
|
||||
private static final int STATUS_BUSY = 1;
|
||||
private static final int STATUS_SUCCESS = 2;
|
||||
private static final int STATUS_ERROR = 3;
|
||||
private static final long TERMINAL_RENDER_INTERVAL_MS = 80L;
|
||||
private static final String OLD_LOCAL_DEFAULT_URL = "http://127.0.0.1:3000";
|
||||
private static final String OLD_GITHUB_DEFAULT_UPDATE_URL = "https://github.com/neatstudio/tmux-browser-android/releases/latest/download/latest.json";
|
||||
@@ -93,11 +98,13 @@ public final class MainActivity extends Activity {
|
||||
private String activeSessionName;
|
||||
private String activeMainPage = PAGE_SESSIONS;
|
||||
private String pendingImageUploadSession;
|
||||
private final StringBuilder terminalBuffer = new StringBuilder();
|
||||
private TerminalScreenBuffer terminalScreen = new TerminalScreenBuffer(DEFAULT_TERMINAL_COLS, DEFAULT_TERMINAL_ROWS);
|
||||
private final StringBuilder queuedTerminalInput = new StringBuilder();
|
||||
private boolean terminalConnected;
|
||||
private boolean terminalRenderPending;
|
||||
private long lastTerminalRenderMs;
|
||||
private int terminalCols = DEFAULT_TERMINAL_COLS;
|
||||
private int terminalRows = DEFAULT_TERMINAL_ROWS;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
@@ -156,7 +163,6 @@ public final class MainActivity extends Activity {
|
||||
statusText.setTextSize(12);
|
||||
statusText.setGravity(Gravity.CENTER_VERTICAL);
|
||||
statusText.setPadding(dp(10), 0, dp(10), 0);
|
||||
statusText.setBackground(rounded(Color.rgb(22, 27, 34), 0, Color.TRANSPARENT, 0));
|
||||
statusText.setSingleLine(true);
|
||||
setStatus("Ready");
|
||||
applySystemBarInsets(root);
|
||||
@@ -961,11 +967,13 @@ public final class MainActivity extends Activity {
|
||||
|
||||
private void openTerminal(String sessionName) {
|
||||
activeSessionName = sessionName;
|
||||
terminalBuffer.setLength(0);
|
||||
terminalScreen = new TerminalScreenBuffer(DEFAULT_TERMINAL_COLS, DEFAULT_TERMINAL_ROWS);
|
||||
queuedTerminalInput.setLength(0);
|
||||
terminalConnected = false;
|
||||
terminalRenderPending = false;
|
||||
lastTerminalRenderMs = 0L;
|
||||
terminalCols = DEFAULT_TERMINAL_COLS;
|
||||
terminalRows = DEFAULT_TERMINAL_ROWS;
|
||||
root.removeAllViews();
|
||||
root.addView(createTerminalTopBar(sessionName), matchWrap());
|
||||
|
||||
@@ -986,21 +994,26 @@ public final class MainActivity extends Activity {
|
||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT
|
||||
));
|
||||
terminalScroll.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) ->
|
||||
resizeTerminalToViewport(false));
|
||||
root.addView(terminalScroll, new LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
0,
|
||||
1
|
||||
));
|
||||
root.addView(createInputBar(), matchWrap());
|
||||
root.addView(createSoftKeyBar(), new LinearLayout.LayoutParams(
|
||||
root.addView(createComposerBar(), matchWrap());
|
||||
root.addView(createSoftKeyPad(), new LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
dp(46)
|
||||
dp(92)
|
||||
));
|
||||
root.addView(statusText, new LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
||||
dp(28)
|
||||
));
|
||||
connectTerminal(sessionName);
|
||||
terminalScroll.post(() -> {
|
||||
resizeTerminalToViewport(false);
|
||||
connectTerminal(sessionName);
|
||||
});
|
||||
}
|
||||
|
||||
private LinearLayout createTerminalTopBar(String sessionName) {
|
||||
@@ -1115,7 +1128,7 @@ public final class MainActivity extends Activity {
|
||||
.setItems(items, (dialog, which) -> {
|
||||
switch (which) {
|
||||
case 0:
|
||||
terminalBuffer.setLength(0);
|
||||
terminalScreen.clear();
|
||||
terminalText.setText("");
|
||||
if (terminalSocket != null) {
|
||||
terminalSocket.clearHistory();
|
||||
@@ -1129,12 +1142,12 @@ public final class MainActivity extends Activity {
|
||||
break;
|
||||
case 3:
|
||||
if (terminalSocket != null) {
|
||||
terminalSocket.scroll(-TERMINAL_ROWS);
|
||||
terminalSocket.scroll(-terminalRows);
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
if (terminalSocket != null) {
|
||||
terminalSocket.scroll(TERMINAL_ROWS);
|
||||
terminalSocket.scroll(terminalRows);
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
@@ -1165,30 +1178,55 @@ public final class MainActivity extends Activity {
|
||||
.show();
|
||||
}
|
||||
|
||||
private LinearLayout createInputBar() {
|
||||
private LinearLayout createComposerBar() {
|
||||
LinearLayout bar = new LinearLayout(this);
|
||||
bar.setOrientation(LinearLayout.HORIZONTAL);
|
||||
bar.setGravity(Gravity.CENTER_VERTICAL);
|
||||
bar.setPadding(dp(8), dp(5), dp(8), dp(5));
|
||||
bar.setOrientation(LinearLayout.VERTICAL);
|
||||
bar.setPadding(dp(8), dp(5), dp(8), dp(6));
|
||||
bar.setBackgroundColor(Color.rgb(17, 20, 24));
|
||||
|
||||
LinearLayout row = new LinearLayout(this);
|
||||
row.setOrientation(LinearLayout.HORIZONTAL);
|
||||
row.setGravity(Gravity.BOTTOM);
|
||||
|
||||
inputField = new EditText(this);
|
||||
inputField.setSingleLine(true);
|
||||
inputField.setTextColor(Color.WHITE);
|
||||
inputField.setHintTextColor(Color.rgb(150, 158, 168));
|
||||
inputField.setHint("type command or text");
|
||||
inputField.setImeOptions(EditorInfo.IME_ACTION_SEND);
|
||||
inputField.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
|
||||
styleInput(inputField);
|
||||
inputField.setHint("type command, text, or multi-line paste");
|
||||
inputField.setSingleLine(false);
|
||||
inputField.setMinLines(1);
|
||||
inputField.setMaxLines(4);
|
||||
inputField.setGravity(Gravity.TOP | Gravity.START);
|
||||
inputField.setImeOptions(EditorInfo.IME_ACTION_NONE);
|
||||
inputField.setInputType(InputType.TYPE_CLASS_TEXT
|
||||
| InputType.TYPE_TEXT_FLAG_MULTI_LINE
|
||||
| InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
|
||||
styleComposerInput(inputField);
|
||||
inputField.setOnEditorActionListener((view, actionId, event) -> {
|
||||
if (actionId == EditorInfo.IME_ACTION_SEND) {
|
||||
if (event != null
|
||||
&& event.getKeyCode() == KeyEvent.KEYCODE_ENTER
|
||||
&& event.isShiftPressed()
|
||||
&& event.getAction() == KeyEvent.ACTION_UP) {
|
||||
sendLine();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
bar.addView(inputField, new LinearLayout.LayoutParams(0, dp(42), 1));
|
||||
bar.addView(toolbarButton("Send", view -> sendLine()));
|
||||
row.addView(inputField, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1));
|
||||
row.addView(toolbarButton("Send", view -> sendLine()), new LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT,
|
||||
dp(54)
|
||||
));
|
||||
bar.addView(row, matchWrap());
|
||||
|
||||
LinearLayout actions = new LinearLayout(this);
|
||||
actions.setOrientation(LinearLayout.HORIZONTAL);
|
||||
actions.setGravity(Gravity.CENTER_VERTICAL);
|
||||
actions.setPadding(0, dp(5), 0, 0);
|
||||
actions.addView(compactButton("Enter", view -> sendTerminalInput("\r")));
|
||||
actions.addView(compactButton("NL", view -> insertComposerText("\n")));
|
||||
actions.addView(compactButton("Hide", view -> hideKeyboard()));
|
||||
actions.addView(compactButton("Clear", view -> inputField.setText("")));
|
||||
bar.addView(actions, matchWrap());
|
||||
return bar;
|
||||
}
|
||||
|
||||
@@ -1709,7 +1747,22 @@ public final class MainActivity extends Activity {
|
||||
return input;
|
||||
}
|
||||
|
||||
private HorizontalScrollView createSoftKeyBar() {
|
||||
private LinearLayout createSoftKeyPad() {
|
||||
LinearLayout pad = new LinearLayout(this);
|
||||
pad.setOrientation(LinearLayout.VERTICAL);
|
||||
pad.setBackgroundColor(Color.rgb(22, 27, 34));
|
||||
pad.addView(createSoftKeyRow(
|
||||
new String[]{"Esc", "Tab", "^C", "^D", "^L", "^R", "^A", "^E", "^V", "^Z", "^\\", "Paste"},
|
||||
new String[]{"\u001b", "\t", "\u0003", "\u0004", "\u000c", "\u0012", "\u0001", "\u0005", "\u0016", "\u001a", "\u001c", null}
|
||||
), new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
|
||||
pad.addView(createSoftKeyRow(
|
||||
new String[]{"Tmux", "Detach", "NewWin", "PrevWin", "NextWin", "Left", "Down", "Up", "Right", "PgUp", "PgDn", "Home", "End"},
|
||||
new String[]{"\u0002", "\u0002d", "\u0002c", "\u0002p", "\u0002n", "\u001b[D", "\u001b[B", "\u001b[A", "\u001b[C", "\u001b[5~", "\u001b[6~", "\u001b[H", "\u001b[F"}
|
||||
), new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1));
|
||||
return pad;
|
||||
}
|
||||
|
||||
private HorizontalScrollView createSoftKeyRow(String[] labels, String[] sequences) {
|
||||
HorizontalScrollView scroller = new HorizontalScrollView(this);
|
||||
scroller.setHorizontalScrollBarEnabled(false);
|
||||
scroller.setBackgroundColor(Color.rgb(22, 27, 34));
|
||||
@@ -1718,32 +1771,15 @@ public final class MainActivity extends Activity {
|
||||
row.setOrientation(LinearLayout.HORIZONTAL);
|
||||
row.setGravity(Gravity.CENTER_VERTICAL);
|
||||
row.setPadding(dp(6), dp(4), dp(6), dp(4));
|
||||
addSoftKey(row, "Enter", "\r");
|
||||
addSoftKey(row, "Esc", "\u001b");
|
||||
addSoftKey(row, "Tab", "\t");
|
||||
addSoftKey(row, "^C", "\u0003");
|
||||
addSoftKey(row, "^D", "\u0004");
|
||||
addSoftKey(row, "^L", "\u000c");
|
||||
addSoftKey(row, "^R", "\u0012");
|
||||
addSoftKey(row, "^A", "\u0001");
|
||||
addSoftKey(row, "^E", "\u0005");
|
||||
addSoftKey(row, "^V", "\u0016");
|
||||
addSoftKey(row, "^Z", "\u001a");
|
||||
addSoftKey(row, "^\\", "\u001c");
|
||||
addSoftKey(row, "Tmux", "\u0002");
|
||||
addSoftKey(row, "Detach", "\u0002d");
|
||||
addSoftKey(row, "NewWin", "\u0002c");
|
||||
addSoftKey(row, "NextWin", "\u0002n");
|
||||
addSoftKey(row, "PrevWin", "\u0002p");
|
||||
addSoftKey(row, "Left", "\u001b[D");
|
||||
addSoftKey(row, "Down", "\u001b[B");
|
||||
addSoftKey(row, "Up", "\u001b[A");
|
||||
addSoftKey(row, "Right", "\u001b[C");
|
||||
addSoftKey(row, "PgUp", "\u001b[5~");
|
||||
addSoftKey(row, "PgDn", "\u001b[6~");
|
||||
addSoftKey(row, "Home", "\u001b[H");
|
||||
addSoftKey(row, "End", "\u001b[F");
|
||||
addSoftButton(row, "Paste", view -> pasteClipboard());
|
||||
for (int index = 0; index < labels.length; index++) {
|
||||
String label = labels[index];
|
||||
String sequence = sequences[index];
|
||||
if (sequence == null) {
|
||||
addSoftButton(row, label, view -> pasteClipboard());
|
||||
} else {
|
||||
addSoftKey(row, label, sequence);
|
||||
}
|
||||
}
|
||||
scroller.addView(row, new HorizontalScrollView.LayoutParams(
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT,
|
||||
ViewGroup.LayoutParams.MATCH_PARENT
|
||||
@@ -1756,6 +1792,7 @@ public final class MainActivity extends Activity {
|
||||
queuedTerminalInput.setLength(0);
|
||||
terminalConnected = false;
|
||||
setStatus("Connecting " + sessionName);
|
||||
resizeTerminalToViewport(false);
|
||||
appendTerminal("[connecting]\r\n");
|
||||
terminalSocket = new TerminalSocketClient(new TerminalSocketClient.Listener() {
|
||||
@Override
|
||||
@@ -1763,6 +1800,7 @@ public final class MainActivity extends Activity {
|
||||
runOnUiThread(() -> {
|
||||
terminalConnected = true;
|
||||
setStatus("Connected " + sessionName);
|
||||
resizeTerminalToViewport(true);
|
||||
flushQueuedTerminalInput();
|
||||
});
|
||||
}
|
||||
@@ -1788,7 +1826,41 @@ public final class MainActivity extends Activity {
|
||||
});
|
||||
}
|
||||
});
|
||||
terminalSocket.connect(api.getBaseUrl(), sessionName, TERMINAL_COLS, TERMINAL_ROWS);
|
||||
terminalSocket.connect(api.getBaseUrl(), sessionName, terminalCols, terminalRows);
|
||||
}
|
||||
|
||||
private void resizeTerminalToViewport(boolean forceSend) {
|
||||
if (terminalText == null || terminalScroll == null) {
|
||||
return;
|
||||
}
|
||||
int width = terminalScroll.getWidth();
|
||||
int height = terminalScroll.getHeight();
|
||||
if (width <= 0 || height <= 0) {
|
||||
return;
|
||||
}
|
||||
int horizontalPadding = terminalText.getPaddingLeft() + terminalText.getPaddingRight();
|
||||
int verticalPadding = terminalText.getPaddingTop() + terminalText.getPaddingBottom();
|
||||
float charWidth = terminalText.getPaint().measureText("W");
|
||||
if (charWidth <= 0f) {
|
||||
charWidth = dp(8);
|
||||
}
|
||||
int lineHeight = terminalText.getLineHeight();
|
||||
if (lineHeight <= 0) {
|
||||
lineHeight = dp(16);
|
||||
}
|
||||
int cols = clamp((int) Math.floor((width - horizontalPadding) / charWidth) - 1, MIN_TERMINAL_COLS, MAX_TERMINAL_COLS);
|
||||
int rows = clamp((height - verticalPadding) / lineHeight, MIN_TERMINAL_ROWS, MAX_TERMINAL_ROWS);
|
||||
if (cols == terminalCols && rows == terminalRows && !forceSend) {
|
||||
return;
|
||||
}
|
||||
terminalCols = cols;
|
||||
terminalRows = rows;
|
||||
terminalScreen.resize(cols, rows);
|
||||
scheduleTerminalRender();
|
||||
TerminalSocketClient socket = terminalSocket;
|
||||
if (socket != null && !socket.isClosed() && terminalConnected) {
|
||||
socket.resize(cols, rows);
|
||||
}
|
||||
}
|
||||
|
||||
private void sendLine() {
|
||||
@@ -1798,10 +1870,16 @@ public final class MainActivity extends Activity {
|
||||
String text = inputField.getText().toString();
|
||||
if (text.isEmpty()) {
|
||||
sendTerminalInput("\r");
|
||||
} else {
|
||||
sendTerminalInput(text + "\r");
|
||||
inputField.setText("");
|
||||
return;
|
||||
}
|
||||
String normalized = text.replace("\r\n", "\n").replace('\r', '\n').replace('\n', '\r');
|
||||
if (!normalized.endsWith("\r")) {
|
||||
normalized = normalized + "\r";
|
||||
}
|
||||
sendTerminalInput(normalized);
|
||||
inputField.setText("");
|
||||
hideKeyboard();
|
||||
setStatus("Sent " + text.length() + " chars");
|
||||
}
|
||||
|
||||
private void sendTerminalInput(String data) {
|
||||
@@ -1811,6 +1889,7 @@ public final class MainActivity extends Activity {
|
||||
TerminalSocketClient socket = terminalSocket;
|
||||
if (socket != null && !socket.isClosed() && terminalConnected) {
|
||||
socket.sendInput(data);
|
||||
setStatus("Sent input");
|
||||
return;
|
||||
}
|
||||
if (socket != null && !socket.isClosed()) {
|
||||
@@ -1823,6 +1902,7 @@ public final class MainActivity extends Activity {
|
||||
for (int i = 0; i < data.length(); i += 200) {
|
||||
api.sendInput(activeSessionName, data.substring(i, Math.min(i + 200, data.length())));
|
||||
}
|
||||
runOnUiThread(() -> setStatus("Sent input"));
|
||||
} catch (Exception error) {
|
||||
runOnUiThread(() -> showMessage("Input failed: " + error.getMessage()));
|
||||
}
|
||||
@@ -1841,23 +1921,45 @@ public final class MainActivity extends Activity {
|
||||
private void pasteClipboard() {
|
||||
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
|
||||
if (clipboard == null || !clipboard.hasPrimaryClip()) {
|
||||
showMessage("Clipboard is empty");
|
||||
return;
|
||||
}
|
||||
ClipData clip = clipboard.getPrimaryClip();
|
||||
if (clip == null || clip.getItemCount() == 0) {
|
||||
showMessage("Clipboard is empty");
|
||||
return;
|
||||
}
|
||||
CharSequence text = clip.getItemAt(0).coerceToText(this);
|
||||
if (text != null && text.length() > 0) {
|
||||
sendTerminalInput(text.toString());
|
||||
} else {
|
||||
showMessage("Clipboard is empty");
|
||||
}
|
||||
}
|
||||
|
||||
private void appendTerminal(String data) {
|
||||
terminalBuffer.append(data);
|
||||
if (terminalBuffer.length() > MAX_TERMINAL_CHARS) {
|
||||
terminalBuffer.delete(0, terminalBuffer.length() - MAX_TERMINAL_CHARS);
|
||||
private void insertComposerText(String text) {
|
||||
if (inputField == null) {
|
||||
return;
|
||||
}
|
||||
int start = Math.max(0, inputField.getSelectionStart());
|
||||
int end = Math.max(0, inputField.getSelectionEnd());
|
||||
inputField.getText().replace(Math.min(start, end), Math.max(start, end), text);
|
||||
inputField.requestFocus();
|
||||
}
|
||||
|
||||
private void hideKeyboard() {
|
||||
if (inputField == null) {
|
||||
return;
|
||||
}
|
||||
InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
|
||||
if (manager != null) {
|
||||
manager.hideSoftInputFromWindow(inputField.getWindowToken(), 0);
|
||||
}
|
||||
inputField.clearFocus();
|
||||
}
|
||||
|
||||
private void appendTerminal(String data) {
|
||||
terminalScreen.write(data);
|
||||
scheduleTerminalRender();
|
||||
}
|
||||
|
||||
@@ -1879,134 +1981,10 @@ public final class MainActivity extends Activity {
|
||||
return;
|
||||
}
|
||||
lastTerminalRenderMs = System.currentTimeMillis();
|
||||
terminalText.setText(renderAnsiForTerminal(terminalBuffer.toString()));
|
||||
terminalText.setText(terminalScreen.render());
|
||||
terminalScroll.post(() -> terminalScroll.fullScroll(View.FOCUS_DOWN));
|
||||
}
|
||||
|
||||
private CharSequence renderAnsiForTerminal(String text) {
|
||||
SpannableStringBuilder output = new SpannableStringBuilder();
|
||||
int fg = Color.rgb(230, 235, 242);
|
||||
int bg = Color.TRANSPARENT;
|
||||
boolean bold = false;
|
||||
int index = 0;
|
||||
while (index < text.length()) {
|
||||
char item = text.charAt(index);
|
||||
if (item == '\r') {
|
||||
index++;
|
||||
continue;
|
||||
}
|
||||
if (item == '\u001b' && index + 1 < text.length() && text.charAt(index + 1) == '[') {
|
||||
int end = findAnsiEnd(text, index + 2);
|
||||
if (end == -1) {
|
||||
break;
|
||||
}
|
||||
char command = text.charAt(end);
|
||||
if (command == 'm') {
|
||||
int[] state = applySgr(text.substring(index + 2, end), fg, bg, bold);
|
||||
fg = state[0];
|
||||
bg = state[1];
|
||||
bold = state[2] == 1;
|
||||
}
|
||||
index = end + 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
int runStart = index;
|
||||
while (index < text.length()) {
|
||||
char runItem = text.charAt(index);
|
||||
if (runItem == '\r' || (runItem == '\u001b' && index + 1 < text.length() && text.charAt(index + 1) == '[')) {
|
||||
break;
|
||||
}
|
||||
index++;
|
||||
}
|
||||
appendTerminalRun(output, text.substring(runStart, index), fg, bg, bold);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
private void appendTerminalRun(SpannableStringBuilder output, String text, int fg, int bg, boolean bold) {
|
||||
if (text.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
int start = output.length();
|
||||
output.append(text);
|
||||
int finish = output.length();
|
||||
output.setSpan(new ForegroundColorSpan(fg), start, finish, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
if (bg != Color.TRANSPARENT) {
|
||||
output.setSpan(new BackgroundColorSpan(bg), start, finish, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
}
|
||||
if (bold) {
|
||||
output.setSpan(new StyleSpan(Typeface.BOLD), start, finish, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
}
|
||||
}
|
||||
|
||||
private int findAnsiEnd(String text, int start) {
|
||||
for (int index = start; index < text.length(); index++) {
|
||||
char item = text.charAt(index);
|
||||
if (item >= '@' && item <= '~') {
|
||||
return index;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private int[] applySgr(String params, int fg, int bg, boolean bold) {
|
||||
if (params.isEmpty()) {
|
||||
params = "0";
|
||||
}
|
||||
String[] parts = params.split(";");
|
||||
for (String part : parts) {
|
||||
int value;
|
||||
try {
|
||||
value = part.isEmpty() ? 0 : Integer.parseInt(part);
|
||||
} catch (NumberFormatException ignored) {
|
||||
continue;
|
||||
}
|
||||
if (value == 0) {
|
||||
fg = Color.rgb(230, 235, 242);
|
||||
bg = Color.TRANSPARENT;
|
||||
bold = false;
|
||||
} else if (value == 1) {
|
||||
bold = true;
|
||||
} else if (value == 22) {
|
||||
bold = false;
|
||||
} else if (value == 39) {
|
||||
fg = Color.rgb(230, 235, 242);
|
||||
} else if (value == 49) {
|
||||
bg = Color.TRANSPARENT;
|
||||
} else if ((value >= 30 && value <= 37) || (value >= 90 && value <= 97)) {
|
||||
fg = ansiColor(value, false);
|
||||
} else if ((value >= 40 && value <= 47) || (value >= 100 && value <= 107)) {
|
||||
bg = ansiColor(value, true);
|
||||
}
|
||||
}
|
||||
return new int[]{fg, bg, bold ? 1 : 0};
|
||||
}
|
||||
|
||||
private int ansiColor(int code, boolean background) {
|
||||
int base = background ? (code >= 100 ? code - 100 : code - 40) : (code >= 90 ? code - 90 : code - 30);
|
||||
boolean bright = code >= 90;
|
||||
switch (base) {
|
||||
case 0:
|
||||
return bright ? Color.rgb(80, 88, 100) : Color.rgb(33, 38, 45);
|
||||
case 1:
|
||||
return bright ? Color.rgb(255, 123, 114) : Color.rgb(248, 81, 73);
|
||||
case 2:
|
||||
return bright ? Color.rgb(86, 211, 100) : Color.rgb(63, 185, 80);
|
||||
case 3:
|
||||
return bright ? Color.rgb(234, 179, 8) : Color.rgb(210, 153, 34);
|
||||
case 4:
|
||||
return bright ? Color.rgb(121, 192, 255) : Color.rgb(88, 166, 255);
|
||||
case 5:
|
||||
return bright ? Color.rgb(210, 168, 255) : Color.rgb(188, 140, 255);
|
||||
case 6:
|
||||
return bright ? Color.rgb(86, 211, 219) : Color.rgb(57, 197, 187);
|
||||
case 7:
|
||||
default:
|
||||
return bright ? Color.rgb(240, 246, 252) : Color.rgb(201, 209, 217);
|
||||
}
|
||||
}
|
||||
|
||||
private void saveServerAndRefresh() {
|
||||
String url = normalizeServerUrl(urlField.getText().toString());
|
||||
prefs.edit().putString("server_url", url).apply();
|
||||
@@ -2081,7 +2059,20 @@ public final class MainActivity extends Activity {
|
||||
button.setPadding(dp(10), 0, dp(10), 0);
|
||||
button.setBackground(buttonBackground());
|
||||
button.setGravity(Gravity.CENTER);
|
||||
button.setOnClickListener(listener);
|
||||
button.setHapticFeedbackEnabled(true);
|
||||
button.setOnClickListener(view -> {
|
||||
view.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
|
||||
view.animate().cancel();
|
||||
view.setScaleX(0.96f);
|
||||
view.setScaleY(0.96f);
|
||||
view.animate()
|
||||
.scaleX(1f)
|
||||
.scaleY(1f)
|
||||
.setDuration(120L)
|
||||
.start();
|
||||
setStatus(label);
|
||||
listener.onClick(view);
|
||||
});
|
||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT,
|
||||
dp(42)
|
||||
@@ -2100,8 +2091,26 @@ public final class MainActivity extends Activity {
|
||||
input.setBackground(rounded(Color.rgb(12, 17, 23), 8, Color.rgb(48, 58, 70), 1));
|
||||
}
|
||||
|
||||
private void styleComposerInput(EditText input) {
|
||||
input.setTextColor(Color.rgb(240, 246, 252));
|
||||
input.setHintTextColor(Color.rgb(139, 148, 158));
|
||||
input.setTextSize(14);
|
||||
input.setPadding(dp(10), dp(8), dp(10), dp(8));
|
||||
input.setBackground(rounded(Color.rgb(12, 17, 23), 8, Color.rgb(48, 58, 70), 1));
|
||||
}
|
||||
|
||||
private Button compactButton(String label, View.OnClickListener listener) {
|
||||
Button button = toolbarButton(label, listener);
|
||||
button.setTextSize(11);
|
||||
button.setPadding(dp(8), 0, dp(8), 0);
|
||||
button.setMinWidth(dp(48));
|
||||
button.setMinimumWidth(dp(48));
|
||||
return button;
|
||||
}
|
||||
|
||||
private StateListDrawable buttonBackground() {
|
||||
StateListDrawable states = new StateListDrawable();
|
||||
states.addState(new int[]{-android.R.attr.state_enabled}, rounded(Color.rgb(24, 30, 37), 8, Color.rgb(35, 42, 50), 1));
|
||||
states.addState(new int[]{android.R.attr.state_pressed}, rounded(Color.rgb(64, 78, 94), 8, Color.rgb(91, 108, 128), 1));
|
||||
states.addState(new int[]{android.R.attr.state_focused}, rounded(Color.rgb(48, 61, 76), 8, Color.rgb(98, 128, 164), 1));
|
||||
states.addState(new int[]{}, rounded(Color.rgb(34, 43, 53), 8, Color.rgb(55, 66, 80), 1));
|
||||
@@ -2156,16 +2165,91 @@ public final class MainActivity extends Activity {
|
||||
}
|
||||
|
||||
private void showMessage(String message) {
|
||||
if (message == null || message.trim().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
|
||||
setStatus(message);
|
||||
}
|
||||
|
||||
private void setStatus(String message) {
|
||||
setStatus(message, inferStatusTone(message));
|
||||
}
|
||||
|
||||
private void setStatus(String message, int tone) {
|
||||
if (statusText != null) {
|
||||
statusText.setText(message);
|
||||
String value = message == null || message.trim().isEmpty() ? "Ready" : message.trim();
|
||||
statusText.setText(value);
|
||||
int bg = Color.rgb(22, 27, 34);
|
||||
int stroke = Color.TRANSPARENT;
|
||||
int text = Color.rgb(210, 215, 224);
|
||||
if (tone == STATUS_BUSY) {
|
||||
bg = Color.rgb(20, 44, 68);
|
||||
stroke = Color.rgb(44, 96, 142);
|
||||
text = Color.rgb(220, 238, 255);
|
||||
} else if (tone == STATUS_SUCCESS) {
|
||||
bg = Color.rgb(20, 56, 40);
|
||||
stroke = Color.rgb(42, 118, 78);
|
||||
text = Color.rgb(218, 245, 228);
|
||||
} else if (tone == STATUS_ERROR) {
|
||||
bg = Color.rgb(72, 28, 31);
|
||||
stroke = Color.rgb(154, 66, 72);
|
||||
text = Color.rgb(255, 226, 226);
|
||||
}
|
||||
statusText.setTextColor(text);
|
||||
statusText.setBackground(rounded(bg, 0, stroke, tone == STATUS_NORMAL ? 0 : 1));
|
||||
}
|
||||
}
|
||||
|
||||
private int inferStatusTone(String message) {
|
||||
if (message == null) {
|
||||
return STATUS_NORMAL;
|
||||
}
|
||||
String value = message.toLowerCase(java.util.Locale.ROOT);
|
||||
if (value.contains("failed")
|
||||
|| value.contains("error")
|
||||
|| value.contains("invalid")
|
||||
|| value.contains("cannot")
|
||||
|| value.contains("mismatch")
|
||||
|| value.contains("disconnected")
|
||||
|| value.contains("empty")
|
||||
|| value.contains("no package")
|
||||
|| value.contains("no app")) {
|
||||
return STATUS_ERROR;
|
||||
}
|
||||
if (value.contains("loading")
|
||||
|| value.contains("checking")
|
||||
|| value.contains("connecting")
|
||||
|| value.contains("probing")
|
||||
|| value.contains("downloading")
|
||||
|| value.contains("preparing")
|
||||
|| value.contains("verifying")
|
||||
|| value.contains("retrying")
|
||||
|| value.contains("queued")
|
||||
|| value.contains("resolving")) {
|
||||
return STATUS_BUSY;
|
||||
}
|
||||
if (value.contains("done")
|
||||
|| value.contains("loaded")
|
||||
|| value.contains("connected")
|
||||
|| value.contains("created")
|
||||
|| value.contains("killed")
|
||||
|| value.contains("opened")
|
||||
|| value.contains("sent")
|
||||
|| value.contains("selected")
|
||||
|| value.contains("saved")
|
||||
|| value.contains("using downloaded")
|
||||
|| value.contains("update found")
|
||||
|| value.contains("already up to date")) {
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
return STATUS_NORMAL;
|
||||
}
|
||||
|
||||
private int clamp(int value, int min, int max) {
|
||||
return Math.max(min, Math.min(max, value));
|
||||
}
|
||||
|
||||
private int dp(int value) {
|
||||
return Math.round(value * getResources().getDisplayMetrics().density);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,647 @@
|
||||
package com.neatstudio.tmuxandroid;
|
||||
|
||||
import android.graphics.Color;
|
||||
import android.graphics.Typeface;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.Spanned;
|
||||
import android.text.style.BackgroundColorSpan;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.text.style.StyleSpan;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
final class TerminalScreenBuffer {
|
||||
private static final int DEFAULT_FG = 0xffe6ebf2;
|
||||
private static final int DEFAULT_BG = Color.TRANSPARENT;
|
||||
|
||||
private int cols;
|
||||
private int rows;
|
||||
private Cell[][] cells;
|
||||
private int cursorRow;
|
||||
private int cursorCol;
|
||||
private int savedRow;
|
||||
private int savedCol;
|
||||
private String pendingControl = "";
|
||||
private boolean wrapPending;
|
||||
private int fg = DEFAULT_FG;
|
||||
private int bg = DEFAULT_BG;
|
||||
private boolean bold;
|
||||
|
||||
TerminalScreenBuffer(int cols, int rows) {
|
||||
resize(cols, rows);
|
||||
}
|
||||
|
||||
void resize(int nextCols, int nextRows) {
|
||||
nextCols = Math.max(1, nextCols);
|
||||
nextRows = Math.max(1, nextRows);
|
||||
Cell[][] previous = cells;
|
||||
int previousRows = rows;
|
||||
int previousCols = cols;
|
||||
cols = nextCols;
|
||||
rows = nextRows;
|
||||
cells = new Cell[rows][cols];
|
||||
for (int row = 0; row < rows; row++) {
|
||||
for (int col = 0; col < cols; col++) {
|
||||
cells[row][col] = new Cell();
|
||||
}
|
||||
}
|
||||
if (previous != null) {
|
||||
int copyRows = Math.min(previousRows, rows);
|
||||
int copyCols = Math.min(previousCols, cols);
|
||||
int previousStart = Math.max(0, previousRows - copyRows);
|
||||
int nextStart = Math.max(0, rows - copyRows);
|
||||
for (int row = 0; row < copyRows; row++) {
|
||||
for (int col = 0; col < copyCols; col++) {
|
||||
cells[nextStart + row][col].copyFrom(previous[previousStart + row][col]);
|
||||
}
|
||||
}
|
||||
}
|
||||
cursorRow = clamp(cursorRow, 0, rows - 1);
|
||||
cursorCol = clamp(cursorCol, 0, cols - 1);
|
||||
savedRow = clamp(savedRow, 0, rows - 1);
|
||||
savedCol = clamp(savedCol, 0, cols - 1);
|
||||
}
|
||||
|
||||
void clear() {
|
||||
clearScreen();
|
||||
cursorRow = 0;
|
||||
cursorCol = 0;
|
||||
savedRow = 0;
|
||||
savedCol = 0;
|
||||
pendingControl = "";
|
||||
wrapPending = false;
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
}
|
||||
|
||||
void write(String text) {
|
||||
if (!pendingControl.isEmpty()) {
|
||||
text = pendingControl + text;
|
||||
pendingControl = "";
|
||||
}
|
||||
int index = 0;
|
||||
while (index < text.length()) {
|
||||
char item = text.charAt(index);
|
||||
if (item == '\u001b') {
|
||||
int next = handleEscape(text, index);
|
||||
if (next < 0) {
|
||||
pendingControl = text.substring(index);
|
||||
return;
|
||||
}
|
||||
index = next;
|
||||
} else if (item == '\r') {
|
||||
wrapPending = false;
|
||||
cursorCol = 0;
|
||||
index++;
|
||||
} else if (item == '\n') {
|
||||
wrapPending = false;
|
||||
newLine();
|
||||
index++;
|
||||
} else if (item == '\b') {
|
||||
wrapPending = false;
|
||||
cursorCol = Math.max(0, cursorCol - 1);
|
||||
index++;
|
||||
} else if (item == '\t') {
|
||||
int nextTab = ((cursorCol / 8) + 1) * 8;
|
||||
while (cursorCol < Math.min(nextTab, cols)) {
|
||||
putChar(' ');
|
||||
}
|
||||
index++;
|
||||
} else if (isNakedDeviceAttributesTail(text, index)) {
|
||||
index = skipNakedDeviceAttributesTail(text, index);
|
||||
} else if (item >= 0x20 && item != 0x7f) {
|
||||
putChar(item);
|
||||
index++;
|
||||
} else {
|
||||
index++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CharSequence render() {
|
||||
SpannableStringBuilder output = new SpannableStringBuilder();
|
||||
for (int row = 0; row < rows; row++) {
|
||||
appendRow(output, row);
|
||||
if (row + 1 < rows) {
|
||||
output.append('\n');
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
private int handleEscape(String text, int index) {
|
||||
if (index + 1 >= text.length()) {
|
||||
return -1;
|
||||
}
|
||||
char next = text.charAt(index + 1);
|
||||
wrapPending = false;
|
||||
if (next == '[') {
|
||||
int end = findAnsiEnd(text, index + 2);
|
||||
if (end == -1) {
|
||||
return -1;
|
||||
}
|
||||
applyCsi(text.substring(index + 2, end), text.charAt(end));
|
||||
return end + 1;
|
||||
}
|
||||
if (next == ']') {
|
||||
return skipStringEscape(text, index + 2);
|
||||
}
|
||||
if (next == 'P' || next == '^' || next == '_') {
|
||||
return skipStringEscape(text, index + 2);
|
||||
}
|
||||
if (next == '(' || next == ')' || next == '*' || next == '+' || next == '-' || next == '.') {
|
||||
if (index + 2 >= text.length()) {
|
||||
return -1;
|
||||
}
|
||||
return Math.min(index + 3, text.length());
|
||||
}
|
||||
if (next == '7') {
|
||||
saveCursor();
|
||||
} else if (next == '8') {
|
||||
restoreCursor();
|
||||
} else if (next == 'D') {
|
||||
newLine();
|
||||
} else if (next == 'E') {
|
||||
cursorCol = 0;
|
||||
newLine();
|
||||
} else if (next == 'M') {
|
||||
reverseIndex();
|
||||
} else if (next == 'c') {
|
||||
clear();
|
||||
}
|
||||
return Math.min(index + 2, text.length());
|
||||
}
|
||||
|
||||
private void applyCsi(String rawParams, char command) {
|
||||
wrapPending = false;
|
||||
String params = rawParams;
|
||||
while (!params.isEmpty()) {
|
||||
char first = params.charAt(0);
|
||||
if (first == '?' || first == '>' || first == '!' || first == '=') {
|
||||
params = params.substring(1);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
List<Integer> values = parseParams(params);
|
||||
switch (command) {
|
||||
case 'm':
|
||||
applySgr(values);
|
||||
break;
|
||||
case 'H':
|
||||
case 'f':
|
||||
cursorRow = clamp(param(values, 0, 1) - 1, 0, rows - 1);
|
||||
cursorCol = clamp(param(values, 1, 1) - 1, 0, cols - 1);
|
||||
break;
|
||||
case 'A':
|
||||
cursorRow = clamp(cursorRow - param(values, 0, 1), 0, rows - 1);
|
||||
break;
|
||||
case 'B':
|
||||
cursorRow = clamp(cursorRow + param(values, 0, 1), 0, rows - 1);
|
||||
break;
|
||||
case 'C':
|
||||
cursorCol = clamp(cursorCol + param(values, 0, 1), 0, cols - 1);
|
||||
break;
|
||||
case 'D':
|
||||
cursorCol = clamp(cursorCol - param(values, 0, 1), 0, cols - 1);
|
||||
break;
|
||||
case 'G':
|
||||
cursorCol = clamp(param(values, 0, 1) - 1, 0, cols - 1);
|
||||
break;
|
||||
case 'd':
|
||||
cursorRow = clamp(param(values, 0, 1) - 1, 0, rows - 1);
|
||||
break;
|
||||
case 'J':
|
||||
eraseDisplay(param(values, 0, 0));
|
||||
break;
|
||||
case 'K':
|
||||
eraseLine(param(values, 0, 0));
|
||||
break;
|
||||
case 'P':
|
||||
deleteChars(param(values, 0, 1));
|
||||
break;
|
||||
case '@':
|
||||
insertChars(param(values, 0, 1));
|
||||
break;
|
||||
case 'X':
|
||||
eraseChars(param(values, 0, 1));
|
||||
break;
|
||||
case 'L':
|
||||
insertLines(param(values, 0, 1));
|
||||
break;
|
||||
case 'M':
|
||||
deleteLines(param(values, 0, 1));
|
||||
break;
|
||||
case 's':
|
||||
saveCursor();
|
||||
break;
|
||||
case 'u':
|
||||
restoreCursor();
|
||||
break;
|
||||
case 'c':
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void applySgr(List<Integer> values) {
|
||||
if (values.isEmpty()) {
|
||||
values.add(0);
|
||||
}
|
||||
for (int index = 0; index < values.size(); index++) {
|
||||
int value = values.get(index);
|
||||
if (value == 0) {
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
} else if (value == 1) {
|
||||
bold = true;
|
||||
} else if (value == 22) {
|
||||
bold = false;
|
||||
} else if (value == 39) {
|
||||
fg = DEFAULT_FG;
|
||||
} else if (value == 49) {
|
||||
bg = DEFAULT_BG;
|
||||
} else if ((value >= 30 && value <= 37) || (value >= 90 && value <= 97)) {
|
||||
fg = ansiColor(value, false);
|
||||
} else if ((value >= 40 && value <= 47) || (value >= 100 && value <= 107)) {
|
||||
bg = ansiColor(value, true);
|
||||
} else if ((value == 38 || value == 48) && index + 2 < values.size()) {
|
||||
boolean background = value == 48;
|
||||
int mode = values.get(index + 1);
|
||||
if (mode == 5) {
|
||||
int color = xtermColor(values.get(index + 2));
|
||||
if (background) {
|
||||
bg = color;
|
||||
} else {
|
||||
fg = color;
|
||||
}
|
||||
index += 2;
|
||||
} else if (mode == 2 && index + 4 < values.size()) {
|
||||
int color = Color.rgb(
|
||||
clamp(values.get(index + 2), 0, 255),
|
||||
clamp(values.get(index + 3), 0, 255),
|
||||
clamp(values.get(index + 4), 0, 255)
|
||||
);
|
||||
if (background) {
|
||||
bg = color;
|
||||
} else {
|
||||
fg = color;
|
||||
}
|
||||
index += 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void putChar(char value) {
|
||||
if (wrapPending) {
|
||||
wrapPending = false;
|
||||
newLine();
|
||||
}
|
||||
cells[cursorRow][cursorCol].set(value, fg, bg, bold);
|
||||
if (cursorCol == cols - 1) {
|
||||
wrapPending = true;
|
||||
} else {
|
||||
cursorCol++;
|
||||
}
|
||||
}
|
||||
|
||||
private void newLine() {
|
||||
wrapPending = false;
|
||||
cursorRow++;
|
||||
if (cursorRow >= rows) {
|
||||
scrollUp(1);
|
||||
cursorRow = rows - 1;
|
||||
}
|
||||
cursorCol = 0;
|
||||
}
|
||||
|
||||
private void reverseIndex() {
|
||||
if (cursorRow == 0) {
|
||||
scrollDown(1);
|
||||
} else {
|
||||
cursorRow--;
|
||||
}
|
||||
}
|
||||
|
||||
private void eraseDisplay(int mode) {
|
||||
if (mode == 2 || mode == 3) {
|
||||
clearScreen();
|
||||
} else if (mode == 1) {
|
||||
for (int row = 0; row < cursorRow; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
clearLine(cursorRow, 0, cursorCol);
|
||||
} else {
|
||||
clearLine(cursorRow, cursorCol, cols - 1);
|
||||
for (int row = cursorRow + 1; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void eraseLine(int mode) {
|
||||
if (mode == 2) {
|
||||
clearLine(cursorRow, 0, cols - 1);
|
||||
} else if (mode == 1) {
|
||||
clearLine(cursorRow, 0, cursorCol);
|
||||
} else {
|
||||
clearLine(cursorRow, cursorCol, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void eraseChars(int count) {
|
||||
int end = Math.min(cols - 1, cursorCol + Math.max(1, count) - 1);
|
||||
clearLine(cursorRow, cursorCol, end);
|
||||
}
|
||||
|
||||
private void deleteChars(int count) {
|
||||
count = Math.max(1, count);
|
||||
Cell[] line = cells[cursorRow];
|
||||
for (int col = cursorCol; col < cols; col++) {
|
||||
int source = col + count;
|
||||
if (source < cols) {
|
||||
line[col].copyFrom(line[source]);
|
||||
} else {
|
||||
line[col].clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void insertChars(int count) {
|
||||
count = Math.max(1, count);
|
||||
Cell[] line = cells[cursorRow];
|
||||
for (int col = cols - 1; col >= cursorCol; col--) {
|
||||
int source = col - count;
|
||||
if (source >= cursorCol) {
|
||||
line[col].copyFrom(line[source]);
|
||||
} else {
|
||||
line[col].clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void insertLines(int count) {
|
||||
count = Math.min(Math.max(1, count), rows - cursorRow);
|
||||
for (int row = rows - 1; row >= cursorRow + count; row--) {
|
||||
copyLine(row, row - count);
|
||||
}
|
||||
for (int row = cursorRow; row < cursorRow + count; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void deleteLines(int count) {
|
||||
count = Math.min(Math.max(1, count), rows - cursorRow);
|
||||
for (int row = cursorRow; row + count < rows; row++) {
|
||||
copyLine(row, row + count);
|
||||
}
|
||||
for (int row = rows - count; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void clearScreen() {
|
||||
for (int row = 0; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void clearLine(int row, int start, int end) {
|
||||
start = clamp(start, 0, cols - 1);
|
||||
end = clamp(end, 0, cols - 1);
|
||||
for (int col = start; col <= end; col++) {
|
||||
cells[row][col].clear();
|
||||
}
|
||||
}
|
||||
|
||||
private void scrollUp(int count) {
|
||||
count = Math.min(Math.max(1, count), rows);
|
||||
for (int row = 0; row + count < rows; row++) {
|
||||
copyLine(row, row + count);
|
||||
}
|
||||
for (int row = rows - count; row < rows; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void scrollDown(int count) {
|
||||
count = Math.min(Math.max(1, count), rows);
|
||||
for (int row = rows - 1; row - count >= 0; row--) {
|
||||
copyLine(row, row - count);
|
||||
}
|
||||
for (int row = 0; row < count; row++) {
|
||||
clearLine(row, 0, cols - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void copyLine(int target, int source) {
|
||||
for (int col = 0; col < cols; col++) {
|
||||
cells[target][col].copyFrom(cells[source][col]);
|
||||
}
|
||||
}
|
||||
|
||||
private void appendRow(SpannableStringBuilder output, int row) {
|
||||
int col = 0;
|
||||
while (col < cols) {
|
||||
Cell first = cells[row][col];
|
||||
int start = output.length();
|
||||
int fgColor = first.fg;
|
||||
int bgColor = first.bg;
|
||||
boolean isBold = first.bold;
|
||||
while (col < cols) {
|
||||
Cell cell = cells[row][col];
|
||||
if (cell.fg != fgColor || cell.bg != bgColor || cell.bold != isBold) {
|
||||
break;
|
||||
}
|
||||
output.append(cell.value);
|
||||
col++;
|
||||
}
|
||||
int end = output.length();
|
||||
output.setSpan(new ForegroundColorSpan(fgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
if (bgColor != DEFAULT_BG) {
|
||||
output.setSpan(new BackgroundColorSpan(bgColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
}
|
||||
if (isBold) {
|
||||
output.setSpan(new StyleSpan(Typeface.BOLD), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveCursor() {
|
||||
savedRow = cursorRow;
|
||||
savedCol = cursorCol;
|
||||
}
|
||||
|
||||
private void restoreCursor() {
|
||||
cursorRow = clamp(savedRow, 0, rows - 1);
|
||||
cursorCol = clamp(savedCol, 0, cols - 1);
|
||||
}
|
||||
|
||||
private int skipStringEscape(String text, int start) {
|
||||
int cursor = start;
|
||||
while (cursor < text.length()) {
|
||||
char item = text.charAt(cursor);
|
||||
if (item == '\u0007') {
|
||||
return cursor + 1;
|
||||
}
|
||||
if (item == '\u001b' && cursor + 1 < text.length() && text.charAt(cursor + 1) == '\\') {
|
||||
return cursor + 2;
|
||||
}
|
||||
cursor++;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private boolean isNakedDeviceAttributesTail(String text, int index) {
|
||||
int cursor = index;
|
||||
boolean hasSemicolon = false;
|
||||
if (cursor < text.length() && (text.charAt(cursor) == '?' || text.charAt(cursor) == '>')) {
|
||||
cursor++;
|
||||
}
|
||||
while (cursor < text.length()) {
|
||||
char item = text.charAt(cursor);
|
||||
if (item >= '0' && item <= '9') {
|
||||
cursor++;
|
||||
continue;
|
||||
}
|
||||
if (item == ';') {
|
||||
hasSemicolon = true;
|
||||
cursor++;
|
||||
continue;
|
||||
}
|
||||
return item == 'c' && hasSemicolon && cursor > index && cursor - index <= 16;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private int skipNakedDeviceAttributesTail(String text, int index) {
|
||||
int cursor = index;
|
||||
while (cursor < text.length() && text.charAt(cursor) != 'c') {
|
||||
cursor++;
|
||||
}
|
||||
return Math.min(cursor + 1, text.length());
|
||||
}
|
||||
|
||||
private int findAnsiEnd(String text, int start) {
|
||||
for (int index = start; index < text.length(); index++) {
|
||||
char item = text.charAt(index);
|
||||
if (item >= '@' && item <= '~') {
|
||||
return index;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private List<Integer> parseParams(String params) {
|
||||
List<Integer> values = new ArrayList<>();
|
||||
if (params.isEmpty()) {
|
||||
return values;
|
||||
}
|
||||
String[] parts = params.split(";", -1);
|
||||
for (String part : parts) {
|
||||
String cleaned = part.trim();
|
||||
if (cleaned.isEmpty()) {
|
||||
values.add(0);
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
values.add(Integer.parseInt(cleaned));
|
||||
} catch (NumberFormatException ignored) {
|
||||
values.add(0);
|
||||
}
|
||||
}
|
||||
return values;
|
||||
}
|
||||
|
||||
private int param(List<Integer> values, int index, int fallback) {
|
||||
if (index >= values.size()) {
|
||||
return fallback;
|
||||
}
|
||||
int value = values.get(index);
|
||||
return value == 0 ? fallback : value;
|
||||
}
|
||||
|
||||
private int ansiColor(int code, boolean background) {
|
||||
int base = background ? (code >= 100 ? code - 100 : code - 40) : (code >= 90 ? code - 90 : code - 30);
|
||||
boolean bright = code >= 90;
|
||||
switch (base) {
|
||||
case 0:
|
||||
return bright ? Color.rgb(80, 88, 100) : Color.rgb(33, 38, 45);
|
||||
case 1:
|
||||
return bright ? Color.rgb(255, 123, 114) : Color.rgb(248, 81, 73);
|
||||
case 2:
|
||||
return bright ? Color.rgb(86, 211, 100) : Color.rgb(63, 185, 80);
|
||||
case 3:
|
||||
return bright ? Color.rgb(234, 179, 8) : Color.rgb(210, 153, 34);
|
||||
case 4:
|
||||
return bright ? Color.rgb(121, 192, 255) : Color.rgb(88, 166, 255);
|
||||
case 5:
|
||||
return bright ? Color.rgb(210, 168, 255) : Color.rgb(188, 140, 255);
|
||||
case 6:
|
||||
return bright ? Color.rgb(86, 211, 219) : Color.rgb(57, 197, 187);
|
||||
case 7:
|
||||
default:
|
||||
return bright ? Color.rgb(240, 246, 252) : Color.rgb(201, 209, 217);
|
||||
}
|
||||
}
|
||||
|
||||
private int xtermColor(int value) {
|
||||
value = clamp(value, 0, 255);
|
||||
if (value < 16) {
|
||||
if (value < 8) {
|
||||
return ansiColor(30 + value, false);
|
||||
}
|
||||
return ansiColor(90 + value - 8, false);
|
||||
}
|
||||
if (value >= 232) {
|
||||
int shade = 8 + (value - 232) * 10;
|
||||
return Color.rgb(shade, shade, shade);
|
||||
}
|
||||
int index = value - 16;
|
||||
int red = xtermComponent(index / 36);
|
||||
int green = xtermComponent((index / 6) % 6);
|
||||
int blue = xtermComponent(index % 6);
|
||||
return Color.rgb(red, green, blue);
|
||||
}
|
||||
|
||||
private int xtermComponent(int value) {
|
||||
return value == 0 ? 0 : 55 + value * 40;
|
||||
}
|
||||
|
||||
private static int clamp(int value, int min, int max) {
|
||||
return Math.max(min, Math.min(max, value));
|
||||
}
|
||||
|
||||
private static final class Cell {
|
||||
char value = ' ';
|
||||
int fg = DEFAULT_FG;
|
||||
int bg = DEFAULT_BG;
|
||||
boolean bold;
|
||||
|
||||
void clear() {
|
||||
value = ' ';
|
||||
fg = DEFAULT_FG;
|
||||
bg = DEFAULT_BG;
|
||||
bold = false;
|
||||
}
|
||||
|
||||
void set(char nextValue, int nextFg, int nextBg, boolean nextBold) {
|
||||
value = nextValue;
|
||||
fg = nextFg;
|
||||
bg = nextBg;
|
||||
bold = nextBold;
|
||||
}
|
||||
|
||||
void copyFrom(Cell other) {
|
||||
value = other.value;
|
||||
fg = other.fg;
|
||||
bg = other.bg;
|
||||
bold = other.bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,10 +87,12 @@ Implemented now:
|
||||
preview display
|
||||
- GitHub Actions APK build
|
||||
- release manifest `latest.json`
|
||||
- selected-source update checks; Gitea and GitHub are not probed in the same
|
||||
update check
|
||||
- Auto/Gitea/GitHub/Selected update checks, with Auto falling back from Gitea
|
||||
to GitHub
|
||||
- one-download-per-version APK cache, SHA-256 verification, and installer
|
||||
handoff
|
||||
- terminal viewport resize derived from the Android text area, including
|
||||
keyboard height changes, to avoid fixed-width tmux output wrapping on phones
|
||||
- permission/about surfaces for unknown-app install status, notification status,
|
||||
app settings, app version/build type, package name, selected update source, and
|
||||
HTTP/WebSocket API/protocol summary
|
||||
@@ -119,6 +121,14 @@ runs are for CI artifacts and should be used to validate grouped changes. Do not
|
||||
publish a new tag for every small UI copy or layout change; publish when there
|
||||
is a useful feature or test batch for phone-side validation.
|
||||
|
||||
Release APKs must be identical across the public GitHub and Gitea download
|
||||
channels. Treat the GitHub Release APK as the canonical build artifact, then
|
||||
mirror that same APK byte-for-byte to the matching Gitea Release. The Gitea
|
||||
`latest.json` should point to the Gitea APK URL, but it must keep the same
|
||||
`versionCode`, `versionName`, and `sha256` as the GitHub manifest. A Gitea-built
|
||||
APK is only a compile check unless its SHA-256 exactly matches the GitHub
|
||||
release APK.
|
||||
|
||||
## Native Roadmap
|
||||
|
||||
To converge with the upstream mobile design, the next implementation should add
|
||||
|
||||
Reference in New Issue
Block a user