FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix root split view controller collapsing and splitting when no in all visible mode

Browse Source
This commit is contained in:
Maurice Parker 2019-08-03 10:55:46 -05:00
parent 12f85f3ad3
commit 0baf15b588
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
iOS/AppCoordinator.swift
View File

@ -608,7 +608,7 @@ class AppCoordinator: NSObject, UndoableCommandRunner {
extension AppCoordinator: UISplitViewControllerDelegate { extension AppCoordinator: UISplitViewControllerDelegate {
func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) { func splitViewController(_ svc: UISplitViewController, willChangeTo displayMode: UISplitViewController.DisplayMode) {
guard rootSplitViewController.traitCollection.userInterfaceIdiom == .pad else { guard rootSplitViewController.traitCollection.userInterfaceIdiom == .pad && !rootSplitViewController.isCollapsed else {
return return
} }
if rootSplitViewController.displayMode != .allVisible && displayMode == .allVisible { if rootSplitViewController.displayMode != .allVisible && displayMode == .allVisible {
@ -620,13 +620,7 @@ extension AppCoordinator: UISplitViewControllerDelegate {
} }
func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool { func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool {
if let detailNav = secondaryViewController.children.first as? UINavigationController, let detail = detailNav.topViewController {
masterNavigationController.pushViewController(detail, animated: false)
detail.navigationItem.leftBarButtonItem = rootSplitViewController.displayModeButtonItem
return true
}
if let subSplit = secondaryViewController.children.first as? UISplitViewController { if let subSplit = secondaryViewController.children.first as? UISplitViewController {
if let masterTimelineNav = subSplit.viewControllers.first as? UINavigationController, if let masterTimelineNav = subSplit.viewControllers.first as? UINavigationController,
@ -634,19 +628,27 @@ extension AppCoordinator: UISplitViewControllerDelegate {
masterNavigationController.pushViewController(masterTimeline, animated: false) masterNavigationController.pushViewController(masterTimeline, animated: false)
} }
if let detailNav = subSplit.viewControllers.last as? UINavigationController, let detail = detailNav.topViewController { if let detailNav = subSplit.viewControllers.last as? UINavigationController, let detail = detailNav.topViewController as? DetailViewController {
masterNavigationController.pushViewController(detail, animated: false) masterNavigationController.pushViewController(detail, animated: false)
} }
return true } else {
if let timeline = masterTimelineViewController, masterNavigationController.viewControllers.count == 1 {
masterNavigationController.pushViewController(timeline, animated: false)
}
if let detailNav = secondaryViewController.children.first as? UINavigationController, let detail = detailNav.topViewController as? DetailViewController {
masterNavigationController.pushViewController(detail, animated: false)
}
} }
return currentArticle == nil return true
} }
func splitViewController(_ splitViewController: UISplitViewController, separateSecondaryFrom primaryViewController: UIViewController) -> UIViewController? { func splitViewController(_ splitViewController: UISplitViewController, separateSecondaryFrom primaryViewController: UIViewController) -> UIViewController? {
if isThreePanelMode { if isThreePanelMode {
return transitionToThreePanelMode() return transitionToThreePanelMode()
} }
@ -659,21 +661,15 @@ extension AppCoordinator: UISplitViewControllerDelegate {
shimController.addChildAndPinView(detailNav) shimController.addChildAndPinView(detailNav)
return shimController return shimController
} } else {
//
// } else {
//
// let systemMessageViewController = UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self)
// let navController = addNavControllerIfNecessary(systemMessageViewController, showButton: true)
// let shimController = UIViewController()
// shimController.addChildAndPinView(navController)
// return shimController
//
// }
//
return nil
let systemMessageViewController = UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self)
let navController = addNavControllerIfNecessary(systemMessageViewController, showButton: true)
let shimController = UIViewController()
shimController.addChildAndPinView(navController)
return shimController
}
} }
} }