Compare commits

...

6 Commits

Author SHA1 Message Date
jonkykong 73be895065 Updated podspec 2019-11-20 01:54:23 -08:00
jonkykong 00003f098f Fix for animation flash when dismissing modal view controller over SideMenu 2019-11-20 01:43:12 -08:00
jonkykong f4b74330c0 Minor refactor 2019-11-20 01:35:23 -08:00
jonkykong fb25017bc7 Updated podspec 2019-10-31 17:37:16 -07:00
jonkykong 1841827ef9 Fix for interactive regression 2019-10-30 11:36:40 -07:00
jonkykong a5852d8fd0 Refactor 2019-10-30 11:36:15 -07:00
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ import UIKit
class PresentedViewController: UIViewController {
@IBAction private func close() {
self.dismiss(animated: true, completion: nil)
dismiss(animated: true, completion: nil)
}
}
@@ -200,7 +200,6 @@ open class SideMenuNavigationController: UINavigationController {
// We had presented a view before, so lets dismiss ourselves as already acted upon
if view.isHidden {
transitionController?.transition(presenting: false, animated: false)
dismiss(animated: false, completion: { [weak self] in
self?.view.isHidden = false
})
@@ -325,7 +324,8 @@ open class SideMenuNavigationController: UINavigationController {
override open var transitioningDelegate: UIViewControllerTransitioningDelegate? {
get {
transitionController = transitionController ?? SideMenuTransitionController(leftSide: leftSide, config: settings)
guard transitionController == nil else { return transitionController }
transitionController = SideMenuTransitionController(leftSide: leftSide, config: settings)
transitionController?.delegate = self
transitionController?.interactive = transitionInteractive
transitionInteractive = false
@@ -484,7 +484,7 @@ internal extension SideMenuNavigationController {
if !presenting {
dismissMenu(interactively: true)
}
transitionController?.handle(state: .update(progress: progress))
fallthrough
case .changed:
transitionController?.handle(state: .update(progress: progress))
case .ended:
@@ -502,7 +502,7 @@ internal extension SideMenuNavigationController {
func dismissMenu(animated flag: Bool = true, interactively: Bool = false, completion: (() -> Void)? = nil) {
guard !isHidden else { return }
transitionInteractive = interactively
transitionController?.interactive = interactively
dismiss(animated: flag, completion: completion)
}
+1 -1
View File
@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "SideMenu"
s.version = "6.4.5"
s.version = "6.4.7"
s.summary = "Simple side menu control for iOS in Swift inspired by Facebook. Right and Left sides. No coding required."
# This description is used to generate tags and improve search results.