Fixes compile crash with sidebar toolbar

This commit is contained in:
Stuart Breckenridge
2020-07-04 22:01:01 +08:00
parent 01a84a2a40
commit 294591d154
4 changed files with 13 additions and 4 deletions

View File

@@ -49,11 +49,10 @@ struct AddWebFeedView: View {
Form {
HStack {
Spacer()
Image("FaviconTemplateImage")
Image(rsImage: AppAssets.faviconTemplateImage)
.resizable()
.renderingMode(.template)
.frame(width: 30, height: 30)
.foregroundColor(.accentColor).font(.title)
Text("Add a Web Feed")
.font(.title)
Spacer()

View File

@@ -26,7 +26,6 @@ struct RegularSidebarContainerView: View {
sidebarModel.delegate = sceneModel
sidebarModel.rebuildSidebarItems()
}
}
}

View File

@@ -14,7 +14,8 @@ struct SidebarToolbar: ViewModifier {
@EnvironmentObject private var appSettings: AppDefaults
@StateObject private var viewModel = SidebarToolbarModel()
func body(content: Content) -> some View {
@ViewBuilder func body(content: Content) -> some View {
#if os(iOS)
content
.toolbar {
ToolbarItem(placement: .automatic) {
@@ -66,6 +67,14 @@ struct SidebarToolbar: ViewModifier {
SettingsView().modifier(PreferredColorSchemeModifier(preferredColorScheme: appSettings.userInterfaceColorPalette))
}
}
#else
content
.toolbar {
ToolbarItem {
Spacer()
}
}
#endif
}
}