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

Fix timeline selected transition to three panel mode

This commit is contained in:
Maurice Parker 2019-08-02 04:29:42 -05:00
parent 4f49a4bcf6
commit e0832260b8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
iOS/AppCoordinator.swift
View File

@ -902,7 +902,7 @@ private extension AppCoordinator {
masterNavigationController.viewControllers = [masterFeedViewController]
}
if currentArticle == nil {
if currentMasterIndexPath == nil && currentArticleIndexPath == nil {
let systemMessageViewController = UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self)
let navController = addNavControllerIfNecessary(systemMessageViewController, showButton: false)
@ -910,6 +910,12 @@ private extension AppCoordinator {
} else {
masterTimelineViewController!.navigationItem.leftBarButtonItem = nil
let subSplit = ensureDoubleSplit()
let masterTimelineNavController = subSplit.viewControllers.first as! UINavigationController
masterTimelineNavController.viewControllers = [masterTimelineViewController!]
let controller: UIViewController = {
if let result = detailViewController {
return result
@ -919,14 +925,6 @@ private extension AppCoordinator {
}()
let navController = addNavControllerIfNecessary(controller, showButton: false)
masterTimelineViewController!.navigationItem.leftBarButtonItem = nil
let subSplit = ensureDoubleSplit()
let masterTimelineNavController = subSplit.viewControllers.first as! UINavigationController
masterTimelineNavController.viewControllers = [masterTimelineViewController!]
subSplit.showDetailViewController(navController, sender: self)
}