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

Rename AppCoordinator to SceneCoordinator as that name better defines its purpose

Browse Source
This commit is contained in:
Maurice Parker
2019-09-01 12:43:07 -05:00
parent 56c81bba1f
commit 858bdb7f21
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Detail/DetailViewController.swift
View File

@@ -24,7 +24,7 @@ class DetailViewController: UIViewController {
@IBOutlet private weak var webViewContainer: UIView!
private var webView: WKWebView!
weak var coordinator: AppCoordinator!
weak var coordinator: SceneCoordinator!
deinit {
webView.removeFromSuperview()

4
iOS/MasterFeed/MasterFeedDataSource.swift
View File

@@ -13,10 +13,10 @@ import Account
class MasterFeedDataSource<SectionIdentifierType, ItemIdentifierType>: UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType> where SectionIdentifierType : Hashable, ItemIdentifierType : Hashable {
private var coordinator: AppCoordinator!
private var coordinator: SceneCoordinator!
private var errorHandler: ((Error) -> ())!
init(coordinator: AppCoordinator, errorHandler: @escaping (Error) -> (), tableView: UITableView, cellProvider: @escaping UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType>.CellProvider) {
init(coordinator: SceneCoordinator, errorHandler: @escaping (Error) -> (), tableView: UITableView, cellProvider: @escaping UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType>.CellProvider) {
super.init(tableView: tableView, cellProvider: cellProvider)
self.coordinator = coordinator
self.errorHandler = errorHandler

4
iOS/MasterFeed/MasterFeedViewController.swift
View File

@@ -20,7 +20,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
private lazy var dataSource = makeDataSource()
var undoableCommands = [UndoableCommand]()
weak var coordinator: AppCoordinator!
weak var coordinator: SceneCoordinator!
override var canBecomeFirstResponder: Bool {
return true
@@ -91,7 +91,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
}
var node: Node? = nil
if let coordinator = representedObject as? AppCoordinator, let fetcher = coordinator.timelineFetcher {
if let coordinator = representedObject as? SceneCoordinator, let fetcher = coordinator.timelineFetcher {
node = coordinator.rootNode.descendantNodeRepresentingObject(fetcher as AnyObject)
} else {
node = coordinator.rootNode.descendantNodeRepresentingObject(representedObject as AnyObject)

4
iOS/MasterTimeline/MasterTimelineDataSource.swift
View File

@@ -10,9 +10,9 @@ import UIKit
class MasterTimelineDataSource<SectionIdentifierType, ItemIdentifierType>: UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType> where SectionIdentifierType : Hashable, ItemIdentifierType : Hashable {
private var coordinator: AppCoordinator!
private var coordinator: SceneCoordinator!
init(coordinator: AppCoordinator, tableView: UITableView, cellProvider: @escaping UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType>.CellProvider) {
init(coordinator: SceneCoordinator, tableView: UITableView, cellProvider: @escaping UITableViewDiffableDataSource<SectionIdentifierType, ItemIdentifierType>.CellProvider) {
super.init(tableView: tableView, cellProvider: cellProvider)
self.coordinator = coordinator
}

2
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@@ -21,7 +21,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
private lazy var dataSource = makeDataSource()
private let searchController = UISearchController(searchResultsController: nil)
weak var coordinator: AppCoordinator!
weak var coordinator: SceneCoordinator!
var undoableCommands = [UndoableCommand]()
override var canBecomeFirstResponder: Bool {

6
iOS/AppCoordinator.swift → iOS/SceneCoordinator.swift
View File

@@ -17,7 +17,7 @@ enum SearchScope: Int {
case global = 1
}
class AppCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
var undoableCommands = [UndoableCommand]()
var undoManager: UndoManager? {
@@ -705,7 +705,7 @@ class AppCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
// MARK: UISplitViewControllerDelegate
extension AppCoordinator: UISplitViewControllerDelegate {
extension SceneCoordinator: UISplitViewControllerDelegate {
func splitViewController(_ splitViewController: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) {
guard splitViewController.traitCollection.userInterfaceIdiom == .pad && !splitViewController.isCollapsed else {
@@ -783,7 +783,7 @@ extension AppCoordinator: UISplitViewControllerDelegate {
// MARK: Private
private extension AppCoordinator {
private extension SceneCoordinator {
func updateUnreadCount() {
var count = 0

2
iOS/SceneDelegate.swift
View File

@@ -11,7 +11,7 @@ import UIKit
class SceneDelegate: UIResponder, UIWindowSceneDelegate {
var window: UIWindow?
var coordinator = AppCoordinator()
var coordinator = SceneCoordinator()
// UIWindowScene delegate