Merge branch 'master' of github.com:andresbrun/SquaresFlipNavigation

# Conflicts:
#	README.md

CustomUINavigationController/NavigationClasses/BaseControllerAnimatedTransitioningDelegate.m

@@ -16,9 +16,7 @@ - (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)
 }
 
 - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionContext {
-    self.toView = [transitionContext viewForKey:UITransitionContextToViewKey];
-    self.fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];
-    self.containerView = [transitionContext containerView];
+    [self captureViewsInContext:transitionContext];
 
     self.toView.frame = self.containerView.frame;
 
@@ -29,7 +27,7 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
 }
 
 - (void)setFinalStateForTransitionContext:(id <UIViewControllerContextTransitioning>)transitionContext {
-    UIViewController *fromVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+    UIViewController *fromVC = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
     [fromVC.view setFrame:[transitionContext finalFrameForViewController:fromVC]];
 
     UIViewController *toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
@@ -46,4 +44,16 @@ - (NSTimeInterval)animationDuration {
     return 1;
 }
 
+- (void)captureViewsInContext:(id <UIViewControllerContextTransitioning>)transitionContext {
+    if ([transitionContext respondsToSelector:@selector(viewForKey:)]) {
+        self.toView = [transitionContext viewForKey:UITransitionContextToViewKey];
+        self.fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];
+    } else {
+        self.toView = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey].view;
+        self.fromView = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey].view;
+    }
+
+    self.containerView = [transitionContext containerView];
+}
+
 @end

README.md

@@ -37,7 +37,7 @@ pod "ABCustomUINavigationController"
 For using that component you only have to copy the SquaresFlipNavigation folder into your project and create the navigation controller as:
 
 ```objective-c
-import "FlipSquaresNavigationController.h"
+#import "FlipSquaresNavigationController.h"
 [[FlipSquaresNavigationController alloc] initWithRootViewController:self.viewController];
 ```
 
@@ -67,7 +67,10 @@ and pushing and pop as usual using commons methods like:
 - (NSArray *)popToViewController:(UIViewController *)viewController animated:(BOOL)animated
 ```
 
-It works with every screen size in iPhone and iPad. Also it supports rotations. And it supports Statusbar, NavigationBar and NavigationToolbar.
+## Features
+- Supports every screen size. iPhone and iPad.
+- Supports rotation.
+- Support status bar, navigation bar and navigation toolbar.
 
 ## Examples