FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Encapsulate more of the NavigationModelController structures.

This commit is contained in:
Maurice Parker 2019-04-21 15:26:37 -05:00
parent 6468f2c333
commit 73500e0244
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iOS/Master/MasterViewController.swift
View File

@ -77,8 +77,8 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
} }
if let account = representedObject as? Account { if let account = representedObject as? Account {
if let node = nmc.treeController.rootNode.childNodeRepresentingObject(account) { if let node = nmc.rootNode.childNodeRepresentingObject(account) {
let sectionIndex = nmc.treeController.rootNode.indexOfChild(node)! let sectionIndex = nmc.rootNode.indexOfChild(node)!
let headerView = tableView.headerView(forSection: sectionIndex) as! MasterTableViewSectionHeader let headerView = tableView.headerView(forSection: sectionIndex) as! MasterTableViewSectionHeader
headerView.unreadCount = account.unreadCount headerView.unreadCount = account.unreadCount
} }
@ -108,7 +108,7 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
@objc func userDidAddFeed(_ notification: Notification) { @objc func userDidAddFeed(_ notification: Notification) {
guard let feed = notification.userInfo?[UserInfoKey.feed], guard let feed = notification.userInfo?[UserInfoKey.feed],
let node = nmc.treeController.rootNode.descendantNodeRepresentingObject(feed as AnyObject) else { let node = nmc.rootNode.descendantNodeRepresentingObject(feed as AnyObject) else {
return return
} }
@ -150,14 +150,14 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
guard let nameProvider = nmc.treeController.rootNode.childAtIndex(section)?.representedObject as? DisplayNameProvider else { guard let nameProvider = nmc.rootNode.childAtIndex(section)?.representedObject as? DisplayNameProvider else {
return nil return nil
} }
let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! MasterTableViewSectionHeader let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! MasterTableViewSectionHeader
headerView.name = nameProvider.nameForDisplay headerView.name = nameProvider.nameForDisplay
guard let sectionNode = nmc.treeController.rootNode.childAtIndex(section) else { guard let sectionNode = nmc.rootNode.childAtIndex(section) else {
return headerView return headerView
} }
@ -325,7 +325,7 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
// Based on the drop we have to determine a node to start looking for a parent container. // Based on the drop we have to determine a node to start looking for a parent container.
let destNode: Node = { let destNode: Node = {
if destinationIndexPath.row == 0 { if destinationIndexPath.row == 0 {
return nmc.treeController.rootNode.childAtIndex(destinationIndexPath.section)! return nmc.rootNode.childAtIndex(destinationIndexPath.section)!
} else { } else {
let movementAdjustment = sourceIndexPath > destinationIndexPath ? 1 : 0 let movementAdjustment = sourceIndexPath > destinationIndexPath ? 1 : 0
let adjustedDestIndexPath = IndexPath(row: destinationIndexPath.row - movementAdjustment, section: destinationIndexPath.section) let adjustedDestIndexPath = IndexPath(row: destinationIndexPath.row - movementAdjustment, section: destinationIndexPath.section)
@ -452,7 +452,7 @@ class MasterViewController: UITableViewController, UndoableCommandRunner {
@objc func toggleSectionHeader(_ sender: UITapGestureRecognizer) { @objc func toggleSectionHeader(_ sender: UITapGestureRecognizer) {
guard let sectionIndex = sender.view?.tag, guard let sectionIndex = sender.view?.tag,
let sectionNode = nmc.treeController.rootNode.childAtIndex(sectionIndex), let sectionNode = nmc.rootNode.childAtIndex(sectionIndex),
let headerView = sender.view as? MasterTableViewSectionHeader let headerView = sender.view as? MasterTableViewSectionHeader
else { else {
return return

4
iOS/NavigationModelController.swift
View File

@ -33,6 +33,10 @@ class NavigationModelController {
return TreeController(delegate: treeControllerDelegate) return TreeController(delegate: treeControllerDelegate)
}() }()
var rootNode: Node {
return treeController.rootNode
}
private var sortDirection = AppDefaults.timelineSortDirection { private var sortDirection = AppDefaults.timelineSortDirection {
didSet { didSet {
if sortDirection != oldValue { if sortDirection != oldValue {