Added startLoaderWithColor:

rounak · Feb 24, 2015 · e2eaba7 · e2eaba7
1 parent 39cabf4
commit e2eaba7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/Pod/Classes/RJCircularLoaderView.h b/Pod/Classes/RJCircularLoaderView.h
@@ -13,5 +13,6 @@
 - (void)reveal;
 
 @property (nonatomic) CGFloat progress;
+@property (strong, nonatomic) UIColor *tintColor;
 
 @end
diff --git a/Pod/Classes/RJCircularLoaderView.m b/Pod/Classes/RJCircularLoaderView.m
@@ -42,7 +42,6 @@ - (instancetype)initWithFrame:(CGRect)frame
         _circlePathLayer.frame = self.bounds;
         _circlePathLayer.lineWidth = 2;
         _circlePathLayer.fillColor = [UIColor clearColor].CGColor;
-        _circlePathLayer.strokeColor = [UIColor redColor].CGColor;
         _circlePathLayer.strokeStart = 0;
         _circlePathLayer.strokeEnd = _progress;
         [self.layer addSublayer:_circlePathLayer];
@@ -112,6 +111,12 @@ - (void)setProgress:(CGFloat)progress
     self.circlePathLayer.strokeEnd = _progress;
 }
 
+- (void)setTintColor:(UIColor *)tintColor
+{
+    _tintColor = tintColor;
+    self.circlePathLayer.strokeColor = _tintColor.CGColor;
+}
+
 - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
 {
     self.superview.layer.mask = nil;

diff --git a/Pod/Classes/UIImageView+RJLoader.h b/Pod/Classes/UIImageView+RJLoader.h
@@ -14,6 +14,7 @@
 
 - (void)updateImageDownloadProgress:(CGFloat)progress;
 - (void)startLoader;
+- (void)startLoaderWithColor:(UIColor *)color;
 - (void)reveal;
 
 @end
diff --git a/Pod/Classes/UIImageView+RJLoader.m b/Pod/Classes/UIImageView+RJLoader.m
@@ -30,8 +30,13 @@ - (void)updateImageDownloadProgress:(CGFloat)progress
 
 - (void)startLoader
 {
+    [self startLoaderWithColor:[UIColor redColor]];
+}
+
+- (void)startLoaderWithColor:(UIColor *)color {
     RJCircularLoaderView *loaderView = self.rj_circularLoaderView;
     loaderView.frame = self.bounds;
+    loaderView.tintColor = color;
     [self addSubview:loaderView];
     loaderView.progress = 0;
 }

diff --git a/README.md b/README.md
@@ -39,6 +39,10 @@ Rounak Jain.
 
 Follow me on Twitter [@r0unak](https://twitter.com/r0unak)
 
+##Contributors
+
+[@bguidolim](http://twitter.com/bguidolim)
+
 ## License
 
 RJImageLoader is available under the MIT license. See the LICENSE file for more info.

diff --git a/RJImageLoader.podspec b/RJImageLoader.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "RJImageLoader"
-  s.version          = "0.1.0"
+  s.version          = "0.2.0"
   s.summary          = "A neat image loader for iOS based on Michael Villar's design."
   s.description      = <<-DESC
                        RJImageLoader is a category on UIImageView that lets you add a circular progress and reveal animation when loading images from the network. It is agnostic to the image download process, has a simple interface, and is very easy to integrate.
@@ -25,9 +25,9 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.source_files = 'Pod/Classes/**/*'
-  s.resource_bundles = {
-    'RJImageLoader' => ['Pod/Assets/*.png']
-  }
+  #s.resource_bundles = {
+  #  'RJImageLoader' => ['Pod/Assets/*.png']
+  #}
 
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'