update podspec

fixing bug with corners
Merge branch 'master' of https://github.com/Ramotion/folding-cell
2016-04-08 17:03:47 +03:00 · 2016-04-08 17:02:56 +03:00 · 2016-04-08 16:42:50 +03:00 · 2016-04-08 16:42:43 +03:00 · 2016-04-08 16:36:44 +03:00 · 2016-04-08 16:32:29 +03:00
11 changed files with 58 additions and 143 deletions
@@ -1,4 +1,4 @@
-osx_image: xcode7.2
+osx_image: xcode7.3
 language: objective-c

 xcode_project: FoldingCell/FoldingCell.xcodeproj
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name         = 'FoldingCell'
-  s.version      = '0.6'
+  s.version      = '0.8.1'
  s.summary      = 'UITableViewCell with folding animation.'
  s.homepage     = 'https://github.com/Ramotion/folding-cell'
  s.license      = 'MIT'
@@ -225,7 +225,7 @@
 				TargetAttributes = {
 					847A58031C294F750028FB84 = {
 						CreatedOnToolsVersion = 7.2;
-						DevelopmentTeam = 34MUF9YXTA;
+						DevelopmentTeam = LEAZS7L33U;
 					};
 					8498513B1C5639F9006FA400 = {
 						CreatedOnToolsVersion = 7.2;
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0720"
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "847A58031C294F750028FB84"
-               BuildableName = "FoldingCell.app"
-               BlueprintName = "FoldingCell"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8498513B1C5639F9006FA400"
-               BuildableName = "FoldingCellTests.xctest"
-               BlueprintName = "FoldingCellTests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-            <LocationScenarioReference
-               identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
-               referenceType = "1">
-            </LocationScenarioReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "847A58031C294F750028FB84"
-            BuildableName = "FoldingCell.app"
-            BlueprintName = "FoldingCell"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "847A58031C294F750028FB84"
-            BuildableName = "FoldingCell.app"
-            BlueprintName = "FoldingCell"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "847A58031C294F750028FB84"
-            BuildableName = "FoldingCell.app"
-            BlueprintName = "FoldingCell"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
@@ -20,6 +20,20 @@
               ReferencedContainer = "container:FoldingCell.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "NO"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8498513B1C5639F9006FA400"
+               BuildableName = "FoldingCellTests.xctest"
+               BlueprintName = "FoldingCellTests"
+               ReferencedContainer = "container:FoldingCell.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
      </BuildActionEntries>
   </BuildAction>
   <TestAction
@@ -28,16 +42,6 @@
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8498513B1C5639F9006FA400"
-               BuildableName = "FoldingCellTests.xctest"
-               BlueprintName = "FoldingCellTests"
-               ReferencedContainer = "container:FoldingCell.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
      </Testables>
      <MacroExpansion>
         <BuildableReference
@@ -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="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="0cn-rv-Emg">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="0cn-rv-Emg">
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
    </dependencies>
    <customFonts key="customFonts">
        <mutableArray key="OpenSans-Light.ttf">
@@ -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]
    }

@@ -31,9 +31,9 @@ public class FoldingCell: UITableViewCell {
  @IBOutlet weak public var foregroundView: RotatedView!
  var animationView: UIView?
  
-  @IBInspectable var itemCount: NSInteger = 2 //count of folding
+  @IBInspectable public var itemCount: NSInteger = 2 //count of folding
  
-  @IBInspectable var backViewColor: UIColor = UIColor.brownColor()
+  @IBInspectable public var backViewColor: UIColor = UIColor.brownColor()
  
  var animationItemViews: [RotatedView]?
  
@@ -120,6 +120,7 @@ public class FoldingCell: UITableViewCell {
  }
  
  func createAnimationView() {
+    
    let anAnimationView = UIView(frame: containerView.frame)
    anAnimationView.layer.cornerRadius = foregroundView.layer.cornerRadius
    anAnimationView.backgroundColor = UIColor.clearColor()
@@ -154,9 +155,9 @@ public class FoldingCell: UITableViewCell {
        anAnimationView.addConstraint(newConstraint)
      }
    }
-    
    animationView = anAnimationView
  }
+
  
  func addImageItemsToAnimationView() {
    containerView.alpha = 1;
@@ -195,7 +196,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)
@@ -209,7 +210,7 @@ public class FoldingCell: UITableViewCell {
      rotatedView.tag = tag
      
      yPosition += itemHeight
-      tag++;
+      tag += 1;
    }
    
    containerView.alpha = 0;
@@ -226,6 +227,16 @@ public class FoldingCell: UITableViewCell {
    animationItemViews = createAnimationItemView()
  }
  
+  private func removeImageItemsFromAnimationView() {
+    
+    guard let animationView = self.animationView else {
+      return
+    }
+
+    animationView.subviews.forEach({ $0.removeFromSuperview() })
+  }
+
+  
  // MARK: public
  
  public func selectedAnimation(isSelected: Bool, animated: Bool, completion: CompletionHandler?) {
@@ -278,7 +289,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))
@@ -288,9 +299,8 @@ public class FoldingCell: UITableViewCell {
  
  func openAnimation(completion completion: CompletionHandler?) {
    
-    if animationView?.subviews.count == 0 { // added animation items if need
-      addImageItemsToAnimationView()
-    }
+    removeImageItemsFromAnimationView()
+    addImageItemsToAnimationView()
    
    guard let animationView = self.animationView else {
      return
@@ -312,7 +322,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)
@@ -341,8 +351,11 @@ public class FoldingCell: UITableViewCell {
  
  func closeAnimation(completion completion: CompletionHandler?) {
    
-    if animationView?.subviews.count == 0 { // added animation items if need
-      addImageItemsToAnimationView()
+    removeImageItemsFromAnimationView()
+    addImageItemsToAnimationView()
+    
+    guard let animationItemViews = self.animationItemViews else {
+      fatalError()
    }
    
    animationView?.alpha = 1;
@@ -356,11 +369,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)
      
@@ -380,9 +394,9 @@ public class FoldingCell: UITableViewCell {
    
    if let animationView = self.animationView {
      let firstItemView = animationView.subviews.filter{$0.tag == 0}.first
-      firstItemView?.layer.masksToBounds = false
+      firstItemView?.layer.cornerRadius = 0
      if let durationLast = durations.last {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64((delay - durationLast * 1.5) * Double(NSEC_PER_SEC))), dispatch_get_main_queue()) { () -> Void in
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64((delay - durationLast - durationLast / 2.0) * Double(NSEC_PER_SEC))), dispatch_get_main_queue()) { () -> Void in
          firstItemView?.layer.cornerRadius = self.foregroundView.layer.cornerRadius
        }
      }
@@ -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
@@ -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)
@@ -8,6 +9,8 @@
 [shot on dribbble](https://dribbble.com/shots/2121350-Delivery-Card):
 ![Animation](Screenshots/folding-cell.gif)

+
+The [iPhone mockup](https://store.ramotion.com/product/iphone-6-mockups?utm_source=gthb&utm_medium=special&utm_campaign=folding-cell) available [here](https://store.ramotion.com/product/iphone-6-mockups?utm_source=gthb&utm_medium=special&utm_campaign=folding-cell).
 ## Requirements

 - iOS 8.0+
@@ -19,7 +22,7 @@ Just add the FoldingCell.swift file to your project.

 or use [CocoaPods](https://cocoapods.org) with Podfile:
 ``` ruby
-pod 'FoldingCell', '~> 0.6'
+pod 'FoldingCell', '~> 0.8.0'
 ```
Author	SHA1	Message	Date
Alex.k	01b09a94ea	update podspec	2016-04-08 17:03:47 +03:00
Alex.k	8c234e4e0d	fixing bug with corners	2016-04-08 17:02:56 +03:00
Alex.k	974ab5eed5	Merge branch 'master' of https://github.com/Ramotion/folding-cell	2016-04-08 16:42:50 +03:00
Alex.k	8e7bb1ee35	remove xcschemes	2016-04-08 16:42:43 +03:00
Alex	5d6c1b6dad	Update README.md	2016-04-08 16:36:44 +03:00
Alex.k	982c9e1b30	update files	2016-04-08 16:32:29 +03:00
Alex.k	6956f385b3	remove ++ operator	2016-04-08 16:30:23 +03:00
Alex	4f641597d7	Update README.md	2016-03-09 12:07:44 +03:00
Alex.k	878a473b02	update podspec	2016-03-09 12:05:18 +03:00
Alex.k	1ebd9b3e6f	Fixes #26	2016-03-09 12:00:55 +03:00
Alex.k	b7dc1f1d75	podspec updated	2016-03-09 09:16:43 +03:00
Artem Kyslicyn	21e64f72c1	Merge pull request #24 from Ramotion/develop upd	2016-02-26 12:07:15 +03:00
Artem Kislitsyn	33dfe08a96	upd	2016-02-26 12:02:34 +03:00
Alex	9d0982e62d	Merge pull request #23 from Ramotion/develop update doc	2016-02-26 11:48:39 +03:00
Artem Kislitsyn	b1b564e1e9	update doc	2016-02-26 11:40:55 +03:00
Alex	3ca2172098	Update README.md	2016-02-24 10:22:58 +03:00
Alex.k	9ea71b64eb	public properties: itemCount, backViewColor	2016-02-24 10:12:26 +03:00
Alex	306632b484	Update README.md	2016-02-15 14:47:02 +03:00
Alex.k	def7ad435b	update podspec	2016-02-15 14:45:30 +03:00
Alex.k	9db9073217	Merge branch 'master' of https://github.com/Ramotion/folding-cell	2016-02-15 14:42:33 +03:00
Alex.k	a5efd73115	code improved	2016-02-15 14:42:26 +03:00
Juri Vasylenko	882ef88655	add header	2016-02-15 11:26:28 +03:00
Alex.k	216a62c6ab	update podspec	2016-02-11 12:06:14 +03:00