Added support for dark mode on iOS 13 and above

Demo/Classes/ViewController.m

@@ -141,10 +141,19 @@ - (void)showErrorWithStatus {
 
 - (IBAction)changeStyle:(id)sender {
  UISegmentedControl *segmentedControl = (UISegmentedControl*)sender;
- if(segmentedControl.selectedSegmentIndex == 0){
- [SVProgressHUD setDefaultStyle:SVProgressHUDStyleLight];
- } else {
- [SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
+ switch(segmentedControl.selectedSegmentIndex){
+ case 0:
+ [SVProgressHUD setDefaultStyle:SVProgressHUDStyleLight];
+ break;
+ case 1:
+ [SVProgressHUD setDefaultStyle:SVProgressHUDStyleDark];
+ break;
+ case 2:
+ [SVProgressHUD setDefaultStyle:SVProgressHUDStyleAutoLight];
+ break;
+ case 3:
+ [SVProgressHUD setDefaultStyle:SVProgressHUDStyleAutoDark];
+ break;
  }
 }
 

Demo/SVProgressHUD-Info.plist

@@ -16,6 +16,8 @@
  <string>APPL</string>
  <key>CFBundleVersion</key>
  <string>1.0</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
  <key>LSRequiresIPhoneOS</key>
  <true/>
  <key>NSMainNibFile~ipad</key>

README.md

@@ -170,6 +170,8 @@ As standard `SVProgressHUD` offers two preconfigured styles:
 
 * `SVProgressHUDStyleLight`: White background with black spinner and text
 * `SVProgressHUDStyleDark`: Black background with white spinner and text
+* `SVProgressHUDStyleAutoLight`: Adjusts foreground and background colors in accordance with the user's appearance setting on iOS 13, falling back to `SVProgressHUDStyleLight` on prior versions of iOS.
+* `SVProgressHUDStyleAutoDark`: Adjusts foreground and background colors in accordance with the user's appearance setting on iOS 13, falling back to `SVProgressHUDStyleDark` on prior versions of iOS.
 
 If you want to use custom colors use `setForegroundColor` and `setBackgroundColor:`. These implicitly set the HUD's style to `SVProgressHUDStyleCustom`.
 

SVProgressHUD/SVIndefiniteAnimatedView.h

@@ -9,6 +9,7 @@
 
 @interface SVIndefiniteAnimatedView : UIView
 
+@property (nonatomic, assign) BOOL adjustsStrokeForTraitCollection;
 @property (nonatomic, assign) CGFloat strokeThickness;
 @property (nonatomic, assign) CGFloat radius;
 @property (nonatomic, strong) UIColor *strokeColor;

SVProgressHUD/SVIndefiniteAnimatedView.m

@@ -28,7 +28,7 @@ - (void)willMoveToSuperview:(UIView*)newSuperview {
 - (void)layoutAnimatedLayer {
  CALayer *layer = self.indefiniteAnimatedGradientLayer;
  [self.layer addSublayer:layer];
-
+ 
  CGFloat widthDiff = CGRectGetWidth(self.bounds) - CGRectGetWidth(layer.bounds);
  CGFloat heightDiff = CGRectGetHeight(self.bounds) - CGRectGetHeight(layer.bounds);
  layer.position = CGPointMake(CGRectGetWidth(self.bounds) - CGRectGetWidth(layer.bounds) / 2 - widthDiff / 2, CGRectGetHeight(self.bounds) - CGRectGetHeight(layer.bounds) / 2 - heightDiff / 2);
@@ -38,7 +38,7 @@ - (CAGradientLayer *)indefiniteAnimatedGradientLayer {
  if (!_indefiniteAnimatedGradientLayer) {
  CGPoint arcCenter = CGPointMake(self.radius+self.strokeThickness/2+5, self.radius+self.strokeThickness/2+5);
  UIBezierPath* smoothedPath = [UIBezierPath bezierPathWithArcCenter:arcCenter radius:self.radius startAngle:(CGFloat) (M_PI*3/2) endAngle:(CGFloat) (-0.5 * M_PI) clockwise:NO];
-
+ 
  CAShapeLayer *shapeLayer = [CAShapeLayer layer];
  shapeLayer.contentsScale = [[UIScreen mainScreen] scale];
  shapeLayer.frame = CGRectMake(0.0f, 0.0f, arcCenter.x*2, arcCenter.y*2);
@@ -50,7 +50,7 @@ - (CAGradientLayer *)indefiniteAnimatedGradientLayer {
  shapeLayer.path = smoothedPath.CGPath;
  shapeLayer.strokeStart = 0.4f;
  shapeLayer.strokeEnd = 1.0f;
-
+ 
  _indefiniteAnimatedGradientLayer = [CAGradientLayer layer];
  _indefiniteAnimatedGradientLayer.startPoint = CGPointMake(0.5f, 0.0f);
  _indefiniteAnimatedGradientLayer.endPoint = CGPointMake(0.5f, 1.0f);
@@ -66,10 +66,10 @@ - (CAGradientLayer *)indefiniteAnimatedGradientLayer {
  @(1.0f),
  nil];
  _indefiniteAnimatedGradientLayer.mask = shapeLayer;
-
+ 
  NSTimeInterval animationDuration = 1;
  CAMediaTimingFunction *linearCurve = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear];
-
+ 
  CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation"];
  animation.fromValue = (id) 0;
  animation.toValue = @(M_PI*2);
@@ -85,24 +85,24 @@ - (CAGradientLayer *)indefiniteAnimatedGradientLayer {
 }
 
 - (void)setFrame:(CGRect)frame {
-
+ 
  if (!CGRectEqualToRect(frame, super.frame)) {
  [super setFrame:frame];
-
+ 
  if (self.superview) {
  [self layoutAnimatedLayer];
  }
  }
-
+ 
 }
 
 - (void)setRadius:(CGFloat)radius {
  if(radius != _radius) {
  _radius = radius;
-
+ 
  [_indefiniteAnimatedGradientLayer removeFromSuperlayer];
  _indefiniteAnimatedGradientLayer = nil;
-
+ 
  if (self.superview) {
  [self layoutAnimatedLayer];
  }
@@ -111,21 +111,21 @@ - (void)setRadius:(CGFloat)radius {
 
 - (void)setStrokeColor:(UIColor*)strokeColor {
  _strokeColor = strokeColor;
-
+ 
  [_indefiniteAnimatedGradientLayer removeFromSuperlayer];
  _indefiniteAnimatedGradientLayer = nil;
-
+ 
  if (self.superview) {
  [self layoutAnimatedLayer];
  }
 }
 
 - (void)setStrokeThickness:(CGFloat)strokeThickness {
  _strokeThickness = strokeThickness;
-
+ 
  [_indefiniteAnimatedGradientLayer removeFromSuperlayer];
  _indefiniteAnimatedGradientLayer = nil;
-
+ 
  if (self.superview) {
  [self layoutAnimatedLayer];
  }
@@ -135,4 +135,17 @@ - (CGSize)sizeThatFits:(CGSize)size {
  return CGSizeMake((self.radius+self.strokeThickness/2+5)*2, (self.radius+self.strokeThickness/2+5)*2);
 }
 
+- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
+ if (@available(iOS 13.0, *)) {
+ if([self.traitCollection hasDifferentColorAppearanceComparedToTraitCollection:previousTraitCollection]
+ && _adjustsStrokeForTraitCollection) {
+ _indefiniteAnimatedGradientLayer.colors = [NSArray arrayWithObjects:
+ (id)[self.strokeColor colorWithAlphaComponent:0.0f].CGColor,
+ (id)[self.strokeColor colorWithAlphaComponent:0.5f].CGColor,
+ (id)self.strokeColor.CGColor,
+ nil];
+ }
+ }
+}
+
 @end

SVProgressHUD/SVProgressAnimatedView.h

@@ -9,6 +9,7 @@
 
 @interface SVProgressAnimatedView : UIView
 
+@property (nonatomic, assign) BOOL adjustsStrokeForTraitCollection;
 @property (nonatomic, assign) CGFloat radius;
 @property (nonatomic, assign) CGFloat strokeThickness;
 @property (nonatomic, strong) UIColor *strokeColor;

SVProgressHUD/SVProgressAnimatedView.m

@@ -93,4 +93,13 @@ - (CGSize)sizeThatFits:(CGSize)size {
  return CGSizeMake((self.radius+self.strokeThickness/2+5)*2, (self.radius+self.strokeThickness/2+5)*2);
 }
 
+- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
+ if (@available(iOS 13.0, *)) {
+ if([self.traitCollection hasDifferentColorAppearanceComparedToTraitCollection:previousTraitCollection]
+ && _adjustsStrokeForTraitCollection) {
+ _ringAnimatedLayer.strokeColor = self.strokeColor.CGColor;
+ }
+ }
+}
+
 @end

SVProgressHUD/SVProgressHUD.h

@@ -18,9 +18,11 @@ extern NSString * _Nonnull const SVProgressHUDDidAppearNotification;
 extern NSString * _Nonnull const SVProgressHUDStatusUserInfoKey;
 
 typedef NS_ENUM(NSInteger, SVProgressHUDStyle) {
- SVProgressHUDStyleLight NS_SWIFT_NAME(light), // default style, white HUD with black text, HUD background will be blurred
- SVProgressHUDStyleDark NS_SWIFT_NAME(dark), // black HUD and white text, HUD background will be blurred
- SVProgressHUDStyleCustom NS_SWIFT_NAME(custom) // uses the fore- and background color properties
+ SVProgressHUDStyleLight NS_SWIFT_NAME(light), // default style, white HUD with black text, HUD background will be blurred
+ SVProgressHUDStyleDark NS_SWIFT_NAME(dark), // black HUD and white text, HUD background will be blurred
+ SVProgressHUDStyleCustom NS_SWIFT_NAME(custom), // uses the fore- and background color properties
+ SVProgressHUDStyleAutoLight NS_SWIFT_NAME(autoLight), // uses dark mode system setting falling back to light prior to iOS 13.
+ SVProgressHUDStyleAutoDark NS_SWIFT_NAME(autoDark) // uses dark mode system setting falling back to dark prior to iOS 13.
 };
 
 typedef NS_ENUM(NSUInteger, SVProgressHUDMaskType) {