Merge pull request #3 from bguidolim/loader-color

Added startLoaderWithTintColor:
rounak · Feb 24, 2015 · 8a65c40
2 parents 39cabf4 + a64f8b8
commit 8a65c40
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/Example/RJImageLoader/RJViewController.m b/Example/RJImageLoader/RJViewController.m
@@ -19,7 +19,7 @@ @implementation RJViewController
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    [self.imageView startLoader];
+    [self.imageView startLoaderWithTintColor:[UIColor blueColor]];
     __weak typeof(self)weakSelf = self;
     [self.imageView sd_setImageWithURL:[NSURL URLWithString:@"http://www.hdwallpapersinn.com/wp-content/uploads/2014/08/cute-cat-wallpapers.jpg"] placeholderImage:nil options:SDWebImageCacheMemoryOnly | SDWebImageRefreshCached progress:^(NSInteger receivedSize, NSInteger expectedSize) {
                 [weakSelf.imageView updateImageDownloadProgress:(CGFloat)receivedSize/expectedSize];

diff --git a/Pod/Classes/RJCircularLoaderView.m b/Pod/Classes/RJCircularLoaderView.m
@@ -42,8 +42,8 @@ - (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.strokeColor = self.tintColor.CGColor;
         _circlePathLayer.strokeEnd = _progress;
         [self.layer addSublayer:_circlePathLayer];
         self.backgroundColor = [UIColor whiteColor];
@@ -58,6 +58,12 @@ - (void)layoutSubviews
     self.circlePathLayer.path = self.circlePath;
 }
 
+- (void)tintColorDidChange
+{
+    [super tintColorDidChange];
+    self.circlePathLayer.strokeColor = self.tintColor.CGColor;
+}
+
 - (void)reveal
 {
     self.backgroundColor = [UIColor clearColor];

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)startLoaderWithTintColor:(UIColor *)color;
 - (void)reveal;
 
 @end
diff --git a/Pod/Classes/UIImageView+RJLoader.m b/Pod/Classes/UIImageView+RJLoader.m
@@ -36,6 +36,12 @@ - (void)startLoader
     loaderView.progress = 0;
 }
 
+- (void)startLoaderWithTintColor:(UIColor *)color
+{
+    [self startLoader];
+    self.rj_circularLoaderView.tintColor = color;
+}
+
 - (void)reveal
 {
     [self.rj_circularLoaderView reveal];

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'