DrawerKit 0.4.1 release (#52)

* Fixes a spelling error in an enumeration case. * Removed the configuration property hasHandleView since it can be inferred from the existence or not of a handle configuration instance. * changed demo params to aid debugging * Run transition logic regardless of whether the state matches. (#46) * Adds a configurable shadow to the drawer * Adds a configurable border to the drawer. * Removed custom corner-rounding for iOS 10. Apparently not needed. * Changed minimum deployment target to 10.2. * Changed demo app configuration parameters. * Updates metadata in preparation for release 0.4.1 * Adds a new gif to the repo and readme file. * Code style fix.
babylonhealth · Nov 27, 2017 · cc5cedd · cc5cedd
1 parent cfe129f
commit cc5cedd
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # DrawerKit
 
+## v. 0.4.1
+
+- Reverses the fix for the [issue](https://github.com/Babylonpartners/DrawerKit/issues/31) about safe areas. The fix broke other things and the issue will need to be re-opened.
+- Changes the minimum deployment target to 10.2.
+
 ## v. 0.4.0
 
 - Drawers can now have borders and shadows, all configurable.

diff --git a/DrawerKit.podspec b/DrawerKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name          = "DrawerKit"
-  s.version       = "0.4.0"
+  s.version       = "0.4.1"
   s.summary       = "An implementation of an interactive and animated view, similar to what you see in Apple Maps"
 
   s.description   = <<-DESC

diff --git a/DrawerKit/DrawerKit.xcodeproj/project.pbxproj b/DrawerKit/DrawerKit.xcodeproj/project.pbxproj
@@ -343,7 +343,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -397,7 +397,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

diff --git a/DrawerKit/DrawerKit/Internal API/AnimationController.swift b/DrawerKit/DrawerKit/Internal API/AnimationController.swift
@@ -29,8 +29,7 @@ extension AnimationController: UIViewControllerAnimatedTransitioning {
     func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
         let (presentingVC, presentedVC) = viewControllers(transitionContext, isPresentation)
         if isPresentation {
-            let controller = presentedVC.presentationController as! PresentationController
-            controller.intermediate.view.addSubview(presentedVC.view)
+            transitionContext.containerView.addSubview(presentedVC.view)            
         }
 
         let duration = transitionDuration(using: transitionContext)

diff --git a/DrawerKit/DrawerKit/Internal API/PresentationController+Properties.swift b/DrawerKit/DrawerKit/Internal API/PresentationController+Properties.swift
@@ -80,8 +80,6 @@ extension PresentationController {
             presentedView?.layer.cornerRadius = radius
             if #available(iOS 11.0, *) {
                 presentedView?.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-            } else {
-                presentedView?.roundCorners([.topLeft, .topRight], radius: radius)
             }
         }
     }

diff --git a/DrawerKit/DrawerKit/Internal API/PresentationController+Utilities.swift b/DrawerKit/DrawerKit/Internal API/PresentationController+Utilities.swift
@@ -33,15 +33,3 @@ extension DrawerState {
         }
     }
 }
-
-// For versions of iOS lower than  11.0
-extension UIView {
-    func roundCorners(_ corners: UIRectCorner, radius: CGFloat) {
-        let path = UIBezierPath(roundedRect: self.bounds,
-                                byRoundingCorners: corners,
-                                cornerRadii: CGSize(width: radius, height: radius))
-        let mask = CAShapeLayer()
-        mask.path = path.cgPath
-        self.layer.mask = mask
-    }
-}
diff --git a/DrawerKit/DrawerKit/Internal API/PresentationController.swift b/DrawerKit/DrawerKit/Internal API/PresentationController.swift
@@ -13,8 +13,6 @@ final class PresentationController: UIPresentationController {
     var drawerDragGR: UIPanGestureRecognizer?
     var lastDrawerState: DrawerState = .collapsed
 
-    let intermediate: UIViewController
-
     init(presentingVC: UIViewController?,
          presentingDrawerAnimationActions: DrawerAnimationActions,
          presentedVC: UIViewController,
@@ -26,15 +24,12 @@ final class PresentationController: UIPresentationController {
         self.handleView = (configuration.handleViewConfiguration != nil ? UIView() : nil)
         self.presentingDrawerAnimationActions = presentingDrawerAnimationActions
         self.presentedDrawerAnimationActions = presentedDrawerAnimationActions
-        self.intermediate = UIViewController()
         super.init(presentedViewController: presentedVC, presenting: presentingVC)
-
-        intermediate.view.translatesAutoresizingMaskIntoConstraints = false
     }
 }
 
 extension PresentationController {
-    private var frameOfPresentedViewInIntermediateView: CGRect {
+    override var frameOfPresentedViewInContainerView: CGRect {
         var frame: CGRect = .zero
         frame.size = size(forChildContentContainer: presentedViewController,
                           withParentContainerSize: containerViewSize)
@@ -60,38 +55,27 @@ extension PresentationController {
         addCornerRadiusAnimationEnding(at: .partiallyExpanded)
         enableDrawerFullExpansionTapRecogniser(enabled: false)
         enableDrawerDismissalTapRecogniser(enabled: false)
-
-        containerView?.addSubview(intermediate.view)
-        intermediate.view.frame = frameOfPresentedViewInContainerView
-        intermediate.view.backgroundColor = .clear
-
-        intermediate.addChildViewController(presentedViewController)
     }
 
     override func presentationTransitionDidEnd(_ completed: Bool) {
         enableDrawerFullExpansionTapRecogniser(enabled: true)
         enableDrawerDismissalTapRecogniser(enabled: true)
-        presentedViewController.didMove(toParentViewController: intermediate)
     }
 
     override func dismissalTransitionWillBegin() {
         addCornerRadiusAnimationEnding(at: .collapsed)
         enableDrawerFullExpansionTapRecogniser(enabled: false)
         enableDrawerDismissalTapRecogniser(enabled: false)
-        presentedViewController.willMove(toParentViewController: nil)
     }
 
     override func dismissalTransitionDidEnd(_ completed: Bool) {
         removeDrawerFullExpansionTapRecogniser()
         removeDrawerDismissalTapRecogniser()
         removeDrawerDragRecogniser()
         removeHandleView()
-        presentedViewController.removeFromParentViewController()
-        intermediate.view.removeFromSuperview()
     }
 
     override func containerViewWillLayoutSubviews() {
-        intermediate.view.frame = frameOfPresentedViewInContainerView
-        presentedView?.frame = frameOfPresentedViewInIntermediateView
+        presentedView?.frame = frameOfPresentedViewInContainerView
     }
 }
diff --git a/DrawerKitDemo/DrawerKitDemo.xcodeproj/project.pbxproj b/DrawerKitDemo/DrawerKitDemo.xcodeproj/project.pbxproj
@@ -326,7 +326,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -377,7 +377,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

diff --git a/DrawerKitDemo/DrawerKitDemo/PresenterViewController.swift b/DrawerKitDemo/DrawerKitDemo/PresenterViewController.swift
@@ -46,16 +46,16 @@ private extension PresenterViewController {
         handleViewConfiguration.cornerRadius = .automatic
         configuration.handleViewConfiguration = handleViewConfiguration
 
-        let borderColor = UIColor(red: 205.0/255.0, green: 206.0/255.0, blue: 210.0/255.0, alpha: 1)
+        let borderColor = UIColor(red: 1, green: 0, blue: 0, alpha: 1)
         let drawerBorderConfiguration = DrawerBorderConfiguration(borderThickness: 0.5,
                                                                   borderColor: borderColor)
-        configuration.drawerBorderConfiguration = drawerBorderConfiguration
+        configuration.drawerBorderConfiguration = drawerBorderConfiguration // default is nil
 
-        let drawerShadowConfiguration = DrawerShadowConfiguration(shadowOpacity: 0.25,
-                                                                  shadowRadius: 4,
+        let drawerShadowConfiguration = DrawerShadowConfiguration(shadowOpacity: 0.75,
+                                                                  shadowRadius: 10,
                                                                   shadowOffset: .zero,
-                                                                  shadowColor: .black)
-        configuration.drawerShadowConfiguration = drawerShadowConfiguration
+                                                                  shadowColor: .red)
+        configuration.drawerShadowConfiguration = drawerShadowConfiguration // default is nil
 
         drawerDisplayController = DrawerDisplayController(presentingViewController: self,
                                                           presentedViewController: vc,

diff --git a/DrawerKitDemo/DrawerKitDemo/Storyboards/Base.lproj/Main.storyboard b/DrawerKitDemo/DrawerKitDemo/Storyboards/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="uBw-Sr-LpF">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="uBw-Sr-LpF">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -138,7 +138,7 @@
                             <constraint firstItem="Ojr-aM-v38" firstAttribute="top" secondItem="dEa-Pl-yQz" secondAttribute="bottom" constant="20" id="Dgd-aQ-agb"/>
                             <constraint firstItem="dEa-Pl-yQz" firstAttribute="top" secondItem="69I-et-UOX" secondAttribute="bottom" constant="100" id="Eai-cn-LDj"/>
                             <constraint firstItem="dEa-Pl-yQz" firstAttribute="leading" secondItem="tAJ-xI-Qxr" secondAttribute="leading" id="Vcw-46-NLg"/>
-                            <constraint firstItem="Jth-UI-73K" firstAttribute="top" secondItem="bMW-fV-gMF" secondAttribute="bottom" constant="8" id="aH2-1L-AcL"/>
+                            <constraint firstItem="Jth-UI-73K" firstAttribute="top" secondItem="tAJ-xI-Qxr" secondAttribute="top" constant="28" id="aH2-1L-AcL"/>
                             <constraint firstItem="Ojr-aM-v38" firstAttribute="leading" secondItem="tAJ-xI-Qxr" secondAttribute="leadingMargin" constant="10" id="cWU-AN-kgF"/>
                             <constraint firstItem="qPD-ym-Fa5" firstAttribute="top" secondItem="69I-et-UOX" secondAttribute="bottom" constant="25" id="cpO-2w-akW"/>
                             <constraint firstAttribute="trailing" secondItem="dEa-Pl-yQz" secondAttribute="trailing" id="gI5-Vo-Tk3"/>

diff --git a/README.md b/README.md
@@ -22,6 +22,11 @@ Please do play with the demo app and try different configuration options because
 <p align="center">
 	<table>
 		<tr>
+			<td>
+				<a href="https://github.com/Babylonpartners/DrawerKit/">
+					<img src="drawers1.gif" alt="DrawerKit" width="288" height="514" />
+				</a>
+			</td>
 			<td>
 				<a href="https://github.com/Babylonpartners/DrawerKit/">
 					<img src="drawers2.gif" alt="DrawerKit" width="288" height="514" />
@@ -36,6 +41,12 @@ Please do play with the demo app and try different configuration options because
 	</table>
 </p>
 
+## What's new in version 0.4.1?
+
+- Reverses the fix for the [issue](https://github.com/Babylonpartners/DrawerKit/issues/31) about safe areas.
+The fix broke other things and the issue will need to be re-opened.
+- Changes the minimum deployment target to 10.2.
+
 ## What's new in version 0.4.0?
 
 - Drawers can now have borders and shadows, all configurable.

diff --git a/drawers1.gif b/drawers1.gif
diff --git a/drawers2.gif b/drawers2.gif
diff --git a/drawers3.gif b/drawers3.gif