Merge pull request samvermette#143 from bdbergeron/master

Add support for setting UIActivityIndicatorView color (iOS 5+)
RonaldAndersonAol · Sep 26, 2013 · 70496a5 · 70496a5
2 parents 5b98a05 + 0116cbc
commit 70496a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.h b/SVPullToRefresh/UIScrollView+SVPullToRefresh.h
@@ -47,6 +47,7 @@ typedef NSUInteger SVPullToRefreshState;
 @property (nonatomic, strong) UIColor *textColor;
 @property (nonatomic, strong, readonly) UILabel *titleLabel;
 @property (nonatomic, strong, readonly) UILabel *subtitleLabel;
+@property (nonatomic, strong, readwrite) UIColor *activityIndicatorViewColor NS_AVAILABLE_IOS(5_0);
 @property (nonatomic, readwrite) UIActivityIndicatorViewStyle activityIndicatorViewStyle;
 
 @property (nonatomic, readonly) SVPullToRefreshState state;

diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.m b/SVPullToRefresh/UIScrollView+SVPullToRefresh.m
@@ -157,7 +157,7 @@ - (BOOL)showsPullToRefresh {
 @implementation SVPullToRefreshView
 
 // public properties
-@synthesize pullToRefreshActionHandler, arrowColor, textColor, activityIndicatorViewStyle, lastUpdatedDate, dateFormatter;
+@synthesize pullToRefreshActionHandler, arrowColor, textColor, activityIndicatorViewColor, activityIndicatorViewStyle, lastUpdatedDate, dateFormatter;
 
 @synthesize state = _state;
 @synthesize scrollView = _scrollView;
@@ -494,6 +494,10 @@ - (UIColor *)textColor {
  return self.titleLabel.textColor;
 }
 
+- (UIColor *)activityIndicatorViewColor {
+ return self.activityIndicatorView.color;
+}
+
 - (UIActivityIndicatorViewStyle)activityIndicatorViewStyle {
  return self.activityIndicatorView.activityIndicatorViewStyle;
 }
@@ -549,6 +553,10 @@ - (void)setTextColor:(UIColor *)newTextColor {
  self.subtitleLabel.textColor = newTextColor;
 }
 
+- (void)setActivityIndicatorViewColor:(UIColor *)color {
+ self.activityIndicatorView.color = color;
+}
+
 - (void)setActivityIndicatorViewStyle:(UIActivityIndicatorViewStyle)viewStyle {
  self.activityIndicatorView.activityIndicatorViewStyle = viewStyle;
 }