Commit 7fa57e1d by Daniel Dahan Committed by GitHub

Merge pull request #921 from CosmicMind/revert-920-issue/919

Revert "Tab bar controller dynamically adds & removes child view controllers"
parents e177ac38 5541cb0f
...@@ -197,15 +197,13 @@ fileprivate extension TabsController { ...@@ -197,15 +197,13 @@ fileprivate extension TabsController {
return return
} }
let fvcIndex = viewControllers.index(of: fvc)
let tvcIndex = viewControllers.index(of: viewController)
let tvc = viewController let tvc = viewController
tvc.beginAppearanceTransition(true, animated: true)
prepareViewController(at: tvcIndex!)
tvc.view.isHidden = false tvc.view.isHidden = false
tvc.view.frame = container.bounds tvc.view.frame = container.bounds
let fvcIndex = viewControllers.index(of: fvc)
let tvcIndex = viewControllers.index(of: viewController)
var isAuto = false var isAuto = false
switch tvc.motionModalTransitionType { switch tvc.motionModalTransitionType {
...@@ -231,9 +229,6 @@ fileprivate extension TabsController { ...@@ -231,9 +229,6 @@ fileprivate extension TabsController {
s.rootViewController = tvc s.rootViewController = tvc
s.view.isUserInteractionEnabled = true s.view.isUserInteractionEnabled = true
tvc.endAppearanceTransition()
s.removeViewController(viewController: fvc)
completion?(isFinished) completion?(isFinished)
...@@ -254,6 +249,15 @@ internal extension TabsController { ...@@ -254,6 +249,15 @@ internal extension TabsController {
fileprivate extension TabsController { fileprivate extension TabsController {
/// Prepares all the view controllers. /// Prepares all the view controllers.
func prepareViewControllers() { func prepareViewControllers() {
for i in 0..<viewControllers.count {
guard i != selectedIndex else {
continue
}
viewControllers[i].view.isHidden = true
prepareViewController(at: i)
}
prepareViewController(at: selectedIndex) prepareViewController(at: selectedIndex)
prepareRootViewController() prepareRootViewController()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment