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

Register for UserDefaults.didChangeNotification instead of using KVO on NSUserDefaultsController.

Browse Source
This commit is contained in:
Brent Simmons 2018-01-28 11:33:45 -08:00
parent 28c4ea82e5
commit ffd11b91ef
1 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Evergreen/MainWindow/Timeline/TimelineViewController.swift
View File

@ -50,10 +50,16 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
} }
private var didRegisterForNotifications = false private var didRegisterForNotifications = false
private let timelineFontSizeKVOKey = "values.{AppDefaults.Key.timelineFontSize}"
private var reloadAvailableCellsTimer: Timer? private var reloadAvailableCellsTimer: Timer?
private var fetchAndMergeArticlesTimer: Timer? private var fetchAndMergeArticlesTimer: Timer?
private var sortDirection = AppDefaults.shared.timelineSortDirection {
didSet {
if sortDirection != oldValue {
sortDirectionDidChange()
}
}
}
private var articles = ArticleArray() { private var articles = ArticleArray() {
didSet { didSet {
if articles != oldValue { if articles != oldValue {
@ -66,7 +72,9 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
private var fontSize: FontSize = AppDefaults.shared.timelineFontSize { private var fontSize: FontSize = AppDefaults.shared.timelineFontSize {
didSet { didSet {
fontSizeDidChange() if fontSize != oldValue {
fontSizeDidChange()
}
} }
} }
@ -122,43 +130,24 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
NotificationCenter.default.addObserver(self, selector: #selector(imageDidBecomeAvailable(_:)), name: .ImageDidBecomeAvailable, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(imageDidBecomeAvailable(_:)), name: .ImageDidBecomeAvailable, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(imageDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(imageDidBecomeAvailable(_:)), name: .FaviconDidBecomeAvailable, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(accountDidDownloadArticles(_:)), name: .AccountDidDownloadArticles, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(accountDidDownloadArticles(_:)), name: .AccountDidDownloadArticles, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(userDefaultsDidChange(_:)), name: UserDefaults.didChangeNotification, object: nil)
NSUserDefaultsController.shared.addObserver(self, forKeyPath: timelineFontSizeKVOKey, options: NSKeyValueObservingOptions(rawValue: 0), context: nil) didRegisterForNotifications = true
didRegisterForNotifications = true
} }
} }
// MARK: KVO
override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
if let keyPath = keyPath {
switch (keyPath) {
case timelineFontSizeKVOKey:
fontSizeInDefaultsDidChange()
return
default:
break
}
}
super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
}
// MARK: Appearance Change // MARK: Appearance Change
private func fontSizeDidChange() { private func fontSizeDidChange() {
TimelineCellData.emptyCache()
RSSingleLineRenderer.emptyCache()
RSMultiLineRenderer.emptyCache()
cellAppearance = TimelineCellAppearance(theme: appDelegate.currentTheme, showAvatar: false, fontSize: fontSize) cellAppearance = TimelineCellAppearance(theme: appDelegate.currentTheme, showAvatar: false, fontSize: fontSize)
cellAppearanceWithAvatar = TimelineCellAppearance(theme: appDelegate.currentTheme, showAvatar: true, fontSize: fontSize) cellAppearanceWithAvatar = TimelineCellAppearance(theme: appDelegate.currentTheme, showAvatar: true, fontSize: fontSize)
updateRowHeights() updateRowHeights()
if tableView.rowHeight != currentRowHeight { tableView.reloadData()
tableView.rowHeight = currentRowHeight
tableView.reloadData()
}
} }
// MARK: - API // MARK: - API
@ -359,18 +348,6 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
} }
} }
func fontSizeInDefaultsDidChange() {
TimelineCellData.emptyCache()
RSSingleLineRenderer.emptyCache()
RSMultiLineRenderer.emptyCache()
let updatedFontSize = AppDefaults.shared.timelineFontSize
if updatedFontSize != self.fontSize {
self.fontSize = updatedFontSize
}
}
@objc func accountDidDownloadArticles(_ note: Notification) { @objc func accountDidDownloadArticles(_ note: Notification) {
guard let feeds = note.userInfo?[Account.UserInfoKey.feeds] as? Set<Feed> else { guard let feeds = note.userInfo?[Account.UserInfoKey.feeds] as? Set<Feed> else {
@ -383,6 +360,12 @@ class TimelineViewController: NSViewController, UndoableCommandRunner {
} }
} }
@objc func userDefaultsDidChange(_ note: Notification) {
self.fontSize = AppDefaults.shared.timelineFontSize
self.sortDirection = AppDefaults.shared.timelineSortDirection
}
// MARK: - Reloading Data // MARK: - Reloading Data
private func cellForRowView(_ rowView: NSView) -> NSView? { private func cellForRowView(_ rowView: NSView) -> NSView? {
@ -632,6 +615,11 @@ private extension TimelineViewController {
} }
} }
func sortDirectionDidChange() {
// TODO
}
// MARK: Fetching Articles // MARK: Fetching Articles
func fetchArticles() { func fetchArticles() {
@ -647,7 +635,7 @@ private extension TimelineViewController {
func updateArticles(with unsortedArticles: Set<Article>) { func updateArticles(with unsortedArticles: Set<Article>) {
let sortedArticles = Array(unsortedArticles).sortedByDate() let sortedArticles = Array(unsortedArticles).sortedByDate(sortDirection)
if articles != sortedArticles { if articles != sortedArticles {
articles = sortedArticles articles = sortedArticles
} }