Skip to content

Commit

Permalink
Remove readerNavigationController from ReaderCoordinator
Browse files Browse the repository at this point in the history
  • Loading branch information
kean committed Sep 16, 2024
1 parent 72d768a commit dca86e8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
4 changes: 3 additions & 1 deletion WordPress/Classes/System/SplitViewRootPresenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,9 @@ final class SplitViewRootPresenter: RootViewPresenter {

var readerTabViewController: ReaderTabViewController?

var readerCoordinator: ReaderCoordinator?
var readerCoordinator: ReaderCoordinator? {
ReaderCoordinator()
}

var readerNavigationController: UINavigationController?

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@ import UIKit

@objc
class ReaderCoordinator: NSObject {
let readerNavigationController: UINavigationController

var failureBlock: (() -> Void)? = nil

@objc
init(readerNavigationController: UINavigationController) {
self.readerNavigationController = readerNavigationController
super.init()
}

func showReaderTab() {
RootViewCoordinator.sharedPresenter.showReaderTab()
}
Expand Down Expand Up @@ -47,7 +37,6 @@ class ReaderCoordinator: NSObject {
func showList(named listName: String, forUser user: String) {
let context = ContextManager.sharedInstance().mainContext
guard let topic = ReaderListTopic.named(listName, forUser: user, in: context) else {
failureBlock?()
return
}

Expand Down Expand Up @@ -103,13 +92,6 @@ class ReaderCoordinator: NSObject {
}

private func showPost(in detailViewController: ReaderDetailViewController) {

let postLoadFailureBlock = { [weak self, failureBlock] in
self?.readerNavigationController.popToRootViewController(animated: false)
failureBlock?()
}

detailViewController.postLoadFailureBlock = postLoadFailureBlock
RootViewCoordinator.sharedPresenter.navigateToReader(detailViewController)
}

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/System/WPTabBarController.m
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ - (MySitesCoordinator *)mySitesCoordinator

- (ReaderCoordinator *)readerCoordinator
{
return [[ReaderCoordinator alloc] initWithReaderNavigationController:self.readerNavigationController];
return [[ReaderCoordinator alloc] init];
}

#pragma mark - Navigation Helpers
Expand Down

0 comments on commit dca86e8

Please sign in to comment.