renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/brentsimmons/Evergreen

Browse Source
This commit is contained in:
Brent Simmons
2018-02-02 21:56:52 -08:00
parent 920be7b0d1 2722735b5d
commit 6347ac7888
109 changed files with 1895 additions and 1881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Evergreen/MainWindow/Keyboard/MainWIndowKeyboardHandler.swift
View File

@@ -19,7 +19,7 @@ final class MainWindowKeyboardHandler: KeyboardDelegate {
let f = Bundle.main.path(forResource: "GlobalKeyboardShortcuts", ofType: "plist")!
let rawShortcuts = NSArray(contentsOfFile: f)! as! [[String: Any]]
self.globalShortcuts = Set(rawShortcuts.flatMap { KeyboardShortcut(dictionary: $0) })
self.globalShortcuts = Set(rawShortcuts.compactMap { KeyboardShortcut(dictionary: $0) })
}
func keydown(_ event: NSEvent, in view: NSView) -> Bool {

4
Evergreen/MainWindow/MainWindowController.swift
View File

@@ -113,7 +113,7 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
// MARK: Toolbar
@objc func makeToolbarValidate(_ sender: Any) {
@objc func makeToolbarValidate(_ sender: Any?) {
window?.toolbar?.validateVisibleItems()
}
@@ -332,7 +332,7 @@ extension MainWindowController: NSSharingServicePickerDelegate {
func sharingServicePicker(_ sharingServicePicker: NSSharingServicePicker, sharingServicesForItems items: [Any], proposedSharingServices proposedServices: [NSSharingService]) -> [NSSharingService] {
let sendToServices = appDelegate.sendToCommands.flatMap { (sendToCommand) -> NSSharingService? in
let sendToServices = appDelegate.sendToCommands.compactMap { (sendToCommand) -> NSSharingService? in
guard let object = items.first else {
return nil

2
Evergreen/MainWindow/Sidebar/Keyboard/SidebarKeyboardDelegate.swift
View File

@@ -19,7 +19,7 @@ import RSCore
let f = Bundle.main.path(forResource: "SidebarKeyboardShortcuts", ofType: "plist")!
let rawShortcuts = NSArray(contentsOfFile: f)! as! [[String: Any]]
self.shortcuts = Set(rawShortcuts.flatMap { KeyboardShortcut(dictionary: $0) })
self.shortcuts = Set(rawShortcuts.compactMap { KeyboardShortcut(dictionary: $0) })
super.init()
}

2
Evergreen/MainWindow/Timeline/ArticleArray.swift
View File

@@ -45,7 +45,7 @@ extension Array where Element == Article {
func articlesForIndexes(_ indexes: IndexSet) -> Set<Article> {
return Set(indexes.flatMap{ (oneIndex) -> Article? in
return Set(indexes.compactMap{ (oneIndex) -> Article? in
return articleAtRow(oneIndex)
})
}

2
Evergreen/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift
View File

@@ -21,7 +21,7 @@ import RSCore
let f = Bundle.main.path(forResource: "TimelineKeyboardShortcuts", ofType: "plist")!
let rawShortcuts = NSArray(contentsOfFile: f)! as! [[String: Any]]
self.shortcuts = Set(rawShortcuts.flatMap { KeyboardShortcut(dictionary: $0) })
self.shortcuts = Set(rawShortcuts.compactMap { KeyboardShortcut(dictionary: $0) })
super.init()
}