Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2026-11-01 09:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide toolbar account switchers where the sidebar already shows one

Browse Source
This commit is contained in:
Arkadiusz Fal
2026-09-16 18:16:10 +02:00
parent a5ed91620f
commit 5d33e4a558
5 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Yattee/Views/Home/HistoryListView.swift
View File

@@ -9,6 +9,9 @@ import SwiftUI
struct HistoryListView: View {
@Environment(\.appEnvironment) private var appEnvironment
#if os(iOS)
@Environment(\.horizontalSizeClass) private var horizontalSizeClass
#endif
@Namespace private var sheetTransition
/// One row, from whichever history the screen is reading.
@@ -331,10 +334,11 @@ struct HistoryListView: View {
ToolbarSpacer(.flexible, placement: .primaryAction)
}
#endif
// No switcher on macOS: the sidebar row is the one persistent
// switcher surface there.
// No switcher wherever a sidebar shows one: the macOS sidebar row
// and the iPad sidebar's bottom bar are the persistent switcher
// surfaces there, so the toolbar menu is compact-width-only.
#if !os(macOS)
if DataContextSwitcherVisibility.showsPickers(in: appEnvironment) {
if DataContextSwitcherVisibility.showsToolbarPickers(in: appEnvironment, horizontalSizeClass: horizontalSizeClass) {
ToolbarItem(placement: viewOptionsPlacement) {
DataContextSwitcherMenu()
}

10
Yattee/Views/Home/HomeView.swift
View File

@@ -9,6 +9,9 @@ import SwiftUI
struct HomeView: View {
@Environment(\.appEnvironment) private var appEnvironment
#if os(iOS)
@Environment(\.horizontalSizeClass) private var horizontalSizeClass
#endif
@Environment(\.scenePhase) private var scenePhase
#if !os(tvOS) && !os(macOS)
@Namespace private var sheetTransition
@@ -166,10 +169,11 @@ struct HomeView: View {
.toolbarTitleDisplayMode(.inlineLarge)
#endif
.toolbar {
// No switcher on macOS: the sidebar row is the one persistent
// switcher surface there.
// No switcher wherever a sidebar shows one: the macOS sidebar row
// and the iPad sidebar's bottom bar are the persistent switcher
// surfaces there, so the toolbar menu is compact-width-only.
#if !os(tvOS) && !os(macOS)
if DataContextSwitcherVisibility.showsPickers(in: appEnvironment) {
if DataContextSwitcherVisibility.showsToolbarPickers(in: appEnvironment, horizontalSizeClass: horizontalSizeClass) {
ToolbarItem(placement: .primaryAction) {
DataContextSwitcherMenu()
}

10
Yattee/Views/Home/PlaylistsListView.swift
View File

@@ -9,6 +9,9 @@ import SwiftUI
struct PlaylistsListView: View {
@Environment(\.appEnvironment) private var appEnvironment
#if os(iOS)
@Environment(\.horizontalSizeClass) private var horizontalSizeClass
#endif
@Namespace private var sheetTransition
@State private var localPlaylists: [LocalPlaylist] = []
@State private var searchText = ""
@@ -229,10 +232,11 @@ struct PlaylistsListView: View {
ToolbarSpacer(.flexible, placement: .primaryAction)
}
#endif
// No switcher on macOS: the sidebar row is the one persistent
// switcher surface there.
// No switcher wherever a sidebar shows one: the macOS sidebar row
// and the iPad sidebar's bottom bar are the persistent switcher
// surfaces there, so the toolbar menu is compact-width-only.
#if !os(macOS)
if DataContextSwitcherVisibility.showsPickers(in: appEnvironment) {
if DataContextSwitcherVisibility.showsToolbarPickers(in: appEnvironment, horizontalSizeClass: horizontalSizeClass) {
ToolbarItem(placement: viewOptionsPlacement) {
DataContextSwitcherMenu()
}