Improve code, and adjust relative duration of cell animation.

Author: seedante

Classes/SDENavigationControllerDelegate.swift

@@ -20,7 +20,10 @@ class SDENavigationControllerDelegate: NSObject, UINavigationControllerDelegate
 
         animationController = SDEPushAndPopAnimationController(operation: operation)
         if operation == .Push{
-            if let toCollectionVC = toVC as? UICollectionViewController{
+            if let fromCollectionVC = fromVC as? UICollectionViewController, let toCollectionVC = toVC as? UICollectionViewController{
+                let layoutAttributes = fromCollectionVC.collectionView?.layoutAttributesForItemAtIndexPath(fromCollectionVC.selectedIndexPath)
+                let areaRect = fromCollectionVC.collectionView!.convertRect(layoutAttributes!.frame, toView: fromCollectionVC.collectionView?.superview)
+                toCollectionVC.areaRectInSuperview = areaRect
                 interactionController =  SDEPopPinchInteractionController(toVC: toCollectionVC, holder: self)
             }
         }

Classes/SDEPushAndPopAnimationController.swift

@@ -160,20 +160,17 @@ class SDEPushAndPopAnimationController: NSObject, UIViewControllerAnimatedTransi
             let columns = verticalCount
 
             let relativeStartTime = (self.kCellAnimationBigDelta * Double(indexPath.row % columns))
-            var relativeDuration = 0.5 - (self.kCellAnimationSmallDelta * Double(indexPath.row))
-            if (relativeStartTime + relativeDuration) > 0.5 {
-                relativeDuration = 0.5 - relativeStartTime
-            }
+            let relativeDuration = 0.5 - (self.kCellAnimationSmallDelta * Double(indexPath.row))
 
             UIView.addKeyframeWithRelativeStartTime(0, relativeDuration: 0.7, animations: {
                 cell.alpha = 1
             })
 
-            UIView.addKeyframeWithRelativeStartTime(0.5 + relativeStartTime, relativeDuration: 0.3, animations: {
+            UIView.addKeyframeWithRelativeStartTime(0.5 + relativeStartTime, relativeDuration: relativeDuration, animations: {
                 cell.transform = CGAffineTransformScale(CGAffineTransformIdentity, 1, 1)
             })
 
-            UIView.addKeyframeWithRelativeStartTime(0.5 + relativeStartTime, relativeDuration: 0.3, animations: {
+            UIView.addKeyframeWithRelativeStartTime(0.5 + relativeStartTime, relativeDuration: relativeDuration, animations: {
                 cell.center = layoutAttributes!.center
             })
 
@@ -271,10 +268,7 @@ class SDEPushAndPopAnimationController: NSObject, UIViewControllerAnimatedTransi
                 let heightScale = cellHeight / cell.frame.height
 
                 let relativeStartTime = (self.kCellAnimationBigDelta * Double(relativeRow % verticalCount))
-                var relativeDuration = 0.5 - (self.kCellAnimationSmallDelta * Double(relativeRow))
-                if (relativeStartTime + relativeDuration) > 0.5 {
-                    relativeDuration = 0.5 - relativeStartTime
-                }
+                let relativeDuration = 0.5 - (self.kCellAnimationSmallDelta * Double(relativeRow))
 
                 UIView.addKeyframeWithRelativeStartTime(relativeStartTime, relativeDuration: relativeDuration, animations: {
                     cell.center = CGPoint(x: centerX, y: centerY)

Example/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ej0-qV-deg">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Ej0-qV-deg">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->

Example/SDEGalleriesViewController.swift

@@ -214,7 +214,6 @@ class SDEGalleriesViewController: UICollectionViewController, PHPhotoLibraryChan
         self.selectedIndexPath = indexPath
 
         let layoutAttributes = self.collectionView!.layoutAttributesForItemAtIndexPath(indexPath)
-        let areaRect = self.collectionView!.convertRect(layoutAttributes!.frame, toView: self.collectionView!.superview)
 
         let circleView = UIView(frame: CGRectMake(0, 0, 30.0, 30.0))
         circleView.layer.cornerRadius = 15.0
@@ -232,7 +231,6 @@ class SDEGalleriesViewController: UICollectionViewController, PHPhotoLibraryChan
                 if let albumVC = self.storyboard?.instantiateViewControllerWithIdentifier("AlbumVC") as? SDEAlbumViewController{
                     let assetCollection = self.dataSource[indexPath.section][indexPath.row]
                     albumVC.assetCollection = assetCollection
-                    albumVC.areaRectInSuperview = areaRect
                     self.navigationController?.pushViewController(albumVC, animated: true)
                 }
         })