Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-11-24 18:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix iOS menu text disappearing in navigation headers

Browse Source 
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
This commit is contained in:
Arkadiusz Fal
2025-11-23 14:16:21 +01:00
parent 65e86d30ec
commit 9177abb0ec
6 changed files with 189 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Shared/Channels/ChannelPlaylistView.swift
View File

@@ -109,22 +109,7 @@ struct ChannelPlaylistView: View {
#if os(iOS)
private var playlistMenu: some View {
Menu {
playButtons
favoriteButton
ListingStyleButtons(listingStyle: $channelPlaylistListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
ZStack {
HStack(spacing: 12) {
if let url = store.item?.thumbnailURL ?? playlist.thumbnailURL {
ThumbnailView(url: url)
@@ -141,8 +126,43 @@ struct ChannelPlaylistView: View {
.imageScale(.small)
}
.frame(maxWidth: 320)
.transaction { t in t.animation = nil }
Menu {
playButtons
favoriteButton
ListingStyleButtons(listingStyle: $channelPlaylistListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
HStack(spacing: 12) {
if let url = store.item?.thumbnailURL ?? playlist.thumbnailURL {
ThumbnailView(url: url)
.frame(width: 60, height: 30)
.clipShape(RoundedRectangle(cornerRadius: 2))
}
Text(playlist.title)
.font(.headline)
.foregroundColor(.primary)
Image(systemName: "chevron.down.circle.fill")
.foregroundColor(.accentColor)
.imageScale(.small)
}
.frame(maxWidth: 320)
.opacity(0)
}
}
.transaction { t in t.animation = nil }
}
#endif

41
Shared/Home/HomeView.swift
View File

@@ -211,19 +211,7 @@ struct HomeView: View {
#if os(iOS)
var homeMenu: some View {
Menu {
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
Button {
navigation.presentingHomeSettings = true
} label: {
Label("Home Settings", systemImage: "gear")
}
}
} label: {
ZStack {
HStack(spacing: 12) {
Text("Home")
.foregroundColor(.primary)
@@ -233,8 +221,33 @@ struct HomeView: View {
.foregroundColor(.accentColor)
.imageScale(.small)
}
.transaction { t in t.animation = nil }
Menu {
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
Button {
navigation.presentingHomeSettings = true
} label: {
Label("Home Settings", systemImage: "gear")
}
}
} label: {
HStack(spacing: 12) {
Text("Home")
.foregroundColor(.primary)
.font(.headline)
Image(systemName: "chevron.down.circle.fill")
.foregroundColor(.accentColor)
.imageScale(.small)
}
.opacity(0)
}
}
.transaction { t in t.animation = nil }
}
#endif
}

91
Shared/Playlists/PlaylistsView.swift
View File

@@ -190,40 +190,7 @@ struct PlaylistsView: View {
#if os(iOS)
var playlistsMenu: some View {
let title = currentPlaylist?.title ?? "Playlists"
return Menu {
Menu {
selectPlaylistButton
} label: {
Label(title, systemImage: "list.and.film")
}
Section {
if let currentPlaylist {
playButtons
editPlaylistButton
if let account = accounts.current {
FavoriteButton(item: FavoriteItem(section: .playlist(account.id, currentPlaylist.id)))
.id(currentPlaylist.id)
}
}
}
if accounts.signedIn {
newPlaylistButton
}
ListingStyleButtons(listingStyle: $playlistListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
return ZStack {
HStack(spacing: 12) {
HStack(spacing: 6) {
Image(systemName: "list.and.film")
@@ -239,9 +206,61 @@ struct PlaylistsView: View {
.imageScale(.small)
.lineLimit(1)
.frame(maxWidth: 320)
.transaction { t in t.animation = nil }
Menu {
Menu {
selectPlaylistButton
} label: {
Label(title, systemImage: "list.and.film")
}
Section {
if let currentPlaylist {
playButtons
editPlaylistButton
if let account = accounts.current {
FavoriteButton(item: FavoriteItem(section: .playlist(account.id, currentPlaylist.id)))
.id(currentPlaylist.id)
}
}
}
if accounts.signedIn {
newPlaylistButton
}
ListingStyleButtons(listingStyle: $playlistListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
HStack(spacing: 12) {
HStack(spacing: 6) {
Image(systemName: "list.and.film")
Text(title)
.font(.headline)
}
.foregroundColor(.primary)
Image(systemName: "chevron.down.circle.fill")
.foregroundColor(.accentColor)
}
.imageScale(.small)
.lineLimit(1)
.frame(maxWidth: 320)
.opacity(0)
}
.disabled(!accounts.signedIn)
}
.disabled(!accounts.signedIn)
.transaction { t in t.animation = nil }
}
#endif

46
Shared/Trending/TrendingView.swift
View File

@@ -168,22 +168,7 @@ struct TrendingView: View {
#if os(iOS)
var trendingMenu: some View {
Menu {
countryButton
categoryButton
ListingStyleButtons(listingStyle: $trendingListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
ZStack {
HStack(spacing: 12) {
Text("\(country.flag) \(country.name)")
.font(.headline)
@@ -194,6 +179,35 @@ struct TrendingView: View {
.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

11
Shared/Views/OpenVideosView.swift
View File

@@ -144,10 +144,15 @@ struct OpenVideosView: View {
Spacer()
#endif
#if os(iOS)
Menu {
playbackModePicker
} label: {
ZStack {
Text(playbackMode.description)
Menu {
playbackModePicker
} label: {
Text(playbackMode.description)
.opacity(0)
}
}
#else
playbackModePicker

45
Shared/Views/PopularView.swift
View File

@@ -90,18 +90,7 @@ struct PopularView: View {
#if os(iOS)
private var popularMenu: some View {
Menu {
ListingStyleButtons(listingStyle: $popularListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
ZStack {
HStack(spacing: 12) {
HStack(spacing: 6) {
Image(systemName: "chart.bar.fill")
@@ -117,8 +106,38 @@ struct PopularView: View {
.foregroundColor(.accentColor)
.imageScale(.small)
}
.transaction { t in t.animation = nil }
Menu {
ListingStyleButtons(listingStyle: $popularListingStyle)
Section {
HideWatchedButtons()
HideShortsButtons()
}
Section {
SettingsButtons()
}
} label: {
HStack(spacing: 12) {
HStack(spacing: 6) {
Image(systemName: "chart.bar.fill")
.foregroundColor(.primary)
.imageScale(.small)
Text("Popular")
.font(.headline)
.foregroundColor(.primary)
}
Image(systemName: "chevron.down.circle.fill")
.foregroundColor(.accentColor)
.imageScale(.small)
}
.opacity(0)
}
}
.transaction { t in t.animation = nil }
}
#endif