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

Continue progress on swapping timeline views.

Browse Source
This commit is contained in:
Brent Simmons
2019-02-16 22:22:26 -08:00
parent 3408a4c725
commit 0f5383b2f9
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NetNewsWire/MainWindow/Timeline/TimelineTableView.xib
View File

@@ -5,7 +5,7 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="TimelineTableViewController" customModule="NetNewsWire" customModuleProvider="target">
<customObject id="-2" userLabel="File's Owner" customClass="TimelineViewController" customModule="NetNewsWire" customModuleProvider="target">
<connections>
<outlet property="tableView" destination="opA-RM-DKR" id="Hnf-mE-gcq"/>
<outlet property="view" destination="dbt-sN-FU2" id="96u-gC-hW0"/>

41
NetNewsWire/MainWindow/Timeline/TimelineViewController.swift
View File

@@ -21,7 +21,12 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
var state: TimelineState = .empty {
didSet {
// TODO
switch state {
case .empty:
representedObjects = nil
case .representedObjects(let updatedRepresentedObjects):
representedObjects = updatedRepresentedObjects
}
}
}
@@ -142,7 +147,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
if !didRegisterForNotifications {
NotificationCenter.default.addObserver(self, selector: #selector(sidebarSelectionDidChange(_:)), name: .SidebarSelectionDidChange, object: nil)
// NotificationCenter.default.addObserver(self, selector: #selector(sidebarSelectionDidChange(_:)), name: .SidebarSelectionDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(statusesDidChange(_:)), name: .StatusesDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(avatarDidBecomeAvailable(_:)), name: .AvatarDidBecomeAvailable, object: nil)
@@ -367,22 +372,22 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner {
// MARK: - Notifications
@objc func sidebarSelectionDidChange(_ notification: Notification) {
guard let userInfo = notification.userInfo else {
return
}
guard let sidebarView = userInfo[UserInfoKey.view] as? NSView, sidebarView.window === tableView.window else {
return
}
if let objects = userInfo[UserInfoKey.objects] as? [AnyObject] {
representedObjects = objects
}
else {
representedObjects = nil
}
}
// @objc func sidebarSelectionDidChange(_ notification: Notification) {
//
// guard let userInfo = notification.userInfo else {
// return
// }
// guard let sidebarView = userInfo[UserInfoKey.view] as? NSView, sidebarView.window === tableView.window else {
// return
// }
//
// if let objects = userInfo[UserInfoKey.objects] as? [AnyObject] {
// representedObjects = objects
// }
// else {
// representedObjects = nil
// }
// }
@objc func statusesDidChange(_ note: Notification) {