diff --git a/Multiplatform/Shared/AppAssets.swift b/Multiplatform/Shared/AppAssets.swift index 3c0953c2f..244c5fb87 100644 --- a/Multiplatform/Shared/AppAssets.swift +++ b/Multiplatform/Shared/AppAssets.swift @@ -301,6 +301,10 @@ struct AppAssets { return IconImage(coloredImage, isSymbol: true) #endif } + + static var sidebarToggleImage: Image { + return Image(systemName: "sidebar.left") + } #if os(macOS) static var webStatusBarBackground: NSColor = { diff --git a/Multiplatform/Shared/MainApp.swift b/Multiplatform/Shared/MainApp.swift index 5b1f7a603..7d987072d 100644 --- a/Multiplatform/Shared/MainApp.swift +++ b/Multiplatform/Shared/MainApp.swift @@ -110,6 +110,7 @@ struct MainApp: App { } .tag(MacPreferencePane.advanced) } + .preferredColorScheme(AppDefaults.userInterfaceColorScheme) .frame(width: 500) .padding() } diff --git a/Multiplatform/Shared/SceneNavigationView.swift b/Multiplatform/Shared/SceneNavigationView.swift index 354142226..da2d1211b 100644 --- a/Multiplatform/Shared/SceneNavigationView.swift +++ b/Multiplatform/Shared/SceneNavigationView.swift @@ -8,6 +8,9 @@ import SwiftUI import Account +#if os(macOS) +import AppKit +#endif struct SceneNavigationView: View { @@ -99,6 +102,14 @@ struct SceneNavigationView: View { .toolbar { #if os(macOS) + ToolbarItem(placement: .navigation) { + Button { + NSApp.keyWindow?.firstResponder?.tryToPerform(#selector(NSSplitViewController.toggleSidebar(_:)), with: nil) + } label: { + AppAssets.sidebarToggleImage + } + .help("Toggle Sidebar") + } ToolbarItem() { Menu { Button("Add Web Feed", action: { sheetToShow = .web }) @@ -111,8 +122,6 @@ struct SceneNavigationView: View { } ToolbarItem { Button { -// AccountManager.shared.refreshAll(errorHandler: handleRefreshError) - AccountManager.shared.refreshAll(completion: nil) } label: { @@ -130,10 +139,10 @@ struct SceneNavigationView: View { .disabled(sceneModel.markAllAsReadButtonState == nil) .help("Mark All as Read") } - ToolbarItem { - MacSearchField() - .frame(width: 200) - } +// ToolbarItem { +// MacSearchField() +// .frame(width: 200) +// } ToolbarItem { Button { sceneModel.goToNextUnread()