FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-03 12:27:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix transition to three panel mode

Browse Source
This commit is contained in:
Maurice Parker 2019-08-02 04:22:47 -05:00
parent eb4d61dc2c
commit 7da1aacf28
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
iOS/AppCoordinator.swift
View File

@ -35,10 +35,15 @@ class AppCoordinator: NSObject, UndoableCommandRunner {
private var detailViewController: DetailViewController? { private var detailViewController: DetailViewController? {
if let subSplit = rootSplitViewController.viewControllers.last?.children.first as? UISplitViewController { if let subSplit = rootSplitViewController.viewControllers.last?.children.first as? UISplitViewController {
return subSplit.viewControllers.last as? DetailViewController if let navController = subSplit.viewControllers.last as? UINavigationController {
return navController.topViewController as? DetailViewController
}
} else { } else {
return rootSplitViewController.viewControllers.last?.children.first as? DetailViewController if let navController = rootSplitViewController.viewControllers.last?.children.first as? UINavigationController {
return navController.topViewController as? DetailViewController
}
} }
return nil
} }
private let fetchAndMergeArticlesQueue = CoalescingQueue(name: "Fetch and Merge Articles", interval: 0.5) private let fetchAndMergeArticlesQueue = CoalescingQueue(name: "Fetch and Merge Articles", interval: 0.5)
@ -901,11 +906,10 @@ private extension AppCoordinator {
masterNavigationController.viewControllers = [masterFeedViewController] masterNavigationController.viewControllers = [masterFeedViewController]
} }
if masterNavigationController.viewControllers.count == 1 { if currentArticle == nil {
let systemMessageViewController = UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self) let systemMessageViewController = UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self)
let navController = UINavigationController(rootViewController: systemMessageViewController) let navController = addNavControllerIfNecessary(systemMessageViewController, showButton: false)
navController.isToolbarHidden = false
rootSplitViewController.showDetailViewController(navController, sender: self) rootSplitViewController.showDetailViewController(navController, sender: self)
} else { } else {
@ -917,14 +921,18 @@ private extension AppCoordinator {
return UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self) return UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self)
} }
}() }()
let navController = addNavControllerIfNecessary(controller, showButton: false)
masterTimelineViewController!.navigationItem.leftBarButtonItem = nil masterTimelineViewController!.navigationItem.leftBarButtonItem = nil
let subSplit = ensureDoubleSplit() let subSplit = ensureDoubleSplit()
let masterTimelineNavController = subSplit.viewControllers.first as! UINavigationController let masterTimelineNavController = subSplit.viewControllers.first as! UINavigationController
masterTimelineNavController.viewControllers = [masterTimelineViewController!] masterTimelineNavController.viewControllers = [masterTimelineViewController!]
installDetailController(controller) subSplit.showDetailViewController(navController, sender: self)
} }
} }