Merge pull request #24 from mallorypaine/min-display-time

Add minimumDisplayTime property
JonasGessner · Apr 14, 2015 · 6e9ff19 · 6e9ff19
2 parents 839beec + 2262053
commit 6e9ff19
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUD.h b/JGProgressHUD/JGProgressHUD/JGProgressHUD.h
@@ -251,6 +251,13 @@ typedef NS_ENUM(NSUInteger, JGProgressHUDInteractionType) {
 - (void)setProgress:(float)progress animated:(BOOL)animated;
 
 
+/**
+ Specify a minimum time that the HUD will be on-screen. Useful to prevent the HUD from flashing quickly on the screen when network operations complete more quickly than expected.
+ 
+ @b Default: 0.0.
+ */
+@property (nonatomic, assign) NSTimeInterval minimumDisplayTime;
+
 /////////////
 // Showing //
 /////////////

diff --git a/JGProgressHUD/JGProgressHUD/JGProgressHUD.m b/JGProgressHUD/JGProgressHUD/JGProgressHUD.m
@@ -48,6 +48,8 @@ @interface JGProgressHUD () {
     BOOL _dismissAfterTransitionFinished;
     BOOL _dismissAfterTransitionFinishedWithAnimation;
 
+    CFAbsoluteTime _displayTime;
+
     JGProgressHUDIndicatorView *_indicatorViewAfterTransitioning;
 }
 
@@ -336,6 +338,7 @@ - (void)cleanUpAfterPresentation {
     self.hidden = NO;
 
     _transitioning = NO;
+    _displayTime = CFAbsoluteTimeGetCurrent();
 
     if (_indicatorViewAfterTransitioning) {
         self.indicatorView = _indicatorViewAfterTransitioning;
@@ -397,6 +400,8 @@ - (void)showInRect:(CGRect)rect inView:(UIView *)view animated:(BOOL)animated {
 
     _transitioning = YES;
 
+    _displayTime = 0;
+
     if ([self.delegate respondsToSelector:@selector(progressHUD:willPresentInView:)]) {
         [self.delegate progressHUD:self willPresentInView:view];
     }
@@ -443,6 +448,15 @@ - (void)dismissAnimated:(BOOL)animated {
         return;
     }
 
+    if (self.minimumDisplayTime > 0 && _displayTime > 0) {
+        CFAbsoluteTime displayedTime = CFAbsoluteTimeGetCurrent() - _displayTime;
+        if (displayedTime < self.minimumDisplayTime) {
+            NSTimeInterval delay = self.minimumDisplayTime - displayedTime;
+            [self dismissAfterDelay:delay animated:animated];
+            return;
+        }
+    }
+
     _transitioning = YES;
 
     if ([self.delegate respondsToSelector:@selector(progressHUD:willDismissFromView:)]) {