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

Show unread count in dock badge. Force-update unread counts at startup.

Browse Source
This commit is contained in:
Brent Simmons 2017-10-18 18:37:45 -07:00
parent 324f330a3b
commit fe29ccd2ed
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Evergreen/AppDelegate.swift
View File

@ -43,6 +43,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations {
NSWindow.allowsAutomaticWindowTabbing = false NSWindow.allowsAutomaticWindowTabbing = false
super.init() super.init()
dockBadge.appDelegate = self dockBadge.appDelegate = self
NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
} }
// MARK: - NSApplicationDelegate // MARK: - NSApplicationDelegate
@ -64,6 +66,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations {
#endif #endif
NSAppleEventManager.shared().setEventHandler(self, andSelector: #selector(AppDelegate.getURL(_:_:)), forEventClass: AEEventClass(kInternetEventClass), andEventID: AEEventID(kAEGetURL)) NSAppleEventManager.shared().setEventHandler(self, andSelector: #selector(AppDelegate.getURL(_:_:)), forEventClass: AEEventClass(kInternetEventClass), andEventID: AEEventID(kAEGetURL))
DispatchQueue.main.async {
self.unreadCount = AccountManager.shared.unreadCount
}
} }
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool { func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
@ -103,10 +109,12 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations {
// MARK: Notifications // MARK: Notifications
func unreadCountDidChange(_ note: Notification) { @objc func unreadCountDidChange(_ note: Notification) {
if note.object is AccountManager {
unreadCount = AccountManager.shared.unreadCount unreadCount = AccountManager.shared.unreadCount
} }
}
// MARK: Main Window // MARK: Main Window

4
Frameworks/Account/Account.swift
View File

@ -138,6 +138,10 @@ public final class Account: DisplayNameProvider, UnreadCountProvider, Container,
NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
pullObjectsFromDisk() pullObjectsFromDisk()
DispatchQueue.main.async {
self.updateUnreadCount()
}
} }
// MARK: - API // MARK: - API

9
Frameworks/Account/AccountManager.swift
View File

@ -80,6 +80,10 @@ public final class AccountManager: UnreadCountProvider {
readNonLocalAccountsFromDisk() readNonLocalAccountsFromDisk()
NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
DispatchQueue.main.async {
self.updateUnreadCount()
}
} }
// MARK: API // MARK: API
@ -117,10 +121,7 @@ public final class AccountManager: UnreadCountProvider {
func updateUnreadCount() { func updateUnreadCount() {
let updatedUnreadCount = calculateUnreadCount(accounts) unreadCount = calculateUnreadCount(accounts)
if updatedUnreadCount != unreadCount {
unreadCount = updatedUnreadCount
}
} }
// MARK: Notifications // MARK: Notifications