Merge branch 'master' of https://github.com/Ramotion/folding-cell

FoldingCell.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FoldingCell'
-  s.version      = '0.6'
+  s.version      = '0.7'
   s.summary      = 'UITableViewCell with folding animation.'
   s.homepage     = 'https://github.com/Ramotion/folding-cell'
   s.license      = 'MIT'

FoldingCell/FoldingCell/DemoCell.swift

@@ -21,8 +21,7 @@ class DemoCell: FoldingCell {
     
     override func animationDuration(itemIndex:NSInteger, type:AnimationType)-> NSTimeInterval {
      
-        let durations = [0.33, 0.26, 0.26]
-        
+        let durations = [0.26, 0.2, 0.2]
         return durations[itemIndex]
     }
 

FoldingCell/FoldingCell/FoldingCell/FoldingCell.swift

@@ -195,7 +195,7 @@ public class FoldingCell: UITableViewCell {
     
     var yPosition = 2 * forgSize.height
     var tag = 2
-    for var index = 2; index < itemCount; index++ {
+    for _ in 2..<itemCount {
       image = containerView.pb_takeSnapshot(CGRect(x: 0, y: yPosition, width: contSize.width, height: itemHeight))
       
       imageView = UIImageView(image: image)
@@ -278,7 +278,7 @@ public class FoldingCell: UITableViewCell {
   
   func durationSequence(type: AnimationType)-> [NSTimeInterval] {
     var durations  = [NSTimeInterval]()
-    for var index = 0; index < itemCount-1; index++ {
+    for index in 0..<itemCount-1 {
       let duration = animationDuration(index, type: .Open)
       durations.append(NSTimeInterval(duration / 2.0))
       durations.append(NSTimeInterval(duration / 2.0))
@@ -312,7 +312,7 @@ public class FoldingCell: UITableViewCell {
       return
     }
     
-    for var index = 0; index < animationItemViews.count; index++ {
+    for index in 0..<animationItemViews.count {
       let animatedView = animationItemViews[index]
       
       animatedView.foldingAnimation(timing, from: from, to: to, duration: durations[index], delay: delay, hidden: hidden)
@@ -345,6 +345,10 @@ public class FoldingCell: UITableViewCell {
       addImageItemsToAnimationView()
     }
     
+    guard let animationItemViews = self.animationItemViews else {
+      fatalError()
+    }
+    
     animationView?.alpha = 1;
     containerView.alpha  = 0;
     
@@ -356,11 +360,12 @@ public class FoldingCell: UITableViewCell {
     var to: CGFloat           = CGFloat(M_PI / 2)
     var hidden                = true
     configureAnimationItems(.Close)
-    for var index = 0; index < animationItemViews?.count; index++ {
-      
-      guard let animatedView = animationItemViews?.reverse()[index] else {
-        continue
-      }
+    
+    if durations.count < animationItemViews.count {
+      fatalError("wrong override func animationDuration(itemIndex:NSInteger, type:AnimationType)-> NSTimeInterval")
+    }
+    for index in 0..<animationItemViews.count {
+      let animatedView = animationItemViews.reverse()[index]
       
       animatedView.foldingAnimation(timing, from: from, to: to, duration: durations[index], delay: delay, hidden: hidden)
       

FoldingCell/FoldingCell/MainTableViewController.swift

@@ -94,7 +94,7 @@ class MainTableViewController: UITableViewController {
         } else {// close cell
             cellHeights[indexPath.row] = kCloseCellHeight
             cell.selectedAnimation(false, animated: true, completion: nil)
-            duration = 1.1
+            duration = 0.8
         }
         
         UIView.animateWithDuration(duration, delay: 0, options: .CurveEaseOut, animations: { () -> Void in

README.md

@@ -1,3 +1,4 @@
+![header](./header.png)
 # FoldingCell
 [![CocoaPods](https://img.shields.io/cocoapods/p/FoldingCell.svg)](https://cocoapods.org/pods/FoldingCell)
 [![CocoaPods](https://img.shields.io/cocoapods/v/FoldingCell.svg)](http://cocoapods.org/pods/FoldingCell)