Make tvOS detail dismiss button opt-in and unstick more views

TVSidebarDetailContainer now exposes a showsDismissButton flag instead of
always attaching a Done toolbar item. The button is only enabled where a
view can end up with no focusable element on its own — Device
Capabilities (informational rows) and the Import Playlists/Subscriptions
flows.

Wrap Contributors, Translators, Acknowledgements, and Device Capabilities
destinations in TVSidebarDetailContainer for the consistent sidebar look,
and make the Translators/Acknowledgements rows focusable on tvOS by
wrapping them in Buttons so the Menu remote button can pop the stack.
This commit is contained in:
Arkadiusz Fal
2026-05-06 22:41:46 +02:00
parent 5c7429abf3
commit 39beb45cff
7 changed files with 68 additions and 71 deletions

View File

@@ -23,19 +23,34 @@ struct AboutView: View {
SettingsFormSection {
#if os(tvOS)
NavigationLink {
ContributorsView()
TVSidebarDetailContainer(
systemImage: "person.3",
title: String(localized: "settings.contributors.title")
) {
ContributorsView()
}
} label: {
Label(String(localized: "settings.contributors.title"), systemImage: "person.3")
}
NavigationLink {
TranslationContributorsView()
TVSidebarDetailContainer(
systemImage: "globe",
title: String(localized: "settings.translators.title")
) {
TranslationContributorsView()
}
} label: {
Label(String(localized: "settings.translators.title"), systemImage: "globe")
}
NavigationLink {
AcknowledgementsView()
TVSidebarDetailContainer(
systemImage: "heart.text.square",
title: String(localized: "settings.acknowledgements.title")
) {
AcknowledgementsView()
}
} label: {
Label(String(localized: "settings.acknowledgements.title"), systemImage: "heart.text.square")
}
@@ -58,7 +73,13 @@ struct AboutView: View {
SettingsFormSection {
#if os(tvOS)
NavigationLink {
DeviceCapabilitiesView()
TVSidebarDetailContainer(
systemImage: "cpu",
title: String(localized: "settings.advanced.deviceCapabilities"),
showsDismissButton: true
) {
DeviceCapabilitiesView()
}
} label: {
Label(String(localized: "settings.advanced.deviceCapabilities"), systemImage: "cpu")
}

View File

@@ -26,9 +26,6 @@ struct AcknowledgementsView: View {
@ViewBuilder
private func dependencyLink(_ name: String, url: String) -> some View {
#if os(tvOS)
Text(name)
#else
Button {
if let url = URL(string: url) {
openURL(url)
@@ -37,15 +34,16 @@ struct AcknowledgementsView: View {
HStack {
Text(name)
Spacer()
#if !os(tvOS)
Image(systemName: "arrow.up.right")
.foregroundStyle(.secondary)
#endif
}
.contentShape(Rectangle())
}
#if os(macOS)
.buttonStyle(.plain)
#endif
#endif
}
}

View File

@@ -242,7 +242,8 @@ private struct EditRemoteServerContent: View {
#if os(tvOS)
TVSidebarDetailContainer(
systemImage: "person.2",
title: String(localized: "sources.import.subscriptions")
title: String(localized: "sources.import.subscriptions"),
showsDismissButton: true
) {
ImportSubscriptionsView(instance: instance)
}
@@ -258,7 +259,8 @@ private struct EditRemoteServerContent: View {
#if os(tvOS)
TVSidebarDetailContainer(
systemImage: "list.bullet.rectangle",
title: String(localized: "sources.import.playlists")
title: String(localized: "sources.import.playlists"),
showsDismissButton: true
) {
ImportPlaylistsView(instance: instance)
}

View File

@@ -11,7 +11,6 @@ struct ImportPlaylistsView: View {
let instance: Instance
@Environment(\.appEnvironment) private var appEnvironment
@Environment(\.dismiss) private var dismiss
@State private var playlists: [Playlist] = []
@State private var importedPlaylistIDs: Set<String> = []
@@ -60,15 +59,6 @@ struct ImportPlaylistsView: View {
.navigationBarTitleDisplayMode(.inline)
#endif
.toolbar {
#if os(tvOS)
ToolbarItem(placement: .cancellationAction) {
Button {
dismiss()
} label: {
Label(String(localized: "common.done"), systemImage: "chevron.backward")
}
}
#endif
if !unimportedPlaylists.isEmpty && importingPlaylistID == nil {
ToolbarItem(placement: .primaryAction) {
Button {

View File

@@ -11,7 +11,6 @@ struct ImportSubscriptionsView: View {
let instance: Instance
@Environment(\.appEnvironment) private var appEnvironment
@Environment(\.dismiss) private var dismiss
@State private var channels: [Channel] = []
@State private var subscribedChannelIDs: Set<String> = []
@@ -51,15 +50,6 @@ struct ImportSubscriptionsView: View {
.navigationBarTitleDisplayMode(.inline)
#endif
.toolbar {
#if os(tvOS)
ToolbarItem(placement: .cancellationAction) {
Button {
dismiss()
} label: {
Label(String(localized: "common.done"), systemImage: "chevron.backward")
}
}
#endif
if !unsubscribedChannels.isEmpty {
ToolbarItem(placement: .primaryAction) {
Button {

View File

@@ -47,6 +47,16 @@ struct TranslationContributorsView: View {
}
private func contributorRow(_ contributor: TranslationContributor) -> some View {
#if os(tvOS)
Button {} label: {
contributorRowContent(contributor)
}
#else
contributorRowContent(contributor)
#endif
}
private func contributorRowContent(_ contributor: TranslationContributor) -> some View {
HStack(spacing: 12) {
// Avatar
LazyImage(url: contributor.gravatarURL) { state in