diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift index d50373019..33c93176a 100644 --- a/Mac/MainWindow/MainWindowController.swift +++ b/Mac/MainWindow/MainWindowController.swift @@ -914,11 +914,11 @@ private extension MainWindowController { return viewController.children.first as? NSSplitViewController } - var currentTimelineViewController: TimelineViewController? { + var currentTimelineViewController: MainTimelineViewController? { return timelineContainerViewController?.currentTimelineViewController } - var regularTimelineViewController: TimelineViewController? { + var regularTimelineViewController: MainTimelineViewController? { return timelineContainerViewController?.regularTimelineViewController } diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift index a4097d36c..9e97a4d59 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift @@ -153,7 +153,7 @@ protocol SidebarDelegate: AnyObject { return } - if let timelineViewController = representedObject as? TimelineViewController { + if let timelineViewController = representedObject as? MainTimelineViewController { configureUnreadCountForCellsForRepresentedObjects(timelineViewController.representedObjects) } else { configureUnreadCountForCellsForRepresentedObjects([representedObject as AnyObject]) diff --git a/Mac/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift b/Mac/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift index fb228538b..94cd5a236 100644 --- a/Mac/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift +++ b/Mac/MainWindow/Timeline/Keyboard/TimelineKeyboardDelegate.swift @@ -13,7 +13,7 @@ import RSCore @objc final class TimelineKeyboardDelegate: NSObject, KeyboardDelegate { - @IBOutlet weak var timelineViewController: TimelineViewController? + @IBOutlet weak var timelineViewController: MainTimelineViewController? let shortcuts: Set override init() { diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/MainTimelineViewController.swift similarity index 97% rename from Mac/MainWindow/Timeline/TimelineViewController.swift rename to Mac/MainWindow/Timeline/MainTimelineViewController.swift index be5b4497c..05b3abd7f 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController.swift +++ b/Mac/MainWindow/Timeline/MainTimelineViewController.swift @@ -13,9 +13,9 @@ import Account import os.log protocol TimelineDelegate: AnyObject { - func timelineSelectionDidChange(_: TimelineViewController, selectedArticles: [Article]?) - func timelineRequestedFeedSelection(_: TimelineViewController, feed: Feed) - func timelineInvalidatedRestorationState(_: TimelineViewController) + func timelineSelectionDidChange(_: MainTimelineViewController, selectedArticles: [Article]?) + func timelineRequestedFeedSelection(_: MainTimelineViewController, feed: Feed) + func timelineInvalidatedRestorationState(_: MainTimelineViewController) } enum TimelineShowFeedName { @@ -24,7 +24,7 @@ enum TimelineShowFeedName { case feed } -final class TimelineViewController: NSViewController, UndoableCommandRunner, UnreadCountProvider { +final class MainTimelineViewController: NSViewController, UndoableCommandRunner, UnreadCountProvider { @IBOutlet var tableView: TimelineTableView! @@ -759,7 +759,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr // MARK: - NSMenuDelegate -extension TimelineViewController: NSMenuDelegate { +extension MainTimelineViewController: NSMenuDelegate { public func menuNeedsUpdate(_ menu: NSMenu) { menu.removeAllItems() @@ -772,7 +772,7 @@ extension TimelineViewController: NSMenuDelegate { // MARK: - NSUserInterfaceValidations -extension TimelineViewController: NSUserInterfaceValidations { +extension MainTimelineViewController: NSUserInterfaceValidations { func validateUserInterfaceItem(_ item: NSValidatedUserInterfaceItem) -> Bool { if item.action == #selector(openArticleInBrowser(_:)) { @@ -794,7 +794,7 @@ extension TimelineViewController: NSUserInterfaceValidations { // MARK: - NSTableViewDataSource -extension TimelineViewController: NSTableViewDataSource { +extension MainTimelineViewController: NSTableViewDataSource { func numberOfRows(in tableView: NSTableView) -> Int { return articles.count } @@ -813,15 +813,15 @@ extension TimelineViewController: NSTableViewDataSource { // MARK: - NSTableViewDelegate -extension TimelineViewController: NSTableViewDelegate { +extension MainTimelineViewController: NSTableViewDelegate { private static let rowViewIdentifier = NSUserInterfaceItemIdentifier(rawValue: "timelineRow") func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? { - if let rowView: TimelineTableRowView = tableView.makeView(withIdentifier: TimelineViewController.rowViewIdentifier, owner: nil) as? TimelineTableRowView { + if let rowView: TimelineTableRowView = tableView.makeView(withIdentifier: MainTimelineViewController.rowViewIdentifier, owner: nil) as? TimelineTableRowView { return rowView } let rowView = TimelineTableRowView() - rowView.identifier = TimelineViewController.rowViewIdentifier + rowView.identifier = MainTimelineViewController.rowViewIdentifier return rowView } @@ -839,13 +839,13 @@ extension TimelineViewController: NSTableViewDelegate { } } - if let cell = tableView.makeView(withIdentifier: TimelineViewController.timelineCellIdentifier, owner: nil) as? TimelineTableCellView { + if let cell = tableView.makeView(withIdentifier: MainTimelineViewController.timelineCellIdentifier, owner: nil) as? TimelineTableCellView { configure(cell) return cell } let cell = TimelineTableCellView() - cell.identifier = TimelineViewController.timelineCellIdentifier + cell.identifier = MainTimelineViewController.timelineCellIdentifier configure(cell) return cell } @@ -943,7 +943,7 @@ extension TimelineViewController: NSTableViewDelegate { // MARK: - Private -private extension TimelineViewController { +private extension MainTimelineViewController { func fetchAndReplacePreservingSelection() { if let article = oneSelectedArticle, let account = article.account { @@ -1187,7 +1187,7 @@ private extension TimelineViewController { } func queueFetchAndMergeArticles() { - TimelineViewController.fetchAndMergeArticlesQueue.add(self, #selector(fetchAndMergeArticles)) + MainTimelineViewController.fetchAndMergeArticlesQueue.add(self, #selector(fetchAndMergeArticles)) } func representedObjectArraysAreEqual(_ objects1: [AnyObject]?, _ objects2: [AnyObject]?) -> Bool { diff --git a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift index b589aa939..af61c9a9b 100644 --- a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift +++ b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift @@ -27,7 +27,7 @@ final class TimelineContainerViewController: NSViewController { @IBOutlet weak var readFilteredButton: NSButton! @IBOutlet var containerView: TimelineContainerView! - var currentTimelineViewController: TimelineViewController? { + var currentTimelineViewController: MainTimelineViewController? { didSet { let view = currentTimelineViewController?.view if containerView.contentView === view { @@ -51,10 +51,10 @@ final class TimelineContainerViewController: NSViewController { } lazy var regularTimelineViewController = { - return TimelineViewController(delegate: self) + return MainTimelineViewController(delegate: self) }() - private lazy var searchTimelineViewController: TimelineViewController = { - let viewController = TimelineViewController(delegate: self) + private lazy var searchTimelineViewController: MainTimelineViewController = { + let viewController = MainTimelineViewController(delegate: self) viewController.showsSearchResults = true return viewController }() @@ -137,15 +137,15 @@ final class TimelineContainerViewController: NSViewController { extension TimelineContainerViewController: TimelineDelegate { - func timelineSelectionDidChange(_ timelineViewController: TimelineViewController, selectedArticles: [Article]?) { + func timelineSelectionDidChange(_ timelineViewController: MainTimelineViewController, selectedArticles: [Article]?) { delegate?.timelineSelectionDidChange(self, articles: selectedArticles, mode: mode(for: timelineViewController)) } - func timelineRequestedFeedSelection(_: TimelineViewController, feed: Feed) { + func timelineRequestedFeedSelection(_: MainTimelineViewController, feed: Feed) { delegate?.timelineRequestedFeedSelection(self, feed: feed) } - func timelineInvalidatedRestorationState(_: TimelineViewController) { + func timelineInvalidatedRestorationState(_: MainTimelineViewController) { delegate?.timelineInvalidatedRestorationState(self) } @@ -158,7 +158,7 @@ private extension TimelineContainerViewController { attributes: [NSAttributedString.Key.font: NSFont.controlContentFont(ofSize: NSFont.systemFontSize)]) } - func timelineViewController(for mode: TimelineSourceMode) -> TimelineViewController { + func timelineViewController(for mode: TimelineSourceMode) -> MainTimelineViewController { switch mode { case .regular: return regularTimelineViewController @@ -167,7 +167,7 @@ private extension TimelineContainerViewController { } } - func mode(for timelineViewController: TimelineViewController) -> TimelineSourceMode { + func mode(for timelineViewController: MainTimelineViewController) -> TimelineSourceMode { if timelineViewController === regularTimelineViewController { return .regular } diff --git a/Mac/MainWindow/Timeline/TimelineTableView.xib b/Mac/MainWindow/Timeline/TimelineTableView.xib index c547c461b..438d06f84 100644 --- a/Mac/MainWindow/Timeline/TimelineTableView.xib +++ b/Mac/MainWindow/Timeline/TimelineTableView.xib @@ -1,11 +1,11 @@ - + - + - + @@ -18,17 +18,16 @@ - + - + - + - diff --git a/Mac/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift b/Mac/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift index 0a05787e3..11916d131 100644 --- a/Mac/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift +++ b/Mac/MainWindow/Timeline/TimelineViewController+ContextualMenus.swift @@ -11,7 +11,7 @@ import RSCore import Articles import Account -extension TimelineViewController { +extension MainTimelineViewController { func contextualMenuForClickedRows() -> NSMenu? { @@ -30,7 +30,7 @@ extension TimelineViewController { // MARK: Contextual Menu Actions -extension TimelineViewController { +extension MainTimelineViewController { @objc func markArticlesReadFromContextualMenu(_ sender: Any?) { guard let articles = articles(from: sender) else { return } @@ -107,7 +107,7 @@ extension TimelineViewController { } -private extension TimelineViewController { +private extension MainTimelineViewController { func markArticles(_ articles: [Article], read: Bool) { markArticles(articles, statusKey: .read, flag: read) diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard index 66056d9cc..8f2a209c6 100644 --- a/iOS/Base.lproj/Main.storyboard +++ b/iOS/Base.lproj/Main.storyboard @@ -112,7 +112,7 @@ - + diff --git a/iOS/Timeline/Cell/MainTimelineAccessibilityCellLayout.swift b/iOS/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift similarity index 100% rename from iOS/Timeline/Cell/MainTimelineAccessibilityCellLayout.swift rename to iOS/MainTimeline/Cell/MainTimelineAccessibilityCellLayout.swift diff --git a/iOS/Timeline/Cell/MainTimelineCellData.swift b/iOS/MainTimeline/Cell/MainTimelineCellData.swift similarity index 100% rename from iOS/Timeline/Cell/MainTimelineCellData.swift rename to iOS/MainTimeline/Cell/MainTimelineCellData.swift diff --git a/iOS/Timeline/Cell/MainTimelineCellLayout.swift b/iOS/MainTimeline/Cell/MainTimelineCellLayout.swift similarity index 100% rename from iOS/Timeline/Cell/MainTimelineCellLayout.swift rename to iOS/MainTimeline/Cell/MainTimelineCellLayout.swift diff --git a/iOS/Timeline/Cell/MainTimelineDefaultCellLayout.swift b/iOS/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift similarity index 100% rename from iOS/Timeline/Cell/MainTimelineDefaultCellLayout.swift rename to iOS/MainTimeline/Cell/MainTimelineDefaultCellLayout.swift diff --git a/iOS/Timeline/Cell/MainTimelineTableViewCell.swift b/iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift similarity index 100% rename from iOS/Timeline/Cell/MainTimelineTableViewCell.swift rename to iOS/MainTimeline/Cell/MainTimelineTableViewCell.swift diff --git a/iOS/Timeline/Cell/MainUnreadIndicatorView.swift b/iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift similarity index 100% rename from iOS/Timeline/Cell/MainUnreadIndicatorView.swift rename to iOS/MainTimeline/Cell/MainUnreadIndicatorView.swift diff --git a/iOS/Timeline/Cell/MultilineUILabelSizer.swift b/iOS/MainTimeline/Cell/MultilineUILabelSizer.swift similarity index 100% rename from iOS/Timeline/Cell/MultilineUILabelSizer.swift rename to iOS/MainTimeline/Cell/MultilineUILabelSizer.swift diff --git a/iOS/Timeline/Cell/SingleLineUILabelSizer.swift b/iOS/MainTimeline/Cell/SingleLineUILabelSizer.swift similarity index 100% rename from iOS/Timeline/Cell/SingleLineUILabelSizer.swift rename to iOS/MainTimeline/Cell/SingleLineUILabelSizer.swift diff --git a/iOS/Timeline/TimelineDataSource.swift b/iOS/MainTimeline/MainTimelineDataSource.swift similarity index 51% rename from iOS/Timeline/TimelineDataSource.swift rename to iOS/MainTimeline/MainTimelineDataSource.swift index 687e0a82b..310e16083 100644 --- a/iOS/Timeline/TimelineDataSource.swift +++ b/iOS/MainTimeline/MainTimelineDataSource.swift @@ -1,5 +1,5 @@ // -// TimelineDataSource.swift +// MainTimelineDataSource.swift // NetNewsWire-iOS // // Created by Maurice Parker on 8/30/19. @@ -8,7 +8,7 @@ import UIKit -class TimelineDataSource: UITableViewDiffableDataSource where SectionIdentifierType : Hashable, ItemIdentifierType : Hashable { +class MainTimelineDataSource: UITableViewDiffableDataSource where SectionIdentifierType : Hashable, ItemIdentifierType : Hashable { override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { return true diff --git a/iOS/Timeline/TimelineTitleView.swift b/iOS/MainTimeline/MainTimelineTitleView.swift similarity index 86% rename from iOS/Timeline/TimelineTitleView.swift rename to iOS/MainTimeline/MainTimelineTitleView.swift index b7d26b682..dc9ed363a 100644 --- a/iOS/Timeline/TimelineTitleView.swift +++ b/iOS/MainTimeline/MainTimelineTitleView.swift @@ -1,5 +1,5 @@ // -// FeedTitleView.swift +// MainTimelineTitleView.swift // NetNewsWire-iOS // // Created by Maurice Parker on 9/21/19. @@ -8,11 +8,11 @@ import UIKit -class TimelineTitleView: UIView { +class MainTimelineTitleView: UIView { @IBOutlet weak var iconView: IconView! @IBOutlet weak var label: UILabel! - @IBOutlet weak var unreadCountView: TimelineUnreadCountView! + @IBOutlet weak var unreadCountView: MainTimelineUnreadCountView! private lazy var pointerInteraction: UIPointerInteraction = { UIPointerInteraction(delegate: self) @@ -44,7 +44,7 @@ class TimelineTitleView: UIView { } } -extension TimelineTitleView: UIPointerInteractionDelegate { +extension MainTimelineTitleView: UIPointerInteractionDelegate { func pointerInteraction(_ interaction: UIPointerInteraction, styleFor region: UIPointerRegion) -> UIPointerStyle? { var rect = self.frame diff --git a/iOS/Timeline/TimelineTitleView.xib b/iOS/MainTimeline/MainTimelineTitleView.xib similarity index 95% rename from iOS/Timeline/TimelineTitleView.xib rename to iOS/MainTimeline/MainTimelineTitleView.xib index 54034dd4a..49c8af7d8 100644 --- a/iOS/Timeline/TimelineTitleView.xib +++ b/iOS/MainTimeline/MainTimelineTitleView.xib @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/iOS/Timeline/TimelineUnreadCountView.swift b/iOS/MainTimeline/MainTimelineUnreadCountView.swift similarity index 89% rename from iOS/Timeline/TimelineUnreadCountView.swift rename to iOS/MainTimeline/MainTimelineUnreadCountView.swift index 8591f7250..6a0f99e3b 100644 --- a/iOS/Timeline/TimelineUnreadCountView.swift +++ b/iOS/MainTimeline/MainTimelineUnreadCountView.swift @@ -1,5 +1,5 @@ // -// TimelineUnreadCountView.swift +// MainTimelineUnreadCountView.swift // NetNewsWire-iOS // // Created by Maurice Parker on 9/30/19. @@ -8,7 +8,7 @@ import UIKit -class TimelineUnreadCountView: MainFeedUnreadCountView { +class MainTimelineUnreadCountView: MainFeedUnreadCountView { override var padding: UIEdgeInsets { return UIEdgeInsets(top: 2.0, left: 9.0, bottom: 2.0, right: 9.0) diff --git a/iOS/Timeline/TimelineViewController.swift b/iOS/MainTimeline/MainTimelineViewController.swift similarity index 97% rename from iOS/Timeline/TimelineViewController.swift rename to iOS/MainTimeline/MainTimelineViewController.swift index 3c9378e86..db926db0c 100644 --- a/iOS/Timeline/TimelineViewController.swift +++ b/iOS/MainTimeline/MainTimelineViewController.swift @@ -1,5 +1,5 @@ // -// TimelineViewController.swift +// MainTimelineViewController.swift // NetNewsWire // // Created by Maurice Parker on 4/8/19. @@ -11,7 +11,7 @@ import RSCore import Account import Articles -class TimelineViewController: UITableViewController, UndoableCommandRunner { +class MainTimelineViewController: UITableViewController, UndoableCommandRunner { private var numberOfTextLines = 0 private var iconSize = IconSize.medium @@ -85,7 +85,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner { iconSize = AppDefaults.shared.timelineIconSize resetEstimatedRowHeight() - if let titleView = Bundle.main.loadNibNamed("TimelineTitleView", owner: self, options: nil)?[0] as? TimelineTitleView { + if let titleView = Bundle.main.loadNibNamed("TimelineTitleView", owner: self, options: nil)?[0] as? MainTimelineTitleView { navigationItem.titleView = titleView } @@ -445,7 +445,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner { @objc func feedIconDidBecomeAvailable(_ note: Notification) { - if let titleView = navigationItem.titleView as? TimelineTitleView { + if let titleView = navigationItem.titleView as? MainTimelineTitleView { titleView.iconView.iconImage = coordinator.timelineIconImage } @@ -483,7 +483,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner { } @objc func faviconDidBecomeAvailable(_ note: Notification) { - if let titleView = navigationItem.titleView as? TimelineTitleView { + if let titleView = navigationItem.titleView as? MainTimelineTitleView { titleView.iconView.iconImage = coordinator.timelineIconImage } if coordinator.showIcons { @@ -508,7 +508,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner { } @objc func displayNameDidChange(_ note: Notification) { - if let titleView = navigationItem.titleView as? TimelineTitleView { + if let titleView = navigationItem.titleView as? MainTimelineTitleView { titleView.label.text = coordinator.timelineFeed?.nameForDisplay } } @@ -564,7 +564,7 @@ class TimelineViewController: UITableViewController, UndoableCommandRunner { // MARK: Searching -extension TimelineViewController: UISearchControllerDelegate { +extension MainTimelineViewController: UISearchControllerDelegate { func willPresentSearchController(_ searchController: UISearchController) { coordinator.beginSearching() @@ -578,7 +578,7 @@ extension TimelineViewController: UISearchControllerDelegate { } -extension TimelineViewController: UISearchResultsUpdating { +extension MainTimelineViewController: UISearchResultsUpdating { func updateSearchResults(for searchController: UISearchController) { let searchScope = SearchScope(rawValue: searchController.searchBar.selectedScopeButtonIndex)! @@ -587,7 +587,7 @@ extension TimelineViewController: UISearchResultsUpdating { } -extension TimelineViewController: UISearchBarDelegate { +extension MainTimelineViewController: UISearchBarDelegate { func searchBar(_ searchBar: UISearchBar, selectedScopeButtonIndexDidChange selectedScope: Int) { let searchScope = SearchScope(rawValue: selectedScope)! coordinator.searchArticles(searchBar.text!, searchScope) @@ -596,7 +596,7 @@ extension TimelineViewController: UISearchBarDelegate { // MARK: Private -private extension TimelineViewController { +private extension MainTimelineViewController { func configureToolbar() { @@ -617,7 +617,7 @@ private extension TimelineViewController { title = coordinator.timelineFeed?.nameForDisplay ?? "Timeline" - if let titleView = navigationItem.titleView as? TimelineTitleView { + if let titleView = navigationItem.titleView as? MainTimelineTitleView { let timelineIconImage = coordinator.timelineIconImage titleView.iconView.iconImage = timelineIconImage if let preferredColor = timelineIconImage?.preferredColor { @@ -688,7 +688,7 @@ private extension TimelineViewController { } func updateTitleUnreadCount() { - if let titleView = navigationItem.titleView as? TimelineTitleView { + if let titleView = navigationItem.titleView as? MainTimelineTitleView { titleView.unreadCountView.unreadCount = coordinator.timelineUnreadCount } } @@ -712,7 +712,7 @@ private extension TimelineViewController { func makeDataSource() -> UITableViewDiffableDataSource { let dataSource: UITableViewDiffableDataSource = - TimelineDataSource(tableView: tableView, cellProvider: { [weak self] tableView, indexPath, article in + MainTimelineDataSource(tableView: tableView, cellProvider: { [weak self] tableView, indexPath, article in let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as! MainTimelineTableViewCell self?.configure(cell, article: article) return cell diff --git a/iOS/Timeline/MarkAsReadAlertController.swift b/iOS/MainTimeline/MarkAsReadAlertController.swift similarity index 100% rename from iOS/Timeline/MarkAsReadAlertController.swift rename to iOS/MainTimeline/MarkAsReadAlertController.swift diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift index 20669b95c..fe71033cc 100644 --- a/iOS/SceneCoordinator.swift +++ b/iOS/SceneCoordinator.swift @@ -61,7 +61,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { private var rootSplitViewController: RootSplitViewController! private var navigationController: UINavigationController! private var feedViewController: MainFeedViewController! - private var timelineViewController: TimelineViewController? + private var timelineViewController: MainTimelineViewController? private var subSplitViewController: UISplitViewController? private var articleViewController: ArticleViewController? { @@ -825,7 +825,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner { self.rebuildBackingStores() } self.activityManager.invalidateSelecting() - if self.rootSplitViewController.isCollapsed && self.navControllerForTimeline().viewControllers.last is TimelineViewController { + if self.rootSplitViewController.isCollapsed && self.navControllerForTimeline().viewControllers.last is MainTimelineViewController { self.navControllerForTimeline().popViewController(animated: animations.contains(.navigation)) } completion?() @@ -2099,9 +2099,9 @@ private extension SceneCoordinator { // MARK: Three Panel Mode func installTimelineControllerIfNecessary(animated: Bool) { - if navControllerForTimeline().viewControllers.filter({ $0 is TimelineViewController }).count < 1 { + if navControllerForTimeline().viewControllers.filter({ $0 is MainTimelineViewController }).count < 1 { isTimelineViewControllerPending = true - timelineViewController = UIStoryboard.main.instantiateController(ofType: TimelineViewController.self) + timelineViewController = UIStoryboard.main.instantiateController(ofType: MainTimelineViewController.self) timelineViewController!.coordinator = self navControllerForTimeline().pushViewController(timelineViewController!, animated: animated) } @@ -2216,7 +2216,7 @@ private extension SceneCoordinator { } if currentFeedIndexPath != nil { - timelineViewController = UIStoryboard.main.instantiateController(ofType: TimelineViewController.self) + timelineViewController = UIStoryboard.main.instantiateController(ofType: MainTimelineViewController.self) timelineViewController!.coordinator = self navigationController.pushViewController(timelineViewController!, animated: false) }