diff --git a/Example/Example/Base.lproj/Main.storyboard b/Example/Example/Base.lproj/Main.storyboard index 0d664bc..e8866fe 100644 --- a/Example/Example/Base.lproj/Main.storyboard +++ b/Example/Example/Base.lproj/Main.storyboard @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -14,9 +18,9 @@ - + - + @@ -38,14 +42,15 @@ - + - + - + - + @@ -102,9 +110,9 @@ - + - + @@ -121,13 +129,13 @@ - + - + - + @@ -154,16 +162,17 @@ - + - + - + - + @@ -205,16 +215,17 @@ - + - + - + - + @@ -255,16 +267,17 @@ - + - + - + - + @@ -306,14 +320,15 @@ - + - + - + - + @@ -406,13 +422,13 @@ - + - + diff --git a/Example/Example/MenuController.swift b/Example/Example/MenuController.swift index f2de035..6f9eb92 100644 --- a/Example/Example/MenuController.swift +++ b/Example/Example/MenuController.swift @@ -17,6 +17,26 @@ class MenuController: UITableViewController { super.viewDidLoad() } + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + print("\(#function) -- \(self)") + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + print("\(#function) -- \(self)") + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + print("\(#function) -- \(self)") + } + + override func viewDidDisappear(_ animated: Bool) { + super.viewDidAppear(animated) + print("\(#function) -- \(self)") + } + override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { return segues.count } diff --git a/Source/SideMenuController.swift b/Source/SideMenuController.swift index 03c8f68..db639d0 100644 --- a/Source/SideMenuController.swift +++ b/Source/SideMenuController.swift @@ -274,7 +274,7 @@ open class SideMenuController: UIViewController, UIGestureRecognizerDelegate { } func prepare(sidePanelForDisplay display: Bool){ - + sideViewController.beginAppearanceTransition(display, animated: true) sidePanel.isHidden = !display if !sidePanelPosition.isPositionedUnder { @@ -312,6 +312,8 @@ open class SideMenuController: UIViewController, UIGestureRecognizerDelegate { let delegateMethod = reveal ? self.delegate?.sideMenuControllerDidReveal : self.delegate?.sideMenuControllerDidHide delegateMethod?(self) } + + self.sideViewController.endAppearanceTransition() } }