Created separate horizontal and vertical swipe interaction controllers

ColinEberhardt · ColinEberhardt · commit f7516deb9845 · 2013-09-22T19:12:38.000+01:00
diff --git a/AnimationControllers/CECardsAnimationController.m b/AnimationControllers/CECardsAnimationController.m
@@ -58,7 +58,7 @@ -(void)executeForwardsAnimation:(id<UIViewControllerContextTransitioning>)transi
         }];
 
     } completion:^(BOOL finished) {
-        [transitionContext completeTransition:YES];
+        [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
     }];
     
     
@@ -89,15 +89,19 @@ -(void)executeReverseAnimation:(id<UIViewControllerContextTransitioning>)transit
         }];
         
         // animate the to- view into place
-        [UIView addKeyframeWithRelativeStartTime:0.3f relativeDuration:0.45f animations:^{
+        [UIView addKeyframeWithRelativeStartTime:0.35f relativeDuration:0.35f animations:^{
             toView.layer.transform = t1;
             toView.alpha = 1.0;
         }];
         [UIView addKeyframeWithRelativeStartTime:0.75f relativeDuration:0.25f animations:^{
             toView.layer.transform = CATransform3DIdentity;
         }];
     } completion:^(BOOL finished) {
-        [transitionContext completeTransition:YES];
+        if ([transitionContext transitionWasCancelled]) {
+            toView.layer.transform = CATransform3DIdentity;
+            toView.alpha = 1.0;
+        }
+        [transitionContext completeTransition:![transitionContext transitionWasCancelled]];
     }];
 }
 
diff --git a/InteractionControllers/CEHorizontalSwipeInteractionController.h b/InteractionControllers/CEHorizontalSwipeInteractionController.h
@@ -0,0 +1,19 @@
+//
+//  SwipeInteractionController.h
+//  ILoveCatz
+//
+//  Created by Colin Eberhardt on 22/08/2013.
+//  Copyright (c) 2013 com.razeware. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CEBaseInteractionController.h"
+
+/**
+ A horizontal swipe interaction controller. When used with a navigation controller, a right-to-left swipe
+ will cause a 'pop' navigation. When used wth a tabbar controller, right-to-left and left-to-right cause navigation
+ between neighbouring tabs.
+ */
+@interface CEHorizontalSwipeInteractionController : CEBaseInteractionController
+
+@end
diff --git a/InteractionControllers/CEHorizontalSwipeInteractionController.m b/InteractionControllers/CEHorizontalSwipeInteractionController.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 com.razeware. All rights reserved.
 //
 
-#import "CESwipeInteractionController.h"
+#import "CEHorizontalSwipeInteractionController.h"
 
-@implementation CESwipeInteractionController {
+@implementation CEHorizontalSwipeInteractionController {
     BOOL _shouldCompleteTransition;
     UIViewController *_viewController;
     UIPanGestureRecognizer *_gesture;
diff --git a/InteractionControllers/CESwipeInteractionController.h b/InteractionControllers/CESwipeInteractionController.h
diff --git a/InteractionControllers/CEVerticalSwipeInteractionController.h b/InteractionControllers/CEVerticalSwipeInteractionController.h
@@ -0,0 +1,17 @@
+//
+//  CEVerticalSwipeInteactionController.h
+//  TransitionsDemo
+//
+//  Created by Colin Eberhardt on 22/09/2013.
+//  Copyright (c) 2013 Colin Eberhardt. All rights reserved.
+//
+
+#import "CEBaseInteractionController.h"
+
+/**
+ A horizontal swipe interaction controller. When used with a navigation controller, a top-to-bottom swipe
+ will cause a 'pop' navigation. This interaction controller cannot be used with a tabbar controller. That would be silly.
+ */
+@interface CEVerticalSwipeInteractionController : CEBaseInteractionController
+
+@end
diff --git a/InteractionControllers/CEVerticalSwipeInteractionController.m b/InteractionControllers/CEVerticalSwipeInteractionController.m
@@ -0,0 +1,96 @@
+//
+//  CEVerticalSwipeInteactionController.m
+//  TransitionsDemo
+//
+//  Created by Colin Eberhardt on 22/09/2013.
+//  Copyright (c) 2013 Colin Eberhardt. All rights reserved.
+//
+
+#import "CEVerticalSwipeInteractionController.h"
+
+@implementation CEVerticalSwipeInteractionController {
+    BOOL _shouldCompleteTransition;
+    UIViewController *_viewController;
+    UIPanGestureRecognizer *_gesture;
+    CEInteractionOperation _operation;
+}
+
+-(void)dealloc {
+    [_gesture.view removeGestureRecognizer:_gesture];
+}
+
+- (void)wireToViewController:(UIViewController *)viewController forOperation:(CEInteractionOperation)operation{
+    
+    if (operation == CEInteractionOperationTab) {
+        @throw [NSException exceptionWithName:NSInternalInconsistencyException
+                                       reason:@"You cannot use a vertical swipe interaction with a tabbar controller - that would be silly!"
+                                     userInfo:nil];
+    }
+    _operation = operation;
+    _viewController = viewController;
+    [self prepareGestureRecognizerInView:viewController.view];
+}
+
+
+- (void)prepareGestureRecognizerInView:(UIView*)view {
+    _gesture = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(handleGesture:)];
+    [view addGestureRecognizer:_gesture];
+}
+
+- (CGFloat)completionSpeed
+{
+    return 1 - self.percentComplete;
+}
+
+- (void)handleGesture:(UIPanGestureRecognizer*)gestureRecognizer {
+    CGPoint translation = [gestureRecognizer translationInView:gestureRecognizer.view.superview];
+    
+    switch (gestureRecognizer.state) {
+        case UIGestureRecognizerStateBegan: {
+            
+            BOOL topToBottomSwipe = translation.y > 0;
+            
+            // perform the required navigation operation ...
+            
+            if (_operation == CEInteractionOperationPop) {
+                // for pop operation, fire on top-to-bottom
+                if (topToBottomSwipe) {
+                    self.interactionInProgress = YES;
+                    [_viewController.navigationController popViewControllerAnimated:YES];
+                }
+            } else {
+                // for dismiss, fire regardless of the translation direction
+                self.interactionInProgress = YES;
+                [_viewController dismissViewControllerAnimated:YES completion:nil];
+            }
+            break;
+        }
+        case UIGestureRecognizerStateChanged: {
+            if (self.interactionInProgress) {
+                // compute the current position
+                CGFloat fraction = fabsf(translation.y / 200.0);
+                fraction = fminf(fmaxf(fraction, 0.0), 1.0);
+                _shouldCompleteTransition = (fraction > 0.5);
+                
+                [self updateInteractiveTransition:fraction];
+            }
+            break;
+        }
+        case UIGestureRecognizerStateEnded:
+        case UIGestureRecognizerStateCancelled:
+            if (self.interactionInProgress) {
+                self.interactionInProgress = NO;
+                if (!_shouldCompleteTransition || gestureRecognizer.state == UIGestureRecognizerStateCancelled) {
+                    [self cancelInteractiveTransition];
+                }
+                else {
+                    [self finishInteractiveTransition];
+                }
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+@end
diff --git a/TabBarDemo/TabBarDemo.xcodeproj/project.pbxproj b/TabBarDemo/TabBarDemo.xcodeproj/project.pbxproj
@@ -30,7 +30,7 @@
 		72EC060017E8DF5D00DCB9A3 /* CETurnAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EC05FA17E8DF5D00DCB9A3 /* CETurnAnimationController.m */; };
 		72EC060317E9655300DCB9A3 /* TabBarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EC060217E9655300DCB9A3 /* TabBarViewController.m */; };
 		72EC060917E96C2500DCB9A3 /* CEBaseInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EC060717E96C2500DCB9A3 /* CEBaseInteractionController.m */; };
-		72EC060A17E96C2500DCB9A3 /* CESwipeInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EC060817E96C2500DCB9A3 /* CESwipeInteractionController.m */; };
+		72EE96DE17EF6A5D0097DF82 /* CEHorizontalSwipeInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EE96DD17EF6A5D0097DF82 /* CEHorizontalSwipeInteractionController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -79,9 +79,9 @@
 		72EC060117E9655300DCB9A3 /* TabBarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabBarViewController.h; sourceTree = "<group>"; };
 		72EC060217E9655300DCB9A3 /* TabBarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TabBarViewController.m; sourceTree = "<group>"; };
 		72EC060517E96C2500DCB9A3 /* CEBaseInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CEBaseInteractionController.h; path = ../InteractionControllers/CEBaseInteractionController.h; sourceTree = "<group>"; };
-		72EC060617E96C2500DCB9A3 /* CESwipeInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CESwipeInteractionController.h; path = ../InteractionControllers/CESwipeInteractionController.h; sourceTree = "<group>"; };
 		72EC060717E96C2500DCB9A3 /* CEBaseInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CEBaseInteractionController.m; path = ../InteractionControllers/CEBaseInteractionController.m; sourceTree = "<group>"; };
-		72EC060817E96C2500DCB9A3 /* CESwipeInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CESwipeInteractionController.m; path = ../InteractionControllers/CESwipeInteractionController.m; sourceTree = "<group>"; };
+		72EE96DC17EF6A5D0097DF82 /* CEHorizontalSwipeInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CEHorizontalSwipeInteractionController.h; path = ../InteractionControllers/CEHorizontalSwipeInteractionController.h; sourceTree = "<group>"; };
+		72EE96DD17EF6A5D0097DF82 /* CEHorizontalSwipeInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CEHorizontalSwipeInteractionController.m; path = ../InteractionControllers/CEHorizontalSwipeInteractionController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -208,10 +208,10 @@
 		72EC060417E96C0C00DCB9A3 /* InteractionControllers */ = {
 			isa = PBXGroup;
 			children = (
+				72EE96DC17EF6A5D0097DF82 /* CEHorizontalSwipeInteractionController.h */,
+				72EE96DD17EF6A5D0097DF82 /* CEHorizontalSwipeInteractionController.m */,
 				72EC060517E96C2500DCB9A3 /* CEBaseInteractionController.h */,
 				72EC060717E96C2500DCB9A3 /* CEBaseInteractionController.m */,
-				72EC060617E96C2500DCB9A3 /* CESwipeInteractionController.h */,
-				72EC060817E96C2500DCB9A3 /* CESwipeInteractionController.m */,
 			);
 			name = InteractionControllers;
 			sourceTree = "<group>";
@@ -315,7 +315,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				72EC060317E9655300DCB9A3 /* TabBarViewController.m in Sources */,
-				72EC060A17E96C2500DCB9A3 /* CESwipeInteractionController.m in Sources */,
+				72EE96DE17EF6A5D0097DF82 /* CEHorizontalSwipeInteractionController.m in Sources */,
 				72EC05D017E8DF3D00DCB9A3 /* ViewController.m in Sources */,
 				72EC05FF17E8DF5D00DCB9A3 /* CEReversibleAnimationController.m in Sources */,
 				72EC05C717E8DF3D00DCB9A3 /* AppDelegate.m in Sources */,
@@ -544,6 +544,7 @@
 				72EC05EA17E8DF3D00DCB9A3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		72EC05EB17E8DF3D00DCB9A3 /* Build configuration list for PBXNativeTarget "TabBarDemoTests" */ = {
 			isa = XCConfigurationList;
@@ -552,6 +553,7 @@
 				72EC05ED17E8DF3D00DCB9A3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
diff --git a/TabBarDemo/TabBarDemo/TabBarViewController.m b/TabBarDemo/TabBarDemo/TabBarViewController.m
@@ -8,23 +8,23 @@
 
 #import "TabBarViewController.h"
 #import "CEFoldAnimationController.h"
-#import "CESwipeInteractionController.h"
+#import "CEHorizontalSwipeInteractionController.h"
 
 @interface TabBarViewController () <UITabBarControllerDelegate>
 
 @end
 
 @implementation TabBarViewController {
     CEFoldAnimationController *_animationController;
-    CESwipeInteractionController *_swipeInteractionController;
+    CEHorizontalSwipeInteractionController *_swipeInteractionController;
 }
 
 - (id)initWithCoder:(NSCoder *)aDecoder {
     if (self = [super initWithCoder:aDecoder]) {
         self.delegate = self;
         
         // create the interaction / animation controllers
-        _swipeInteractionController = [CESwipeInteractionController new];
+        _swipeInteractionController = [CEHorizontalSwipeInteractionController new];
         _animationController = [CEFoldAnimationController new];
         _animationController.folds = 3;
         
diff --git a/TransitionsDemo/TransitionsDemo.xcodeproj/project.pbxproj b/TransitionsDemo/TransitionsDemo.xcodeproj/project.pbxproj
@@ -23,14 +23,15 @@
 		7273236017DFBEBF0072C7FD /* CETurnAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7273235D17DFBEBF0072C7FD /* CETurnAnimationController.m */; };
 		7273236317DFBEFE0072C7FD /* CEReversibleAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7273236217DFBEFE0072C7FD /* CEReversibleAnimationController.m */; };
 		7273236917DFBF140072C7FD /* CEBaseInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7273236617DFBF140072C7FD /* CEBaseInteractionController.m */; };
-		7273236A17DFBF140072C7FD /* CESwipeInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7273236817DFBF140072C7FD /* CESwipeInteractionController.m */; };
+		7273236A17DFBF140072C7FD /* CEHorizontalSwipeInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7273236817DFBF140072C7FD /* CEHorizontalSwipeInteractionController.m */; };
 		7273236D17DFC0690072C7FD /* NavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7273236C17DFC0690072C7FD /* NavigationController.m */; };
 		7273237017DFC4710072C7FD /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7273236F17DFC4710072C7FD /* SettingsViewController.m */; };
 		72C15E1117E10C620056B3F9 /* CECrossfadeAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C15E1017E10C620056B3F9 /* CECrossfadeAnimationController.m */; };
 		72C15E1417E10E7B0056B3F9 /* CEExplodeAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C15E1317E10E7B0056B3F9 /* CEExplodeAnimationController.m */; };
 		72C15E1717E19A940056B3F9 /* CEFoldAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C15E1617E19A940056B3F9 /* CEFoldAnimationController.m */; };
 		72EC05A917E7B1BE00DCB9A3 /* CEPinchInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EC05A817E7B1BE00DCB9A3 /* CEPinchInteractionController.m */; };
 		72EE96D817EF47A60097DF82 /* CECardsAnimationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EE96D717EF47A60097DF82 /* CECardsAnimationController.m */; };
+		72EE96DB17EF66040097DF82 /* CEVerticalSwipeInteractionController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EE96DA17EF66040097DF82 /* CEVerticalSwipeInteractionController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -68,8 +69,8 @@
 		7273236217DFBEFE0072C7FD /* CEReversibleAnimationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEReversibleAnimationController.m; sourceTree = "<group>"; };
 		7273236517DFBF140072C7FD /* CEBaseInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEBaseInteractionController.h; sourceTree = "<group>"; };
 		7273236617DFBF140072C7FD /* CEBaseInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEBaseInteractionController.m; sourceTree = "<group>"; };
-		7273236717DFBF140072C7FD /* CESwipeInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CESwipeInteractionController.h; sourceTree = "<group>"; };
-		7273236817DFBF140072C7FD /* CESwipeInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CESwipeInteractionController.m; sourceTree = "<group>"; };
+		7273236717DFBF140072C7FD /* CEHorizontalSwipeInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEHorizontalSwipeInteractionController.h; sourceTree = "<group>"; };
+		7273236817DFBF140072C7FD /* CEHorizontalSwipeInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEHorizontalSwipeInteractionController.m; sourceTree = "<group>"; };
 		7273236B17DFC0690072C7FD /* NavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationController.h; sourceTree = "<group>"; };
 		7273236C17DFC0690072C7FD /* NavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavigationController.m; sourceTree = "<group>"; };
 		7273236E17DFC4710072C7FD /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
@@ -84,6 +85,8 @@
 		72EC05A817E7B1BE00DCB9A3 /* CEPinchInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEPinchInteractionController.m; sourceTree = "<group>"; };
 		72EE96D617EF47A60097DF82 /* CECardsAnimationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CECardsAnimationController.h; sourceTree = "<group>"; };
 		72EE96D717EF47A60097DF82 /* CECardsAnimationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CECardsAnimationController.m; sourceTree = "<group>"; };
+		72EE96D917EF66040097DF82 /* CEVerticalSwipeInteractionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CEVerticalSwipeInteractionController.h; sourceTree = "<group>"; };
+		72EE96DA17EF66040097DF82 /* CEVerticalSwipeInteractionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CEVerticalSwipeInteractionController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -197,10 +200,12 @@
 			children = (
 				7273236517DFBF140072C7FD /* CEBaseInteractionController.h */,
 				7273236617DFBF140072C7FD /* CEBaseInteractionController.m */,
-				7273236717DFBF140072C7FD /* CESwipeInteractionController.h */,
-				7273236817DFBF140072C7FD /* CESwipeInteractionController.m */,
+				7273236717DFBF140072C7FD /* CEHorizontalSwipeInteractionController.h */,
+				7273236817DFBF140072C7FD /* CEHorizontalSwipeInteractionController.m */,
 				72EC05A717E7B1BE00DCB9A3 /* CEPinchInteractionController.h */,
 				72EC05A817E7B1BE00DCB9A3 /* CEPinchInteractionController.m */,
+				72EE96D917EF66040097DF82 /* CEVerticalSwipeInteractionController.h */,
+				72EE96DA17EF66040097DF82 /* CEVerticalSwipeInteractionController.m */,
 			);
 			name = InteractionControllers;
 			path = ../InteractionControllers;
@@ -311,9 +316,10 @@
 				7273233017DFBD4D0072C7FD /* AppDelegate.m in Sources */,
 				7273232C17DFBD4D0072C7FD /* main.m in Sources */,
 				7273236017DFBEBF0072C7FD /* CETurnAnimationController.m in Sources */,
-				7273236A17DFBF140072C7FD /* CESwipeInteractionController.m in Sources */,
+				7273236A17DFBF140072C7FD /* CEHorizontalSwipeInteractionController.m in Sources */,
 				7273236D17DFC0690072C7FD /* NavigationController.m in Sources */,
 				7273237017DFC4710072C7FD /* SettingsViewController.m in Sources */,
+				72EE96DB17EF66040097DF82 /* CEVerticalSwipeInteractionController.m in Sources */,
 				7273235F17DFBEBF0072C7FD /* CEFlipAnimationController.m in Sources */,
 				7273236317DFBEFE0072C7FD /* CEReversibleAnimationController.m in Sources */,
 				72EE96D817EF47A60097DF82 /* CECardsAnimationController.m in Sources */,
diff --git a/TransitionsDemo/TransitionsDemo/AppDelegate.m b/TransitionsDemo/TransitionsDemo/AppDelegate.m
diff --git a/TransitionsDemo/TransitionsDemo/SettingsViewController.m b/TransitionsDemo/TransitionsDemo/SettingsViewController.m
