Use native text Close button for sheet toolbars on macOS

Sheet dismiss buttons rendered as an iOS-style circular glass "X" on macOS 26, which looks foreign on the desktop. Add a shared sheetCloseToolbarItem helper that renders a native text "Close" button on macOS while keeping the compact icon-only xmark on iOS/tvOS, and replace the ~14 duplicated inline close buttons across sheets with it.
2026-07-19 22:02:10 +00:00 · 2026-05-24 12:34:53 +02:00
parent c245a0e2a0
commit 9568149c21
15 changed files with 64 additions and 121 deletions
--- a/Yattee/Extensions/ToolbarContent+Close.swift
+++ b/Yattee/Extensions/ToolbarContent+Close.swift
@@ -0,0 +1,50 @@
+//
+//  ToolbarContent+Close.swift
+//  Yattee
+//
+//  Shared sheet-dismiss toolbar item.
+//
+
+import SwiftUI
+
+/// Standard sheet-dismiss toolbar item.
+///
+/// On macOS this renders a native text button (e.g. "Close"), which fits the desktop
+/// convention. On iOS/tvOS it renders the compact icon-only xmark used by the rest of
+/// the app's sheets.
+///
+/// Placement defaults to `.confirmationAction`; only the *label* changes per platform,
+/// so it can be dropped into existing `.toolbar { }` blocks without changing layout.
+@ToolbarContentBuilder
+func sheetCloseToolbarItem(
+    placement: ToolbarItemPlacement = .confirmationAction,
+    titleKey: LocalizedStringResource = "common.close",
+    identifier: String? = nil,
+    action: @escaping () -> Void
+) -> some ToolbarContent {
+    ToolbarItem(placement: placement) {
+        sheetCloseButton(titleKey: titleKey, identifier: identifier, action: action)
+    }
+}
+
+@ViewBuilder
+private func sheetCloseButton(
+    titleKey: LocalizedStringResource,
+    identifier: String?,
+    action: @escaping () -> Void
+) -> some View {
+    let button = Button(role: .cancel, action: action) {
+        #if os(macOS)
+        Text(String(localized: titleKey))
+        #else
+        Label(String(localized: titleKey), systemImage: "xmark")
+            .labelStyle(.iconOnly)
+        #endif
+    }
+
+    if let identifier {
+        button.accessibilityIdentifier(identifier)
+    } else {
+        button
+    }
+}
--- a/Yattee/Views/MediaBrowser/MediaBrowserViewOptionsSheet.swift
+++ b/Yattee/Views/MediaBrowser/MediaBrowserViewOptionsSheet.swift
@@ -88,14 +88,7 @@ struct MediaBrowserViewOptionsSheet: View {
        .navigationBarTitleDisplayMode(.inline)
        #endif
        .toolbar {
-            ToolbarItem(placement: .confirmationAction) {
-                Button(role: .cancel) {
-                    dismiss()
-                } label: {
-                    Label(String(localized: "common.close"), systemImage: "xmark")
-                        .labelStyle(.iconOnly)
-                }
-            }
+            sheetCloseToolbarItem { dismiss() }
        }
    }
 }
--- a/Yattee/Views/Player/ChaptersView.swift
+++ b/Yattee/Views/Player/ChaptersView.swift
@@ -31,14 +31,7 @@ struct ChaptersView: View {
            .navigationBarTitleDisplayMode(.inline)
            #endif
            .toolbar {
-                ToolbarItem(placement: .confirmationAction) {
-                    Button(role: .cancel) {
-                        dismiss()
-                    } label: {
-                        Label(String(localized: "common.close"), systemImage: "xmark")
-                            .labelStyle(.iconOnly)
-                    }
-                }
+                sheetCloseToolbarItem { dismiss() }
            }
            .task {
                await preloadChapterSheets()
--- a/Yattee/Views/Player/PlayerHelperViews.swift
+++ b/Yattee/Views/Player/PlayerHelperViews.swift
@@ -114,14 +114,7 @@ struct ErrorDetailsSheet: View {
            #endif
            .toolbar {
                #if !os(tvOS)
-                ToolbarItem(placement: .confirmationAction) {
-                    Button(role: .cancel) {
-                        dismiss()
-                    } label: {
-                        Label(String(localized: "common.close"), systemImage: "xmark")
-                            .labelStyle(.iconOnly)
-                    }
-                }
+                sheetCloseToolbarItem { dismiss() }

                ToolbarItemGroup(placement: .primaryAction) {
                    // Copy button
--- a/Yattee/Views/Player/QualitySelectorView.swift
+++ b/Yattee/Views/Player/QualitySelectorView.swift
@@ -276,14 +276,7 @@ struct QualitySelectorView: View {
        #endif
        #if !os(tvOS)
        .toolbar {
-            ToolbarItem(placement: .confirmationAction) {
-                Button(role: .cancel) {
-                    performDismiss()
-                } label: {
-                    Label(String(localized: "common.close"), systemImage: "xmark")
-                        .labelStyle(.iconOnly)
-                }
-            }
+            sheetCloseToolbarItem { performDismiss() }
        }
        #endif
        .navigationDestination(for: QualitySelectorDestination.self) { destination in
--- a/Yattee/Views/Player/QueueManagementSheet.swift
+++ b/Yattee/Views/Player/QueueManagementSheet.swift
@@ -125,14 +125,7 @@ struct QueueManagementSheet: View {
                ToolbarItem(placement: .cancellationAction) {
                    queueModeMenu
                }
-                ToolbarItem(placement: .confirmationAction) {
-                    Button(role: .cancel) {
-                        performDismiss()
-                    } label: {
-                        Label(String(localized: "common.close"), systemImage: "xmark")
-                            .labelStyle(.iconOnly)
-                    }
-                }
+                sheetCloseToolbarItem { performDismiss() }
            }
        }
        .presentationDragIndicator(.visible)
--- a/Yattee/Views/RemoteControl/RemoteDevicesSheet.swift
+++ b/Yattee/Views/RemoteControl/RemoteDevicesSheet.swift
@@ -24,14 +24,7 @@ struct RemoteDevicesSheet: View {
                    .frame(minWidth: 400, minHeight: 300)
                    #endif
                    .toolbar {
-                        ToolbarItem(placement: .confirmationAction) {
-                            Button(role: .cancel) {
-                                dismiss()
-                            } label: {
-                                Label(String(localized: "common.close"), systemImage: "xmark")
-                                    .labelStyle(.iconOnly)
-                            }
-                        }
+                        sheetCloseToolbarItem { dismiss() }
                    }
                    .navigationDestination(item: $selectedDevice) { device in
                        RemoteControlView(device: device)
--- a/Yattee/Views/Settings/AddSourceView.swift
+++ b/Yattee/Views/Settings/AddSourceView.swift
@@ -64,14 +64,7 @@ struct AddSourceView: View {
                .navigationBarTitleDisplayMode(.inline)
                #endif
                .toolbar {
-                    ToolbarItem(placement: .confirmationAction) {
-                        Button(role: .cancel) {
-                            dismiss()
-                        } label: {
-                            Label(String(localized: "common.close"), systemImage: "xmark")
-                                .labelStyle(.iconOnly)
-                        }
-                    }
+                    sheetCloseToolbarItem { dismiss() }
                }
                .navigationDestination(isPresented: $navigateToWebDAV) {
                    AddWebDAVView(
--- a/Yattee/Views/Settings/InstancePickerSheet.swift
+++ b/Yattee/Views/Settings/InstancePickerSheet.swift
@@ -54,14 +54,7 @@ struct InstancePickerSheet: View {
            .navigationBarTitleDisplayMode(.inline)
            #endif
            .toolbar {
-                ToolbarItem(placement: .confirmationAction) {
-                    Button(role: .cancel) {
-                        dismiss()
-                    } label: {
-                        Label(String(localized: "common.close"), systemImage: "xmark")
-                            .labelStyle(.iconOnly)
-                    }
-                }
+                sheetCloseToolbarItem { dismiss() }
            }
        }
        .presentationDetents([.medium, .large])
--- a/Yattee/Views/Settings/LogViewerView.swift
+++ b/Yattee/Views/Settings/LogViewerView.swift
@@ -278,14 +278,7 @@ private struct LogEntryDetailView: View {
            .navigationBarTitleDisplayMode(.inline)
            #endif
            .toolbar {
-                ToolbarItem(placement: .confirmationAction) {
-                    Button(role: .cancel) {
-                        dismiss()
-                    } label: {
-                        Label(String(localized: "common.close"), systemImage: "xmark")
-                            .labelStyle(.iconOnly)
-                    }
-                }
+                sheetCloseToolbarItem { dismiss() }
            }
        }
        .presentationDetents([.medium, .large])
--- a/Yattee/Views/Settings/PeerTubeInstancesExploreView.swift
+++ b/Yattee/Views/Settings/PeerTubeInstancesExploreView.swift
@@ -215,14 +215,7 @@ struct PeerTubeInstancesExploreView: View {
    @ToolbarContentBuilder
    private var toolbarContent: some ToolbarContent {
        #if !os(tvOS)
-        ToolbarItem(placement: .confirmationAction) {
-            Button(role: .cancel) {
-                dismiss()
-            } label: {
-                Label(String(localized: "common.close"), systemImage: "xmark")
-                    .labelStyle(.iconOnly)
-            }
-        }
+        sheetCloseToolbarItem { dismiss() }
        #endif

        ToolbarItem(placement: .primaryAction) {
--- a/Yattee/Views/Settings/PlayerControls/Gestures/TapGesturesSettingsView.swift
+++ b/Yattee/Views/Settings/PlayerControls/Gestures/TapGesturesSettingsView.swift
@@ -187,14 +187,7 @@ struct TapGesturesSettingsView: View {

        TapZoneActionPicker(position: position, action: binding)
            .toolbar {
-                ToolbarItem(placement: .confirmationAction) {
-                    Button(role: .cancel) {
-                        selectedZonePosition = nil
-                    } label: {
-                        Label(String(localized: "common.close"), systemImage: "xmark")
-                            .labelStyle(.iconOnly)
-                    }
-                }
+                sheetCloseToolbarItem { selectedZonePosition = nil }
            }
    }

--- a/Yattee/Views/Settings/SettingsView.swift
+++ b/Yattee/Views/Settings/SettingsView.swift
@@ -328,15 +328,7 @@ struct SettingsView: View {
            .navigationBarTitleDisplayMode(.inline)
            .toolbar {
                if showCloseButton {
-                    ToolbarItem(placement: .confirmationAction) {
-                        Button(role: .cancel) {
-                            dismiss()
-                        } label: {
-                            Label(String(localized: "common.close"), systemImage: "xmark")
-                                .labelStyle(.iconOnly)
-                        }
-                        .accessibilityIdentifier("settings.doneButton")
-                    }
+                    sheetCloseToolbarItem(identifier: "settings.doneButton") { dismiss() }
                }
            }
            .accessibilityIdentifier("settings.view")
--- a/Yattee/Views/Video/PlaylistSelectorSheet.swift
+++ b/Yattee/Views/Video/PlaylistSelectorSheet.swift
@@ -89,22 +89,7 @@ struct PlaylistSelectorSheet: View {
            .navigationBarTitleDisplayMode(.inline)
            #endif
            .toolbar {
-                #if os(macOS)
-                ToolbarItem(placement: .cancellationAction) {
-                    Button(String(localized: "common.close"), role: .cancel) {
-                        dismiss()
-                    }
-                }
-                #else
-                ToolbarItem(placement: .confirmationAction) {
-                    Button(role: .cancel) {
-                        dismiss()
-                    } label: {
-                        Label(String(localized: "common.close"), systemImage: "xmark")
-                            .labelStyle(.iconOnly)
-                    }
-                }
-                #endif
+                sheetCloseToolbarItem { dismiss() }
            }
            #endif
            .sheet(isPresented: $showingNewPlaylist) {
--- a/Yattee/Views/Video/VideoInfoView.swift
+++ b/Yattee/Views/Video/VideoInfoView.swift
@@ -1973,14 +1973,7 @@ struct VideoInfoView: View {
                #endif
                #if !os(tvOS)
                .toolbar {
-                    ToolbarItem(placement: .confirmationAction) {
-                        Button(role: .cancel) {
-                            showingCommentsSheet = false
-                        } label: {
-                            Label(String(localized: "common.close"), systemImage: "xmark")
-                                .labelStyle(.iconOnly)
-                        }
-                    }
+                    sheetCloseToolbarItem { showingCommentsSheet = false }
                }
                #endif
            }