Fixed finalPoint handling

ElasticTransistionExample/InitialViewController.m

@@ -33,10 +33,10 @@ - (void)viewDidLoad {
     transition.sticky           = YES;
     transition.showShadow       = YES;
     transition.panThreshold     = 0.3;
-    //transition.radiusFactor     = 0.3;
-    transition.transformType    = TRANSLATEMID;
-    transition.overlayColor     = [UIColor colorWithWhite:0 alpha:0.5];
-    transition.shadowColor      = [UIColor colorWithWhite:0 alpha:0.5];
+    transition.transformType    = ROTATE;
+
+    //transition.overlayColor     = [UIColor colorWithWhite:0 alpha:0.5];
+    //transition.shadowColor      = [UIColor colorWithWhite:0 alpha:0.5];
 
 
     // gesture recognizers

ElasticTransition/EdgePanTransition.m

@@ -28,7 +28,7 @@ -(id)init{
         self.panThreshold   = 0.2;
         self.edge           = RIGHT;
 
-        NSLog(@"[EdgePanTransition] %@" , [HelperFunctions typeToStringOfEdge:self.edge]);
+        //NSLog(@"[EdgePanTransition] %@" , [HelperFunctions typeToStringOfEdge:self.edge]);
 
         self.transitioning  = NO;
         self.presenting     = YES;
@@ -153,32 +153,26 @@ -(void)startInteractivePresentFromViewController:(UIViewController*)fromVC ToVie
     self.translation    = [pan translationInView:pan.view];
     self.dragPoint      = [pan locationInView:pan.view];
 
-    NSLog(@"START T:(%.1f,%.1f)\tD:(%.1f,%.1f)", self.translation.x, self.translation.y, self.dragPoint.x, self.dragPoint.y);
+    //NSLog(@"START T:(%.1f,%.1f)\tD:(%.1f,%.1f)", self.translation.x, self.translation.y, self.dragPoint.x, self.dragPoint.y);
 }
 
 
 -(BOOL)updateInteractiveTransitionWithGestureRecognizer:(UIPanGestureRecognizer*) pan{
 
-    if (self.transitioning == true){
-        NSLog(@"YES");
-    }else{
-        NSLog(@"NO");
-    }
-
-
+
     if (!self.transitioning){
-        NSLog(@"UPDATE NO");
+
         return NO;
     }
 
-    NSLog(@"UPDATE YES");
+    //NSLog(@"UPDATE YES");
 
     if (pan.state == UIGestureRecognizerStateChanged){
 
         self.translation    = [pan translationInView:pan.view];
         self.dragPoint      = [pan locationInView:pan.view];
 
-        NSLog(@"UPDATE T:(%.1f,%.1f)\tD:(%.1f,%.1f)", self.translation.x, self.translation.y, self.dragPoint.x, self.dragPoint.y);
+        //NSLog(@"UPDATE T:(%.1f,%.1f)\tD:(%.1f,%.1f)", self.translation.x, self.translation.y, self.dragPoint.x, self.dragPoint.y);
 
         [self update];
 

ElasticTransition/ElasticShapeLayer.m

@@ -19,7 +19,6 @@ @implementation ElasticShapeLayer
 @synthesize dragPoint;
 @synthesize radiusFactor;
 
-
 -(id)init{
 
     self = [super init];
@@ -84,7 +83,7 @@ -(CGPathRef)currentPath{
 
     CGPoint centerPoint = self.dragPoint;
 
-    NSLog(@"D:(%.1f,%.1f)",self.dragPoint.x, self.dragPoint.y);
+    //NSLog(@"D:(%.1f,%.1f)",self.dragPoint.x, self.dragPoint.y);
 
     CGPoint leftPoint, rightPoint, bottomRightPoint, bottomLeftPoint;
 
@@ -116,13 +115,6 @@ -(CGPathRef)currentPath{
             break;
     }
 
-    /*
-    NSLog(@"leftPoint :(%.1f,%.1f)", leftPoint.x, leftPoint.y);
-    NSLog(@"rightPoint :(%.1f,%.1f)", rightPoint.x, rightPoint.y);
-    NSLog(@"bottomRightPoint :(%.1f,%.1f)", bottomRightPoint.x, bottomRightPoint.y);
-    NSLog(@"bottomLeftPoint :(%.1f,%.1f)", bottomLeftPoint.x, bottomLeftPoint.y);
-    */
-
     UIBezierPath *shapePath = [UIBezierPath new];
 
     [shapePath moveToPoint:leftPoint];

ElasticTransition/ElasticTransition.h

@@ -100,6 +100,8 @@ typedef NS_ENUM(int,ElasticTransitionBackgroundTransform){
  */
 @property (nonatomic) CGFloat shadowRadius;
 
+
+
 @property (nonatomic) ElasticTransitionBackgroundTransform transformType;
 
 @property (nonatomic) BOOL useTranlation;
@@ -112,6 +114,8 @@ typedef NS_ENUM(int,ElasticTransitionBackgroundTransform){
 @end
 
 
+
+
 @protocol ElasticMenuTransitionDelegate
 
 @optional

ElasticTransition/ElasticTransition.m

@@ -50,21 +50,19 @@ -(id)init{
         self.containerColor = [UIColor colorWithRed:152.0/255.0 green:174.0/255.0 blue:196.0/255.0 alpha:1.0];
         self.overlayColor   = [UIColor colorWithRed:152.0/255.0 green:174.0/255.0 blue:196.0/255.0 alpha:0.5];
         self.showShadow     = FALSE;
-        self.shadowColor    = [UIColor colorWithRed:100.0/255.0 green:122.0/255.0 blue:144.0/255.0 alpha:0.5];
+        self.shadowColor    = [UIColor colorWithRed:100.0/255.0 green:122.0/255.0 blue:144.0/255.0 alpha:1.0];
         self.shadowRadius   = 50.0;
 
         self.transformType  = TRANSLATEMID;
 
-        NSLog(@"[ElasticTransition] %@", [self transformTypeToString]);
+        //NSLog(@"[ElasticTransition] %@", [self transformTypeToString]);
 
         self.startingPoint = CGPointZero;
 
 
         self.contentLength  = 0.0;
         self.lastPoint      = CGPointZero;
 
-       // self.maskLayer      = [[CALayer alloc]  init];
-
         self.useTranlation  = TRUE;
         self.damping        = 0.2f;
 
@@ -115,7 +113,7 @@ -(void)setContentLength:(CGFloat)aContentLength{
 
     self.stickDistance = self.sticky ? self.contentLength * self.panThreshold : 0.0;
 
-    NSLog(@"stickDistance: %f", self.stickDistance);
+    //NSLog(@"stickDistance: %f", self.stickDistance);
 }
 
 
@@ -143,12 +141,10 @@ -(void)setDamping:(CGFloat)aDamping{
 
 - (CGPoint)finalPoint{
 
-    static BOOL p;
-
-    p = TRUE;
+    BOOL p = self.presenting;
 
-   // NSLog(@"presenting è nil");
-   // NSLog(@"%@| self %@", p ? @"1" : @"0", self.presenting ? @"Yes" : @"No");
+//    NSLog(@"presenting è nil");
+//    NSLog(@"%@| self %@", p ? @"1" : @"0", self.presenting ? @"Yes" : @"No");
 
     switch (self.edge){
         case LEFT:
@@ -164,12 +160,10 @@ - (CGPoint)finalPoint{
 
 - (CGPoint)finalPoint:(BOOL)presentingIn{
 
-    BOOL p;
+    BOOL p = presentingIn;
 
-    p = presentingIn;
-
-    NSLog(@"presenting: %@", presentingIn ? @"1" : @"0");
-    NSLog(@"%@| self %@", p ? @"1" : @"0", self.presenting ? @"Yes" : @"No");
+//    NSLog(@"presenting: %@", presentingIn ? @"1" : @"0");
+//    NSLog(@"%@| self %@", p ? @"1" : @"0", self.presenting ? @"Yes" : @"No");
 
     switch (self.edge){
         case LEFT:
@@ -325,7 +319,7 @@ -(void)update{
         }
 
 
-        NSLog(@"cb.point:(%.1f,%.1f) | lb.point:(%.1f,%.1f)", self.cb.point.x, self.cb.point.y, self.lb.point.x, self.lb.point.y);
+        //NSLog(@"cb.point:(%.1f,%.1f) | lb.point:(%.1f,%.1f)", self.cb.point.x, self.cb.point.y, self.lb.point.x, self.lb.point.y);
     }
 }
 
@@ -354,7 +348,6 @@ -(void)updateShape{
 
     CGFloat progress = 1.0 - (CGPointDistance(self.lc.center, finalPoint) / CGPointDistance(initialPoint, finalPoint));
 
-    NSLog(@"Progress: %f", progress);
 
     switch (self.edge){
 
@@ -474,7 +467,7 @@ -(void)updateShape{
                     }
                 }
 
-                NSLog(@"Translation: (%.1f, %.1f)", x, y);
+                //NSLog(@"Translation: (%.1f, %.1f)", x, y);
 
                 self.backView.layer.transform = CATransform3DMakeTranslation(x, y, 0);
 
@@ -487,6 +480,8 @@ -(void)updateShape{
         }
     }
 
+    //NSLog(@"progress: %f", progress);
+
     self.overlayView.alpha = progress;
 
     [self updateShadow:progress];
@@ -550,7 +545,7 @@ -(void)setup{
     self.overlayView.frame              = self.container.bounds;
     self.overlayView.backgroundColor    = self.overlayColor;
     [self.overlayView addGestureRecognizer:self.backgroundExitPanGestureRecognizer];
-    //[self.container addSubview:self.overlayView];
+    [self.container addSubview:self.overlayView];
 
     // 4. setup front view
     CGRect rect = self.container.bounds;