Merge branch 'master' of https://github.com/runeb/MBProgressHUD into runeb-master

Author: matej

MBProgressHUD.h

@@ -433,6 +433,13 @@ typedef void (^MBProgressHUDCompletionBlock)();
  */
 @property (assign, getter = isSquare) BOOL square;
 
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000
+/**
+ * The color of the activity indicator. Defaults to [UIColor whiteColor]
+ */
+@property() UIColor *activityIndicatorColor;
+#endif
+
 @end
 
 

MBProgressHUD.m

@@ -106,6 +106,9 @@ @implementation MBProgressHUD
 @synthesize detailsLabelText;
 @synthesize progress;
 @synthesize size;
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000
+@dynamic activityIndicatorColor;
+#endif
 #if NS_BLOCKS_AVAILABLE
 @synthesize completionBlock;
 #endif
@@ -474,6 +477,23 @@ - (void)setupLabels {
 	[self addSubview:detailsLabel];
 }
 
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000
+-(void)setActivityIndicatorColor:(UIColor *)activityIndicatorColor
+{
+  if(self.indicator && [indicator isKindOfClass:[UIActivityIndicatorView class]]) {
+      ((UIActivityIndicatorView*)self.indicator).color = activityIndicatorColor;
+  }
+}
+
+-(UIColor*)activityIndicatorColor
+{
+  if(self.indicator && [indicator isKindOfClass:[UIActivityIndicatorView class]]) {
+    return ((UIActivityIndicatorView*)self.indicator).color;
+  }
+  return nil;
+}
+#endif
+
 - (void)updateIndicators {
 
 	BOOL isActivityIndicator = [indicator isKindOfClass:[UIActivityIndicatorView class]];