FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-01-31 11:14:54 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NetNewsWire.xcodeproj/project.pbxproj
View File

@ -10,7 +10,7 @@
5110AB7822B7BD6200A94F76 /* AddView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5110AB7722B7BD6200A94F76 /* AddView.swift */; };
51126DA4225FDE2F00722696 /* RSImage-Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51126DA3225FDE2F00722696 /* RSImage-Extensions.swift */; };
5115CAF42266301400B21BCE /* AddContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51121B5A22661FEF00BC0EC1 /* AddContainerViewController.swift */; };
5126EE97226CB48A00C22AFC /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5126EE96226CB48A00C22AFC /* AppCoordinator.swift */; };
5126EE97226CB48A00C22AFC /* SceneCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5126EE96226CB48A00C22AFC /* SceneCoordinator.swift */; };
5127B238222B4849006D641D /* DetailKeyboardDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5127B236222B4849006D641D /* DetailKeyboardDelegate.swift */; };
5127B23A222B4849006D641D /* DetailKeyboardShortcuts.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5127B237222B4849006D641D /* DetailKeyboardShortcuts.plist */; };
512E08E62268800D00BDCFDD /* FolderTreeControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849A97A11ED9F180007D329B /* FolderTreeControllerDelegate.swift */; };
@ -682,7 +682,7 @@
51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = NetNewsWire_iOSapp_target.xcconfig; sourceTree = "<group>"; };
51121B5A22661FEF00BC0EC1 /* AddContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddContainerViewController.swift; sourceTree = "<group>"; };
51126DA3225FDE2F00722696 /* RSImage-Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RSImage-Extensions.swift"; sourceTree = "<group>"; };
5126EE96226CB48A00C22AFC /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
5126EE96226CB48A00C22AFC /* SceneCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneCoordinator.swift; sourceTree = "<group>"; };
5127B236222B4849006D641D /* DetailKeyboardDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailKeyboardDelegate.swift; sourceTree = "<group>"; };
5127B237222B4849006D641D /* DetailKeyboardShortcuts.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = DetailKeyboardShortcuts.plist; sourceTree = "<group>"; };
512E08F722688F7C00BDCFDD /* MasterFeedTableViewSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterFeedTableViewSectionHeader.swift; sourceTree = "<group>"; };
@ -1755,7 +1755,7 @@
84C9FC9F2262A1B300D921D6 /* Main.storyboard */,
840D617E2029031C009BC708 /* AppDelegate.swift */,
519E743422C663F900A78E47 /* SceneDelegate.swift */,
5126EE96226CB48A00C22AFC /* AppCoordinator.swift */,
5126EE96226CB48A00C22AFC /* SceneCoordinator.swift */,
51C45254226507D200C03939 /* AppAssets.swift */,
51C45255226507D200C03939 /* AppDefaults.swift */,
51E3EB3C229AB08300645299 /* ErrorHandler.swift */,
@ -2420,7 +2420,7 @@
51C452792265091600C03939 /* MasterTimelineTableViewCell.swift in Sources */,
51C452852265093600C03939 /* AddFeedFolderPickerData.swift in Sources */,
51C4526B226508F600C03939 /* MasterFeedViewController.swift in Sources */,
5126EE97226CB48A00C22AFC /* AppCoordinator.swift in Sources */,
5126EE97226CB48A00C22AFC /* SceneCoordinator.swift in Sources */,
84CAFCB022BC8C35007694F0 /* FetchRequestOperation.swift in Sources */,
51EF0F77227716200050506E /* FaviconGenerator.swift in Sources */,
51938DF3231AFC660055A1A0 /* SearchTimelineFeedDelegate.swift in Sources */,

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