fix tint adjustment mode bug

kyoji2 · kyoji2 · commit 4dcb64ee2e66 · 2014-08-11T14:32:05.000+08:00
diff --git a/SIAlertView/SIAlertView.m b/SIAlertView/SIAlertView.m
@@ -36,9 +36,7 @@
 @interface SIAlertView ()
 
 @property (nonatomic, strong) NSMutableArray *items;
-@property (nonatomic, weak) UIWindow *oldKeyWindow;
 @property (nonatomic, strong) UIWindow *alertWindow;
-@property (nonatomic, assign) UIViewTintAdjustmentMode oldTintAdjustmentMode;
 @property (nonatomic, assign, getter = isVisible) BOOL visible;
 
 @property (nonatomic, strong) UILabel *titleLabel;
@@ -288,23 +286,34 @@ + (void)showBackground
                          animations:^{
                              __si_alert_background_window.alpha = 1;
                          }];
+        
+        UIWindow *mainWindow = [UIApplication sharedApplication].windows[0];
+        mainWindow.tintAdjustmentMode = UIViewTintAdjustmentModeDimmed;
     }
 }
 
 + (void)hideBackgroundAnimated:(BOOL)animated
 {
-    if (!animated) {
+    void (^completion)(void) = ^{
         [__si_alert_background_window removeFromSuperview];
         __si_alert_background_window = nil;
+        
+        UIWindow *mainWindow = [UIApplication sharedApplication].windows[0];
+        mainWindow.tintAdjustmentMode = UIViewTintAdjustmentModeNormal;
+        [mainWindow makeKeyWindow];
+        mainWindow.hidden = NO;
+    };
+    
+    if (!animated) {
+        completion();
         return;
     }
     [UIView animateWithDuration:0.3
                      animations:^{
                          __si_alert_background_window.alpha = 0;
                      }
                      completion:^(BOOL finished) {
-                         [__si_alert_background_window removeFromSuperview];
-                         __si_alert_background_window = nil;
+                         completion();
                      }];
 }
 
@@ -454,11 +463,6 @@ - (void)show
         return;
     }
     
-    self.oldKeyWindow = [[UIApplication sharedApplication] keyWindow];
-    
-    self.oldTintAdjustmentMode = self.oldKeyWindow.tintAdjustmentMode;
-    self.oldKeyWindow.tintAdjustmentMode = UIViewTintAdjustmentModeDimmed;
-
     if (![[SIAlertView sharedQueue] containsObject:self]) {
         [[SIAlertView sharedQueue] addObject:self];
     }
@@ -589,14 +593,6 @@ - (void)dismissAnimated:(BOOL)animated cleanup:(BOOL)cleanup
             [SIAlertView hideBackgroundAnimated:YES];
         }
     }
-    
-    UIWindow *window = self.oldKeyWindow;
-    window.tintAdjustmentMode = self.oldTintAdjustmentMode;
-    if (!window) {
-        window = [UIApplication sharedApplication].windows[0];
-    }
-    [window makeKeyWindow];
-    window.hidden = NO;
 }
 
 #pragma mark - Transitions
