Closes ECSlidingViewController#244 Give custom layouts top view position

Author: enriquez

ECSlidingViewController/ECSlidingViewController.m

@@ -49,8 +49,8 @@ @interface ECSlidingViewController()
 - (void)setup;
 
 - (CGRect)topViewCalculatedFrameForPosition:(ECSlidingViewControllerTopViewPosition)position;
-- (CGRect)underLeftViewCalculatedFrame;
-- (CGRect)underRightViewCalculatedFrame;
+- (CGRect)underLeftViewCalculatedFrameForTopViewPosition:(ECSlidingViewControllerTopViewPosition)position;
+- (CGRect)underRightViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTopViewPosition)position;
 - (CGRect)frameFromDelegateForViewController:(UIViewController *)viewController
                              topViewPosition:(ECSlidingViewControllerTopViewPosition)topViewPosition;
 - (ECSlidingViewControllerOperation)operationFromPosition:(ECSlidingViewControllerTopViewPosition)fromPosition
@@ -178,8 +178,8 @@ - (void)viewDidLayoutSubviews {
     if (self.currentOperation == ECSlidingViewControllerOperationNone) {
         self.gestureView.frame = [self topViewCalculatedFrameForPosition:self.currentTopViewPosition];
         self.topViewController.view.frame = [self topViewCalculatedFrameForPosition:self.currentTopViewPosition];
-        self.underLeftViewController.view.frame = [self underLeftViewCalculatedFrame];
-        self.underRightViewController.view.frame = [self underRightViewCalculatedFrame];
+        self.underLeftViewController.view.frame = [self underLeftViewCalculatedFrameTopViewPosition:self.currentTopViewPosition];
+        self.underRightViewController.view.frame = [self underRightViewCalculatedFrameTopViewPosition:self.currentTopViewPosition];
     }
 }
 
@@ -470,9 +470,9 @@ - (CGRect)topViewCalculatedFrameForPosition:(ECSlidingViewControllerTopViewPosit
     }
 }
 
-- (CGRect)underLeftViewCalculatedFrame {
+- (CGRect)underLeftViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTopViewPosition)position {
     CGRect frameFromDelegate = [self frameFromDelegateForViewController:self.underLeftViewController
-                                                        topViewPosition:self.currentTopViewPosition];
+                                                        topViewPosition:position];
     if (!CGRectIsInfinite(frameFromDelegate)) return frameFromDelegate;
 
     CGRect containerViewFrame = self.view.bounds;
@@ -495,9 +495,9 @@ - (CGRect)underLeftViewCalculatedFrame {
     return containerViewFrame;
 }
 
-- (CGRect)underRightViewCalculatedFrame {
+- (CGRect)underRightViewCalculatedFrameTopViewPosition:(ECSlidingViewControllerTopViewPosition)position {
     CGRect frameFromDelegate = [self frameFromDelegateForViewController:self.underRightViewController
-                                                        topViewPosition:self.currentTopViewPosition];
+                                                        topViewPosition:position];
     if (!CGRectIsInfinite(frameFromDelegate)) return frameFromDelegate;
 
     CGRect containerViewFrame = self.view.bounds;
@@ -880,10 +880,10 @@ - (CGRect)initialFrameForViewController:(UIViewController *)vc {
         if ([vc isEqual:self.topViewController]) return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionCentered];
     } else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
         if ([vc isEqual:self.topViewController])        return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionAnchoredLeft];
-        if ([vc isEqual:self.underRightViewController]) return [self underRightViewCalculatedFrame];
+        if ([vc isEqual:self.underRightViewController]) return [self underRightViewCalculatedFrameTopViewPosition:ECSlidingViewControllerTopViewPositionAnchoredLeft];
     } else if (self.currentOperation == ECSlidingViewControllerOperationResetFromRight) {
         if ([vc isEqual:self.topViewController])        return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionAnchoredRight];
-        if ([vc isEqual:self.underLeftViewController])  return [self underLeftViewCalculatedFrame];
+        if ([vc isEqual:self.underLeftViewController])  return [self underLeftViewCalculatedFrameTopViewPosition:ECSlidingViewControllerTopViewPositionAnchoredRight];
     }
 
     return CGRectZero;
@@ -892,10 +892,10 @@ - (CGRect)initialFrameForViewController:(UIViewController *)vc {
 - (CGRect)finalFrameForViewController:(UIViewController *)vc {
     if (self.currentOperation == ECSlidingViewControllerOperationAnchorLeft) {
         if (vc == self.topViewController)        return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionAnchoredLeft];
-        if (vc == self.underRightViewController) return [self underRightViewCalculatedFrame];
+        if (vc == self.underRightViewController) return [self underRightViewCalculatedFrameTopViewPosition:ECSlidingViewControllerTopViewPositionAnchoredLeft];
     } else if (self.currentOperation == ECSlidingViewControllerOperationAnchorRight) {
         if (vc == self.topViewController) return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionAnchoredRight];
-        if (vc == self.underLeftViewController)  return [self underLeftViewCalculatedFrame];
+        if (vc == self.underLeftViewController)  return [self underLeftViewCalculatedFrameTopViewPosition:ECSlidingViewControllerTopViewPositionAnchoredRight];
     } else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
         if (vc == self.topViewController) return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionCentered];
     } else if (self.currentOperation == ECSlidingViewControllerOperationResetFromRight) {

Examples/TransitionFun/TransitionFun/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A3017" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13B3116" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
     </dependencies>