unom/punktfunk
11
0
Fork 5
Code Issues 15 Pull Requests 23 Actions 19 Packages Projects 1 Releases 60 Wiki Activity

Clicking a host connects to it again; the library goes back to the card menu #309

Merged
enricobuehler merged 1 commits from worktree-revert-host-card-primary-connect into main 2026-08-18 19:20:34 +00:00
Conversation 0 Commits 1 Files Changed 1
+12 -22
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/apple/Sources/PunktfunkClient/Home/HostCards.swift
+12 -22
View File
@@ -126,13 +126,11 @@ struct HostCardView: View {
let onSpeedTest: () -> Void
let onForget: () -> Void
let onRemove: () -> Void
/// Open this host's game library. `nil` — no library affordance at all — when the setting is
/// off or the host is unpaired (the library plane needs the pinned identity).
/// Open this host's game library — a MENU action. `nil` — no library affordance at all — when
/// the setting is off or the host is unpaired (the library plane needs the pinned identity).
///
/// When present this is the card's **primary** action: tapping a machine you play games on
/// should offer the games, not drop you on its desktop. Streaming the desktop is still one tap
/// away, in the menu, and remains primary for a host with no library. Field note, 2026-08-16:
/// "clicking the PC opening the library directly".
/// Never the card's primary tap: tapping a host connects to it, on every surface. Browsing is
/// one step further in, exactly where the console shell keeps it (Y on a tile).
var onBrowseLibrary: (() -> Void)? = nil
/// Send a Wake-on-LAN magic packet. Shown only when the host is offline and we have a stored
/// MAC to target (a tap-to-connect already auto-wakes; this is the explicit "just wake it").
@@ -152,13 +150,9 @@ struct HostCardView: View {
}
}
/// What tapping the card does: open the library where the host has one, else connect. The
/// menu carries whichever of the two this isn't, so neither is ever more than one press away.
private var primaryAction: () -> Void { onBrowseLibrary ?? onConnect }
var body: some View {
let m = CardMetrics.current
return Button(action: primaryAction) {
return Button(action: onConnect) {
HStack(spacing: m.spacing) {
monogramTile(monogram(host.displayName), osChain: host.osChain,
m: m, connecting: isConnecting, filled: true)
@@ -230,12 +224,11 @@ struct HostCardView: View {
// the host's default binding.
connectWithMenu(menu)
// Browsing IS a connect-shaped action — it is this card's connect with a title picked
// first — and it is now what TAPPING the card does, so the menu carries the other
// half instead: streaming the machine itself. (Pair / speed test / wake / forget stay
// on the host's card: those are about the machine, and a shortcut has no business
// claiming them.)
if onBrowseLibrary != nil {
Button("Stream the Desktop", systemImage: "display", action: onConnect)
// first — so a pinned card offers it and opens its own shelf, whose launches carry the
// pinned profile. (Pair / speed test / wake / forget stay on the host's card: those
// are about the machine, and a shortcut has no business claiming them.)
if let onBrowseLibrary {
Button("Browse Library…", action: onBrowseLibrary)
}
if LinkClipboard.isAvailable {
Button("Copy Link") { menu.copyLink(pinned.id) }
@@ -256,11 +249,8 @@ struct HostCardView: View {
}
Button("Pair with PIN…", action: onPair)
Button("Test Network Speed…", action: onSpeedTest)
// The inverse of the card's primary tap — see `onBrowseLibrary`. Absent for a host
// with no library, where connecting IS the primary tap and a menu row for it would
// just be the same action twice.
if onBrowseLibrary != nil {
Button("Stream the Desktop", systemImage: "display", action: onConnect)
if let onBrowseLibrary {
Button("Browse Library…", action: onBrowseLibrary)
}
if !isOnline, !host.wakeMacs.isEmpty, PunktfunkConnection.wakeOnLANAvailable, let onWake {
Button("Wake Host", systemImage: "power", action: onWake)