Move secondary navigation into header menu

2026-07-15 10:37:22 +00:00
parent 0cf8de3dda
commit 0d32e6105a
1 changed files with 23 additions and 2 deletions
@@ -297,7 +297,10 @@ public final class MainActivity extends Activity {
                serverUrls.size() + " nodes",
                "Servers",
                "＋ Add",
-                view -> promptCustomServer()
+                view -> promptCustomServer(),
+                "⋮",
+                "More navigation",
+                view -> showMainNavigation()
        ));
        for (String url : serverUrls) {
            content.addView(serverProfileCard(url), spacedHeight(72, 0, 12));
@@ -492,6 +495,18 @@ public final class MainActivity extends Activity {
            String titleText,
            String actionLabel,
            View.OnClickListener action
+    ) {
+        return createPageHeader(eyebrow, titleText, actionLabel, action, null, null, null);
+    }
+
+    private View createPageHeader(
+            String eyebrow,
+            String titleText,
+            String actionLabel,
+            View.OnClickListener action,
+            String utilityLabel,
+            String utilityDescription,
+            View.OnClickListener utilityAction
    ) {
        LinearLayout header = new LinearLayout(this);
        header.setOrientation(LinearLayout.HORIZONTAL);
@@ -520,6 +535,13 @@ public final class MainActivity extends Activity {
                ViewGroup.LayoutParams.WRAP_CONTENT,
                dp(38)
        ));
+        if (utilityAction != null) {
+            Button utility = terminalToolButton(utilityLabel, utilityAction);
+            utility.setContentDescription(utilityDescription);
+            LinearLayout.LayoutParams utilityParams = new LinearLayout.LayoutParams(dp(38), dp(38));
+            utilityParams.leftMargin = dp(6);
+            header.addView(utility, utilityParams);
+        }
        return header;
    }

@@ -529,7 +551,6 @@ public final class MainActivity extends Activity {
        row.setPadding(0, dp(4), 0, 0);
        row.addView(compactButton("Probe all", view -> probeServerProfiles()));
        row.addView(compactButton("Update", view -> renderUpdateScreen()));
-        row.addView(compactButton("More", view -> showMainNavigation()));
        return row;
    }