From 9134d200322b89f65f7ce73552d3a5af547bd650 Mon Sep 17 00:00:00 2001 From: Stephen Sowole Date: Mon, 30 Sep 2019 14:02:59 -0700 Subject: [PATCH] [PanModal] Fix unbalanced calls to appearance (#52) * [PanModal] Use init instead of viewDidLoad in NavigationController * [PanModal] Remove unbalanced calls to viewWillAppear/viewWillDisappear --- .../Animator/PanModalPresentationAnimator.swift | 4 ---- .../NavigationController.swift | 14 +++++++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PanModal/Animator/PanModalPresentationAnimator.swift b/PanModal/Animator/PanModalPresentationAnimator.swift index 41d7a7b..2815729 100644 --- a/PanModal/Animator/PanModalPresentationAnimator.swift +++ b/PanModal/Animator/PanModalPresentationAnimator.swift @@ -72,7 +72,6 @@ public class PanModalPresentationAnimator: NSObject { // Calls viewWillAppear and viewWillDisappear fromVC.beginAppearanceTransition(false, animated: true) - toVC.beginAppearanceTransition(true, animated: true) // Presents the view in shortForm position, initially let yPos: CGFloat = presentable?.shortFormYPos ?? 0.0 @@ -94,7 +93,6 @@ public class PanModalPresentationAnimator: NSObject { }, config: presentable) { [weak self] didComplete in // Calls viewDidAppear and viewDidDisappear fromVC.endAppearanceTransition() - toVC.endAppearanceTransition() transitionContext.completeTransition(didComplete) self?.feedbackGenerator = nil } @@ -111,7 +109,6 @@ public class PanModalPresentationAnimator: NSObject { else { return } // Calls viewWillAppear and viewWillDisappear - fromVC.beginAppearanceTransition(false, animated: true) toVC.beginAppearanceTransition(true, animated: true) let presentable = panModalLayoutType(from: transitionContext) @@ -122,7 +119,6 @@ public class PanModalPresentationAnimator: NSObject { }, config: presentable) { didComplete in fromVC.view.removeFromSuperview() // Calls viewDidAppear and viewDidDisappear - fromVC.endAppearanceTransition() toVC.endAppearanceTransition() transitionContext.completeTransition(didComplete) } diff --git a/Sample/View Controllers/User Groups (Navigation Controller)/NavigationController.swift b/Sample/View Controllers/User Groups (Navigation Controller)/NavigationController.swift index 239b9e2..6aed5e1 100644 --- a/Sample/View Controllers/User Groups (Navigation Controller)/NavigationController.swift +++ b/Sample/View Controllers/User Groups (Navigation Controller)/NavigationController.swift @@ -12,13 +12,17 @@ class NavigationController: UINavigationController, PanModalPresentable { private let navGroups = NavUserGroups() - override var preferredStatusBarStyle: UIStatusBarStyle { - return .lightContent + init() { + super.init(nibName: nil, bundle: nil) + viewControllers = [navGroups] } - override func viewDidLoad() { - super.viewDidLoad() - pushViewController(navGroups, animated: false) + required init?(coder aDecoder: NSCoder) { + fatalError() + } + + override var preferredStatusBarStyle: UIStatusBarStyle { + return .lightContent } override func popViewController(animated: Bool) -> UIViewController? {