Merge pull request #15 from vokalinteractive/master

Added option to fade in new controller
twotoasters · Jan 3, 2014 · 283652f · 283652f
2 parents da255fa + 245e7e9
commit 283652f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/TWTSideMenuViewController/TWTSideMenuViewController.h b/TWTSideMenuViewController/TWTSideMenuViewController.h
@@ -26,6 +26,14 @@
 
 @interface TWTSideMenuViewController : UIViewController
 
+typedef NS_ENUM(NSInteger, TWTSideMenuAnimationType) {
+    TWTSideMenuAnimationTypeSlideOver, //Default - new view controllers slide over the old view controller.
+    TWTSideMenuAnimationTypeFadeIn //New View controllers fade in over the old view controller.
+};
+
+/** The animation type - will default to Slide Over. */
+@property (nonatomic, assign) TWTSideMenuAnimationType animationType;
+
 /** Time interval for opening and closing the side menu */
 @property (nonatomic, assign) NSTimeInterval animationDuration;
 

diff --git a/TWTSideMenuViewController/TWTSideMenuViewController.m b/TWTSideMenuViewController/TWTSideMenuViewController.m
@@ -64,6 +64,7 @@ - (id)initWithMenuViewController:(UIViewController *)menuViewController mainView
 - (void)commonInitialization
 {
     self.animationDuration = kDefaultAnimationDuration;
+    self.animationType = TWTSideMenuAnimationTypeSlideOver;
 
     [self addViewController:self.menuViewController];
     [self addViewController:self.mainViewController];
@@ -294,7 +295,6 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
     animation.duration = kDefaultAnimationDuration;
     [overlayView.layer addAnimation:animation forKey:@"opacity"];
 
-    CGFloat outgoingStartX = CGRectGetMaxX(outgoingViewController.view.frame);
     NSTimeInterval changeTimeInterval = kDefaultSwapAnimationDuration;
     NSTimeInterval delayInterval = kDefaultAnimationDelayDuration;
     if (!self.open) {
@@ -307,10 +307,33 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
     [self.containerView addSubview:incomingViewController.view];
 
     incomingViewController.view.frame = self.containerView.bounds;
-    incomingViewController.view.transform = CGAffineTransformTranslate(incomingViewController.view.transform, outgoingStartX, 0.0f);
+
+    //Create default animation curve.
+    UIViewAnimationOptions options = UIViewAnimationOptionCurveEaseInOut;
+    switch (self.animationType) {
+        case TWTSideMenuAnimationTypeSlideOver: {
+            CGFloat outgoingStartX = CGRectGetMaxX(outgoingViewController.view.frame);
+
+            incomingViewController.view.transform = CGAffineTransformTranslate(incomingViewController.view.transform, outgoingStartX, 0.0f);
+            break;
+        }
+        case TWTSideMenuAnimationTypeFadeIn:
+            incomingViewController.view.alpha = 0.6f;
+            options = UIViewAnimationOptionCurveEaseOut;
+            break;
+    }
+
 
     void (^swapChangeBlock)(void) = ^{
-        incomingViewController.view.transform = CGAffineTransformIdentity;
+        switch (self.animationType) {
+            case TWTSideMenuAnimationTypeSlideOver:
+                incomingViewController.view.transform = CGAffineTransformIdentity;
+                break;
+            case TWTSideMenuAnimationTypeFadeIn:
+                incomingViewController.view.alpha = 1.0f;
+            default:
+                break;
+        }
     };
 
     void (^finishedChangeBlock)(BOOL finished) = ^(BOOL finished) {
@@ -331,7 +354,7 @@ - (void)setMainViewController:(UIViewController *)mainViewController animated:(B
 
         [UIView animateWithDuration:changeTimeInterval
                               delay:delayInterval
-                            options:UIViewAnimationOptionCurveEaseInOut
+                            options:options
                          animations:swapChangeBlock
                          completion:finishedChangeBlock];
     } else {