Merge pull request #97 from holgersindbaek/master

Added ability to set the animation duration for fading in the image
kean · Mar 30, 2016 · 892346d · 892346d
2 parents a350e2e + 6c398cf
commit 892346d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Pod/Source/UI/DFImageView.h b/Pod/Source/UI/DFImageView.h
@@ -24,6 +24,10 @@
  */
 @property (nonatomic) BOOL allowsAnimations;
 
+/*! Duration it will take to animate image in if image view allows animations.
+ */
+@property (nonatomic) CGFloat fadeDuration;
+
 /*! Performs any clean up necessary to prepare the view for use again. Removes currently displayed image and cancels all requests registered with a receiver.
  */
 - (void)prepareForReuse;

diff --git a/Pod/Source/UI/DFImageView.m b/Pod/Source/UI/DFImageView.m
@@ -37,6 +37,7 @@ - (instancetype)initWithCoder:(NSCoder *)decoder {
 - (void)_commonInit {
     self.imageManager = [DFImageManager sharedManager];
     _allowsAnimations = YES;
+    _fadeDuration = 0.25f;
 }
 
 - (void)prepareForReuse {
@@ -84,7 +85,7 @@ - (void)didCompleteImageTask:(nonnull DFImageTask *)task withImage:(nullable UII
             animation.keyPath = @"opacity";
             animation.fromValue = @0.f;
             animation.toValue = @1.f;
-            animation.duration = 0.25f;
+            animation.duration = self.fadeDuration;
             animation;
         }) forKey:@"opacity"];
     } else {