Fixes SVProgressHUD#635, Fixes SVProgressHUD#672, Fixes SVProgressHUD#673

Tobias Tiemerding · Tobias Tiemerding · commit 077e5e0172fa · 2016-10-15T11:38:14.000+02:00
diff --git a/Demo/Classes/ViewController.m b/Demo/Classes/ViewController.m
@@ -38,7 +38,7 @@ - (void)viewWillAppear:(BOOL)animated {
 }
 
 - (void)handleNotification:(NSNotification *)notification {
-    NSLog(@"Notification recieved: %@", notification.name);
+    NSLog(@"Notification received: %@", notification.name);
     NSLog(@"Status user info key: %@", notification.userInfo[SVProgressHUDStatusUserInfoKey]);
 }
 
diff --git a/Demo/SVProgressHUD.xcodeproj/project.pbxproj b/Demo/SVProgressHUD.xcodeproj/project.pbxproj
@@ -97,6 +97,7 @@
 		080E96DDFE201D6D7F000001 /* iOS Demo */ = {
 			isa = PBXGroup;
 			children = (
+				63ADC4B81364C1360060E45B /* SVProgressHUD */,
 				28D7ACF60DDB3853001CB0EB /* ViewController.h */,
 				28D7ACF70DDB3853001CB0EB /* ViewController.m */,
 				2899E5210DE3E06400AC0155 /* ViewController.xib */,
@@ -139,7 +140,6 @@
 				8D1107310486CEB800E47090 /* SVProgressHUD-Info.plist */,
 				32CA4F630368D1EE00C91783 /* SVProgressHUD_Prefix.pch */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
-				63ADC4B81364C1360060E45B /* SVProgressHUD */,
 			);
 			name = "Other Sources";
 			path = ..;
@@ -170,7 +170,7 @@
 				3CD078E91A3B809500290D80 /* SVRadialGradientLayer.m */,
 			);
 			name = SVProgressHUD;
-			path = ../SVProgressHUD;
+			path = ../../SVProgressHUD;
 			sourceTree = "<group>";
 		};
 		D36EDBCF1BE7E9B000BD0EF1 /* tvOS Demo */ = {
diff --git a/README.md b/README.md
@@ -39,16 +39,7 @@ pod install
 
 ### Carthage 
 
-[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
-
-You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
-
-```bash
-$ brew update
-$ brew install carthage
-```
-
-To integrate `SVProgressHUD` into your Xcode project using Carthage, specify it in your `Cartfile`:
+[Carthage](https://github.com/Carthage/Carthage) is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks. To integrate `SVProgressHUD` into your Xcode project using Carthage, specify it in your `Cartfile`:
 
 ```ogdl
 github "SVProgressHUD/SVProgressHUD"
diff --git a/SVProgressHUD/SVProgressHUD.m b/SVProgressHUD/SVProgressHUD.m
@@ -344,6 +344,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
         _defaultMaskType = SVProgressHUDMaskTypeNone;
         _defaultStyle = SVProgressHUDStyleLight;
         _defaultAnimationType = SVProgressHUDAnimationTypeFlat;
+        _minimumSize = CGSizeMake(100.0f, 100.0f);
         
         if ([UIFont respondsToSelector:@selector(preferredFontForTextStyle:)]) {
             _font = [UIFont preferredFontForTextStyle:UIFontTextStyleSubheadline];
@@ -395,12 +396,14 @@ - (instancetype)initWithFrame:(CGRect)frame {
 - (void)updateHUDFrame {
     // For the beginning use default values, these
     // might get update if string is too large etc.
-    CGFloat hudWidth = 100.0f;
-    CGFloat hudHeight = 100.0f;
-    CGFloat stringHeightBuffer = 20.0f;
-    CGFloat stringAndContentHeightBuffer = 80.0f;
+    CGFloat hudWidth;
+    CGFloat hudHeight;
     CGRect labelRect = CGRectZero;
     
+    CGFloat verticalSpacing = 12.0f; // |-12-content-(8-label-)12-|
+    CGFloat horizontalSpacing = 12.0f; // |-12-content-12-|
+    CGFloat progressLabelSpacing = 8.0f; // content-8-label; progess = spinner or image
+    
     // Check if an image or progress ring is displayed
     BOOL imageUsed = (self.imageView.image) && !(self.imageView.hidden);
     BOOL progressUsed = self.imageView.hidden;
@@ -409,12 +412,11 @@ - (void)updateHUDFrame {
     NSString *string = self.statusLabel.text;
     if(string) {
         CGSize constraintSize = CGSizeMake(200.0f, 300.0f);
-        CGRect stringRect;
         if([string respondsToSelector:@selector(boundingRectWithSize:options:attributes:context:)]) {
-            stringRect = [string boundingRectWithSize:constraintSize
-                                              options:(NSStringDrawingOptions)(NSStringDrawingUsesFontLeading|NSStringDrawingTruncatesLastVisibleLine|NSStringDrawingUsesLineFragmentOrigin)
-                                           attributes:@{NSFontAttributeName: self.statusLabel.font}
-                                              context:NULL];
+            labelRect = [string boundingRectWithSize:constraintSize
+                                             options:(NSStringDrawingOptions)(NSStringDrawingUsesFontLeading|NSStringDrawingTruncatesLastVisibleLine|NSStringDrawingUsesLineFragmentOrigin)
+                                          attributes:@{NSFontAttributeName: self.statusLabel.font}
+                                             context:NULL];
         } else {
             CGSize stringSize;
             if([string respondsToSelector:@selector(sizeWithAttributes:)]) {
@@ -427,75 +429,55 @@ - (void)updateHUDFrame {
 #pragma clang diagnostic pop
 #endif
             }
-            stringRect = CGRectMake(0.0f, 0.0f, stringSize.width, stringSize.height);
+            labelRect = CGRectMake(0.0f, 0.0f, stringSize.width, stringSize.height);
         }
-
-        CGFloat stringWidth = stringRect.size.width;
-        CGFloat stringHeight = ceilf(CGRectGetHeight(stringRect));
+        labelRect.size.width = MAX(self.minimumSize.width, horizontalSpacing + CGRectGetWidth(labelRect) + horizontalSpacing);
+        
+        CGFloat labelHeight = ceilf(CGRectGetHeight(labelRect));
+        CGFloat labelWidth = ceilf(CGRectGetWidth(labelRect));
         
         if(imageUsed || progressUsed) {
-            hudHeight = stringAndContentHeightBuffer + stringHeight;
+            CGFloat contentHeight = (imageUsed ? CGRectGetHeight(self.imageView.frame) : CGRectGetHeight(self.indefiniteAnimatedView.frame));
+            hudHeight = verticalSpacing + contentHeight + progressLabelSpacing + labelHeight + verticalSpacing;
         } else {
-            hudHeight = stringHeightBuffer + stringHeight;
-        }
-        if(stringWidth > hudWidth) {
-            hudWidth = ceilf(stringWidth/2)*2;
-        }
-        CGFloat labelRectY = (imageUsed || progressUsed) ? 68.0f : 9.0f;
-        if(hudHeight > 100.0f) {
-            labelRect = CGRectMake(12.0f, labelRectY, hudWidth, stringHeight);
-            hudWidth += 24.0f;
-        } else {
-            hudWidth += 24.0f;
-            labelRect = CGRectMake(0.0f, labelRectY, hudWidth, stringHeight);
+            hudHeight = verticalSpacing + labelHeight + verticalSpacing;
         }
+        hudWidth = labelWidth;
     }
     
     // Update values on subviews
     self.hudView.bounds = CGRectMake(0.0f, 0.0f, MAX(self.minimumSize.width, hudWidth), MAX(self.minimumSize.height, hudHeight));
-    labelRect.size.width += MAX(0, self.minimumSize.width - hudWidth);
     [self updateBlurBounds];
     
-    if(string) {
-        self.imageView.center = CGPointMake(CGRectGetWidth(self.hudView.bounds)/2, 36.0f);
-    } else {
-       	self.imageView.center = CGPointMake(CGRectGetWidth(self.hudView.bounds)/2, CGRectGetHeight(self.hudView.bounds)/2);
-    }
-
-	self.statusLabel.hidden = NO;
-	self.statusLabel.frame = labelRect;
-    
     // Animate value update
     [CATransaction begin];
     [CATransaction setDisableActions:YES];
     
-	if(string) {
-        if(self.defaultAnimationType == SVProgressHUDAnimationTypeFlat) {
-            SVIndefiniteAnimatedView *indefiniteAnimationView = (SVIndefiniteAnimatedView*)self.indefiniteAnimatedView;
-            indefiniteAnimationView.radius = self.ringRadius;
-            [indefiniteAnimationView sizeToFit];
-        }
-        
-        CGPoint center = CGPointMake((CGRectGetWidth(self.hudView.bounds)/2), 36.0f);
-        self.indefiniteAnimatedView.center = center;
+    // Spinner and image view
+    CGFloat centerY;
+    if(string){
+        CGFloat contentHeight = (imageUsed ? CGRectGetHeight(self.imageView.frame) : CGRectGetHeight(self.indefiniteAnimatedView.frame));
+        CGFloat labelHeight = ceilf(CGRectGetHeight(labelRect));
+        CGFloat yOffset = MAX(verticalSpacing, (self.minimumSize.height - contentHeight - progressLabelSpacing - labelHeight) / 2.0f);
         
-        if(self.progress != SVProgressHUDUndefinedProgress) {
-            self.backgroundRingView.center = self.ringView.center = CGPointMake((CGRectGetWidth(self.hudView.bounds)/2), 36.0f);
-        }
-	} else {
-        if(self.defaultAnimationType == SVProgressHUDAnimationTypeFlat) {
-            SVIndefiniteAnimatedView *indefiniteAnimationView = (SVIndefiniteAnimatedView*)self.indefiniteAnimatedView;
-            indefiniteAnimationView.radius = self.ringNoTextRadius;
-            [indefiniteAnimationView sizeToFit];
-        }
-        
-        CGPoint center = CGPointMake((CGRectGetWidth(self.hudView.bounds)/2), CGRectGetHeight(self.hudView.bounds)/2);
-        self.indefiniteAnimatedView.center = center;
-        
-        if(self.progress != SVProgressHUDUndefinedProgress) {
-            self.backgroundRingView.center = self.ringView.center = CGPointMake((CGRectGetWidth(self.hudView.bounds)/2), CGRectGetHeight(self.hudView.bounds)/2);
-        }
+        centerY = yOffset + contentHeight / 2.0f;
+    } else {
+        centerY = CGRectGetHeight(self.hudView.bounds) / 2.0f;
+    }
+    self.indefiniteAnimatedView.center = CGPointMake((CGRectGetWidth(self.hudView.bounds) / 2.0f), centerY);
+    if(self.progress != SVProgressHUDUndefinedProgress) {
+        self.backgroundRingView.center = self.ringView.center = CGPointMake((CGRectGetWidth(self.hudView.bounds) / 2.0f), centerY);
     }
+    self.imageView.center = CGPointMake(CGRectGetWidth(self.hudView.bounds) / 2.0f, centerY);
+
+    // Label
+    if(imageUsed || progressUsed){
+        labelRect.origin.y = (imageUsed ? CGRectGetMaxY(self.imageView.frame) : CGRectGetMaxY(self.indefiniteAnimatedView.frame)) + progressLabelSpacing;
+    } else {
+        labelRect.origin.y = verticalSpacing;
+    }
+    self.statusLabel.frame = labelRect;
+    self.statusLabel.hidden = !string;
     
     [CATransaction commit];
 }
@@ -693,15 +675,17 @@ - (void)positionHUD:(NSNotification*)notification {
 #if !defined(SV_APP_EXTENSIONS) && TARGET_OS_IOS
     self.frame = [[[UIApplication sharedApplication] delegate] window].bounds;
     UIInterfaceOrientation orientation = UIApplication.sharedApplication.statusBarOrientation;
-#elif !defined(SV_APP_EXTENSIONS)
-    self.frame = [UIApplication sharedApplication].keyWindow.bounds;
+#elif !defined(SV_APP_EXTENSIONS) && !TARGET_OS_IOS
+    self.frame= [UIApplication sharedApplication].keyWindow.bounds;
 #else
     if (self.viewForExtension) {
         self.frame = self.viewForExtension.frame;
     } else {
         self.frame = UIScreen.mainScreen.bounds;
     }
+#if TARGET_OS_IOS
     UIInterfaceOrientation orientation = CGRectGetWidth(self.frame) > CGRectGetHeight(self.frame) ? UIInterfaceOrientationLandscapeLeft : UIInterfaceOrientationPortrait;
+#endif
 #endif
     
     // no transforms applied to window in iOS 8, but only if compiled with iOS 8 sdk as base sdk, otherwise system supports old rotation logic.
@@ -799,7 +783,7 @@ - (void)positionHUD:(NSNotification*)notification {
         __weak SVProgressHUD *weakSelf = self;
         [UIView animateWithDuration:animationDuration
                               delay:0
-                            options:UIViewAnimationOptionAllowUserInteraction
+                            options:(UIViewAnimationOptions) (UIViewAnimationOptionAllowUserInteraction | UIViewAnimationOptionBeginFromCurrentState)
                          animations:^{
                              __strong SVProgressHUD *strongSelf = weakSelf;
                              if(strongSelf) {
@@ -867,10 +851,17 @@ - (void)showProgress:(float)progress status:(NSString*)status {
                 // Cancel the indefiniteAnimatedView, then show the ringLayer
                 [strongSelf cancelIndefiniteAnimatedViewAnimation];
                 
-                // Add ring to HUD and set progress
-                [strongSelf.hudView addSubview:strongSelf.ringView];
-                [strongSelf.hudView addSubview:strongSelf.backgroundRingView];
+                // Add ring to HUD
+                if(!strongSelf.ringView.superview)
+                    [strongSelf.hudView addSubview:strongSelf.ringView];
+                if(!strongSelf.backgroundRingView.superview)
+                    [strongSelf.hudView addSubview:strongSelf.backgroundRingView];
+                
+                // Set progress animated
+                [CATransaction begin];
+                [CATransaction setDisableActions:YES];
                 strongSelf.ringView.strokeEnd = progress;
+                [CATransaction commit];
                 
                 // Update the activity count
                 if(progress == 0) {
@@ -988,7 +979,7 @@ __block void (^completionBlock)(void) = ^{
             if(strongSelf) {
                 // Check if we really achieved to show the HUD (<=> alpha values are applied)
                 // and the change of these values has not been cancelled in between
-                // e.g. due to a dismissmal
+                // e.g. due to a dismissal
                 if(strongSelf.alpha == 1.0f && strongSelf.hudView.alpha == 1.0f){
                     // Register observer <=> we now have to handle orientation changes etc.
                     [strongSelf registerNotifications];
diff --git a/SVProgressHUD/SVRadialGradientLayer.m b/SVProgressHUD/SVRadialGradientLayer.m
@@ -12,7 +12,7 @@ @implementation SVRadialGradientLayer
 - (void)drawInContext:(CGContextRef)context {
     size_t locationsCount = 2;
     CGFloat locations[2] = {0.0f, 1.0f};
-    CGFloat colors[8] = {0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.0f,0.75f};
+    CGFloat colors[8] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.75f};
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
     CGGradientRef gradient = CGGradientCreateWithColorComponents(colorSpace, colors, locations, locationsCount);
     CGColorSpaceRelease(colorSpace);

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ - (void)viewWillAppear:(BOOL)animated {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`- (void)handleNotification:(NSNotification *)notification {`
`41`		`- NSLog(@"Notification recieved: %@", notification.name);`
	`41`	`+ NSLog(@"Notification received: %@", notification.name);`
`42`	`42`	`NSLog(@"Status user info key: %@", notification.userInfo[SVProgressHUDStatusUserInfoKey]);`
`43`	`43`	`}`
`44`	`44`