FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-31 11:14:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Ranchero-Software/NetNewsWire into main

Browse Source
This commit is contained in:
Maurice Parker 2020-08-09 20:28:00 -05:00
commit 32c0911d6e
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Multiplatform/Shared/AppAssets.swift
View File

@ -301,6 +301,10 @@ struct AppAssets {
return IconImage(coloredImage, isSymbol: true) return IconImage(coloredImage, isSymbol: true)
#endif #endif
} }
static var sidebarToggleImage: Image {
return Image(systemName: "sidebar.left")
}
#if os(macOS) #if os(macOS)
static var webStatusBarBackground: NSColor = { static var webStatusBarBackground: NSColor = {

1
Multiplatform/Shared/MainApp.swift
View File

@ -110,6 +110,7 @@ struct MainApp: App {
} }
.tag(MacPreferencePane.advanced) .tag(MacPreferencePane.advanced)
} }
.preferredColorScheme(AppDefaults.userInterfaceColorScheme)
.frame(width: 500) .frame(width: 500)
.padding() .padding()
} }

21
Multiplatform/Shared/SceneNavigationView.swift
View File

@ -8,6 +8,9 @@
import SwiftUI import SwiftUI
import Account import Account
#if os(macOS)
import AppKit
#endif
struct SceneNavigationView: View { struct SceneNavigationView: View {
@ -99,6 +102,14 @@ struct SceneNavigationView: View {
.toolbar { .toolbar {
#if os(macOS) #if os(macOS)
ToolbarItem(placement: .navigation) {
Button {
NSApp.keyWindow?.firstResponder?.tryToPerform(#selector(NSSplitViewController.toggleSidebar(_:)), with: nil)
} label: {
AppAssets.sidebarToggleImage
}
.help("Toggle Sidebar")
}
ToolbarItem() { ToolbarItem() {
Menu { Menu {
Button("Add Web Feed", action: { sheetToShow = .web }) Button("Add Web Feed", action: { sheetToShow = .web })
@ -111,8 +122,6 @@ struct SceneNavigationView: View {
} }
ToolbarItem { ToolbarItem {
Button { Button {
// AccountManager.shared.refreshAll(errorHandler: handleRefreshError)
AccountManager.shared.refreshAll(completion: nil) AccountManager.shared.refreshAll(completion: nil)
} label: { } label: {
@ -130,10 +139,10 @@ struct SceneNavigationView: View {
.disabled(sceneModel.markAllAsReadButtonState == nil) .disabled(sceneModel.markAllAsReadButtonState == nil)
.help("Mark All as Read") .help("Mark All as Read")
} }
ToolbarItem { // ToolbarItem {
MacSearchField() // MacSearchField()
.frame(width: 200) // .frame(width: 200)
} // }
ToolbarItem { ToolbarItem {
Button { Button {
sceneModel.goToNextUnread() sceneModel.goToNextUnread()