Merge branch 'v2.0.0'

Conflicts:
	.gitignore
	ECSlidingViewController.podspec
	ECSlidingViewController.xcodeproj/project.pbxproj
	ECSlidingViewController/AppDelegate.m
	ECSlidingViewController/InitialSlidingViewController.m
	ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.h
	ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.m
	README.md

Keep all changes/deletions form --theirs. The v2.0.0 branch was
re-written from scratch and re-organized.

Author: enriquez

.gitignore

@@ -1,21 +1,18 @@
-#Mac OS X Finder and whatnot
+# Xcode
 .DS_Store
-.idea
-
-# Sparkle distribution Private Key (Don't check me in!)
-dsa_priv.pem
-
-# XCode (and ancestors) per-user config (very noisy, and not relevant)
-*.mode1
+build/
+*.pbxuser
+!default.pbxuser
 *.mode1v3
+!default.mode1v3
 *.mode2v3
-*.perspective
+!default.mode2v3
 *.perspectivev3
-*.pbxuser
-*.xcodeproj/project.xcworkspace/
-*.xcodeproj/xcuserdata/
-*xcuserdata
-xcshareddata
-
-# CocoaPods
-Pods
+!default.perspectivev3
+*.xcworkspace
+!default.xcworkspace
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/

ECSlidingViewController.podspec

@@ -1,22 +1,15 @@
 Pod::Spec.new do |s|
-  s.name         =  'ECSlidingViewController'
-  s.version      =  '1.3.3'
-  s.license      = { :type => 'MIT', :text => <<-LICENSE
-      Copyright (C) 2013 EdgeCase
+  s.name         = "ECSlidingViewController"
+  s.version      = "2.0.beta.1"
+  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 => s.version.to_s }
 
-      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+  s.platform     = :ios, '7.0'
+  s.requires_arc = true
 
-      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-    LICENSE
-  }
-  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/edgecase/ecslidingviewcontroller'
-  s.author       =  { 'Mike Enriquez' => '[email protected]' }
-  s.source       =  { :git => 'https://github.com/edgecase/ECSlidingViewController.git', :tag => '1.3.3' }
-  s.platform     =  :ios
-  s.source_files =  'ECSlidingViewController/Vendor/ECSlidingViewController/'
-  s.requires_arc =  true
+  s.source_files = 'ECSlidingViewController'
 end

ECSlidingViewController.xcodeproj/project.pbxproj

@@ -0,0 +1,64 @@
+// ECPercentDrivenInteractiveTransition.h
+// ECSlidingViewController 2
+//
+// Copyright (c) 2013, Michael Enriquez (http://enriquez.me)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+/**
+ Used to create a percent-driven interactive transition. Analogous to `UIPercentDrivenInteractiveTransition` except that it is compatible with `ECSlidingViewController`.
+ 
+ See `ECSlidingInteractiveTransition` as an example subclass that uses a panning gesture to drive the percentage.
+ 
+ You can subclass `ECPercentDrivenInteractiveTransition`, but if you do so you must start each of your method overrides with a call to the super implementation of the method.
+ */
+@interface ECPercentDrivenInteractiveTransition : NSObject <UIViewControllerInteractiveTransitioning>
+
+/**
+ The animator object that will be percent-driven. The animation will be triggered when the interactive transition is triggered, but instead of playing from start to finish it will be controlled by the calls to `updateInteractiveTransition:`, `cancelInteractiveTransition`, and `finishInteractiveTransition`.
+ */
+@property (nonatomic, strong) id<UIViewControllerAnimatedTransitioning> animationController;
+
+/**
+ The amount of the transition (specified as a percentage of the overall duration) that is complete.
+ 
+ The value in this property reflects the last value passed to the `updateInteractiveTransition:` method.
+ */
+@property (nonatomic, assign, readonly) CGFloat percentComplete;
+
+/**
+ Updates the completion percentage of the transition. In general terms, this method is used to "scrub the playhead" of the animation defined by the `animationController`.
+ 
+ While tracking user events, your code should call this method regularly to update the current progress toward completing the transition. If, during tracking, the interactions cross a threshold that you consider signifies the completion or cancellation of the transition, stop tracking events and call the finishInteractiveTransition or cancelInteractiveTransition method.
+ */
+- (void)updateInteractiveTransition:(CGFloat)percentComplete;
+
+/**
+ Causes the animation defined by the `animationController` to play from current `percentComplete` to zero percent. You must call this method or `finishInteractiveTransition` at some point during the interaction to ensure everything ends in a consistent state.
+ */
+- (void)cancelInteractiveTransition;
+
+/**
+ Causes the animation defined by the `animationController` to play from current `percentComplete` to 100 percent. You must call this method or `cancelInteractiveTransition` at some point during the interaction to ensure everything ends in a consistent state.
+ */
+- (void)finishInteractiveTransition;
+@end

ECSlidingViewController/AppDelegate.h

@@ -0,0 +1,98 @@
+// ECPercentDrivenInteractiveTransition.m
+// ECSlidingViewController 2
+//
+// Copyright (c) 2013, Michael Enriquez (http://enriquez.me)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import "ECPercentDrivenInteractiveTransition.h"
+
+@interface ECPercentDrivenInteractiveTransition ()
+@property (nonatomic, assign) id<UIViewControllerContextTransitioning> transitionContext;
+@end
+
+@implementation ECPercentDrivenInteractiveTransition
+
+- (void)startInteractiveTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
+    self.transitionContext = transitionContext;
+    
+    [self.animationController animateTransition:transitionContext];
+    [self updateInteractiveTransition:0];
+}
+
+- (void)updateInteractiveTransition:(CGFloat)percentComplete {
+    [self.transitionContext updateInteractiveTransition:_percentComplete];
+    
+    CGFloat boundedPercentage;
+    if (percentComplete > 1.0) {
+        boundedPercentage = 1.0;
+    } else if (percentComplete < 0.0) {
+        boundedPercentage = 0.0;
+    } else {
+        boundedPercentage = percentComplete;
+    }
+    
+    _percentComplete = boundedPercentage;
+    CALayer *layer = [self.transitionContext containerView].layer;
+    CFTimeInterval pausedTime = [self.animationController transitionDuration:self.transitionContext] * _percentComplete;
+    layer.speed = 0.0;
+    layer.timeOffset = pausedTime;
+}
+
+- (void)cancelInteractiveTransition {
+    [self.transitionContext cancelInteractiveTransition];
+    
+    CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(reversePausedAnimation:)];
+    [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
+}
+
+- (void)finishInteractiveTransition {
+    [self.transitionContext finishInteractiveTransition];
+    
+    CALayer *layer = [self.transitionContext containerView].layer;
+    CFTimeInterval pausedTime = [layer timeOffset];
+    layer.speed = 1.0;
+    layer.timeOffset = 0.0;
+    layer.beginTime = 0.0;
+    CFTimeInterval timeSincePause = [layer convertTime:CACurrentMediaTime() fromLayer:nil] - pausedTime;
+    layer.beginTime = timeSincePause;
+}
+
+#pragma mark - CADisplayLink action
+
+- (void)reversePausedAnimation:(CADisplayLink *)displayLink {
+    double percentInterval = displayLink.duration / [self.animationController transitionDuration:self.transitionContext];
+    
+    _percentComplete -= percentInterval;
+    
+    if (_percentComplete <= 0.0) {
+        _percentComplete = 0.0;
+        [displayLink invalidate];
+    }
+    
+    [self updateInteractiveTransition:self.percentComplete];
+    
+    if (_percentComplete == 0.0) {
+        CALayer *layer = [self.transitionContext containerView].layer;
+        [layer removeAllAnimations];
+        layer.speed = 1.0;
+    }
+}
+
+@end

ECSlidingViewController/AppDelegate.m

@@ -0,0 +1,34 @@
+// ECSlidingAnimationController.h
+// ECSlidingViewController 2
+//
+// Copyright (c) 2013, Michael Enriquez (http://enriquez.me)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+/**
+ `ECSlidingAnimationController` is the default animator object used by `ECSlidingViewController`. It animates the top view by sliding it horizontally.
+ 
+ An instance this class may be returned from a sliding view controller's delegate for `slidingViewController:animationControllerForOperation:topViewController:`. Do this if you want to use the default animation along with a custom interactive transition.
+ */
+@interface ECSlidingAnimationController : NSObject <UIViewControllerAnimatedTransitioning>
+
+@end