7655c36f34
ci / rust (push) Has been cancelled
The navigationLink Picker's INTERNAL destination list renders its rows in the focused (dark-text) style while the push animates — black text over the dark backdrop until focus settles (present under the old fade too; a SwiftUI-on-tvOS quirk we don't control). Settings now uses its own primitives instead: - TVSelectionRow: label + current value, pushes… - TVSelectionList: a Settings-app-style option list (plain button rows + checkmark, selecting pops back) — ordinary button chrome, no focused-style pre-rendering. The stream-mode and compositor pickers are gone on tvOS; the Settings screen itself is a plain scroll of rows + footer (no Form), matching the rest of the tv UI. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
145 lines
4.8 KiB
Swift
145 lines
4.8 KiB
Swift
// The native tvOS text-entry experience: real tvOS apps never edit text inline —
|
|
// selecting a field presents the SYSTEM full-screen keyboard (Apple's "Designing the
|
|
// Keyboard Input Experience"). UIKit gives that for free: a UITextField that becomes
|
|
// first responder presents the fullscreen keyboard UI with the field's placeholder as
|
|
// the prompt. SwiftUI's inline TextField on tvOS is an expanding pill with stray
|
|
// chrome — this bridge replaces it everywhere on tvOS.
|
|
|
|
#if os(tvOS)
|
|
import SwiftUI
|
|
import UIKit
|
|
|
|
/// Present inside a fullScreenCover: immediately raises the system keyboard for one
|
|
/// value, then calls `onDone` with the result (also on Menu-button dismissal, with
|
|
/// whatever was typed so far — match the system apps' "edits stick" behavior).
|
|
struct TVTextEntry: UIViewControllerRepresentable {
|
|
let title: String
|
|
let text: String
|
|
var keyboardType: UIKeyboardType = .default
|
|
let onDone: (String) -> Void
|
|
|
|
func makeUIViewController(context: Context) -> TVTextEntryController {
|
|
let controller = TVTextEntryController()
|
|
controller.configure(
|
|
title: title, text: text, keyboardType: keyboardType, onDone: onDone)
|
|
return controller
|
|
}
|
|
|
|
func updateUIViewController(_ controller: TVTextEntryController, context: Context) {}
|
|
}
|
|
|
|
final class TVTextEntryController: UIViewController, UITextFieldDelegate {
|
|
private let field = UITextField()
|
|
private var onDone: ((String) -> Void)?
|
|
private var finished = false
|
|
|
|
func configure(
|
|
title: String, text: String, keyboardType: UIKeyboardType,
|
|
onDone: @escaping (String) -> Void
|
|
) {
|
|
field.placeholder = title
|
|
field.text = text
|
|
field.keyboardType = keyboardType
|
|
field.returnKeyType = .done
|
|
self.onDone = onDone
|
|
}
|
|
|
|
override func viewDidLoad() {
|
|
super.viewDidLoad()
|
|
view.backgroundColor = .clear
|
|
field.delegate = self
|
|
view.addSubview(field) // must be in a window to become first responder
|
|
}
|
|
|
|
override func viewDidAppear(_ animated: Bool) {
|
|
super.viewDidAppear(animated)
|
|
field.becomeFirstResponder() // presents the tvOS fullscreen keyboard
|
|
}
|
|
|
|
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
|
|
textField.resignFirstResponder()
|
|
return true
|
|
}
|
|
|
|
func textFieldDidEndEditing(_ textField: UITextField) {
|
|
guard !finished else { return }
|
|
finished = true
|
|
onDone?(textField.text ?? "")
|
|
}
|
|
}
|
|
|
|
/// A Settings-app-style value row: label leading, current value trailing — the whole
|
|
/// row is one system lozenge, and pressing it opens the fullscreen keyboard.
|
|
struct TVFieldRow: View {
|
|
let label: String
|
|
let value: String
|
|
let placeholder: String
|
|
let action: () -> Void
|
|
|
|
var body: some View {
|
|
Button(action: action) {
|
|
HStack {
|
|
Text(label)
|
|
Spacer()
|
|
Text(value.isEmpty ? placeholder : value)
|
|
.foregroundStyle(.secondary)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/// A Settings-app-style selection screen: pushed list of option rows, checkmark on the
|
|
/// current value, selecting pops back. Replaces Picker(.navigationLink), whose internal
|
|
/// list renders rows in the focused (dark-text) style while the push animates.
|
|
struct TVSelectionList<Tag: Hashable>: View {
|
|
let title: String
|
|
let options: [(label: String, tag: Tag)]
|
|
@Binding var selection: Tag
|
|
@Environment(\.dismiss) private var dismiss
|
|
|
|
var body: some View {
|
|
ScrollView {
|
|
VStack(spacing: 16) {
|
|
ForEach(options, id: \.tag) { option in
|
|
Button {
|
|
selection = option.tag
|
|
dismiss()
|
|
} label: {
|
|
HStack {
|
|
Text(option.label)
|
|
Spacer()
|
|
if option.tag == selection {
|
|
Image(systemName: "checkmark")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.frame(maxWidth: 900)
|
|
.frame(maxWidth: .infinity)
|
|
.padding(60)
|
|
}
|
|
.navigationTitle(title)
|
|
}
|
|
}
|
|
|
|
/// The pushing row for a TVSelectionList: label leading, current value trailing.
|
|
struct TVSelectionRow<Tag: Hashable>: View {
|
|
let title: String
|
|
let options: [(label: String, tag: Tag)]
|
|
@Binding var selection: Tag
|
|
|
|
var body: some View {
|
|
NavigationLink {
|
|
TVSelectionList(title: title, options: options, selection: $selection)
|
|
} label: {
|
|
HStack {
|
|
Text(title)
|
|
Spacer()
|
|
Text(options.first { $0.tag == selection }?.label ?? "—")
|
|
.foregroundStyle(.secondary)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif
|