Merge branch 'master' into under_layout

Author: enriquez

ECSlidingViewController/FirstTopViewController.m

@@ -46,12 +46,12 @@ - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceO
 
 - (IBAction)revealMenu:(id)sender
 {
-  [self.slidingViewController anchorTopViewTo:ECRight animations:nil onComplete:nil];
+  [self.slidingViewController anchorTopViewTo:ECRight];
 }
 
 - (IBAction)revealUnderRight:(id)sender
 {
-  [self.slidingViewController anchorTopViewTo:ECLeft animations:nil onComplete:nil];
+  [self.slidingViewController anchorTopViewTo:ECLeft];
 }
 
 @end

ECSlidingViewController/SampleTableViewController.m

@@ -40,7 +40,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 - (IBAction)revealMenu:(id)sender
 {
-  [self.slidingViewController anchorTopViewTo:ECRight animations:nil onComplete:nil];
+  [self.slidingViewController anchorTopViewTo:ECRight];
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation

ECSlidingViewController/SecondTopViewController.m

@@ -26,7 +26,7 @@ - (void)viewWillAppear:(BOOL)animated
 
 - (IBAction)revealMenu:(id)sender
 {
-  [self.slidingViewController anchorTopViewTo:ECRight animations:nil onComplete:nil];
+  [self.slidingViewController anchorTopViewTo:ECRight];
 }
 
 @end

ECSlidingViewController/ThirdTopViewController.m

@@ -53,7 +53,7 @@ - (void)viewWillAppear:(BOOL)animated
 
 - (IBAction)revealMenu:(id)sender
 {
-  [self.slidingViewController anchorTopViewTo:ECRight animations:nil onComplete:nil];
+  [self.slidingViewController anchorTopViewTo:ECRight];
 }
 
 // slidingViewController notification

ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.h

@@ -140,6 +140,14 @@ typedef enum {
  */
 - (UIPanGestureRecognizer *)panGesture;
 
+/** Slides the top view in the direction of the specified side.
+ 
+ A peek amount or reveal amount must be set for the given side. The top view will anchor to one of those specified values.
+ 
+ @param side The side for the top view to slide towards.
+ */
+- (void)anchorTopViewTo:(ECSide)side;
+
 /** Slides the top view in the direction of the specified side.
  
  A peek amount or reveal amount must be set for the given side. The top view will anchor to one of those specified values.
@@ -150,6 +158,12 @@ typedef enum {
  */
 - (void)anchorTopViewTo:(ECSide)side animations:(void(^)())animations onComplete:(void(^)())complete;
 
+/** Slides the top view off of the screen in the direction of the specified side.
+ 
+ @param side The side for the top view to slide off the screen towards.
+ */
+- (void)anchorTopViewOffScreenTo:(ECSide)side;
+
 /** Slides the top view off of the screen in the direction of the specified side.
  
  @param side The side for the top view to slide off the screen towards.
@@ -161,6 +175,13 @@ typedef enum {
 /** Slides the top view back to the center. */
 - (void)resetTopView;
 
+/** Slides the top view back to the center.
+
+ @param animations Perform changes to properties that will be animated while top view is moved back to the center of the screen. Can be nil.
+ @param onComplete Executed after the animation is completed. Can be nil.
+ */
+- (void)resetTopViewWithAnimations:(void(^)())animations onComplete:(void(^)())complete;
+
 /** Returns true if the underLeft view is showing (even partially) */
 - (BOOL)underLeftShowing;
 

ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.m

@@ -225,9 +225,9 @@ - (void)updateTopViewHorizontalCenterWithRecognizer:(UIPanGestureRecognizer *)re
     CGFloat currentVelocityX     = currentVelocityPoint.x;
 
     if ([self underLeftShowing] && currentVelocityX > 100) {
-      [self anchorTopViewTo:ECRight animations:nil onComplete:nil];
+      [self anchorTopViewTo:ECRight];
     } else if ([self underRightShowing] && currentVelocityX < 100) {
-      [self anchorTopViewTo:ECLeft animations:nil onComplete:nil];
+      [self anchorTopViewTo:ECLeft];
     } else {
       [self resetTopView];
     }
@@ -239,6 +239,11 @@ - (UIPanGestureRecognizer *)panGesture
   return _panGesture;
 }
 
+- (void)anchorTopViewTo:(ECSide)side
+{
+  [self anchorTopViewTo:side animations:nil onComplete:nil];
+}
+
 - (void)anchorTopViewTo:(ECSide)side animations:(void (^)())animations onComplete:(void (^)())complete
 {
   CGFloat newCenter = self.topView.center.x;
@@ -274,6 +279,11 @@ - (void)anchorTopViewTo:(ECSide)side animations:(void (^)())animations onComplet
   }];
 }
 
+- (void)anchorTopViewOffScreenTo:(ECSide)side
+{
+  [self anchorTopViewOffScreenTo:side animations:nil onComplete:nil];
+}
+
 - (void)anchorTopViewOffScreenTo:(ECSide)side animations:(void(^)())animations onComplete:(void(^)())complete
 {
   CGFloat newCenter = self.topView.center.x;
@@ -304,10 +314,21 @@ - (void)anchorTopViewOffScreenTo:(ECSide)side animations:(void(^)())animations o
 }
 
 - (void)resetTopView
+{
+  [self resetTopViewWithAnimations:nil onComplete:nil];
+}
+
+- (void)resetTopViewWithAnimations:(void(^)())animations onComplete:(void(^)())complete
 {
   [UIView animateWithDuration:0.25f animations:^{
+    if (animations) {
+      animations();
+    }
     [self updateTopViewHorizontalCenter:self.resettedCenter];
   } completion:^(BOOL finished) {
+    if (complete) {
+      complete();
+    }
     [self topViewHorizontalCenterDidChange:self.resettedCenter];
   }];
 }