Files
yattee/Shared/Trending/TrendingView.swift
Arkadiusz Fal 9177abb0ec Fix iOS menu text disappearing in navigation headers
Extended the ZStack overlay fix to all iOS navigation header menus
where text labels would disappear when tapping the menu:

- HomeView: "Home" title menu
- PopularView: "Popular" title with icon menu
- TrendingView: Country/flag title menu
- PlaylistsView: Playlist title with thumbnail menu
- ChannelPlaylistView: Playlist title with thumbnail menu
- OpenVideosView: Playback mode picker menu

All menus now use the same pattern as PlaybackSettings:
- Visible static label layer in ZStack
- Invisible Menu overlay with .opacity(0)
- Prevents text disappearing and resizing animations
2025-11-23 14:16:21 +01:00

302 lines
8.6 KiB
Swift

import Defaults
import Siesta
import SwiftUI
struct TrendingView: View {
@StateObject private var store = Store<[Video]>()
private var videos = [Video]()
@Default(.trendingCategory) private var category
@Default(.trendingCountry) private var country
@Default(.trendingListingStyle) private var trendingListingStyle
@State private var presentingCountrySelection = false
@State private var favoriteItem: FavoriteItem?
@ObservedObject private var accounts = AccountsModel.shared
var trending: [ContentItem] {
ContentItem.array(of: store.collection)
}
@State private var error: RequestError?
init(_ videos: [Video] = [Video]()) {
self.videos = videos
}
var resource: Resource {
let newResource: Resource
newResource = accounts.api.trending(country: country, category: category)
newResource.addObserver(store)
return newResource
}
var body: some View {
Section {
VerticalCells(items: trending) { if shouldDisplayHeader { header } }
.environment(\.listingStyle, trendingListingStyle)
}
.toolbar {
ToolbarItem {
RequestErrorButton(error: error)
}
#if os(macOS)
ToolbarItemGroup {
if let favoriteItem {
FavoriteButton(item: favoriteItem)
.id(favoriteItem.id)
}
categoryButton
countryButton
}
#endif
}
.onChange(of: resource) { _ in
resource.load()
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
updateFavoriteItem()
}
.onAppear {
resource.loadIfNeeded()?
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
updateFavoriteItem()
}
#if os(tvOS)
.fullScreenCover(isPresented: $presentingCountrySelection) {
TrendingCountry(selectedCountry: $country)
}
#else
.sheet(isPresented: $presentingCountrySelection) {
TrendingCountry(selectedCountry: $country)
#if os(macOS)
.frame(minWidth: 400, minHeight: 400)
#endif
}
.background(
Button("Refresh") {
resource.load()
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
}
.keyboardShortcut("r")
.opacity(0)
)
.navigationTitle("Trending")
#endif
#if os(iOS)
.refreshControl { refreshControl in
resource.load().onCompletion { _ in
refreshControl.endRefreshing()
}
}
.backport
.refreshable {
DispatchQueue.main.async {
resource.load()
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
}
}
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .principal) {
trendingMenu
}
}
#endif
#if os(macOS)
.toolbar {
ToolbarItem {
ListingStyleButtons(listingStyle: $trendingListingStyle)
}
ToolbarItem {
HideWatchedButtons()
}
ToolbarItem {
HideShortsButtons()
}
}
#else
.onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in
resource.loadIfNeeded()?
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
}
#endif
}
#if os(tvOS)
private var toolbar: some View {
HStack {
if accounts.app.supportsTrendingCategories {
HStack {
Text("Category")
.foregroundColor(.secondary)
categoryButton
}
}
HStack {
Text("Country")
.foregroundColor(.secondary)
countryButton
}
if let favoriteItem {
FavoriteButton(item: favoriteItem)
.id(favoriteItem.id)
.labelStyle(.iconOnly)
}
}
}
#endif
#if os(iOS)
var trendingMenu: some View {
ZStack {
HStack(spacing: 12) {
Text("\(country.flag) \(country.name)")
.font(.headline)
.foregroundColor(.primary)
Image(systemName: "chevron.down.circle.fill")
.foregroundColor(.accentColor)
.imageScale(.small)
}
.frame(maxWidth: 320)
Menu {
countryButton
categoryButton
ListingStyleButtons(listingStyle: $trendingListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
HStack(spacing: 12) {
Text("\(country.flag) \(country.name)")
.font(.headline)
.foregroundColor(.primary)
Image(systemName: "chevron.down.circle.fill")
.foregroundColor(.accentColor)
.imageScale(.small)
}
.frame(maxWidth: 320)
.opacity(0)
}
}
}
#endif
@ViewBuilder private var categoryButton: some View {
if accounts.app.supportsTrendingCategories {
#if os(tvOS)
Button(category.name) {
self.category = category.next()
}
.contextMenu {
ForEach(TrendingCategory.allCases) { category in
Button(category.controlLabel) { self.category = category }
}
Button("Cancel", role: .cancel) {}
}
#else
Picker(category.controlLabel, selection: $category) {
ForEach(TrendingCategory.allCases) { category in
Label(category.controlLabel, systemImage: category.systemImage).tag(category)
}
}
#endif
}
}
private var countryButton: some View {
Button(action: {
presentingCountrySelection.toggle()
resource.removeObservers(ownedBy: store)
}) {
#if os(iOS)
Label("Country", systemImage: "flag")
#else
Text("\(country.flag) \(country.id)")
#endif
}
}
private func updateFavoriteItem() {
favoriteItem = FavoriteItem(section: .trending(country.rawValue, category.rawValue))
}
var header: some View {
HStack {
Group {
categoryButton
countryButton
}
.font(.caption)
Spacer()
ListingStyleButtons(listingStyle: $trendingListingStyle)
HideWatchedButtons()
HideShortsButtons()
Button {
resource.load()
.onFailure { self.error = $0 }
.onSuccess { _ in self.error = nil }
} label: {
Label("Refresh", systemImage: "arrow.clockwise")
.labelStyle(.iconOnly)
.imageScale(.small)
.font(.caption)
}
}
.padding(.leading, 30)
.padding(.bottom, 15)
.padding(.trailing, 30)
}
var shouldDisplayHeader: Bool {
#if os(tvOS)
true
#else
false
#endif
}
}
struct TrendingView_Previews: PreviewProvider {
static var previews: some View {
NavigationView {
TrendingView(Video.allFixtures)
}
}
}