FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make toolbar placement more explicit to fix problems that appeared in Xcode 12 Beta 3

This commit is contained in:
Maurice Parker 2020-07-22 21:01:02 -05:00
parent 71a6f03fd6
commit 6ebd5ad5ed
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiplatform/Shared/Article/ArticleToolbarModifier.swift
View File

@ -18,7 +18,7 @@ struct ArticleToolbarModifier: ViewModifier {
.toolbar { .toolbar {
#if os(iOS) #if os(iOS)
ToolbarItem(placement: .navigation) { ToolbarItem(placement: .primaryAction) {
HStack(spacing: 20) { HStack(spacing: 20) {
Button { Button {
} label: { } label: {

12
Multiplatform/Shared/Sidebar/SidebarToolbarModifier.swift
View File

@ -20,7 +20,7 @@ struct SidebarToolbarModifier: ViewModifier {
content content
.toolbar { .toolbar {
ToolbarItem(placement: .navigation) { ToolbarItem(placement: .primaryAction) {
Button { Button {
withAnimation { withAnimation {
sidebarModel.isReadFiltered.toggle() sidebarModel.isReadFiltered.toggle()
@ -35,7 +35,7 @@ struct SidebarToolbarModifier: ViewModifier {
.help(sidebarModel.isReadFiltered ? "Show Read Feeds" : "Filter Read Feeds") .help(sidebarModel.isReadFiltered ? "Show Read Feeds" : "Filter Read Feeds")
} }
ToolbarItem(placement: .automatic) { ToolbarItem(placement: .bottomBar) {
Button { Button {
viewModel.sheetToShow = .settings viewModel.sheetToShow = .settings
} label: { } label: {
@ -44,11 +44,11 @@ struct SidebarToolbarModifier: ViewModifier {
.help("Settings") .help("Settings")
} }
ToolbarItem { ToolbarItem(placement: .bottomBar) {
Spacer() Spacer()
} }
ToolbarItem(placement: .automatic) { ToolbarItem(placement: .bottomBar) {
switch refreshProgress.state { switch refreshProgress.state {
case .refreshProgress(let progress): case .refreshProgress(let progress):
ProgressView(value: progress) ProgressView(value: progress)
@ -63,11 +63,11 @@ struct SidebarToolbarModifier: ViewModifier {
} }
} }
ToolbarItem { ToolbarItem(placement: .bottomBar) {
Spacer() Spacer()
} }
ToolbarItem(placement: .automatic, content: { ToolbarItem(placement: .bottomBar, content: {
Button { Button {
viewModel.showActionSheet = true viewModel.showActionSheet = true
} label: { } label: {

6
Multiplatform/Shared/Timeline/TimelineToolbarModifier.swift
View File

@ -17,7 +17,7 @@ struct TimelineToolbarModifier: ViewModifier {
content content
.toolbar { .toolbar {
#if os(iOS) #if os(iOS)
ToolbarItem(placement: .navigation) { ToolbarItem(placement: .primaryAction) {
Button { Button {
withAnimation { withAnimation {
timelineModel.toggleReadFilter() timelineModel.toggleReadFilter()
@ -33,7 +33,7 @@ struct TimelineToolbarModifier: ViewModifier {
.help(timelineModel.isReadFiltered ?? false ? "Show Read Articles" : "Filter Read Articles") .help(timelineModel.isReadFiltered ?? false ? "Show Read Articles" : "Filter Read Articles")
} }
ToolbarItem { ToolbarItem(placement: .bottomBar) {
Button { Button {
sceneModel.markAllAsRead() sceneModel.markAllAsRead()
} label: { } label: {
@ -43,7 +43,7 @@ struct TimelineToolbarModifier: ViewModifier {
.help("Mark All As Read") .help("Mark All As Read")
} }
ToolbarItem { ToolbarItem(placement: .bottomBar) {
Spacer() Spacer()
} }
#endif #endif