Really add the animation back

lucoceano · Apr 12, 2016 · 91355ec · 91355ec
1 parent d538cf8
commit 91355ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/DOFavoriteButton-DEMO/DOFavoriteButton-DEMO/ViewController.swift b/DOFavoriteButton-DEMO/DOFavoriteButton-DEMO/ViewController.swift
@@ -64,7 +64,7 @@ class ViewController: UIViewController {
         if sender.selected {
             sender.deselect()
         } else {
-            sender.selectAnimated()
+			sender.select(animated: false)
         }
     }
 }

diff --git a/DOFavoriteButton.podspec b/DOFavoriteButton.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "DOFavoriteButton"
-  s.version      = "0.0.6"
+  s.version      = "0.0.7"
   s.summary      = "Cute Animated Button written in Swift. It could be just right for favorite buttons!"
   s.homepage     = "https://github.com/okmr-d/DOFavoriteButton"
   s.screenshots  = "https://raw.githubusercontent.com/okmr-d/okmr-d.github.io/master/img/DOFavoriteButton/demo.gif"

diff --git a/DOFavoriteButton/DOFavoriteButton.swift b/DOFavoriteButton/DOFavoriteButton.swift
@@ -371,19 +371,21 @@ public class DOFavoriteButton: UIButton {
         selected = true
         imageShape.fillColor = imageColorOn.CGColor
 
-		CATransaction.begin()
+		if animated {
+			CATransaction.begin()
 
-		circleShape.addAnimation(circleTransform, forKey: "transform")
-		circleMask.addAnimation(circleMaskTransform, forKey: "transform")
-		imageShape.addAnimation(imageTransform, forKey: "transform")
+			circleShape.addAnimation(circleTransform, forKey: "transform")
+			circleMask.addAnimation(circleMaskTransform, forKey: "transform")
+			imageShape.addAnimation(imageTransform, forKey: "transform")
 
-		for i in 0 ..< 5 {
-			lines[i].addAnimation(lineStrokeStart, forKey: "strokeStart")
-			lines[i].addAnimation(lineStrokeEnd, forKey: "strokeEnd")
-			lines[i].addAnimation(lineOpacity, forKey: "opacity")
-		}
+			for i in 0 ..< 5 {
+				lines[i].addAnimation(lineStrokeStart, forKey: "strokeStart")
+				lines[i].addAnimation(lineStrokeEnd, forKey: "strokeEnd")
+				lines[i].addAnimation(lineOpacity, forKey: "opacity")
+			}
 
-		CATransaction.commit()
+			CATransaction.commit()
+		}
     }
 
     public func deselect() {