Merge branch 'master' of https://github.com/devSC/WSProgressHUD

devSC · Aug 20, 2015 · 5a7e4ea · 5a7e4ea
2 parents 7feed2b + f0b862f
commit 5a7e4ea
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 26 deletions.
diff --git a/Demo/WSProgressHUD.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Demo/WSProgressHUD.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Demo/WSProgressHUD/MMMaterialDesignSpinner.h b/Demo/WSProgressHUD/MMMaterialDesignSpinner.h
@@ -33,6 +33,7 @@ FOUNDATION_EXPORT const unsigned char MMMaterialDesignSpinnerVersionString[];
 /** Property indicating whether the view is currently animating. */
 @property (nonatomic, readonly) BOOL isAnimating;
 
+@property (nonatomic, strong) UIColor *spinnerColor;
 /**
  *  Convenience function for starting & stopping animation with a boolean variable instead of explicit
  *  method calls.

diff --git a/Demo/WSProgressHUD/MMMaterialDesignSpinner.m b/Demo/WSProgressHUD/MMMaterialDesignSpinner.m
@@ -169,12 +169,17 @@ - (void)updatePath {
 - (CAShapeLayer *)progressLayer {
     if (!_progressLayer) {
         _progressLayer = [CAShapeLayer layer];
-        _progressLayer.strokeColor = self.tintColor.CGColor;
+        _progressLayer.strokeColor = [UIColor blueColor].CGColor;
         _progressLayer.fillColor = nil;
         _progressLayer.lineWidth = 1.5f;
     }
     return _progressLayer;
 }
+- (void)setSpinnerColor:(UIColor *)spinnerColor
+{
+    self.progressLayer.strokeColor = spinnerColor.CGColor;
+}
+
 
 - (BOOL)isAnimating {
     return _isAnimating;

diff --git a/Demo/WSProgressHUD/WSProgressBundle.bundle/error@2x.png b/Demo/WSProgressHUD/WSProgressBundle.bundle/error@2x.png
diff --git a/Demo/WSProgressHUD/WSProgressBundle.bundle/success@2x.png b/Demo/WSProgressHUD/WSProgressBundle.bundle/success@2x.png
diff --git a/Demo/WSProgressHUD/WSProgressHUD.h b/Demo/WSProgressHUD/WSProgressHUD.h
@@ -23,8 +23,8 @@ typedef NS_ENUM(NSInteger, WSProgressHUDMaskWithoutType) { //
 };
 
 typedef NS_ENUM(NSInteger, WSProgressHUDIndicatorStyle) {
-    WSProgressHUDIndicatorMMSpinner,
     WSProgressHUDIndicatorCustom,
+    WSProgressHUDIndicatorMMSpinner,
     WSProgressHUDIndicatorSmallLight,
 };
 

diff --git a/Demo/WSProgressHUD/WSProgressHUD.m b/Demo/WSProgressHUD/WSProgressHUD.m
@@ -69,7 +69,7 @@ @interface WSProgressHUD ()
 static UIImage *WSProgressHUDSuccessImage;
 static UIImage *WSProgressHUDErrorImage;
 
-static CGFloat const WSProgressHUDIndicatorBig = 35;
+static CGFloat const WSProgressHUDIndicatorBig = 31;
 static CGFloat const WSProgressHUDIndicatorSmall = 20;
 
 static CGFloat WSProgressHUDRingThickness = 2;
@@ -341,15 +341,14 @@ - (void)showProgress:(CGFloat)progress status:(NSString*)string maskType:(WSProg
         self.ringLayer.strokeEnd = progress;
         return;
     }
-
     objc_setAssociatedObject(self, @selector(maskType), @(maskType), OBJC_ASSOCIATION_ASSIGN);
     objc_setAssociatedObject(self, @selector(hudType), @(WSProgressHUDTypeProgress), OBJC_ASSOCIATION_ASSIGN);
     objc_setAssociatedObject(self, @selector(withoutType), @(withoutType), OBJC_ASSOCIATION_ASSIGN);
+
     [self invalidateTimer];
 
     [self setMaskEdgeWithType:self.maskType];
 
-
     [self updateSubviewsPositionWithString:string];
 
     [self showHudViewWithAnimation];
@@ -567,6 +566,7 @@ - (void)updateSubviewsPositionWithString: (NSString *)string
                     WSProgressHUDStringRect.origin.y = imageOffset;
                     [self startIndicatorAnimation:NO];
                     self.labelView.center = CGPointMake(hudCenterX , hudCenterY + 20);
+					self.labelView.textAlignment = NSTextAlignmentCenter;
                     self.imageView.center = CGPointMake(hudCenterX, 30);
                 } else {
                     self.labelView.text = string;
@@ -982,7 +982,7 @@ - (void)drawRect:(CGRect)rect
     switch (self.maskType) {
         case WSProgressHUDMaskTypeClear: {
             CGContextRef context = UIGraphicsGetCurrentContext();
-            [[UIColor colorWithWhite:0 alpha:0.5] set];
+			[[UIColor clearColor] set];
             CGRect bounds = self.bounds;
             CGContextFillRect(context, bounds);
         }break;
@@ -1155,11 +1155,6 @@ - (UIImageView *)imageView
     if (!_imageView) {
         _imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 28)];
         _imageView.hidden = YES;
-        if ([_imageView respondsToSelector:@selector(setTintColor:)]) {
-            [_imageView setTintColor:WSProgressHUDForeGroundColor];
-        } else {
-
-        }
     }
     return _imageView;
 }
@@ -1181,7 +1176,7 @@ - (MMMaterialDesignSpinner *)spinnerView
     if (!_spinnerView) {
         _spinnerView = [[MMMaterialDesignSpinner alloc] initWithFrame:CGRectZero];
         _spinnerView.bounds = CGRectMake(0, 0, 20, 20);
-        _spinnerView.tintColor = WSProgressHUDForeGroundColor;
+        [_spinnerView setSpinnerColor:[UIColor whiteColor]];
     }
     return _spinnerView;
 }

diff --git a/Demo/WSProgressHUDDemo/ViewController.m b/Demo/WSProgressHUDDemo/ViewController.m
@@ -47,7 +47,7 @@ - (IBAction)show:(id)sender {
 //    [WSProgressHUD setProgressHUDIndicatorStyle:WSProgressHUDIndicatorCustom];
     [WSProgressHUD showWithMaskType:WSProgressHUDMaskTypeBlack];
 
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [WSProgressHUD dismiss];
     });
 }

diff --git a/README.md b/README.md
@@ -13,6 +13,17 @@ This is a beauful hud view for iPhone &amp; iPad
 To Download the project. Run the WSProgressHUD.xcodeproj in the demo directory.
 
 ``` objc
+
+    [WSProgressHUD show];
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        ...
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+        ...
+        [WSProgressHUD dismiss];
+        });
+    });
+
 //Show on the self.view
 
 @implementation ViewController
@@ -76,7 +87,13 @@ it, simply add the following line to your Podfile:
 
 ```ruby
 pod "WSProgressHUD"
+
 ```
+## Manually
+
+Drag the WSProgressHUD/Demo/WSProgressHUD folder into your project.
+Then take care that WSProgressHUD.bundle is added to Targets->Build Phases->Copy Bundle Resources.
+Add the QuartzCore framework to your project.
 
 ##Thanks
 

diff --git a/WSProgressHUD.podspec b/WSProgressHUD.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "WSProgressHUD"
-  s.version      = "1.0.5"
+  s.version      = "1.0.6"
   s.summary      = "WSProgressHUD is a beauful hud view for iPhone & iPad."
 
   s.description  = <<-DESC
@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
 
   s.author             = { "袁仕崇" => "xiaochong2154@163.com" }
   s.platform     = :ios, "6.0"
-  s.source       = { :git => "https://github.com/devSC/WSProgressHUD.git", :tag => "1.0.5" }
+  s.source       = { :git => "https://github.com/devSC/WSProgressHUD.git", :tag => "1.0.6" }
   s.source_files  = "WSProgressHUD/*"
   s.exclude_files = "Demo/Exclude"
 

diff --git a/WSProgressHUD/MMMaterialDesignSpinner.h b/WSProgressHUD/MMMaterialDesignSpinner.h
@@ -33,6 +33,7 @@ FOUNDATION_EXPORT const unsigned char MMMaterialDesignSpinnerVersionString[];
 /** Property indicating whether the view is currently animating. */
 @property (nonatomic, readonly) BOOL isAnimating;
 
+@property (nonatomic, strong) UIColor *spinnerColor;
 /**
  *  Convenience function for starting & stopping animation with a boolean variable instead of explicit
  *  method calls.

diff --git a/WSProgressHUD/MMMaterialDesignSpinner.m b/WSProgressHUD/MMMaterialDesignSpinner.m
@@ -169,12 +169,17 @@ - (void)updatePath {
 - (CAShapeLayer *)progressLayer {
     if (!_progressLayer) {
         _progressLayer = [CAShapeLayer layer];
-        _progressLayer.strokeColor = self.tintColor.CGColor;
+        _progressLayer.strokeColor = [UIColor blueColor].CGColor;
         _progressLayer.fillColor = nil;
         _progressLayer.lineWidth = 1.5f;
     }
     return _progressLayer;
 }
+- (void)setSpinnerColor:(UIColor *)spinnerColor
+{
+    self.progressLayer.strokeColor = spinnerColor.CGColor;
+}
+
 
 - (BOOL)isAnimating {
     return _isAnimating;

diff --git a/WSProgressHUD/WSProgressHUD.h b/WSProgressHUD/WSProgressHUD.h
@@ -23,8 +23,8 @@ typedef NS_ENUM(NSInteger, WSProgressHUDMaskWithoutType) { //
 };
 
 typedef NS_ENUM(NSInteger, WSProgressHUDIndicatorStyle) {
-    WSProgressHUDIndicatorMMSpinner,
     WSProgressHUDIndicatorCustom,
+    WSProgressHUDIndicatorMMSpinner,
     WSProgressHUDIndicatorSmallLight,
 };
 

diff --git a/WSProgressHUD/WSProgressHUD.m b/WSProgressHUD/WSProgressHUD.m
@@ -69,7 +69,7 @@ @interface WSProgressHUD ()
 static UIImage *WSProgressHUDSuccessImage;
 static UIImage *WSProgressHUDErrorImage;
 
-static CGFloat const WSProgressHUDIndicatorBig = 35;
+static CGFloat const WSProgressHUDIndicatorBig = 31;
 static CGFloat const WSProgressHUDIndicatorSmall = 20;
 
 static CGFloat WSProgressHUDRingThickness = 2;
@@ -341,10 +341,10 @@ - (void)showProgress:(CGFloat)progress status:(NSString*)string maskType:(WSProg
         self.ringLayer.strokeEnd = progress;
         return;
     }
-
     objc_setAssociatedObject(self, @selector(maskType), @(maskType), OBJC_ASSOCIATION_ASSIGN);
     objc_setAssociatedObject(self, @selector(hudType), @(WSProgressHUDTypeProgress), OBJC_ASSOCIATION_ASSIGN);
     objc_setAssociatedObject(self, @selector(withoutType), @(withoutType), OBJC_ASSOCIATION_ASSIGN);
+
     [self invalidateTimer];
 
     [self setMaskEdgeWithType:self.maskType];
@@ -566,6 +566,7 @@ - (void)updateSubviewsPositionWithString: (NSString *)string
                     WSProgressHUDStringRect.origin.y = imageOffset;
                     [self startIndicatorAnimation:NO];
                     self.labelView.center = CGPointMake(hudCenterX , hudCenterY + 20);
+					self.labelView.textAlignment = NSTextAlignmentCenter;
                     self.imageView.center = CGPointMake(hudCenterX, 30);
                 } else {
                     self.labelView.text = string;
@@ -981,7 +982,7 @@ - (void)drawRect:(CGRect)rect
     switch (self.maskType) {
         case WSProgressHUDMaskTypeClear: {
             CGContextRef context = UIGraphicsGetCurrentContext();
-            [[UIColor colorWithWhite:0 alpha:0.5] set];
+			[[UIColor clearColor] set];
             CGRect bounds = self.bounds;
             CGContextFillRect(context, bounds);
         }break;
@@ -1154,11 +1155,6 @@ - (UIImageView *)imageView
     if (!_imageView) {
         _imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 28)];
         _imageView.hidden = YES;
-        if ([_imageView respondsToSelector:@selector(setTintColor:)]) {
-            [_imageView setTintColor:WSProgressHUDForeGroundColor];
-        } else {
-
-        }
     }
     return _imageView;
 }
@@ -1180,7 +1176,7 @@ - (MMMaterialDesignSpinner *)spinnerView
     if (!_spinnerView) {
         _spinnerView = [[MMMaterialDesignSpinner alloc] initWithFrame:CGRectZero];
         _spinnerView.bounds = CGRectMake(0, 0, 20, 20);
-        _spinnerView.tintColor = WSProgressHUDForeGroundColor;
+        [_spinnerView setSpinnerColor:[UIColor whiteColor]];
     }
     return _spinnerView;
 }