Rename animation methods to avoid UKit conflicts

Fixes #2
kaishin · Nov 10, 2014 · 86a4306 · 86a4306
1 parent 0e48455
commit 86a4306
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/demo/classes/ViewController.swift b/demo/classes/ViewController.swift
@@ -8,17 +8,17 @@ class ViewController: UIViewController {
   override func viewDidLoad() {
     super.viewDidLoad()
     imageView.setAnimatableImage(named: "mugen.gif")
-    imageView.startAnimating()
+    imageView.startAnimatingGIF()
     UIApplication.sharedApplication().setStatusBarStyle(.LightContent, animated: false)
   }
 
   @IBAction func toggleAnimation(button: UIButton) {
-    if imageView.isAnimating {
-      imageView.stopAnimating()
+    if imageView.isAnimatingGIF {
+      imageView.stopAnimatingGIF()
       button.layer.backgroundColor = UIColor.whiteColor().CGColor
       button.setTitleColor(UIColor.blackColor(), forState: .Normal)
     } else {
-      imageView.startAnimating()
+      imageView.startAnimatingGIF()
       button.layer.backgroundColor = UIColor.clearColor().CGColor
       button.setTitleColor(UIColor.whiteColor(), forState: .Normal)
     }

diff --git a/source/UIImageView+Gifu.swift b/source/UIImageView+Gifu.swift
@@ -10,8 +10,8 @@ extension UIImageView {
     }
   }
 
-  var isAnimating: Bool {
-    return animatableImage?.isAnimating() ?? false
+  var isAnimatingGIF: Bool {
+    return animatableImage?.isAnimating() ?? isAnimating()
   }
 
   var animatable: Bool {
@@ -39,15 +39,19 @@ extension UIImageView {
   }
 
   // MARK: - Animation
-  func startAnimating() {
+  func startAnimatingGIF() {
     if animatable {
       animatableImage!.resumeAnimation()
+    } else {
+      startAnimating()
     }
   }
 
-  func stopAnimating() {
+  func stopAnimatingGIF() {
     if animatable {
       animatableImage!.pauseAnimation()
+    } else {
+      stopAnimating()
     }
   }
 }