FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes compile crash with sidebar toolbar

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Multiplatform/Shared/Add/AddWebFeedView.swift
View File

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

1
Multiplatform/Shared/Sidebar/RegularSidebarContainerView.swift
View File

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

11
Multiplatform/Shared/Sidebar/SidebarToolbar.swift
View File

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

2
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -31,6 +31,7 @@
17D232A924AFF10A0005F075 /* AddWebFeedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D232A724AFF10A0005F075 /* AddWebFeedModel.swift */; }; 17D232A924AFF10A0005F075 /* AddWebFeedModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D232A724AFF10A0005F075 /* AddWebFeedModel.swift */; };
17D5F17124B0BC6700375168 /* SidebarToolbarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D5F17024B0BC6700375168 /* SidebarToolbarModel.swift */; }; 17D5F17124B0BC6700375168 /* SidebarToolbarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D5F17024B0BC6700375168 /* SidebarToolbarModel.swift */; };
17D5F17224B0BC6700375168 /* SidebarToolbarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D5F17024B0BC6700375168 /* SidebarToolbarModel.swift */; }; 17D5F17224B0BC6700375168 /* SidebarToolbarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17D5F17024B0BC6700375168 /* SidebarToolbarModel.swift */; };
17D5F19524B0C1DD00375168 /* SidebarToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 172199F024AB716900A31D04 /* SidebarToolbar.swift */; };
3B3A32A5238B820900314204 /* FeedWranglerAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B3A328B238B820900314204 /* FeedWranglerAccountViewController.swift */; }; 3B3A32A5238B820900314204 /* FeedWranglerAccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B3A328B238B820900314204 /* FeedWranglerAccountViewController.swift */; };
3B826DCB2385C84800FC1ADB /* AccountsFeedWrangler.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3B826DB02385C84800FC1ADB /* AccountsFeedWrangler.xib */; }; 3B826DCB2385C84800FC1ADB /* AccountsFeedWrangler.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3B826DB02385C84800FC1ADB /* AccountsFeedWrangler.xib */; };
3B826DCC2385C84800FC1ADB /* AccountsFeedWranglerWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B826DCA2385C84800FC1ADB /* AccountsFeedWranglerWindowController.swift */; }; 3B826DCC2385C84800FC1ADB /* AccountsFeedWranglerWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B826DCA2385C84800FC1ADB /* AccountsFeedWranglerWindowController.swift */; };
@ -4965,6 +4966,7 @@
51E4995024A8734C00B667CB /* ExtensionPoint.swift in Sources */, 51E4995024A8734C00B667CB /* ExtensionPoint.swift in Sources */,
51E4990E24A808CC00B667CB /* HTMLMetadataDownloader.swift in Sources */, 51E4990E24A808CC00B667CB /* HTMLMetadataDownloader.swift in Sources */,
51E498FB24A808BA00B667CB /* FaviconGenerator.swift in Sources */, 51E498FB24A808BA00B667CB /* FaviconGenerator.swift in Sources */,
17D5F19524B0C1DD00375168 /* SidebarToolbar.swift in Sources */,
51E4996724A8760B00B667CB /* ArticleStylesManager.swift in Sources */, 51E4996724A8760B00B667CB /* ArticleStylesManager.swift in Sources */,
1729529B24AA1FD200D65E66 /* MacSearchField.swift in Sources */, 1729529B24AA1FD200D65E66 /* MacSearchField.swift in Sources */,
51408B7F24A9EC6F0073CF4E /* SidebarItem.swift in Sources */, 51408B7F24A9EC6F0073CF4E /* SidebarItem.swift in Sources */,