Simplify server page actions

.gitea/workflows/android.yaml

@@ -55,12 +55,12 @@ jobs:
 
             mkdir -p release
             ATTEMPT=1
-            while [ "${ATTEMPT}" -le 30 ]; do
+            while [ "${ATTEMPT}" -le 6 ]; do
               if curl -fsSL "${GITHUB_APK_URL}" -o release/tmux-android.apk; then
                 break
               fi
               rm -f release/tmux-android.apk
-              echo "Waiting for GitHub release ${TAG} (${ATTEMPT}/30)..."
+              echo "Waiting for GitHub release ${TAG} (${ATTEMPT}/6)..."
               sleep 10
               ATTEMPT=$((ATTEMPT + 1))
             done
@@ -95,7 +95,7 @@ jobs:
                 "${API_ROOT}/releases/tags/${TAG}" \
                 -o /tmp/gitea-release.json
             fi
-            RELEASE_ID="$(sed -n 's/.*"id":\([0-9][0-9]*\).*/\1/p' /tmp/gitea-release.json | head -1)"
+            RELEASE_ID="$(sed -n 's/^{"id":\([0-9][0-9]*\),.*/\1/p' /tmp/gitea-release.json | head -1)"
             if [ -z "${RELEASE_ID}" ]; then
               echo "Cannot resolve Gitea release id for ${TAG}." >&2
               exit 1
@@ -248,7 +248,7 @@ jobs:
               "${API_ROOT}/releases/tags/${TAG}" \
               -o /tmp/gitea-release.json
           fi
-          RELEASE_ID="$(sed -n 's/.*"id":\([0-9][0-9]*\).*/\1/p' /tmp/gitea-release.json | head -1)"
+          RELEASE_ID="$(sed -n 's/^{"id":\([0-9][0-9]*\),.*/\1/p' /tmp/gitea-release.json | head -1)"
           if [ -z "${RELEASE_ID}" ]; then
             echo "Cannot resolve Gitea release id." >&2
             cat /tmp/gitea-release.json >&2

app/src/main/java/com/neatstudio/tmuxandroid/MainActivity.java

@@ -293,17 +293,11 @@ public final class MainActivity extends Activity {
         ScrollView scroll = new ScrollView(this);
         LinearLayout content = pageContent();
         List<String> serverUrls = savedServerUrls();
-        content.addView(createPageHeader(
+        content.addView(createServerPageHeader(serverUrls.size() + " nodes"));
-                serverUrls.size() + " nodes",
-                "Servers",
-                "＋ Add",
-                view -> promptCustomServer()
-        ));
         for (String url : serverUrls) {
             content.addView(serverProfileCard(url), spacedHeight(72, 0, 12));
         }
 
-        content.addView(createServerUtilityRow());
         scroll.addView(content);
         root.addView(scroll, new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -523,14 +517,46 @@ public final class MainActivity extends Activity {
         return header;
     }
 
-    private View createServerUtilityRow() {
+    private View createServerPageHeader(String eyebrow) {
-        LinearLayout row = new LinearLayout(this);
+        LinearLayout header = new LinearLayout(this);
-        row.setOrientation(LinearLayout.HORIZONTAL);
+        header.setOrientation(LinearLayout.HORIZONTAL);
-        row.setPadding(0, dp(4), 0, 0);
+        header.setGravity(Gravity.BOTTOM);
-        row.addView(compactButton("Probe all", view -> probeServerProfiles()));
+        header.setPadding(dp(2), dp(6), dp(2), dp(18));
-        row.addView(compactButton("Update", view -> renderUpdateScreen()));
+
-        row.addView(compactButton("More", view -> showMainNavigation()));
+        LinearLayout titleBlock = new LinearLayout(this);
-        return row;
+        titleBlock.setOrientation(LinearLayout.VERTICAL);
+        TextView eyebrowView = new TextView(this);
+        eyebrowView.setText(eyebrow.toUpperCase(java.util.Locale.ROOT));
+        eyebrowView.setTextColor(COLOR_TEXT_MUTED);
+        eyebrowView.setTextSize(10);
+        eyebrowView.setTypeface(Typeface.MONOSPACE);
+        TextView title = new TextView(this);
+        title.setText("Servers");
+        title.setTextColor(COLOR_TEXT);
+        title.setTextSize(25);
+        title.setTypeface(Typeface.DEFAULT_BOLD);
+        title.setIncludeFontPadding(false);
+        titleBlock.addView(eyebrowView);
+        titleBlock.addView(title);
+        header.addView(titleBlock, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1));
+
+        addHeaderTool(header, "↻", "Refresh servers", view -> probeServerProfiles());
+        addHeaderTool(header, "＋", "Add server", view -> promptCustomServer());
+        addHeaderTool(header, "⋮", "More navigation", view -> showMainNavigation());
+        return header;
+    }
+
+    private void addHeaderTool(
+            LinearLayout header,
+            String label,
+            String description,
+            View.OnClickListener action
+    ) {
+        Button button = terminalToolButton(label, action);
+        button.setContentDescription(description);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(dp(38), dp(38));
+        params.leftMargin = dp(4);
+        header.addView(button, params);
     }
 
     private View createSessionPageHeader() {