diff --git a/Multiplatform/Shared/Article/ArticleToolbarModifier.swift b/Multiplatform/Shared/Article/ArticleToolbarModifier.swift index 7568d4772..dd148e4aa 100644 --- a/Multiplatform/Shared/Article/ArticleToolbarModifier.swift +++ b/Multiplatform/Shared/Article/ArticleToolbarModifier.swift @@ -18,7 +18,7 @@ struct ArticleToolbarModifier: ViewModifier { .toolbar { #if os(iOS) - ToolbarItem(placement: .navigation) { + ToolbarItem(placement: .primaryAction) { HStack(spacing: 20) { Button { } label: { diff --git a/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift b/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift index d33d38c85..c66ce0ed1 100644 --- a/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift +++ b/Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift @@ -20,7 +20,7 @@ struct SidebarToolbarModifier: ViewModifier { content .toolbar { - ToolbarItem(placement: .navigation) { + ToolbarItem(placement: .primaryAction) { Button { withAnimation { sidebarModel.isReadFiltered.toggle() @@ -35,7 +35,7 @@ struct SidebarToolbarModifier: ViewModifier { .help(sidebarModel.isReadFiltered ? "Show Read Feeds" : "Filter Read Feeds") } - ToolbarItem(placement: .automatic) { + ToolbarItem(placement: .bottomBar) { Button { viewModel.sheetToShow = .settings } label: { @@ -44,11 +44,11 @@ struct SidebarToolbarModifier: ViewModifier { .help("Settings") } - ToolbarItem { + ToolbarItem(placement: .bottomBar) { Spacer() } - ToolbarItem(placement: .automatic) { + ToolbarItem(placement: .bottomBar) { switch refreshProgress.state { case .refreshProgress(let progress): ProgressView(value: progress) @@ -63,11 +63,11 @@ struct SidebarToolbarModifier: ViewModifier { } } - ToolbarItem { + ToolbarItem(placement: .bottomBar) { Spacer() } - ToolbarItem(placement: .automatic, content: { + ToolbarItem(placement: .bottomBar, content: { Button { viewModel.showActionSheet = true } label: { diff --git a/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift b/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift index 5c32026d1..fef375353 100644 --- a/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift +++ b/Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift @@ -17,7 +17,7 @@ struct TimelineToolbarModifier: ViewModifier { content .toolbar { #if os(iOS) - ToolbarItem(placement: .navigation) { + ToolbarItem(placement: .primaryAction) { Button { withAnimation { timelineModel.toggleReadFilter() @@ -33,7 +33,7 @@ struct TimelineToolbarModifier: ViewModifier { .help(timelineModel.isReadFiltered ?? false ? "Show Read Articles" : "Filter Read Articles") } - ToolbarItem { + ToolbarItem(placement: .bottomBar) { Button { sceneModel.markAllAsRead() } label: { @@ -43,7 +43,7 @@ struct TimelineToolbarModifier: ViewModifier { .help("Mark All As Read") } - ToolbarItem { + ToolbarItem(placement: .bottomBar) { Spacer() } #endif