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

Fix tvOS instance browse view overlapping search and navigation UI

Browse Source 
Use inline TextField with focusSection instead of .searchable() and
.navigationTitle() on tvOS, matching the pattern in HistoryListView.
This commit is contained in:
Arkadiusz Fal
2026-04-13 20:14:56 +02:00
parent 4b245ec176
commit 5ae1fc3f29
1 changed files with 123 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
Yattee/Views/Instances/InstanceBrowseView.swift
View File

@@ -115,6 +115,114 @@ struct InstanceBrowseView: View {
var body: some View { var body: some View {
let backgroundStyle: ListBackgroundStyle = listStyle == .inset ? .grouped : .plain let backgroundStyle: ListBackgroundStyle = listStyle == .inset ? .grouped : .plain
GeometryReader { geometry in GeometryReader { geometry in
#if os(tvOS)
VStack(spacing: 0) {
// tvOS: Inline search field and view options button
HStack(spacing: 24) {
TextField("instance.browse.search.placeholder", text: $searchText)
.textFieldStyle(.plain)
.onSubmit {
searchViewModel?.cancelSuggestions()
Task { await searchViewModel?.search(query: searchText) }
}
Button {
showViewOptions = true
} label: {
Label(String(localized: "viewOptions.title"), systemImage: "slider.horizontal.3")
}
}
.focusSection()
.padding(.horizontal, 48)
.padding(.top, 20)
// Content
ScrollView {
VStack(spacing: 0) {
// Tab picker (hidden during search)
if !isInSearchMode {
Picker("", selection: $selectedTab) {
ForEach(availableTabs) { tab in
Label(tab.title, systemImage: tab.systemImage)
.tag(tab)
}
}
.pickerStyle(.segmented)
.padding()
}
// Feed channel filter strip (hidden during search)
if selectedTab == .feed && !feedSubscriptions.isEmpty && !isInSearchMode {
feedChannelFilterStrip
}
// Search filter strip (shown persistently after search submitted)
if isInSearchMode && (searchViewModel?.hasSearched ?? false) && instance.supportsSearchFilters {
searchFiltersStrip
}
// Content
Group {
if isInSearchMode, let vm = searchViewModel {
if !vm.hasSearched {
if vm.suggestions.isEmpty {
searchHintView
} else {
suggestionsView
}
} else if vm.isSearching && !vm.hasResults {
ProgressView()
.frame(maxWidth: .infinity, minHeight: 200)
} else if let error = vm.errorMessage, !vm.hasResults {
searchErrorView(error)
} else if vm.hasResults {
searchResultsContent
} else {
searchEmptyView
}
} else if selectedTab == .playlists {
if isLoading && userPlaylists.isEmpty {
ProgressView()
.frame(maxWidth: .infinity, minHeight: 200)
} else if let error = errorMessage, userPlaylists.isEmpty {
errorView(error)
} else if !userPlaylists.isEmpty {
switch layout {
case .list:
playlistsListContent
case .grid:
playlistsGridContent
}
} else {
playlistsEmptyView
}
} else if isLoading && currentVideos.isEmpty {
ProgressView()
.frame(maxWidth: .infinity, minHeight: 200)
} else if let error = errorMessage, currentVideos.isEmpty {
errorView(error)
} else if !currentVideos.isEmpty {
switch layout {
case .list:
listContent
case .grid:
gridContent
}
} else {
emptyView
}
}
}
}
.refreshable {
await startContentLoad(forceRefresh: true)
}
.focusSection()
}
.onChange(of: geometry.size.width, initial: true) { _, newWidth in
viewWidth = newWidth
}
#else
backgroundStyle.color backgroundStyle.color
.ignoresSafeArea() .ignoresSafeArea()
.overlay( .overlay(
@@ -206,11 +314,11 @@ struct InstanceBrowseView: View {
.onChange(of: geometry.size.width, initial: true) { _, newWidth in .onChange(of: geometry.size.width, initial: true) { _, newWidth in
viewWidth = newWidth viewWidth = newWidth
} }
}
.navigationTitle(instance.displayName)
#if !os(tvOS)
.toolbarTitleDisplayMode(.inlineLarge)
#endif #endif
}
#if !os(tvOS)
.navigationTitle(instance.displayName)
.toolbarTitleDisplayMode(.inlineLarge)
.toolbar { .toolbar {
ToolbarItem(placement: .primaryAction) { ToolbarItem(placement: .primaryAction) {
Button { Button {
@@ -221,6 +329,7 @@ struct InstanceBrowseView: View {
.liquidGlassTransitionSource(id: "instanceBrowseViewOptions", in: sheetTransition) .liquidGlassTransitionSource(id: "instanceBrowseViewOptions", in: sheetTransition)
} }
} }
#endif
.sheet(isPresented: $showViewOptions) { .sheet(isPresented: $showViewOptions) {
ViewOptionsSheet( ViewOptionsSheet(
layout: $layout, layout: $layout,
@@ -278,18 +387,24 @@ struct InstanceBrowseView: View {
placement: .navigationBarDrawer(displayMode: .automatic), placement: .navigationBarDrawer(displayMode: .automatic),
prompt: Text(String(localized: "instance.browse.search.placeholder")) prompt: Text(String(localized: "instance.browse.search.placeholder"))
) )
#else
.searchable(
text: $searchText,
prompt: Text(String(localized: "instance.browse.search.placeholder"))
)
#endif
.onSubmit(of: .search) { .onSubmit(of: .search) {
searchViewModel?.cancelSuggestions() searchViewModel?.cancelSuggestions()
Task { Task {
await searchViewModel?.search(query: searchText) await searchViewModel?.search(query: searchText)
} }
} }
#elseif !os(tvOS)
.searchable(
text: $searchText,
prompt: Text(String(localized: "instance.browse.search.placeholder"))
)
.onSubmit(of: .search) {
searchViewModel?.cancelSuggestions()
Task {
await searchViewModel?.search(query: searchText)
}
}
#endif
.onChange(of: searchText) { _, newValue in .onChange(of: searchText) { _, newValue in
if newValue.isEmpty { if newValue.isEmpty {
searchViewModel?.clearResults() searchViewModel?.clearResults()