DrawerKit release 0.3.1

CHANGELOG.md

@@ -1,5 +1,11 @@
 # DrawerKit
 
+## v. 0.3.1
+
+- Better support for concurrent animations: in previous versions, the actual presenting view controller wasn't necessarily what you'd think is the presenting view controller, which caused problems when trying to animate its view concurrently with the drawer animation. Now, although it's still the case that the presenting view controller may not be the view controller you think it is, the view controller that you think is the presenting view controller and which you add conformance to `DrawerAnimationParticipant` is the view controller whose animation closures get invoked.
+
+- Notifications: it's now possible to subscribe to notifications indicating when the drawer is tapped (both in its interior and in its exterior), when drawer transitions are about to start, and when they're completed.
+
 ## v. 0.3.0
 
 Release 0.3.0 breaks backwards compatibility with the earlier releases. Specific changes and new features are as follows:

DrawerKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name          = "DrawerKit"
-  s.version       = "0.3.0"
+  s.version       = "0.3.1"
   s.summary       = "An implementation of an interactive and animated view, similar to what you see in Apple Maps"
 
   s.description   = <<-DESC

DrawerKit/DrawerKit.xcodeproj/project.pbxproj

@@ -15,6 +15,8 @@
 		CB2CB79F1F8E951900AA152D /* AnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB2CB79C1F8E951900AA152D /* AnimationController.swift */; };
 		CB2CB7AD1F8E9D9900AA152D /* DrawerDisplayController+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB2CB7AC1F8E9D9900AA152D /* DrawerDisplayController+Extensions.swift */; };
 		CB2CB7AF1F8E9F4C00AA152D /* DrawerDisplayController+Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB2CB7AE1F8E9F4C00AA152D /* DrawerDisplayController+Configuration.swift */; };
+		CB3CAFBE1FB248B000AD28A1 /* DrawerNotifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB3CAFBD1FB248B000AD28A1 /* DrawerNotifications.swift */; };
+		CB3CAFC01FB24BD800AD28A1 /* Notifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB3CAFBF1FB24BD800AD28A1 /* Notifications.swift */; };
 		CB5AF7FC1F9B834E000B2DC9 /* DrawerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5AF7FB1F9B834E000B2DC9 /* DrawerState.swift */; };
 		CB5AF8001F9BDAC5000B2DC9 /* DrawerAnimationParticipant.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5AF7FF1F9BDAC5000B2DC9 /* DrawerAnimationParticipant.swift */; };
 		CB5AF8021F9BDF29000B2DC9 /* DrawerAnimationActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5AF8011F9BDF29000B2DC9 /* DrawerAnimationActions.swift */; };
@@ -44,6 +46,8 @@
 		CB2CB79C1F8E951900AA152D /* AnimationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationController.swift; sourceTree = "<group>"; };
 		CB2CB7AC1F8E9D9900AA152D /* DrawerDisplayController+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DrawerDisplayController+Extensions.swift"; sourceTree = "<group>"; };
 		CB2CB7AE1F8E9F4C00AA152D /* DrawerDisplayController+Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DrawerDisplayController+Configuration.swift"; sourceTree = "<group>"; };
+		CB3CAFBD1FB248B000AD28A1 /* DrawerNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DrawerNotifications.swift; sourceTree = "<group>"; };
+		CB3CAFBF1FB24BD800AD28A1 /* Notifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Notifications.swift; sourceTree = "<group>"; };
 		CB5AF7FB1F9B834E000B2DC9 /* DrawerState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawerState.swift; sourceTree = "<group>"; };
 		CB5AF7FF1F9BDAC5000B2DC9 /* DrawerAnimationParticipant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawerAnimationParticipant.swift; sourceTree = "<group>"; };
 		CB5AF8011F9BDF29000B2DC9 /* DrawerAnimationActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawerAnimationActions.swift; sourceTree = "<group>"; };
@@ -81,6 +85,8 @@
 			isa = PBXGroup;
 			children = (
 				CB2CB79A1F8E951900AA152D /* DrawerDisplayController.swift */,
+				CB3CAFBD1FB248B000AD28A1 /* DrawerNotifications.swift */,
+				CB3CAFBF1FB24BD800AD28A1 /* Notifications.swift */,
 				CB5AF8071F9BE105000B2DC9 /* Protocols */,
 				CB5AF8081F9BE12E000B2DC9 /* Structs */,
 				CB5AF8121F9BE9B3000B2DC9 /* Extensions */,
@@ -250,6 +256,7 @@
 				CB5AF8061F9BE0E3000B2DC9 /* DrawerGeometry.swift in Sources */,
 				CB5AF8021F9BDF29000B2DC9 /* DrawerAnimationActions.swift in Sources */,
 				CB2CB7941F8E934500AA152D /* DrawerPresentable.swift in Sources */,
+				CB3CAFC01FB24BD800AD28A1 /* Notifications.swift in Sources */,
 				CB5AF8001F9BDAC5000B2DC9 /* DrawerAnimationParticipant.swift in Sources */,
 				CB619CEC1F8FFBAD0076E1DE /* InteractionController.swift in Sources */,
 				CB6F86B81F9C0539000FA37A /* PresentationController+Properties.swift in Sources */,
@@ -265,6 +272,7 @@
 				CB6F86BA1F9C05E6000FA37A /* PresentationController+Gestures.swift in Sources */,
 				CB5AF7FC1F9B834E000B2DC9 /* DrawerState.swift in Sources */,
 				CB2CB7971F8E934500AA152D /* DrawerConfiguration.swift in Sources */,
+				CB3CAFBE1FB248B000AD28A1 /* DrawerNotifications.swift in Sources */,
 				CBFA36F21F9C4004006847BB /* GeometryEvaluator.swift in Sources */,
 				CB6F86B41F9C036D000FA37A /* PresentationController+Utilities.swift in Sources */,
 				CB5AF8141F9BEA91000B2DC9 /* DrawerAnimationInfo+Geometry.swift in Sources */,

DrawerKit/DrawerKit/Internal API/AnimationController.swift

@@ -4,9 +4,17 @@ final class AnimationController: NSObject {
     private let isPresentation: Bool
     private let configuration: DrawerConfiguration
 
-    init(isPresentation: Bool, configuration: DrawerConfiguration) {
+    let presentingDrawerAnimationActions: DrawerAnimationActions
+    let presentedDrawerAnimationActions: DrawerAnimationActions
+
+    init(isPresentation: Bool,
+         configuration: DrawerConfiguration,
+         presentingDrawerAnimationActions: DrawerAnimationActions,
+         presentedDrawerAnimationActions: DrawerAnimationActions) {
         self.isPresentation = isPresentation
         self.configuration = configuration
+        self.presentingDrawerAnimationActions = presentingDrawerAnimationActions
+        self.presentedDrawerAnimationActions = presentedDrawerAnimationActions
         super.init()
     }
 }
@@ -58,22 +66,25 @@ extension AnimationController: UIViewControllerAnimatedTransitioning {
                                              duration,
                                              isPresentation)
 
-        AnimationSupport.clientPrepareViews(presentingVC: presentingVC,
-                                            presentedVC: presentedVC,
+        let presentingAnimationActions = self.presentingDrawerAnimationActions
+        let presentedAnimationActions = self.presentedDrawerAnimationActions
+
+        AnimationSupport.clientPrepareViews(presentingDrawerAnimationActions: presentingAnimationActions,
+                                            presentedDrawerAnimationActions: presentedAnimationActions,
                                             info)
         presentedVC.view.frame = initialFrame
 
         animator.addAnimations {
             presentedVC.view.frame = finalFrame
-            AnimationSupport.clientAnimateAlong(presentingVC: presentingVC,
-                                                presentedVC: presentedVC,
+            AnimationSupport.clientAnimateAlong(presentingDrawerAnimationActions: presentingAnimationActions,
+                                                presentedDrawerAnimationActions: presentedAnimationActions,
                                                 info)
         }
 
         animator.addCompletion { endingPosition in
             let finished = (endingPosition == UIViewAnimatingPosition.end)
-            AnimationSupport.clientCleanupViews(presentingVC: presentingVC,
-                                                presentedVC: presentedVC,
+            AnimationSupport.clientCleanupViews(presentingDrawerAnimationActions: presentingAnimationActions,
+                                                presentedDrawerAnimationActions: presentedAnimationActions,
                                                 endingPosition,
                                                 info)
             transitionContext.completeTransition(finished)

DrawerKit/DrawerKit/Internal API/AnimationSupport.swift

@@ -49,27 +49,29 @@ struct AnimationSupport {
                                    endPosition: endingPosition)
     }
 
-    static func clientPrepareViews(presentingVC: UIViewController,
-                                   presentedVC: UIViewController,
+    static func clientPrepareViews(presentingDrawerAnimationActions: DrawerAnimationActions,
+                                   presentedDrawerAnimationActions: DrawerAnimationActions,
                                    _ info: DrawerAnimationInfo) {
-        (presentingVC as? DrawerAnimationParticipant)?.drawerAnimationActions.prepare?(info)
-        (presentedVC as? DrawerAnimationParticipant)?.drawerAnimationActions.prepare?(info)
+        NotificationCenter.default.post(notification: DrawerNotification.transitionWillStart(info: info))
+        presentingDrawerAnimationActions.prepare?(info)
+        presentedDrawerAnimationActions.prepare?(info)
     }
 
-    static func clientAnimateAlong(presentingVC: UIViewController,
-                                   presentedVC: UIViewController,
+    static func clientAnimateAlong(presentingDrawerAnimationActions: DrawerAnimationActions,
+                                   presentedDrawerAnimationActions: DrawerAnimationActions,
                                    _ info: DrawerAnimationInfo) {
-        (presentingVC as? DrawerAnimationParticipant)?.drawerAnimationActions.animateAlong?(info)
-        (presentedVC as? DrawerAnimationParticipant)?.drawerAnimationActions.animateAlong?(info)
+        presentingDrawerAnimationActions.animateAlong?(info)
+        presentedDrawerAnimationActions.animateAlong?(info)
     }
 
-    static func clientCleanupViews(presentingVC: UIViewController,
-                                   presentedVC: UIViewController,
+    static func clientCleanupViews(presentingDrawerAnimationActions: DrawerAnimationActions,
+                                   presentedDrawerAnimationActions: DrawerAnimationActions,
                                    _ endingPosition: UIViewAnimatingPosition,
                                    _ info: DrawerAnimationInfo) {
         var endInfo = info
         endInfo.endPosition = endingPosition
-        (presentingVC as? DrawerAnimationParticipant)?.drawerAnimationActions.cleanup?(info)
-        (presentedVC as? DrawerAnimationParticipant)?.drawerAnimationActions.cleanup?(info)
+        presentingDrawerAnimationActions.cleanup?(info)
+        presentedDrawerAnimationActions.cleanup?(info)
+        NotificationCenter.default.post(notification: DrawerNotification.transitionDidFinish(info: info))
     }
 }

DrawerKit/DrawerKit/Internal API/DrawerDisplayController+Extensions.swift

@@ -5,7 +5,9 @@ extension DrawerDisplayController: UIViewControllerTransitioningDelegate {
                                        presenting: UIViewController?,
                                        source: UIViewController) -> UIPresentationController? {
         let presentationController = PresentationController(presentingVC: presentingVC,
+                                                            presentingDrawerAnimationActions: presentingDrawerAnimationActions,
                                                             presentedVC: presented,
+                                                            presentedDrawerAnimationActions: presentedDrawerAnimationActions,
                                                             configuration: configuration,
                                                             inDebugMode: inDebugMode)
         presentationController.delegate = self
@@ -15,11 +17,17 @@ extension DrawerDisplayController: UIViewControllerTransitioningDelegate {
     public func animationController(forPresented presented: UIViewController,
                                     presenting: UIViewController,
                                     source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return AnimationController(isPresentation: true, configuration: configuration)
+        return AnimationController(isPresentation: true,
+                                   configuration: configuration,
+                                   presentingDrawerAnimationActions: presentingDrawerAnimationActions,
+                                   presentedDrawerAnimationActions: presentedDrawerAnimationActions)
     }
 
     public func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-        return AnimationController(isPresentation: false, configuration: configuration)
+        return AnimationController(isPresentation: false,
+                                   configuration: configuration,
+                                   presentingDrawerAnimationActions: presentingDrawerAnimationActions,
+                                   presentedDrawerAnimationActions: presentedDrawerAnimationActions)
     }
 
     public func interactionControllerForPresentation(using animator: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {

DrawerKit/DrawerKit/Internal API/PresentationController+Animation.swift

@@ -43,16 +43,19 @@ extension PresentationController {
         let autoAnimatesDimming = configuration.handleViewConfiguration.autoAnimatesDimming
         if autoAnimatesDimming { self.handleView?.alpha = handleViewAlpha(at: startingState) }
 
-        AnimationSupport.clientPrepareViews(presentingVC: presentingVC,
-                                            presentedVC: presentedVC,
+        let presentingAnimationActions = self.presentingDrawerAnimationActions
+        let presentedAnimationActions = self.presentedDrawerAnimationActions
+
+        AnimationSupport.clientPrepareViews(presentingDrawerAnimationActions: presentingAnimationActions,
+                                            presentedDrawerAnimationActions: presentedAnimationActions,
                                             info)
 
         animator.addAnimations {
             self.currentDrawerY = endingPositionY
             if autoAnimatesDimming { self.handleView?.alpha = endingHandleViewAlpha }
             if maxCornerRadius != 0 { self.currentDrawerCornerRadius = endingCornerRadius }
-            AnimationSupport.clientAnimateAlong(presentingVC: presentingVC,
-                                                presentedVC: presentedVC,
+            AnimationSupport.clientAnimateAlong(presentingDrawerAnimationActions: presentingAnimationActions,
+                                                presentedDrawerAnimationActions: presentedAnimationActions,
                                                 info)
         }
 
@@ -84,8 +87,8 @@ extension PresentationController {
                 self.currentDrawerCornerRadius = 0
             }
 
-            AnimationSupport.clientCleanupViews(presentingVC: presentingVC,
-                                                presentedVC: presentedVC,
+            AnimationSupport.clientCleanupViews(presentingDrawerAnimationActions: presentingAnimationActions,
+                                                presentedDrawerAnimationActions: presentedAnimationActions,
                                                 endingPosition,
                                                 info)
         }

DrawerKit/DrawerKit/Internal API/PresentationController+Gestures.swift

@@ -5,13 +5,15 @@ extension PresentationController {
         guard let tapGesture = drawerFullExpansionTapGR else { return }
         let tapY = tapGesture.location(in: presentedView).y
         guard tapY < drawerPartialHeight else { return }
+        NotificationCenter.default.post(notification: DrawerNotification.drawerInteriorTapped)
         animateTransition(to: .fullyExpanded)
     }
 
     @objc func handleDrawerDismissalTap() {
         guard let tapGesture = drawerDismissalTapGR else { return }
         let tapY = tapGesture.location(in: containerView).y
         guard tapY < currentDrawerY else { return }
+        NotificationCenter.default.post(notification: DrawerNotification.drawerExteriorTapped)
         tapGesture.isEnabled = false
         presentedViewController.dismiss(animated: true)
     }

DrawerKit/DrawerKit/Internal API/PresentationController.swift

@@ -5,18 +5,25 @@ final class PresentationController: UIPresentationController {
     let inDebugMode: Bool
     let handleView: UIView?
 
+    let presentingDrawerAnimationActions: DrawerAnimationActions
+    let presentedDrawerAnimationActions: DrawerAnimationActions
+
     var drawerFullExpansionTapGR: UITapGestureRecognizer?
     var drawerDismissalTapGR: UITapGestureRecognizer?
     var drawerDragGR: UIPanGestureRecognizer?
     var lastDrawerState: DrawerState = .collapsed
 
     init(presentingVC: UIViewController?,
+         presentingDrawerAnimationActions: DrawerAnimationActions,
          presentedVC: UIViewController,
+         presentedDrawerAnimationActions: DrawerAnimationActions,
          configuration: DrawerConfiguration,
          inDebugMode: Bool = false) {
         self.configuration = configuration
         self.inDebugMode = inDebugMode
         self.handleView = (configuration.hasHandleView ? UIView() : nil)
+        self.presentingDrawerAnimationActions = presentingDrawerAnimationActions
+        self.presentedDrawerAnimationActions = presentedDrawerAnimationActions
         super.init(presentedViewController: presentedVC, presenting: presentingVC)
     }
 }

DrawerKit/DrawerKit/Public API/DrawerDisplayController.swift

@@ -15,6 +15,9 @@ public final class DrawerDisplayController: NSObject {
     weak var presentingVC: UIViewController?
     /* strong */ var presentedVC: (UIViewController & DrawerPresentable)
 
+    let presentingDrawerAnimationActions: DrawerAnimationActions
+    let presentedDrawerAnimationActions: DrawerAnimationActions
+
     let inDebugMode: Bool
 
     /// Initialiser for `DrawerDisplayController`.
@@ -38,6 +41,19 @@ public final class DrawerDisplayController: NSObject {
         self.presentedVC = presentedViewController
         self.configuration = configuration
         self.inDebugMode = inDebugMode
+
+        if let presentingAsDrawerParticipant = presentingViewController as? DrawerAnimationParticipant {
+            self.presentingDrawerAnimationActions = presentingAsDrawerParticipant.drawerAnimationActions
+        } else {
+            self.presentingDrawerAnimationActions = DrawerAnimationActions()
+        }
+
+        if let presentedAsDrawerParticipant = presentedViewController as? DrawerAnimationParticipant {
+            self.presentedDrawerAnimationActions = presentedAsDrawerParticipant.drawerAnimationActions
+        } else {
+            self.presentedDrawerAnimationActions = DrawerAnimationActions()
+        }
+
         super.init()
         presentedViewController.transitioningDelegate = self
         presentedViewController.modalPresentationStyle = .custom