Merge pull request #14 from devSC/feature-dev

Fix bug [#13]
devSC · Apr 3, 2017 · f88e376 · f88e376
2 parents d7c2ed1 + d605f67
commit f88e376
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 28 deletions.
diff --git a/Demo/WSProgressHUD/WSProgressHUD.m b/Demo/WSProgressHUD/WSProgressHUD.m
@@ -419,7 +419,7 @@ - (void)showHudViewWithAnimation
                               delay:0
                             options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut | UIViewAnimationOptionBeginFromCurrentState
                          animations:^{
-                             self.hudView.transform = CGAffineTransformScale(self.hudView.transform, 1/1.2, 1/1.2);
+                             self.hudView.transform = CGAffineTransformIdentity;
                              self.hudView.alpha = 1;
                          }
                          completion:^(BOOL finished){
@@ -467,24 +467,27 @@ - (void)dismiss
     self.hudView.transform = CGAffineTransformIdentity;
     [UIView animateWithDuration:WSProgressHUDDismissDuration
                           delay:0
-                        options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut
+                        options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut | UIViewAnimationOptionBeginFromCurrentState
                      animations:^{
                          self.hudView.transform = CGAffineTransformScale(self.hudView.transform, .8, .8);
                          self.hudView.alpha = 0;
                      }
                      completion:^(BOOL finished){
-                         self.hudView.transform = CGAffineTransformIdentity;
 
-                         [self.overlayView removeFromSuperview];
-
-                         self.userInteractionEnabled = NO;
-
-                         [self stopIndicatorAnimation];
-
-                         //Call drawInRact
-                         [self setNeedsDisplay];
-
-                         [self setProgressHUDIndicatorStyle:self.indicatorStyle];
+                         if (self.hudView.alpha == 0) {
+                             self.hudView.transform = CGAffineTransformIdentity;
+
+                             [self.overlayView removeFromSuperview];
+
+                             self.userInteractionEnabled = NO;
+
+                             [self stopIndicatorAnimation];
+
+                             //Call drawInRact
+                             [self setNeedsDisplay];
+
+                             [self setProgressHUDIndicatorStyle:self.indicatorStyle];
+                         }
                      }];
 }
 

diff --git a/WSProgressHUD.podspec b/WSProgressHUD.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "WSProgressHUD"
-  s.version      = "1.1.1"
+  s.version      = "1.1.2"
   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.1.1" }
+  s.source       = { :git => "https://github.com/devSC/WSProgressHUD.git", :tag => "1.1.2" }
   s.source_files  = "WSProgressHUD/*"
   s.exclude_files = "Demo/Exclude"
 

diff --git a/WSProgressHUD/MMMaterialDesignSpinner.m b/WSProgressHUD/MMMaterialDesignSpinner.m
@@ -36,6 +36,8 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {
 
 - (void)awakeFromNib
 {
+    [super awakeFromNib];
+
     [self initialize];
 }
 

diff --git a/WSProgressHUD/WSProgressBundle.bundle/error@2x.png b/WSProgressHUD/WSProgressBundle.bundle/error@2x.png
diff --git a/WSProgressHUD/WSProgressBundle.bundle/success@2x.png b/WSProgressHUD/WSProgressBundle.bundle/success@2x.png
diff --git a/WSProgressHUD/WSProgressHUD.m b/WSProgressHUD/WSProgressHUD.m
@@ -419,7 +419,7 @@ - (void)showHudViewWithAnimation
                               delay:0
                             options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut | UIViewAnimationOptionBeginFromCurrentState
                          animations:^{
-                             self.hudView.transform = CGAffineTransformScale(self.hudView.transform, 1/1.2, 1/1.2);
+                             self.hudView.transform = CGAffineTransformIdentity;
                              self.hudView.alpha = 1;
                          }
                          completion:^(BOOL finished){
@@ -467,24 +467,27 @@ - (void)dismiss
     self.hudView.transform = CGAffineTransformIdentity;
     [UIView animateWithDuration:WSProgressHUDDismissDuration
                           delay:0
-                        options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut
+                        options:UIViewAnimationOptionAllowUserInteraction | UIViewAnimationCurveEaseOut | UIViewAnimationOptionBeginFromCurrentState
                      animations:^{
                          self.hudView.transform = CGAffineTransformScale(self.hudView.transform, .8, .8);
                          self.hudView.alpha = 0;
                      }
                      completion:^(BOOL finished){
-                         self.hudView.transform = CGAffineTransformIdentity;
 
-                         [self.overlayView removeFromSuperview];
-
-                         self.userInteractionEnabled = NO;
-
-                         [self stopIndicatorAnimation];
-
-                         //Call drawInRact
-                         [self setNeedsDisplay];
-
-                         [self setProgressHUDIndicatorStyle:self.indicatorStyle];
+                         if (self.hudView.alpha == 0) {
+                             self.hudView.transform = CGAffineTransformIdentity;
+
+                             [self.overlayView removeFromSuperview];
+
+                             self.userInteractionEnabled = NO;
+
+                             [self stopIndicatorAnimation];
+
+                             //Call drawInRact
+                             [self setNeedsDisplay];
+
+                             [self setProgressHUDIndicatorStyle:self.indicatorStyle];
+                         }
                      }];
 }