Updated podspec

* tag '6.2.3':
  Updated podspec
  Propagate configured onTopShadowOffset to layer

Example/Main.storyboard

@@ -291,7 +291,7 @@
         <!--Side Menu Navigation Controller-->
         <scene sceneID="Zbc-0f-8nT">
             <objects>
-                <navigationController storyboardIdentifier="LeftMenuNavigationController" navigationBarHidden="YES" id="DuX-EW-0mP" customClass="UISideMenuNavigationController" customModule="SideMenu" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="LeftMenuNavigationController" navigationBarHidden="YES" id="DuX-EW-0mP" customClass="SideMenuNavigationController" customModule="SideMenu" sceneMemberID="viewController">
                     <navigationItem key="navigationItem" id="ipz-Lx-Wgf"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="35F-wh-r6h">
                         <autoresizingMask key="autoresizingMask"/>
@@ -423,7 +423,7 @@
         <!--Side Menu Navigation Controller-->
         <scene sceneID="kei-0w-mFw">
             <objects>
-                <navigationController storyboardIdentifier="RightMenuNavigationController" navigationBarHidden="YES" id="z7k-fk-pfc" customClass="UISideMenuNavigationController" customModule="SideMenu" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="RightMenuNavigationController" navigationBarHidden="YES" id="z7k-fk-pfc" customClass="SideMenuNavigationController" customModule="SideMenu" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="qOd-yQ-2i8">
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>

Pod/Classes/Extensions.swift

@@ -63,6 +63,10 @@ internal extension UIGestureRecognizer {
         guard let view = view else { return nil }
         self.init(addTo: view, target: target, action: action)
     }
+
+    func remove() {
+        view?.removeGestureRecognizer(self)
+    }
 }
 
 internal extension UIPanGestureRecognizer {

Pod/Classes/Models.swift

@@ -1,75 +0,0 @@
-//
-//  Models.swift
-//  SideMenu
-//
-//  Created by Jon Kent on 7/3/19.
-//
-
-import Foundation
-
-internal protocol MenuModel: TransitionModel {
-    /// Prevents the same view controller (or a view controller of the same class) from being pushed more than once. Defaults to true.
-    var allowPushOfSameClassTwice: Bool { get }
-    /// Forces menus to always animate when appearing or disappearing, regardless of a pushed view controller's animation.
-    var alwaysAnimate: Bool { get }
-    /**
-     The blur effect style of the menu if the menu's root view controller is a UITableViewController or UICollectionViewController.
-
-     - Note: If you want cells in a UITableViewController menu to show vibrancy, make them a subclass of UITableViewVibrantCell.
-     */
-    var blurEffectStyle: UIBlurEffect.Style? { get }
-    /// Animation curve of the remaining animation when the menu is partially dismissed with gestures. Default is .easeIn.
-    var completionCurve: UIView.AnimationCurve { get }
-    /// Automatically dismisses the menu when another view is presented from it.
-    var dismissOnPresent: Bool { get }
-    /// Automatically dismisses the menu when another view controller is pushed from it.
-    var dismissOnPush: Bool { get }
-    /// Automatically dismisses the menu when the screen is rotated.
-    var dismissOnRotation: Bool { get }
-    /// Automatically dismisses the menu when app goes to the background.
-    var dismissWhenBackgrounded: Bool { get }
-    /// Enable or disable a swipe gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
-    var enableSwipeToDismissGesture: Bool { get }
-    /// Enable or disable a tap gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
-    var enableTapToDismissGesture: Bool { get }
-    /**
-     The push style of the menu.
-
-     There are six modes in MenuPushStyle:
-     - defaultBehavior: The view controller is pushed onto the stack.
-     - popWhenPossible: If a view controller already in the stack is of the same class as the pushed view controller, the stack is instead popped back to the existing view controller. This behavior can help users from getting lost in a deep navigation stack.
-     - preserve: If a view controller already in the stack is of the same class as the pushed view controller, the existing view controller is pushed to the end of the stack. This behavior is similar to a UITabBarController.
-     - preserveAndHideBackButton: Same as .preserve and back buttons are automatically hidden.
-     - replace: Any existing view controllers are released from the stack and replaced with the pushed view controller. Back buttons are automatically hidden. This behavior is ideal if view controllers require a lot of memory or their state doesn't need to be preserved..
-     - subMenu: Unlike all other behaviors that push using the menu's presentingViewController, this behavior pushes view controllers within the menu.  Use this behavior if you want to display a sub menu.
-     */
-    var pushStyle: SideMenuPushStyle { get }
-}
-
-internal protocol TransitionModel: PresentationModel {
-    /// The animation options when a menu is displayed. Ignored when displayed with a gesture.
-    var animationOptions: UIView.AnimationOptions { get }
-    /// Duration of the remaining animation when the menu is partially dismissed with gestures. Default is 0.35 seconds.
-    var completeGestureDuration: Double { get }
-    /// Duration of the animation when the menu is dismissed without gestures. Default is 0.35 seconds.
-    var dismissDuration: Double { get }
-    /// The animation initial spring velocity when a menu is displayed. Ignored when displayed with a gesture.
-    var initialSpringVelocity: CGFloat { get }
-    /// Duration of the animation when the menu is presented without gestures. Default is 0.35 seconds.
-    var presentDuration: Double { get }
-    /// The animation spring damping when a menu is displayed. Ignored when displayed with a gesture.
-    var usingSpringWithDamping: CGFloat { get }
-}
-
-internal protocol PresentationModel {
-    /// Draws `presentStyle.backgroundColor` behind the status bar. Default is 1.
-    var statusBarEndAlpha: CGFloat { get }
-    /// Enable or disable interaction with the presenting view controller while the menu is displayed. Enabling may make it difficult to dismiss the menu or cause exceptions if the user tries to present and already presented menu. `presentingViewControllerUseSnapshot` must also set to false. Default is false.
-    var presentingViewControllerUserInteractionEnabled: Bool { get }
-    /// Use a snapshot for the presenting vierw controller while the menu is displayed. Useful when layout changes occur during transitions. Not recommended for apps that support rotation. Default is false.
-    var presentingViewControllerUseSnapshot: Bool { get }
-    /// The presentation style of the menu.
-    var presentationStyle: SideMenuPresentationStyle { get }
-    /// Width of the menu when presented on screen, showing the existing view controller in the remaining space. Default is zero.
-    var menuWidth: CGFloat { get }
-}

Pod/Classes/SideMenuAnimationController.swift

@@ -0,0 +1,204 @@
+//
+//  SideMenuAnimationController.swift
+//  SideMenu
+//
+//  Created by Jon Kent on 10/24/18.
+//
+
+import UIKit
+
+internal protocol AnimationModel {
+    /// The animation options when a menu is displayed. Ignored when displayed with a gesture.
+    var animationOptions: UIView.AnimationOptions { get }
+    /// Duration of the remaining animation when the menu is partially dismissed with gestures. Default is 0.35 seconds.
+    var completeGestureDuration: Double { get }
+    /// Duration of the animation when the menu is dismissed without gestures. Default is 0.35 seconds.
+    var dismissDuration: Double { get }
+    /// The animation initial spring velocity when a menu is displayed. Ignored when displayed with a gesture.
+    var initialSpringVelocity: CGFloat { get }
+    /// Duration of the animation when the menu is presented without gestures. Default is 0.35 seconds.
+    var presentDuration: Double { get }
+    /// The animation spring damping when a menu is displayed. Ignored when displayed with a gesture.
+    var usingSpringWithDamping: CGFloat { get }
+}
+
+internal protocol SideMenuAnimationControllerDelegate: class {
+    func sideMenuAnimationController(_ animationController: SideMenuAnimationController, didDismiss viewController: UIViewController)
+    func sideMenuAnimationController(_ animationController: SideMenuAnimationController, didPresent viewController: UIViewController)
+}
+
+internal final class SideMenuAnimationController: NSObject, UIViewControllerAnimatedTransitioning {
+
+    typealias Model = AnimationModel & PresentationModel
+
+    private var config: Model
+    private weak var containerView: UIView?
+    private let leftSide: Bool
+    private var presentationController: SideMenuPresentationController!
+    private unowned var presentedViewController: UIViewController?
+    private unowned var presentingViewController: UIViewController?
+    weak var delegate: SideMenuAnimationControllerDelegate?
+
+    init(config: Model, leftSide: Bool, delegate: SideMenuAnimationControllerDelegate? = nil) {
+        self.config = config
+        self.leftSide = leftSide
+        self.delegate = delegate
+    }
+
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
+        guard
+            let presentedViewController = transitionContext.presentedViewController,
+            let presentingViewController = transitionContext.presentingViewController
+            else { return }
+
+        if transitionContext.isPresenting {
+            self.containerView = transitionContext.containerView
+            self.presentedViewController = presentedViewController
+            self.presentingViewController = presentingViewController
+            self.presentationController = SideMenuPresentationController(
+                config: config,
+                leftSide: leftSide,
+                presentedViewController: presentedViewController,
+                presentingViewController: presentingViewController,
+                containerView: transitionContext.containerView
+            )
+        }
+
+        transition(using: transitionContext)
+    }
+
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
+        guard let transitionContext = transitionContext else { return 0 }
+        return duration(presenting: transitionContext.isPresenting, interactive: transitionContext.isInteractive)
+    }
+
+    func animationEnded(_ transitionCompleted: Bool) {
+        guard let presentedViewController = presentedViewController else { return }
+        if presentedViewController.isHidden {
+            delegate?.sideMenuAnimationController(self, didDismiss: presentedViewController)
+        } else {
+            delegate?.sideMenuAnimationController(self, didPresent: presentedViewController)
+        }
+    }
+
+    func transition(presenting: Bool, animated: Bool = true, interactive: Bool = false, alongsideTransition: (() -> Void)? = nil, complete: Bool = true, completion: ((Bool) -> Void)? = nil) {
+        transitionWillBegin(presenting: presenting)
+        transition(presenting: presenting,
+                   animated: animated,
+                   interactive: interactive,
+                   animations: { [weak self] in
+                    guard let self = self else { return }
+                    self.transition(presenting: presenting)
+                    alongsideTransition?()
+            }, completion: { [weak self] _ in
+                guard let self = self else { return }
+                if complete {
+                    self.transitionDidEnd(presenting: presenting, completed: true)
+                }
+                completion?(true)
+        })
+    }
+
+    func layout() {
+        presentationController.containerViewWillLayoutSubviews()
+    }
+}
+
+private extension SideMenuAnimationController {
+
+    func duration(presenting: Bool, interactive: Bool) -> Double {
+        if interactive { return config.completeGestureDuration }
+        return presenting ? config.presentDuration : config.dismissDuration
+    }
+
+    func transitionWillBegin(presenting: Bool) {
+        // prevent any other menu gestures from firing
+        containerView?.isUserInteractionEnabled = false
+
+        if presenting {
+            presentationController.presentationTransitionWillBegin()
+        } else {
+            presentationController.dismissalTransitionWillBegin()
+        }
+    }
+
+    func transition(presenting: Bool) {
+        if presenting {
+            presentationController.presentationTransition()
+        } else {
+            presentationController.dismissalTransition()
+        }
+    }
+
+    func transitionDidEnd(presenting: Bool, completed: Bool) {
+        if presenting {
+            presentationController.presentationTransitionDidEnd(completed)
+        } else {
+            presentationController.dismissalTransitionDidEnd(completed)
+        }
+
+        containerView?.isUserInteractionEnabled = true
+    }
+
+    func transition(using transitionContext: UIViewControllerContextTransitioning) {
+        transitionWillBegin(presenting: transitionContext.isPresenting)
+        transition(presenting: transitionContext.isPresenting,
+                   animated: transitionContext.isAnimated,
+                   interactive: transitionContext.isInteractive,
+                   animations: { [weak self] in
+                    guard let self = self else { return }
+                    self.transition(presenting: transitionContext.isPresenting)
+        }, completion: { [weak self] _ in
+                    guard let self = self else { return }
+                    let completed = !transitionContext.transitionWasCancelled
+                    self.transitionDidEnd(presenting: transitionContext.isPresenting, completed: completed)
+                    transitionContext.completeTransition(completed)
+        })
+    }
+
+    func transition(presenting: Bool, animated: Bool = true, interactive: Bool = false, animations: @escaping (() -> Void) = {}, completion: @escaping ((Bool) -> Void) = { _ in }) {
+        if !animated {
+            animations()
+            completion(true)
+            return
+        }
+
+        let duration = self.duration(presenting: presenting, interactive: interactive)
+        if interactive {
+            // IMPORTANT: The non-interactive animation block will not complete if adapted for interactive. The below animation block must be used!
+            UIView.animate(
+                withDuration: duration,
+                delay: duration, // HACK: If zero, the animation briefly flashes in iOS 11.
+                options: .curveLinear,
+                animations: animations,
+                completion: completion
+            )
+            return
+        }
+
+        UIView.animate(
+            withDuration: duration,
+            delay: 0,
+            usingSpringWithDamping: config.usingSpringWithDamping,
+            initialSpringVelocity: config.initialSpringVelocity,
+            options: config.animationOptions,
+            animations: animations,
+            completion: completion
+        )
+    }
+}
+
+private extension UIViewControllerContextTransitioning {
+
+    var isPresenting: Bool {
+        return viewController(forKey: .from)?.presentedViewController === viewController(forKey: .to)
+    }
+
+    var presentingViewController: UIViewController? {
+        return viewController(forKey: isPresenting ? .from : .to)
+    }
+
+    var presentedViewController: UIViewController? {
+        return viewController(forKey: isPresenting ? .to : .from)
+    }
+}

Pod/Classes/SideMenuInteractionController.swift

@@ -7,10 +7,6 @@
 
 import UIKit
 
-internal protocol SideMenuInteractable {
-    func handle(state: SideMenuInteractionController.State)
-}
-
 internal final class SideMenuInteractionController: UIPercentDrivenInteractiveTransition {
 
     enum State { case
@@ -44,20 +40,6 @@ internal final class SideMenuInteractionController: UIPercentDrivenInteractiveTr
         guard !isCancelled && !isFinished else { return }
         super.update(percentComplete)
     }
-}
-
-private extension SideMenuInteractionController {
-
-    @objc func handleNotification(notification: NSNotification) {
-        switch notification.name {
-        case UIApplication.didEnterBackgroundNotification:
-            cancel()
-        default: break
-        }
-    }
-}
-
-extension SideMenuInteractionController: SideMenuInteractable {
 
     func handle(state: State) {
         switch state {
@@ -70,3 +52,14 @@ extension SideMenuInteractionController: SideMenuInteractable {
         }
     }
 }
+
+private extension SideMenuInteractionController {
+
+    @objc func handleNotification(notification: NSNotification) {
+        switch notification.name {
+        case UIApplication.didEnterBackgroundNotification:
+            cancel()
+        default: break
+        }
+    }
+}

Pod/Classes/SideMenuManager.swift

@@ -202,7 +202,7 @@ private extension SideMenuManager {
     func addScreenEdgeGesture(to view: UIView, edge: UIRectEdge) -> UIScreenEdgePanGestureRecognizer {
         if let screenEdgeGestureRecognizer = view.gestureRecognizers?.first(where: { $0 is SideMenuScreenEdgeGestureRecognizer }) as? SideMenuScreenEdgeGestureRecognizer,
             screenEdgeGestureRecognizer.edges == edge {
-            view.removeGestureRecognizer(screenEdgeGestureRecognizer)
+            screenEdgeGestureRecognizer.remove()
         }
         return SideMenuScreenEdgeGestureRecognizer(addTo: view, target: self, action: #selector(handlePresentMenuScreenEdge(_:))).with {
             $0.edges = edge

Pod/Classes/SideMenuNavigationController.swift

@@ -16,6 +16,45 @@ import UIKit
     subMenu
 }
 
+internal protocol MenuModel {
+    /// Prevents the same view controller (or a view controller of the same class) from being pushed more than once. Defaults to true.
+    var allowPushOfSameClassTwice: Bool { get }
+    /// Forces menus to always animate when appearing or disappearing, regardless of a pushed view controller's animation.
+    var alwaysAnimate: Bool { get }
+    /**
+     The blur effect style of the menu if the menu's root view controller is a UITableViewController or UICollectionViewController.
+
+     - Note: If you want cells in a UITableViewController menu to show vibrancy, make them a subclass of UITableViewVibrantCell.
+     */
+    var blurEffectStyle: UIBlurEffect.Style? { get }
+    /// Animation curve of the remaining animation when the menu is partially dismissed with gestures. Default is .easeIn.
+    var completionCurve: UIView.AnimationCurve { get }
+    /// Automatically dismisses the menu when another view is presented from it.
+    var dismissOnPresent: Bool { get }
+    /// Automatically dismisses the menu when another view controller is pushed from it.
+    var dismissOnPush: Bool { get }
+    /// Automatically dismisses the menu when the screen is rotated.
+    var dismissOnRotation: Bool { get }
+    /// Automatically dismisses the menu when app goes to the background.
+    var dismissWhenBackgrounded: Bool { get }
+    /// Enable or disable a swipe gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
+    var enableSwipeToDismissGesture: Bool { get }
+    /// Enable or disable a tap gesture that dismisses the menu. Will not be triggered when `presentingViewControllerUserInteractionEnabled` is set to true. Default is true.
+    var enableTapToDismissGesture: Bool { get }
+    /**
+     The push style of the menu.
+
+     There are six modes in MenuPushStyle:
+     - defaultBehavior: The view controller is pushed onto the stack.
+     - popWhenPossible: If a view controller already in the stack is of the same class as the pushed view controller, the stack is instead popped back to the existing view controller. This behavior can help users from getting lost in a deep navigation stack.
+     - preserve: If a view controller already in the stack is of the same class as the pushed view controller, the existing view controller is pushed to the end of the stack. This behavior is similar to a UITabBarController.
+     - preserveAndHideBackButton: Same as .preserve and back buttons are automatically hidden.
+     - replace: Any existing view controllers are released from the stack and replaced with the pushed view controller. Back buttons are automatically hidden. This behavior is ideal if view controllers require a lot of memory or their state doesn't need to be preserved..
+     - subMenu: Unlike all other behaviors that push using the menu's presentingViewController, this behavior pushes view controllers within the menu.  Use this behavior if you want to display a sub menu.
+     */
+    var pushStyle: SideMenuPushStyle { get }
+}
+
 @objc public protocol SideMenuNavigationControllerDelegate {
     @objc optional func sideMenuWillAppear(menu: SideMenuNavigationController, animated: Bool)
     @objc optional func sideMenuDidAppear(menu: SideMenuNavigationController, animated: Bool)
@@ -27,7 +66,7 @@ internal protocol SideMenuNavigationControllerTransitionDelegate: class {
     func sideMenuTransitionDidDismiss(menu: Menu)
 }
 
-public struct SideMenuSettings: MenuModel, InitializableStruct {
+public struct SideMenuSettings: MenuModel & PresentationModel & AnimationModel, InitializableStruct {
     public var allowPushOfSameClassTwice: Bool = true
     public var alwaysAnimate: Bool = true
     public var animationOptions: UIView.AnimationOptions = .curveEaseInOut
@@ -73,14 +112,12 @@ open class SideMenuNavigationController: UINavigationController {
 
     private weak var _sideMenuManager: SideMenuManager?
     private weak var foundViewController: UIViewController?
-    private weak var interactionController: SideMenuInteractionController?
-    private var interactive: Bool = false
     private var originalBackgroundColor: UIColor?
     private var rotating: Bool = false
     private var transitionController: SideMenuTransitionController?
 
     /// Delegate for receiving appear and disappear related events. If `nil` the visible view controller that displays a `SideMenuNavigationController` automatically receives these events.
-    internal weak var sideMenuDelegate: SideMenuNavigationControllerDelegate?
+    public weak var sideMenuDelegate: SideMenuNavigationControllerDelegate?
 
     /// The swipe to dismiss gesture.
     open private(set) weak var swipeToDismissGesture: UIPanGestureRecognizer? = nil
@@ -105,10 +142,10 @@ open class SideMenuNavigationController: UINavigationController {
         didSet {
             setupBlur()
             if !enableSwipeToDismissGesture {
-                removeSwipeGesture()
+                swipeToDismissGesture?.remove()
             }
             if !enableTapToDismissGesture {
-                removeTapGesture()
+                tapToDismissGesture?.remove()
             }
         }
     }
@@ -322,7 +359,11 @@ open class SideMenuNavigationController: UINavigationController {
     }
 
     override open var transitioningDelegate: UIViewControllerTransitioningDelegate? {
-        get { return self }
+        get {
+            transitionController = transitionController ?? SideMenuTransitionController(leftSide: leftSide, config: settings)
+            transitionController?.delegate = self
+            return transitionController
+        }
         set { Print.warning(.transitioningDelegate, required: true) }
     }
 }
@@ -452,46 +493,14 @@ extension SideMenuNavigationController: MenuModel {
     }
 }
 
-// IMPORTANT: These methods must be declared open or they will not be called.
-extension SideMenuNavigationController: UIViewControllerTransitioningDelegate {
-
-    open func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        transitionController = SideMenuTransitionController(
-            config: self,
-            leftSide: leftSide,
-            delegate: self)
-        return transitionController
-    }
-
-    open func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return transitionController
-    }
-
-    open func interactionControllerForPresentation(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
-        return interactionController(using: animator)
-    }
-
-    open func interactionControllerForDismissal(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
-        return interactionController(using: animator)
-    }
-
-    private func interactionController(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
-        guard interactive else { return nil }
-        interactive = false
-        let interactionController = SideMenuInteractionController(cancelWhenBackgrounded: dismissWhenBackgrounded, completionCurve: completionCurve)
-        self.interactionController = interactionController
-        return interactionController
-    }
-}
-
 extension SideMenuNavigationController: SideMenuTransitionControllerDelegate {
 
-    internal func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didDismiss viewController: UIViewController) {
+    func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didDismiss viewController: UIViewController) {
         sideMenuManager.sideMenuTransitionDidDismiss(menu: self)
     }
 
-    internal func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didPresent viewController: UIViewController) {
-        removeSwipeGesture()
+    func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didPresent viewController: UIViewController) {
+        swipeToDismissGesture?.remove()
         swipeToDismissGesture = addSwipeToDismissGesture(to: view.superview)
         tapToDismissGesture = addTapToDismissGesture(to: view.superview)
     }
@@ -508,32 +517,32 @@ internal extension SideMenuNavigationController {
             if !presenting {
                 dismissMenu(interactively: true)
             }
-            interactionController?.handle(state: .update(progress: progress))
+            transitionController?.handle(state: .update(progress: progress))
         case .changed:
-            interactionController?.handle(state: .update(progress: progress))
+            transitionController?.handle(state: .update(progress: progress))
         case .ended:
             let velocity = gesture.xVelocity * factor(presenting)
             let finished = velocity >= 100 || velocity >= -50 && abs(progress) >= 0.5
-            interactionController?.handle(state: finished ? .finish : .cancel)
+            transitionController?.handle(state: finished ? .finish : .cancel)
         default:
-            interactionController?.handle(state: .cancel)
+            transitionController?.handle(state: .cancel)
         }
     }
 
     func cancelMenuPan(_ gesture: UIPanGestureRecognizer) {
-        interactionController?.handle(state: .cancel)
+        transitionController?.handle(state: .cancel)
     }
 
     func dismissMenu(animated flag: Bool = true, interactively interactive: Bool = false, completion: (() -> Void)? = nil) {
         guard !isHidden else { return }
-        self.interactive = interactive
+        transitionController?.interactive = interactive
         dismiss(animated: flag, completion: completion)
     }
 
     // Note: although this method is syntactically reversed it allows the interactive property to scoped privately
     func presentFrom(_ viewControllerToPresentFrom: UIViewController?, interactively interactive: Bool, completion: (() -> Void)? = nil) {
-        guard let viewControllerToPresentFrom = viewControllerToPresentFrom else { return }
-        self.interactive = interactive
+        guard let viewControllerToPresentFrom = viewControllerToPresentFrom, transitioningDelegate != nil else { return }
+        transitionController?.interactive = interactive
         viewControllerToPresentFrom.present(self, animated: true, completion: completion)
     }
 }
@@ -616,18 +625,6 @@ private extension SideMenuNavigationController {
         }
     }
 
-    func removeSwipeGesture() {
-        if let swipeToDismissGesture = swipeToDismissGesture {
-            swipeToDismissGesture.view?.removeGestureRecognizer(swipeToDismissGesture)
-        }
-    }
-
-    func removeTapGesture() {
-        if let tapToDismissGesture = tapToDismissGesture {
-            tapToDismissGesture.view?.removeGestureRecognizer(tapToDismissGesture)
-        }
-    }
-
     func registerForNotifications() {
         NotificationCenter.default.removeObserver(self)
 

Pod/Classes/SideMenuPresentationController.swift

@@ -7,6 +7,19 @@
 
 import UIKit
 
+internal protocol PresentationModel {
+    /// Draws `presentStyle.backgroundColor` behind the status bar. Default is 1.
+    var statusBarEndAlpha: CGFloat { get }
+    /// Enable or disable interaction with the presenting view controller while the menu is displayed. Enabling may make it difficult to dismiss the menu or cause exceptions if the user tries to present and already presented menu. `presentingViewControllerUseSnapshot` must also set to false. Default is false.
+    var presentingViewControllerUserInteractionEnabled: Bool { get }
+    /// Use a snapshot for the presenting vierw controller while the menu is displayed. Useful when layout changes occur during transitions. Not recommended for apps that support rotation. Default is false.
+    var presentingViewControllerUseSnapshot: Bool { get }
+    /// The presentation style of the menu.
+    var presentationStyle: SideMenuPresentationStyle { get }
+    /// Width of the menu when presented on screen, showing the existing view controller in the remaining space. Default is zero.
+    var menuWidth: CGFloat { get }
+}
+
 internal protocol SideMenuPresentationControllerDelegate: class {
     func sideMenuPresentationControllerDidTap(_ presentationController: SideMenuPresentationController)
     func sideMenuPresentationController(_ presentationController: SideMenuPresentationController, didPanWith gesture: UIPanGestureRecognizer)
@@ -221,7 +234,7 @@ private extension SideMenuPresentationController {
         view.layer.shadowColor = config.presentationStyle.onTopShadowColor.cgColor
         view.layer.shadowRadius = config.presentationStyle.onTopShadowRadius
         view.layer.shadowOpacity = config.presentationStyle.onTopShadowOpacity
-        view.layer.shadowOffset = CGSize(width: 0, height: 0)
+        view.layer.shadowOffset = config.presentationStyle.onTopShadowOffset
     }
 
     func addParallax(to view: UIView) {

Pod/Classes/SideMenuTransitionController.swift

@@ -1,187 +1,93 @@
 //
-//  SideMenuAnimationController.swift
+//  SideMenuTransitioningDelegate.swift
 //  SideMenu
 //
-//  Created by Jon Kent on 10/24/18.
+//  Created by Jon Kent on 8/29/19.
+//  Copyright © 2019 jonkykong. All rights reserved.
 //
 
-import UIKit
+import Foundation
 
 internal protocol SideMenuTransitionControllerDelegate: class {
     func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didDismiss viewController: UIViewController)
     func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didPresent viewController: UIViewController)
 }
 
-internal final class SideMenuTransitionController: NSObject, UIViewControllerAnimatedTransitioning {
+internal final class SideMenuTransitionController: NSObject, UIViewControllerTransitioningDelegate {
+
+    typealias Model = MenuModel & AnimationModel & PresentationModel
 
-    private var config: TransitionModel
-    private weak var containerView: UIView?
     private let leftSide: Bool
-    private var presentationController: SideMenuPresentationController!
-    private unowned var presentedViewController: UIViewController?
-    private unowned var presentingViewController: UIViewController?
+    private let config: Model
+    private var animationController: SideMenuAnimationController?
+    private weak var interactionController: SideMenuInteractionController?
+
+    var interactive: Bool = false
     weak var delegate: SideMenuTransitionControllerDelegate?
 
-    init(config: TransitionModel, leftSide: Bool, delegate: SideMenuTransitionControllerDelegate? = nil) {
-        self.config = config
+    init(leftSide: Bool, config: Model) {
         self.leftSide = leftSide
-        self.delegate = delegate
+        self.config = config
+        super.init()
     }
 
-    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
-        guard
-            let presentedViewController = transitionContext.presentedViewController,
-            let presentingViewController = transitionContext.presentingViewController
-            else { return }
-
-        if transitionContext.isPresenting {
-            self.containerView = transitionContext.containerView
-            self.presentedViewController = presentedViewController
-            self.presentingViewController = presentingViewController
-            self.presentationController = SideMenuPresentationController(
-                config: config,
-                leftSide: leftSide,
-                presentedViewController: presentedViewController,
-                presentingViewController: presentingViewController,
-                containerView: transitionContext.containerView
-            )
-        }
-
-        transition(using: transitionContext)
+    func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        animationController = SideMenuAnimationController(
+            config: config,
+            leftSide: leftSide,
+            delegate: self)
+        return animationController
     }
 
-    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-        guard let transitionContext = transitionContext else { return 0 }
-        return duration(presenting: transitionContext.isPresenting, interactive: transitionContext.isInteractive)
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return animationController
     }
 
-    func animationEnded(_ transitionCompleted: Bool) {
-        guard let presentedViewController = presentedViewController else { return }
-        if presentedViewController.isHidden {
-            delegate?.sideMenuTransitionController(self, didDismiss: presentedViewController)
-        } else {
-            delegate?.sideMenuTransitionController(self, didPresent: presentedViewController)
-        }
+    func interactionControllerForPresentation(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
+        return interactionController(using: animator)
     }
 
-    func transition(presenting: Bool, animated: Bool = true, interactive: Bool = false, alongsideTransition: (() -> Void)? = nil, complete: Bool = true, completion: ((Bool) -> Void)? = nil) {
-        transitionWillBegin(presenting: presenting)
-        transition(presenting: presenting,
-                   animated: animated,
-                   interactive: interactive,
-                   animations: { [weak self] in
-                    guard let self = self else { return }
-                    self.transition(presenting: presenting)
-                    alongsideTransition?()
-            }, completion: { [weak self] _ in
-                guard let self = self else { return }
-                if complete {
-                    self.transitionDidEnd(presenting: presenting, completed: true)
-                }
-                completion?(true)
-        })
+    func interactionControllerForDismissal(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
+        return interactionController(using: animator)
+    }
+
+    internal func handle(state: SideMenuInteractionController.State) {
+        interactionController?.handle(state: state)
     }
 
     func layout() {
-        presentationController.containerViewWillLayoutSubviews()
+        animationController?.layout()
+    }
+
+    func transition(presenting: Bool, animated: Bool = true, interactive: Bool = false, alongsideTransition: (() -> Void)? = nil, complete: Bool = true, completion: ((Bool) -> Void)? = nil) {
+        animationController?.transition(
+            presenting: presenting,
+            animated: animated,
+            interactive: interactive,
+            alongsideTransition: alongsideTransition,
+            complete: complete, completion: completion
+        )
+    }
+}
+
+extension SideMenuTransitionController: SideMenuAnimationControllerDelegate {
+
+    internal func sideMenuAnimationController(_ animationController: SideMenuAnimationController, didDismiss viewController: UIViewController) {
+        delegate?.sideMenuTransitionController(self, didDismiss: viewController)
+    }
+
+    internal func sideMenuAnimationController(_ animationController: SideMenuAnimationController, didPresent viewController: UIViewController) {
+        delegate?.sideMenuTransitionController(self, didPresent: viewController)
     }
 }
 
 private extension SideMenuTransitionController {
 
-    func duration(presenting: Bool, interactive: Bool) -> Double {
-        if interactive { return config.completeGestureDuration }
-        return presenting ? config.presentDuration : config.dismissDuration
-    }
-
-    func transitionWillBegin(presenting: Bool) {
-        // prevent any other menu gestures from firing
-        containerView?.isUserInteractionEnabled = false
-
-        if presenting {
-            presentationController.presentationTransitionWillBegin()
-        } else {
-            presentationController.dismissalTransitionWillBegin()
-        }
-    }
-
-    func transition(presenting: Bool) {
-        if presenting {
-            presentationController.presentationTransition()
-        } else {
-            presentationController.dismissalTransition()
-        }
-    }
-
-    func transitionDidEnd(presenting: Bool, completed: Bool) {
-        if presenting {
-            presentationController.presentationTransitionDidEnd(completed)
-        } else {
-            presentationController.dismissalTransitionDidEnd(completed)
-        }
-
-        containerView?.isUserInteractionEnabled = true
-    }
-
-    func transition(using transitionContext: UIViewControllerContextTransitioning) {
-        transitionWillBegin(presenting: transitionContext.isPresenting)
-        transition(presenting: transitionContext.isPresenting,
-                   animated: transitionContext.isAnimated,
-                   interactive: transitionContext.isInteractive,
-                   animations: { [weak self] in
-                    guard let self = self else { return }
-                    self.transition(presenting: transitionContext.isPresenting)
-        }, completion: { [weak self] _ in
-                    guard let self = self else { return }
-                    let completed = !transitionContext.transitionWasCancelled
-                    self.transitionDidEnd(presenting: transitionContext.isPresenting, completed: completed)
-                    transitionContext.completeTransition(completed)
-        })
-    }
-
-    func transition(presenting: Bool, animated: Bool = true, interactive: Bool = false, animations: @escaping (() -> Void) = {}, completion: @escaping ((Bool) -> Void) = { _ in }) {
-        if !animated {
-            animations()
-            completion(true)
-            return
-        }
-
-        let duration = self.duration(presenting: presenting, interactive: interactive)
-        if interactive {
-            // IMPORTANT: The non-interactive animation block will not complete if adapted for interactive. The below animation block must be used!
-            UIView.animate(
-                withDuration: duration,
-                delay: duration, // HACK: If zero, the animation briefly flashes in iOS 11.
-                options: .curveLinear,
-                animations: animations,
-                completion: completion
-            )
-            return
-        }
-
-        UIView.animate(
-            withDuration: duration,
-            delay: 0,
-            usingSpringWithDamping: config.usingSpringWithDamping,
-            initialSpringVelocity: config.initialSpringVelocity,
-            options: config.animationOptions,
-            animations: animations,
-            completion: completion
-        )
-    }
-}
-
-private extension UIViewControllerContextTransitioning {
-
-    var isPresenting: Bool {
-        return viewController(forKey: .from)?.presentedViewController === viewController(forKey: .to)
-    }
-
-    var presentingViewController: UIViewController? {
-        return viewController(forKey: isPresenting ? .from : .to)
-    }
-
-    var presentedViewController: UIViewController? {
-        return viewController(forKey: isPresenting ? .to : .from)
+    func interactionController(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
+        guard interactive else { return nil }
+        interactive = false
+        let interactionController = SideMenuInteractionController(cancelWhenBackgrounded: config.dismissWhenBackgrounded, completionCurve: config.completionCurve)
+        self.interactionController = interactionController
+        return interactionController
     }
 }

Pods/Pods.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		032FEB01E4C88E7C87032FCF9780FC7C /* SideMenuNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F8B09C72B577EFDB20A3EFF4F0C668A /* SideMenuNavigationController.swift */; };
-		0D2D410A6087D4E0A54642165913EF30 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F10B146FA49E99D07F0FA0E38ABE8F /* Models.swift */; };
 		0F9F3CABB81269CF711A73BAD21E7976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */; };
 		287FA1360FD3EF72D700C54856C685C1 /* SideMenuManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE7B8C8447DD35D435B2AF4A23E221C /* SideMenuManager.swift */; };
 		31E79D7BA42208D00E73C18CBAF1598E /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1B25193EDCA447F119795F68F75BF05 /* Extensions.swift */; };
@@ -17,6 +16,7 @@
 		5B0A5C9933D0FCD08E12CFFB56145333 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */; };
 		614FC39555CB129D97FC24B2D953A427 /* SideMenuPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61AFB3209BCB97295281AC6437FB346B /* SideMenuPresentationController.swift */; };
 		6E6E17C0E8351D23CB4B20332C70BE61 /* Print.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CB39D726F07EA27650309A1A3213412 /* Print.swift */; };
+		84278B87231F932A000B9B05 /* SideMenuTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84278B85231F9316000B9B05 /* SideMenuTransitionController.swift */; };
 		8428210422E0540800C6F2D8 /* Deprecations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8428210022E0448700C6F2D8 /* Deprecations.swift */; };
 		89B2CFA98A07964FBD2D7775FF5FB98D /* Pods-Example-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D6D7C498FA339E02BD53ECB8916CEA8E /* Pods-Example-dummy.m */; };
 		A2ACFE2D997BC8F1DA4EE3064A4270DD /* SideMenuInteractionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB64592703EA9A196B5C0F07BA1A918A /* SideMenuInteractionController.swift */; };
@@ -25,7 +25,7 @@
 		D7BD58D0FF7BF7E887B6D70D4651D70B /* Pods-Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 7825A90E082A1582EB16256B0E722B3F /* Pods-Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DA6F42990A37DF6179D6386008BB87F8 /* SideMenu-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 36C5772477B00653D86343BABD123EF3 /* SideMenu-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F1967413D21BCA08963F09969D47E152 /* SideMenu-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9CF977D7FB42D367F2810037EBA59B7D /* SideMenu-dummy.m */; };
-		FCBFE25630B6309DF3213AE0F6F34D1A /* SideMenuTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C3188EE68841BE36716860BE079AF8 /* SideMenuTransitionController.swift */; };
+		FCBFE25630B6309DF3213AE0F6F34D1A /* SideMenuAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30C3188EE68841BE36716860BE079AF8 /* SideMenuAnimationController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -48,7 +48,7 @@
 		1FE7B8C8447DD35D435B2AF4A23E221C /* SideMenuManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuManager.swift; path = Pod/Classes/SideMenuManager.swift; sourceTree = "<group>"; };
 		243410B9535472556EA4BB6DBC133A0D /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
 		2CB39D726F07EA27650309A1A3213412 /* Print.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Print.swift; path = Pod/Classes/Print.swift; sourceTree = "<group>"; };
-		30C3188EE68841BE36716860BE079AF8 /* SideMenuTransitionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuTransitionController.swift; path = Pod/Classes/SideMenuTransitionController.swift; sourceTree = "<group>"; };
+		30C3188EE68841BE36716860BE079AF8 /* SideMenuAnimationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuAnimationController.swift; path = Pod/Classes/SideMenuAnimationController.swift; sourceTree = "<group>"; };
 		319D06AA0D1D0BA345459C039040A1ED /* SideMenu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SideMenu.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		31C1D37707DFAA5E6A164BCC07834264 /* Pods-Example-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Example-Info.plist"; sourceTree = "<group>"; };
 		3212113385A8FBBDB272BD23C409FF61 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS12.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
@@ -58,6 +58,7 @@
 		441854E35F81731E63E53DC7E4EEAD9D /* Pods-Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Example-acknowledgements.markdown"; sourceTree = "<group>"; };
 		61AFB3209BCB97295281AC6437FB346B /* SideMenuPresentationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuPresentationController.swift; path = Pod/Classes/SideMenuPresentationController.swift; sourceTree = "<group>"; };
 		7825A90E082A1582EB16256B0E722B3F /* Pods-Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Example-umbrella.h"; sourceTree = "<group>"; };
+		84278B85231F9316000B9B05 /* SideMenuTransitionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuTransitionController.swift; path = Pod/Classes/SideMenuTransitionController.swift; sourceTree = "<group>"; };
 		8428210022E0448700C6F2D8 /* Deprecations.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Deprecations.swift; path = Pod/Classes/Deprecations.swift; sourceTree = "<group>"; };
 		8F8B09C72B577EFDB20A3EFF4F0C668A /* SideMenuNavigationController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuNavigationController.swift; path = Pod/Classes/SideMenuNavigationController.swift; sourceTree = "<group>"; };
 		9CF977D7FB42D367F2810037EBA59B7D /* SideMenu-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SideMenu-dummy.m"; sourceTree = "<group>"; };
@@ -65,7 +66,6 @@
 		AB64592703EA9A196B5C0F07BA1A918A /* SideMenuInteractionController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SideMenuInteractionController.swift; path = Pod/Classes/SideMenuInteractionController.swift; sourceTree = "<group>"; };
 		AFECBC24E09D0D25F822C27BD944AFD4 /* Pods-Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Example-frameworks.sh"; sourceTree = "<group>"; };
 		B45138496B85A072654D1D0F8EBBEDE5 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
-		B5F10B146FA49E99D07F0FA0E38ABE8F /* Models.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Pod/Classes/Models.swift; sourceTree = "<group>"; };
 		BB1EC6DFBB713FC2F280D596714173EC /* SideMenu.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SideMenu.xcconfig; sourceTree = "<group>"; };
 		BD4CEC04022777F53C1CA2113A43FACE /* SideMenu-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SideMenu-prefix.pch"; sourceTree = "<group>"; };
 		BE262D79CAE897127A1984945DCE9FEE /* SideMenu.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; path = SideMenu.podspec; sourceTree = "<group>"; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
@@ -140,15 +140,15 @@
 				8428210022E0448700C6F2D8 /* Deprecations.swift */,
 				F1B25193EDCA447F119795F68F75BF05 /* Extensions.swift */,
 				00F847D27577EF5335081BFA43A0BFA3 /* Initializable.swift */,
-				B5F10B146FA49E99D07F0FA0E38ABE8F /* Models.swift */,
 				2CB39D726F07EA27650309A1A3213412 /* Print.swift */,
 				13846826E721392191757B9033D6F63F /* Protected.swift */,
 				AB64592703EA9A196B5C0F07BA1A918A /* SideMenuInteractionController.swift */,
 				1FE7B8C8447DD35D435B2AF4A23E221C /* SideMenuManager.swift */,
+				30C3188EE68841BE36716860BE079AF8 /* SideMenuAnimationController.swift */,
+				8F8B09C72B577EFDB20A3EFF4F0C668A /* SideMenuNavigationController.swift */,
 				61AFB3209BCB97295281AC6437FB346B /* SideMenuPresentationController.swift */,
 				D154DB98A04C7BD96E4EFBBD3FE0008A /* SideMenuPresentationStyle.swift */,
-				30C3188EE68841BE36716860BE079AF8 /* SideMenuTransitionController.swift */,
-				8F8B09C72B577EFDB20A3EFF4F0C668A /* SideMenuNavigationController.swift */,
+				84278B85231F9316000B9B05 /* SideMenuTransitionController.swift */,
 				3ACA278071ED85D04DA83677D6C60528 /* UITableViewVibrantCell.swift */,
 			);
 			name = SideMenu;
@@ -281,7 +281,7 @@
 				LastUpgradeCheck = 1100;
 				TargetAttributes = {
 					0AEE99A309977BD12A049FF48AF9BA4B = {
-						LastSwiftMigration = 1020;
+						LastSwiftMigration = 1030;
 					};
 				};
 			};
@@ -328,7 +328,6 @@
 				8428210422E0540800C6F2D8 /* Deprecations.swift in Sources */,
 				31E79D7BA42208D00E73C18CBAF1598E /* Extensions.swift in Sources */,
 				BD5C0C12B6BB0BF6DA294E095B35E38D /* Initializable.swift in Sources */,
-				0D2D410A6087D4E0A54642165913EF30 /* Models.swift in Sources */,
 				6E6E17C0E8351D23CB4B20332C70BE61 /* Print.swift in Sources */,
 				384CBA8850C8BF3A7AAB3A3D78844B1E /* Protected.swift in Sources */,
 				F1967413D21BCA08963F09969D47E152 /* SideMenu-dummy.m in Sources */,
@@ -336,7 +335,8 @@
 				287FA1360FD3EF72D700C54856C685C1 /* SideMenuManager.swift in Sources */,
 				614FC39555CB129D97FC24B2D953A427 /* SideMenuPresentationController.swift in Sources */,
 				D0B45D0F0E7B359807CAFB744FB80CE4 /* SideMenuPresentationStyle.swift in Sources */,
-				FCBFE25630B6309DF3213AE0F6F34D1A /* SideMenuTransitionController.swift in Sources */,
+				FCBFE25630B6309DF3213AE0F6F34D1A /* SideMenuAnimationController.swift in Sources */,
+				84278B87231F932A000B9B05 /* SideMenuTransitionController.swift in Sources */,
 				032FEB01E4C88E7C87032FCF9780FC7C /* SideMenuNavigationController.swift in Sources */,
 				45A647715262A70BB9F2F4E7C1439C58 /* UITableViewVibrantCell.swift in Sources */,
 			);

README.md

@@ -35,7 +35,7 @@
 
 SideMenu is a simple and versatile side menu control written in Swift.
 - [x] **It can be implemented in storyboard without a single line of [code](#code-less-storyboard-implementation).**
-- [x] Four standard animation styles to choose from (there's even a parallax effect if you want to get weird).
+- [x] Eight standard animation styles to choose from (there's even a parallax effect if you want to get weird).
 - [x] Highly customizable without needing to write tons of custom code.
 - [x] Supports continuous swiping between side menus on boths sides in a single gesture.
 - [x] Global menu configuration. Set-up once and be done for all screens.

SideMenu.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SideMenu"
-  s.version          = "6.2.1"
+  s.version          = "6.2.5"
   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.

SideMenu.xcodeproj/project.pbxproj

@@ -16,10 +16,10 @@
 		7B552D5D1DCC65830010301C /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B552D5C1DCC65830010301C /* Launch Screen.storyboard */; };
 		7B5FA9B61DCB269700278DF6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B5FA9B51DCB269700278DF6 /* Main.storyboard */; };
 		84276D8A2282929A0095B7C5 /* SideMenuManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84276D892282929A0095B7C5 /* SideMenuManager.swift */; };
+		84278B84231F9126000B9B05 /* SideMenuTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84278B83231F9126000B9B05 /* SideMenuTransitionController.swift */; };
+		84278B89231F948D000B9B05 /* SideMenuAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84278B88231F948D000B9B05 /* SideMenuAnimationController.swift */; };
 		842820EF22DDD1BC00C6F2D8 /* Protected.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820EE22DDD1BC00C6F2D8 /* Protected.swift */; };
 		842820F622DDD1E800C6F2D8 /* SideMenuPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F022DDD1E800C6F2D8 /* SideMenuPresentationController.swift */; };
-		842820F722DDD1E800C6F2D8 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F122DDD1E800C6F2D8 /* Models.swift */; };
-		842820F822DDD1E800C6F2D8 /* SideMenuTransitionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F222DDD1E800C6F2D8 /* SideMenuTransitionController.swift */; };
 		842820F922DDD1E800C6F2D8 /* Print.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F322DDD1E800C6F2D8 /* Print.swift */; };
 		842820FA22DDD1E800C6F2D8 /* Initializable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F422DDD1E800C6F2D8 /* Initializable.swift */; };
 		842820FB22DDD1E800C6F2D8 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 842820F522DDD1E800C6F2D8 /* Extensions.swift */; };
@@ -62,9 +62,10 @@
 		7B5FA9B51DCB269700278DF6 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		7B9DC9041DC6E8C1000D4007 /* SideMenu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SideMenu.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		84276D892282929A0095B7C5 /* SideMenuManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuManager.swift; path = Pod/Classes/SideMenuManager.swift; sourceTree = "<group>"; };
+		84278B83231F9126000B9B05 /* SideMenuTransitionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuTransitionController.swift; path = Pod/Classes/SideMenuTransitionController.swift; sourceTree = "<group>"; };
+		84278B88231F948D000B9B05 /* SideMenuAnimationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuAnimationController.swift; path = Pod/Classes/SideMenuAnimationController.swift; sourceTree = "<group>"; };
 		842820EE22DDD1BC00C6F2D8 /* Protected.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Protected.swift; path = Pod/Classes/Protected.swift; sourceTree = "<group>"; };
 		842820F022DDD1E800C6F2D8 /* SideMenuPresentationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuPresentationController.swift; path = Pod/Classes/SideMenuPresentationController.swift; sourceTree = "<group>"; };
-		842820F122DDD1E800C6F2D8 /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Models.swift; path = Pod/Classes/Models.swift; sourceTree = "<group>"; };
 		842820F222DDD1E800C6F2D8 /* SideMenuTransitionController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SideMenuTransitionController.swift; path = Pod/Classes/SideMenuTransitionController.swift; sourceTree = "<group>"; };
 		842820F322DDD1E800C6F2D8 /* Print.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Print.swift; path = Pod/Classes/Print.swift; sourceTree = "<group>"; };
 		842820F422DDD1E800C6F2D8 /* Initializable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Initializable.swift; path = Pod/Classes/Initializable.swift; sourceTree = "<group>"; };
@@ -128,16 +129,16 @@
 				8428210222E0449300C6F2D8 /* Deprecations.swift */,
 				842820F522DDD1E800C6F2D8 /* Extensions.swift */,
 				842820F422DDD1E800C6F2D8 /* Initializable.swift */,
-				842820F122DDD1E800C6F2D8 /* Models.swift */,
 				842820F322DDD1E800C6F2D8 /* Print.swift */,
 				842820EE22DDD1BC00C6F2D8 /* Protected.swift */,
 				65FF1B3D1DE321D8007B0845 /* SideMenu.h */,
+				84278B88231F948D000B9B05 /* SideMenuAnimationController.swift */,
 				842820FE22DDD24200C6F2D8 /* SideMenuInteractionController.swift */,
 				84276D892282929A0095B7C5 /* SideMenuManager.swift */,
+				8461A2D11E145A08001DA4F8 /* SideMenuNavigationController.swift */,
 				842820F022DDD1E800C6F2D8 /* SideMenuPresentationController.swift */,
 				842820FC22DDD21100C6F2D8 /* SideMenuPresentationStyle.swift */,
-				842820F222DDD1E800C6F2D8 /* SideMenuTransitionController.swift */,
-				8461A2D11E145A08001DA4F8 /* SideMenuNavigationController.swift */,
+				84278B83231F9126000B9B05 /* SideMenuTransitionController.swift */,
 				8461A2D21E145A08001DA4F8 /* UITableViewVibrantCell.swift */,
 			);
 			name = Source;
@@ -167,6 +168,7 @@
 				7B9DC9051DC6E8C1000D4007 /* Products */,
 				9FB98148377EAEC00E35AC14 /* Pods */,
 				9C94EEEBD250FF394115AAFC /* Frameworks */,
+				84B19B84231F9BB000601D5C /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
@@ -189,6 +191,14 @@
 			path = ExampleTests;
 			sourceTree = "<group>";
 		};
+		84B19B84231F9BB000601D5C /* Recovered References */ = {
+			isa = PBXGroup;
+			children = (
+				842820F222DDD1E800C6F2D8 /* SideMenuTransitionController.swift */,
+			);
+			name = "Recovered References";
+			sourceTree = "<group>";
+		};
 		84B489B81DD469B900D6CB43 /* Podspec Metadata */ = {
 			isa = PBXGroup;
 			children = (
@@ -428,15 +438,15 @@
 			files = (
 				842820EF22DDD1BC00C6F2D8 /* Protected.swift in Sources */,
 				8461A2D51E145A08001DA4F8 /* SideMenuNavigationController.swift in Sources */,
+				84278B84231F9126000B9B05 /* SideMenuTransitionController.swift in Sources */,
 				842820FD22DDD21100C6F2D8 /* SideMenuPresentationStyle.swift in Sources */,
-				842820F822DDD1E800C6F2D8 /* SideMenuTransitionController.swift in Sources */,
 				842820FF22DDD24200C6F2D8 /* SideMenuInteractionController.swift in Sources */,
 				842820F922DDD1E800C6F2D8 /* Print.swift in Sources */,
 				84276D8A2282929A0095B7C5 /* SideMenuManager.swift in Sources */,
 				842820FB22DDD1E800C6F2D8 /* Extensions.swift in Sources */,
-				842820F722DDD1E800C6F2D8 /* Models.swift in Sources */,
 				842820F622DDD1E800C6F2D8 /* SideMenuPresentationController.swift in Sources */,
 				842820FA22DDD1E800C6F2D8 /* Initializable.swift in Sources */,
+				84278B89231F948D000B9B05 /* SideMenuAnimationController.swift in Sources */,
 				8428210322E0449300C6F2D8 /* Deprecations.swift in Sources */,
 				8461A2D61E145A08001DA4F8 /* UITableViewVibrantCell.swift in Sources */,
 			);