Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-05-13 19:05:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

68
Yattee/Views/Components/TVSidebarDetailContainer.swift
View File

@@ -9,22 +9,24 @@
#if os(tvOS)
import SwiftUI
struct TVSidebarDetailContainer<Content: View, BottomAction: View>: View {
struct TVSidebarDetailContainer<Content: View>: View {
let content: Content
let bottomAction: BottomAction
var systemImage: String?
var title: String?
var showsDismissButton: Bool
@Environment(\.dismiss) private var dismiss
init(
systemImage: String? = nil,
title: String? = nil,
@ViewBuilder bottomAction: () -> BottomAction = { EmptyView() },
showsDismissButton: Bool = false,
@ViewBuilder content: () -> Content
) {
self.content = content()
self.bottomAction = bottomAction()
self.systemImage = systemImage
self.title = title
self.showsDismissButton = showsDismissButton
}
var body: some View {
@@ -32,30 +34,19 @@ struct TVSidebarDetailContainer<Content: View, BottomAction: View>: View {
.focusSection()
.safeAreaInset(edge: .leading) {
if let systemImage {
VStack(spacing: 0) {
Spacer()
VStack(spacing: 16) {
Image(systemName: systemImage)
.font(.system(size: 80))
VStack(spacing: 16) {
Image(systemName: systemImage)
.font(.system(size: 80))
.foregroundStyle(.secondary)
if let title {
Text(title)
.font(.title3)
.fontWeight(.semibold)
.foregroundStyle(.secondary)
if let title {
Text(title)
.font(.title3)
.fontWeight(.semibold)
.foregroundStyle(.secondary)
.multilineTextAlignment(.center)
}
.multilineTextAlignment(.center)
}
.allowsHitTesting(false)
if BottomAction.self != EmptyView.self {
bottomAction
.padding(.top, 40)
.focusSection()
}
Spacer()
}
.allowsHitTesting(false)
.frame(width: 400)
} else {
Spacer()
@@ -63,22 +54,17 @@ struct TVSidebarDetailContainer<Content: View, BottomAction: View>: View {
.allowsHitTesting(false)
}
}
}
}
struct TVDismissBottomButton: View {
var title: String = String(localized: "common.done")
var systemImage: String = "chevron.backward"
@Environment(\.dismiss) private var dismiss
var body: some View {
Button {
dismiss()
} label: {
Label(title, systemImage: systemImage)
}
.buttonStyle(TVSettingsButtonStyle())
.toolbar {
if showsDismissButton {
ToolbarItem(placement: .cancellationAction) {
Button {
dismiss()
} label: {
Label(String(localized: "common.done"), systemImage: "chevron.backward")
}
}
}
}
}
}
#endif