diff --git a/iOS/AppCoordinator.swift b/iOS/AppCoordinator.swift index 3eb4d5fd0..69526a668 100644 --- a/iOS/AppCoordinator.swift +++ b/iOS/AppCoordinator.swift @@ -67,6 +67,10 @@ class AppCoordinator: NSObject, UndoableCommandRunner { return TreeController(delegate: treeControllerDelegate) }() + var isRootSplitCollapsed: Bool { + return rootSplitViewController.isCollapsed + } + var isThreePanelMode: Bool { return rootSplitViewController.traitCollection.userInterfaceIdiom == .pad && rootSplitViewController.displayMode == .allVisible } diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 126e2611f..e3b906da1 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -53,8 +53,8 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { } override func viewWillAppear(_ animated: Bool) { - clearsSelectionOnViewWillAppear = true navigationController?.title = NSLocalizedString("Feeds", comment: "Feeds") + clearsSelectionOnViewWillAppear = coordinator.isRootSplitCollapsed super.viewWillAppear(animated) } diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index 2cc6bbd52..5e55c2cb0 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -54,6 +54,11 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner } + override func viewWillAppear(_ animated: Bool) { + clearsSelectionOnViewWillAppear = coordinator.isRootSplitCollapsed + super.viewWillAppear(animated) + } + override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) becomeFirstResponder()