back to 1.3.3 again

Author: Billy Ohgren

.travis.yml

@@ -2,3 +2,5 @@ language: objective-c
 before_install: rake travis:before_install
 install: rake travis:install
 script: rake travis:script
+branches:
+  only: master

ECSlidingViewController.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name         = "ECSlidingViewController"
-  s.version      = "2.0.0-beta1"
+  s.version      = "2.0.0-beta2"
   s.summary      = "View controller container that presents its child view controllers in two sliding layers. Inspired by the Path 2.0 and Facebook iPhone apps."
   s.description  = "ECSlidingViewController is a view controller container that presents its child view controllers in two layers. It provides functionality for sliding the top view to reveal the views underneath it. This functionality is inspired by the Path 2.0 and Facebook iPhone apps."
   s.homepage     = "https://github.com/ECSlidingViewController/ECSlidingViewController"
   s.license      = 'MIT'
   s.author       = { "Mike Enriquez" => "[email protected]" }
-  s.source       = { :git => "https://github.com/ECSlidingViewController/ECSlidingViewController.git", :tag => "2.0.0-beta1" }
+  s.source       = { :git => "https://github.com/ECSlidingViewController/ECSlidingViewController.git", :tag => "2.0.0-beta2" }
 
   s.platform     = :ios, '7.0'
   s.requires_arc = true

ECSlidingViewController/ECPercentDrivenInteractiveTransition.m

@@ -25,18 +25,25 @@
 
 @interface ECPercentDrivenInteractiveTransition ()
 @property (nonatomic, assign) id<UIViewControllerContextTransitioning> transitionContext;
+@property (nonatomic, assign) BOOL isActive;
+- (void)removeAnimationsRecursively:(CALayer *)layer;
 @end
 
 @implementation ECPercentDrivenInteractiveTransition
 
 - (void)startInteractiveTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
+    self.isActive = YES;
     self.transitionContext = transitionContext;
 
+    CALayer *containerLayer = [self.transitionContext containerView].layer;
+    [self removeAnimationsRecursively:containerLayer];
     [self.animationController animateTransition:transitionContext];
     [self updateInteractiveTransition:0];
 }
 
 - (void)updateInteractiveTransition:(CGFloat)percentComplete {
+    if (!self.isActive) return;
+    
     [self.transitionContext updateInteractiveTransition:_percentComplete];
 
     CGFloat boundedPercentage;
@@ -56,13 +63,18 @@ - (void)updateInteractiveTransition:(CGFloat)percentComplete {
 }
 
 - (void)cancelInteractiveTransition {
+    if (!self.isActive) return;
+    
     [self.transitionContext cancelInteractiveTransition];
 
     CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(reversePausedAnimation:)];
     [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
 }
 
 - (void)finishInteractiveTransition {
+    if (!self.isActive) return;
+    self.isActive = NO;
+    
     [self.transitionContext finishInteractiveTransition];
 
     CALayer *layer = [self.transitionContext containerView].layer;
@@ -89,10 +101,22 @@ - (void)reversePausedAnimation:(CADisplayLink *)displayLink {
     [self updateInteractiveTransition:self.percentComplete];
 
     if (_percentComplete == 0.0) {
+        self.isActive = NO;
         CALayer *layer = [self.transitionContext containerView].layer;
         [layer removeAllAnimations];
         layer.speed = 1.0;
     }
 }
 
+#pragma mark - Private
+
+- (void)removeAnimationsRecursively:(CALayer *)layer {
+    if (layer.sublayers.count > 0) {
+        for (CALayer *subLayer in layer.sublayers) {
+            [subLayer removeAllAnimations];
+            [self removeAnimationsRecursively:subLayer];
+        }
+    }
+}
+
 @end

ECSlidingViewController/ECSlidingAnimationController.m

@@ -41,11 +41,14 @@ - (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionC
     UIViewController *topViewController = [transitionContext viewControllerForKey:ECTransitionContextTopViewControllerKey];
     UIViewController *toViewController  = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
     UIView *containerView = [transitionContext containerView];
+    CGRect topViewInitialFrame = [transitionContext initialFrameForViewController:topViewController];
     CGRect topViewFinalFrame   = [transitionContext finalFrameForViewController:topViewController];
 
+    topViewController.view.frame = topViewInitialFrame;
+    
     if (topViewController != toViewController) {
-        CGRect toViewInitialFrame = [transitionContext initialFrameForViewController:toViewController];
-        toViewController.view.frame = toViewInitialFrame;
+        CGRect toViewFinalFrame = [transitionContext finalFrameForViewController:toViewController];
+        toViewController.view.frame = toViewFinalFrame;
         [containerView insertSubview:toViewController.view belowSubview:topViewController.view];
     }
 

ECSlidingViewController/ECSlidingViewController.m

@@ -34,7 +34,6 @@ @interface ECSlidingViewController()
 @property (nonatomic, strong) id<UIViewControllerAnimatedTransitioning> currentAnimationController;
 @property (nonatomic, strong) id<UIViewControllerInteractiveTransitioning> currentInteractiveTransition;
 @property (nonatomic, strong) UIView *gestureView;
-@property (nonatomic, strong) UIPanGestureRecognizer *resetPanGesture;
 @property (nonatomic, strong) NSMapTable *customAnchoredGesturesViewMap;
 @property (nonatomic, assign) CGFloat currentAnimationPercentage;
 @property (nonatomic, assign) BOOL preserveLeftPeekAmount;
@@ -175,18 +174,9 @@ - (void)viewDidDisappear:(BOOL)animated {
     }
 }
 
-- (void)viewWillLayoutSubviews {
-    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];
-    }
-}
-
 - (void)viewDidLayoutSubviews {
     if (self.currentOperation == ECSlidingViewControllerOperationNone) {
-        [self topViewCalculatedFrameForPosition:self.currentTopViewPosition];
+        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];
@@ -258,7 +248,6 @@ - (void)setTopViewController:(UIViewController *)topViewController {
 
         if ([self isViewLoaded]) {
             [_topViewController beginAppearanceTransition:YES animated:NO];
-            _topViewController.view.frame = [self topViewCalculatedFrameForPosition:self.currentTopViewPosition];
             [self.view addSubview:_topViewController.view];
             [_topViewController endAppearanceTransition];
         }
@@ -388,14 +377,6 @@ - (UIView *)gestureView {
     return _gestureView;
 }
 
-- (UIPanGestureRecognizer *)resetPanGesture {
-    if (_resetPanGesture) return _resetPanGesture;
-    
-    _resetPanGesture = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(detectPanGestureRecognizer:)];
-    
-    return _resetPanGesture;
-}
-
 - (NSMapTable *)customAnchoredGesturesViewMap {
     if (_customAnchoredGesturesViewMap) return _customAnchoredGesturesViewMap;
 
@@ -580,6 +561,8 @@ - (ECSlidingViewControllerOperation)operationFromPosition:(ECSlidingViewControll
 - (void)animateOperation:(ECSlidingViewControllerOperation)operation {
     if (![self operationIsValid:operation]) return;
     if (self.transitionInProgress) return;
+
+    self.view.userInteractionEnabled = NO;
 
     self.transitionInProgress = YES;
 
@@ -697,25 +680,28 @@ - (void)updateTopViewGestures {
             topView.userInteractionEnabled = NO;
         } else {
             self.gestureView.frame = topView.frame;
-            for (UIGestureRecognizer *gesture in self.gestureView.gestureRecognizers) {
-                [self.gestureView removeGestureRecognizer:gesture];
-            }
 
-            if (self.topViewAnchoredGesture & ECSlidingViewControllerAnchoredGesturePanning && self.panGesture.view && self.panGesture.isEnabled) {
-                [self.gestureView addGestureRecognizer:self.resetPanGesture];
+            if (self.topViewAnchoredGesture & ECSlidingViewControllerAnchoredGesturePanning &&
+                ![self.customAnchoredGesturesViewMap objectForKey:self.panGesture]) {
+                [self.customAnchoredGesturesViewMap setObject:self.panGesture.view forKey:self.panGesture];
+                [self.panGesture.view removeGestureRecognizer:self.panGesture];
+                [self.gestureView addGestureRecognizer:self.panGesture];
                 if (!self.gestureView.superview) [self.view insertSubview:self.gestureView aboveSubview:topView];
             }
 
-            if (self.topViewAnchoredGesture & ECSlidingViewControllerAnchoredGestureTapping) {
+            if (self.topViewAnchoredGesture & ECSlidingViewControllerAnchoredGestureTapping &&
+                ![self.customAnchoredGesturesViewMap objectForKey:self.resetTapGesture]) {
                 [self.gestureView addGestureRecognizer:self.resetTapGesture];
                 if (!self.gestureView.superview) [self.view insertSubview:self.gestureView aboveSubview:topView];
             }
 
             if (self.topViewAnchoredGesture & ECSlidingViewControllerAnchoredGestureCustom) {
                 for (UIGestureRecognizer *gesture in self.customAnchoredGestures) {
-                    [self.customAnchoredGesturesViewMap setObject:gesture.view forKey:gesture];
-                    [gesture.view removeGestureRecognizer:gesture];
-                    [self.gestureView addGestureRecognizer:gesture];
+                    if (![self.customAnchoredGesturesViewMap objectForKey:gesture]) {
+                        [self.customAnchoredGesturesViewMap setObject:gesture.view forKey:gesture];
+                        [gesture.view removeGestureRecognizer:gesture];
+                        [self.gestureView addGestureRecognizer:gesture];
+                    }
                 }
                 if (!self.gestureView.superview) [self.view insertSubview:self.gestureView aboveSubview:topView];
             }
@@ -725,7 +711,15 @@ - (void)updateTopViewGestures {
         [self.gestureView removeFromSuperview];
         for (UIGestureRecognizer *gesture in self.customAnchoredGestures) {
             UIView *originalView = [self.customAnchoredGesturesViewMap objectForKey:gesture];
-            if (![originalView.gestureRecognizers containsObject:gesture]) [originalView addGestureRecognizer:gesture];
+            if ([originalView isDescendantOfView:self.topViewController.view]) {
+                [originalView addGestureRecognizer:gesture];
+            }
+        }
+        if ([self.customAnchoredGesturesViewMap objectForKey:self.panGesture]) {
+            UIView *view = [self.customAnchoredGesturesViewMap objectForKey:self.panGesture];
+            if ([view isDescendantOfView:self.topViewController.view]) {
+                [view addGestureRecognizer:self.panGesture];
+            }
         }
         [self.customAnchoredGesturesViewMap removeAllObjects];
     }
@@ -739,6 +733,7 @@ - (void)detectPanGestureRecognizer:(UIPanGestureRecognizer *)recognizer {
     }
 
     [self.defaultInteractiveTransition updateTopViewHorizontalCenterWithRecognizer:recognizer];
+    _isInteractive = NO;
 }
 
 #pragma mark - UIViewControllerTransitionCoordinatorContext
@@ -833,9 +828,9 @@ - (void)completeTransition:(BOOL)didComplete {
     if (self.animationComplete) self.animationComplete();
     self.animationComplete = nil;
 
-    [self endAppearanceTransitionForOperation:self.currentOperation isCancelled:[self transitionWasCancelled]];
     [self setNeedsStatusBarAppearanceUpdate];
     [self updateTopViewGestures];
+    [self endAppearanceTransitionForOperation:self.currentOperation isCancelled:[self transitionWasCancelled]];
 
     _transitionWasCancelled          = NO;
     _isInteractive                   = NO;
@@ -845,6 +840,7 @@ - (void)completeTransition:(BOOL)didComplete {
     self.currentAnimationPercentage  = 0;
     self.currentOperation            = ECSlidingViewControllerOperationNone;
     self.transitionInProgress        = NO;
+    self.view.userInteractionEnabled = YES;
     [UIViewController attemptRotationToDeviceOrientation];
 }
 
@@ -864,10 +860,10 @@ - (UIViewController *)viewControllerForKey:(NSString *)key {
         if (key == UITransitionContextFromViewControllerKey) return self.topViewController;
         if (key == UITransitionContextToViewControllerKey)   return self.underLeftViewController;
     } else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
-        if (key == UITransitionContextFromViewControllerKey) return self.underLeftViewController;
+        if (key == UITransitionContextFromViewControllerKey) return self.underRightViewController;
         if (key == UITransitionContextToViewControllerKey)   return self.topViewController;
     } else if (self.currentOperation == ECSlidingViewControllerOperationResetFromRight) {
-        if (key == UITransitionContextFromViewControllerKey) return self.underRightViewController;
+        if (key == UITransitionContextFromViewControllerKey) return self.underLeftViewController;
         if (key == UITransitionContextToViewControllerKey)   return self.topViewController;
     }
 
@@ -877,10 +873,8 @@ - (UIViewController *)viewControllerForKey:(NSString *)key {
 - (CGRect)initialFrameForViewController:(UIViewController *)vc {
     if (self.currentOperation == ECSlidingViewControllerOperationAnchorLeft) {
         if ([vc isEqual:self.topViewController]) return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionCentered];
-        if ([vc isEqual:self.underRightViewController]) return [self underRightViewCalculatedFrame];
     } else if (self.currentOperation == ECSlidingViewControllerOperationAnchorRight) {
         if ([vc isEqual:self.topViewController]) return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionCentered];
-        if ([vc isEqual:self.underLeftViewController])  return [self underLeftViewCalculatedFrame];
     } else if (self.currentOperation == ECSlidingViewControllerOperationResetFromLeft) {
         if ([vc isEqual:self.topViewController])        return [self topViewCalculatedFrameForPosition:ECSlidingViewControllerTopViewPositionAnchoredLeft];
         if ([vc isEqual:self.underRightViewController]) return [self underRightViewCalculatedFrame];
@@ -929,6 +923,7 @@ - (void)notifyWhenInteractionEndsUsingBlock:(void(^)(id<UIViewControllerTransiti
     self.coordinatorInteractionEnded = handler;
 }
 
+/*
 #pragma mark AutoRotation
 
 - (BOOL)shouldAutorotate {
@@ -948,5 +943,5 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
     return [self.topViewController preferredInterfaceOrientationForPresentation];
 }
 
-
+*/
 @end