mirror of
https://github.com/yattee/yattee.git
synced 2025-11-12 21:28:42 +00:00
ce7ba207ea
This commit resolves multiple build errors caused by using APIs that require newer OS versions than the deployment targets (macOS 11.0 and tvOS 15.0). macOS fixes: - Add missing init(frame:) initializer to PlayerLayerView - Add availability checks for textSelection modifier (macOS 12.0+) - Add availability checks for AttributedString (macOS 12.0+) - Add availability checks for listStyle.inset(alternatesRowBackgrounds:) (macOS 12.0+) - Add availability checks for focusScope modifier (macOS 12.0+) - Correct listRowSeparator availability from macOS 12.0 to 13.0 tvOS fixes: - Use older onChange(of:) signature compatible with tvOS 15.0 - Add availability check for Menu with primaryAction (tvOS 17.0+) All changes include appropriate fallbacks for older OS versions to maintain backward compatibility. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
89 lines
2.7 KiB
Swift
89 lines
2.7 KiB
Swift
import SwiftUI
|
|
|
|
struct TrendingCountry: View {
|
|
static let prompt = "Country Name or Code".localized()
|
|
@Binding var selectedCountry: Country
|
|
|
|
@StateObject private var store = Store(Country.allCases)
|
|
|
|
@State private var query = ""
|
|
@State private var selection: Country?
|
|
|
|
@Environment(\.colorScheme) private var colorScheme
|
|
@Environment(\.presentationMode) private var presentationMode
|
|
|
|
var body: some View {
|
|
VStack {
|
|
#if !os(tvOS)
|
|
HStack {
|
|
// swiftlint:disable:next deployment_target
|
|
if #available(iOS 15.0, macOS 12.0, *) {
|
|
TextField("Country", text: $query, prompt: Text(Self.prompt))
|
|
} else {
|
|
TextField("Country", text: $query)
|
|
}
|
|
|
|
Button("Done") { selectCountryAndDismiss() }
|
|
.keyboardShortcut(.defaultAction)
|
|
.keyboardShortcut(.cancelAction)
|
|
}
|
|
.padding([.horizontal, .top])
|
|
#endif
|
|
countriesList
|
|
}
|
|
#if os(tvOS)
|
|
.searchable(text: $query, placement: .automatic, prompt: Text(Self.prompt))
|
|
.background(Color.background(scheme: colorScheme))
|
|
#endif
|
|
}
|
|
|
|
var countriesList: some View {
|
|
let list = ScrollViewReader { _ in
|
|
List(store.collection, selection: $selection) { country in
|
|
#if os(macOS)
|
|
Text(country.name)
|
|
.tag(country)
|
|
.id(country)
|
|
#else
|
|
Button(country.name) { selectCountryAndDismiss(country) }
|
|
#endif
|
|
}
|
|
.onChange(of: query) { newQuery in
|
|
let results = Country.search(newQuery)
|
|
store.replace(results)
|
|
|
|
selection = results.first
|
|
}
|
|
}
|
|
|
|
return Group {
|
|
#if os(macOS)
|
|
if #available(macOS 12.0, *) {
|
|
list.listStyle(.inset(alternatesRowBackgrounds: true))
|
|
} else {
|
|
list.listStyle(.inset)
|
|
}
|
|
#else
|
|
list
|
|
#endif
|
|
}
|
|
#if os(macOS)
|
|
.padding(.bottom, 5)
|
|
#endif
|
|
}
|
|
|
|
func selectCountryAndDismiss(_ country: Country? = nil) {
|
|
if let selected = country ?? selection {
|
|
selectedCountry = selected
|
|
}
|
|
|
|
presentationMode.wrappedValue.dismiss()
|
|
}
|
|
}
|
|
|
|
struct TrendingCountry_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
TrendingCountry(selectedCountry: .constant(.pl))
|
|
}
|
|
}
|