Fixed issue #9

terryworona · Mar 13, 2014 · 231b388 · 231b388
1 parent 43045f1
commit 231b388
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/Classes/TWMessageBarManager.h b/Classes/TWMessageBarManager.h
@@ -103,9 +103,12 @@ typedef enum {
 - (void)showMessageWithTitle:(NSString *)title description:(NSString *)description type:(TWMessageBarMessageType)type duration:(CGFloat)duration callback:(void (^)())callback;
 
 /**
- *  Hides the topmost message from view and removes all remaining messages in the queue (not animated).
+ *  Hides the topmost message and removes all remaining messages in the queue.
+ *
+ *  @param animated     Animates the current message view off the screen.
  */
-- (void)hideAll;
+- (void)hideAllAnimated:(BOOL)animated;
+- (void)hideAll; // non-animated
 
 @end
 

diff --git a/Classes/TWMessageBarManager.m b/Classes/TWMessageBarManager.m
@@ -180,16 +180,25 @@ - (void)showMessageWithTitle:(NSString *)title description:(NSString *)descripti
     }
 }
 
-- (void)hideAll
+- (void)hideAllAnimated:(BOOL)animated
 {
-    TWMessageView *currentMessageView = nil;
-
     for (UIView *subview in [[[UIApplication sharedApplication] keyWindow] subviews])
     {
         if ([subview isKindOfClass:[TWMessageView class]])
         {
-            currentMessageView = (TWMessageView *)subview;
-            [currentMessageView removeFromSuperview];
+            TWMessageView *currentMessageView = (TWMessageView *)subview;
+            if (animated)
+            {
+                [UIView animateWithDuration:kTWMessageBarManagerDismissAnimationDuration animations:^{
+                    currentMessageView.frame = CGRectMake(currentMessageView.frame.origin.x, -currentMessageView.frame.size.height, currentMessageView.frame.size.width, currentMessageView.frame.size.height);
+                } completion:^(BOOL finished) {
+                    [currentMessageView removeFromSuperview];
+                }];
+            }
+            else
+            {
+                [currentMessageView removeFromSuperview];
+            }
         }
     }
 
@@ -198,6 +207,11 @@ - (void)hideAll
     [NSObject cancelPreviousPerformRequestsWithTarget:self];
 }
 
+- (void)hideAll
+{
+    [self hideAllAnimated:NO];
+}
+
 #pragma mark - Helpers
 
 - (void)showNextMessage

diff --git a/Demo/MessageBarManagerDemo/MessageBarManagerDemo/Controllers/TWMesssageBarDemoController.m b/Demo/MessageBarManagerDemo/MessageBarManagerDemo/Controllers/TWMesssageBarDemoController.m
@@ -152,7 +152,7 @@ - (void)infoButtonPressed:(id)sender
 
 - (void)hideAllButtonPressed:(id)sender
 {
-    [[TWMessageBarManager sharedInstance] hideAll];
+    [[TWMessageBarManager sharedInstance] hideAllAnimated:YES];
 }
 
 #pragma mark - Generators