[CRD iOS] Cleanup ClientGestures

remoting/ios/client_gestures.mm

Index: remoting/ios/client_gestures.mm
diff --git a/remoting/ios/client_gestures.mm b/remoting/ios/client_gestures.mm
index 79c957a13134b92ac5acde90f576385a7bb83636..00e5900c398018bc6b399781e145ddc2d59fda53 100644
--- a/remoting/ios/client_gestures.mm
+++ b/remoting/ios/client_gestures.mm
@@ -10,7 +10,6 @@
 
 #import "remoting/ios/session/remoting_client.h"
 
-#include "base/logging.h"
 #include "remoting/client/gesture_interpreter.h"
 
 remoting::GestureInterpreter::GestureState toGestureState(
@@ -25,6 +24,23 @@ remoting::GestureInterpreter::GestureState toGestureState(
   }
 }
 
+@interface ClientGestures ()<UIGestureRecognizerDelegate> {
+ @private
+  UILongPressGestureRecognizer* _longPressRecognizer;
+  UIPanGestureRecognizer* _panRecognizer;
+  UIPanGestureRecognizer* _flingRecognizer;
+  UIPanGestureRecognizer* _scrollRecognizer;
+  UIPanGestureRecognizer* _threeFingerPanRecognizer;
+  UIPinchGestureRecognizer* _pinchRecognizer;
+  UITapGestureRecognizer* _singleTapRecognizer;
+  UITapGestureRecognizer* _twoFingerTapRecognizer;
+  UITapGestureRecognizer* _threeFingerTapRecognizer;
+
+  __weak UIView* _view;
+  __weak RemotingClient* _client;
+}
+@end
+
 @implementation ClientGestures
 
 @synthesize delegate = _delegate;
@@ -33,8 +49,6 @@ remoting::GestureInterpreter::GestureState toGestureState(
   _view = view;
   _client = client;
 
-  _inputScheme = HostInputSchemeTouch;
-
   _longPressRecognizer = [[UILongPressGestureRecognizer alloc]
       initWithTarget:self
               action:@selector(longPressGestureTriggered:)];
@@ -99,8 +113,6 @@ remoting::GestureInterpreter::GestureState toGestureState(
   _threeFingerTapRecognizer.delegate = self;
   [view addGestureRecognizer:_threeFingerTapRecognizer];
 
-  _inputScheme = HostInputSchemeTouch;
-
   [_singleTapRecognizer requireGestureRecognizerToFail:_twoFingerTapRecognizer];
   [_twoFingerTapRecognizer
       requireGestureRecognizerToFail:_threeFingerTapRecognizer];
@@ -111,34 +123,11 @@ remoting::GestureInterpreter::GestureState toGestureState(
       requireGestureRecognizerToFail:_threeFingerTapRecognizer];
   [_panRecognizer requireGestureRecognizerToFail:_scrollRecognizer];
 
-  _edgeGesture = [[UIScreenEdgePanGestureRecognizer alloc]
-      initWithTarget:self
-              action:@selector(edgeGestureTriggered:)];
-  //_edgeGesture.edges = UIRectEdgeLeft;
-  _edgeGesture.delegate = self;
-  [view addGestureRecognizer:_edgeGesture];
-
-  _swipeGesture = [[UISwipeGestureRecognizer alloc]
-      initWithTarget:self
-              action:@selector(swipeGestureTriggered:)];
-  _swipeGesture.numberOfTouchesRequired = 2;
-  _swipeGesture.delegate = self;
-  [view addGestureRecognizer:_swipeGesture];
-
   return self;
 }
 
-// TODO(nicholss): The following several methods have been commented out.
-// Integreation with the original implementation will be done with the app
-// is able to run to the point of interaction and debugging can happen.
-// I would prefer to leave this here rather than deleting because it is close
-// to the implementation that will be used client gestures integration.
-// This is a new class that was derived from the original source which had
-// the implementation mixed in with the host controller and was a huge mess.
-
 // Resize the view of the desktop - Zoom in/out.  This can occur during a Pan.
 - (IBAction)pinchGestureTriggered:(UIPinchGestureRecognizer*)sender {
-  // LOG_TRACE(INFO) << "pinchGestureTriggered";
   CGPoint pivot = [sender locationInView:_view];
   _client.gestureInterpreter->Zoom(pivot.x, pivot.y, sender.scale,
                                    toGestureState([sender state]));
@@ -151,8 +140,7 @@ remoting::GestureInterpreter::GestureState toGestureState(
   _client.gestureInterpreter->Tap(touchPoint.x, touchPoint.y);
 }
 
-// Change position of scene.  This can occur during a pinch or long press.
-// Or perform a Mouse Wheel Scroll.
+// Change position of the viewport. This can occur during a pinch or long press.
 - (IBAction)panGestureTriggered:(UIPanGestureRecognizer*)sender {
   if ([sender state] == UIGestureRecognizerStateChanged) {
     CGPoint translation = [sender translationInView:_view];
@@ -161,100 +149,6 @@ remoting::GestureInterpreter::GestureState toGestureState(
     // Reset translation so next iteration is relative
     [sender setTranslation:CGPointZero inView:_view];
   }
-
-  // LOG_TRACE(INFO) << "panGestureTriggered";
-  //   CGPoint translation = [sender translationInView:self.view];
-  //   // If we start with 2 touches, and the pinch gesture is not in progress
-  //   yet,
-  //   // then disable it, so mouse scrolling and zoom do not occur at the same
-  //   // time.
-  //   if ([sender numberOfTouches] == 2 &&
-  //       [sender state] == UIGestureRecognizerStateBegan &&
-  //       !(_pinchRecognizer.state == UIGestureRecognizerStateBegan ||
-  //         _pinchRecognizer.state == UIGestureRecognizerStateChanged)) {
-  //     _pinchRecognizer.enabled = NO;
-  //   }
-  //
-  //   if (!_pinchRecognizer.enabled) {
-  //     // Began with 2 touches, so this is a scroll event.
-  //     translation.x *= kMouseWheelSensitivity;
-  //     translation.y *= kMouseWheelSensitivity;
-  //     // [Utility mouseScroll:_clientToHostProxy
-  //     //                   at:_scene.mousePosition
-  //     //                delta:webrtc::DesktopVector(translation.x,
-  //     translation.y)];
-  //   } else {
-  //     // Did not begin with 2 touches, doing a pan event.
-  //     if ([sender state] == UIGestureRecognizerStateChanged) {
-  //       CGPoint translation = [sender translationInView:self.view];
-  //       BOOL shouldApplyPanAndTapBounding =
-  //           _inputScheme == HostInputSchemeTouch &&
-  //           [_longPressRecognizer state] != UIGestureRecognizerStateChanged;
-  //
-  //       if (shouldApplyPanAndTapBounding) {
-  //         // Reverse the orientation on both axes.
-  //         translation = CGPointMake(-translation.x, -translation.y);
-  //       }
-  //
-  //       // if (shouldApplyPanAndTapBounding) {
-  //       //   // Stop the translation as soon as the view becomes anchored.
-  //       //   if ([SceneView
-  //       //           couldMouseMoveTowardAnchorWithTranslation:translation.x
-  //       // isAnchoredLow:_scene.anchored.left
-  //       // isAnchoredHigh:_scene.anchored
-  //       //                                                         .right]) {
-  //       //     translation = CGPointMake(0, translation.y);
-  //       //   }
-  //       //
-  //       //   if ([SceneView
-  //       //           couldMouseMoveTowardAnchorWithTranslation:translation.y
-  //       // isAnchoredLow:_scene.anchored.top
-  //       // isAnchoredHigh:_scene.anchored
-  //       //                                                         .bottom])
-  //       {
-  //       //     translation = CGPointMake(translation.x, 0);
-  //       //   }
-  //       // }
-  //
-  //       [self applySceneChange:translation scaleBy:1.0];
-  //
-  //       if (_inputScheme == HostInputSchemeTouch &&
-  //           [_longPressRecognizer state] == UIGestureRecognizerStateChanged
-  //           &&
-  //           [sender numberOfTouches] == 1) {
-  //         // [_scene
-  //         //     setMouseLocationFromLocationInView:[sender
-  //         // locationInView:self.view]];
-  //
-  // //        [Utility moveMouse:_clientToHostProxy at:_scene.mousePosition];
-  //       }
-  //
-  //     } else if ([sender state] == UIGestureRecognizerStateEnded) {
-  //       // After user removes their fingers from the screen
-  //       // apply an acceleration effect.
-  //       CGPoint velocity = [sender velocityInView:self.view];
-  //
-  //       if (_inputScheme == HostInputSchemeTouch) {
-  //         // Reverse the orientation on both axes.
-  //         velocity = CGPointMake(-velocity.x, -velocity.y);
-  //       }
-  // //      [_scene setPanVelocity:velocity];
-  //     }
-  //   }
-  //
-  //   // Finished the event chain.
-  //   if (!([sender state] == UIGestureRecognizerStateBegan ||
-  //         [sender state] == UIGestureRecognizerStateChanged)) {
-  //     _pinchRecognizer.enabled = YES;
-  //   }
-  //
-  //   // Reset translation so next iteration is relative.  Wait until a changed
-  //   // event in order to also capture the portion of the translation that
-  //   occurred
-  //   // between the Began and Changed States.
-  //   if ([sender state] == UIGestureRecognizerStateChanged) {
-  //     [sender setTranslation:CGPointZero inView:self.view];
-  //   }
 }
 
 // Do fling on the viewport. This will happen at the end of the one-finger
@@ -268,6 +162,7 @@ remoting::GestureInterpreter::GestureState toGestureState(
   }
 }
 
+// Handles the two finger scrolling gesture.
 - (IBAction)scrollGestureTriggered:(UIPanGestureRecognizer*)sender {
   if ([sender state] == UIGestureRecognizerStateEnded) {
     CGPoint velocity = [sender velocityInView:_view];
@@ -289,37 +184,6 @@ remoting::GestureInterpreter::GestureState toGestureState(
   CGPoint touchPoint = [sender locationInView:_view];
   _client.gestureInterpreter->Drag(touchPoint.x, touchPoint.y,
                                    toGestureState([sender state]));
-
-  // LOG_TRACE(INFO) << "longPressGestureTriggered";
-  // if ([sender state] == UIGestureRecognizerStateBegan) {
-  //   if (_inputScheme == HostInputSchemeTouch) {
-  //     CGPoint touchPoint = [sender locationInView:self.view];
-  //     [_scene setMouseLocationFromLocationInView:touchPoint];
-  //   }
-  //   [_clientToHostProxy mouseAction:_scene.mousePosition
-  //                        wheelDelta:webrtc::DesktopVector(0, 0)
-  //                       whichButton:1
-  //                        buttonDown:YES];
-  //   if (_inputScheme == HostInputSchemeTouch) {
-  //     // location is going to be under the user's finger
-  //     // create a bigger bubble.
-  //     _circle.expandedRadius = 110.0f;
-  //   } else {
-  //     _circle.expandedRadius = 11.0f;
-  //   }
-  //
-  //   [_circle doExpandingAnimationAtLocation:[_scene mouseLocationInView]];
-  // } else if (!([sender state] == UIGestureRecognizerStateBegan ||
-  //              [sender state] == UIGestureRecognizerStateChanged)) {
-  //   [_clientToHostProxy mouseAction:_scene.mousePosition
-  //                        wheelDelta:webrtc::DesktopVector(0, 0)
-  //                       whichButton:1
-  //                        buttonDown:NO];
-  //   if (_inputScheme == HostInputSchemeTouch) {
-  //     // Return to the center.
-  //     [_scene centerMouseInView];
-  //   }
-  // }
 }
 
 - (IBAction)twoFingerTapGestureTriggered:(UITapGestureRecognizer*)sender {
@@ -333,7 +197,6 @@ remoting::GestureInterpreter::GestureState toGestureState(
 }
 
 - (IBAction)threeFingerPanGestureTriggered:(UIPanGestureRecognizer*)sender {
-  // LOG_TRACE(INFO) << "threeFingerPanGestureTriggered";
   if ([sender state] != UIGestureRecognizerStateEnded) {
     return;
   }
@@ -348,20 +211,14 @@ remoting::GestureInterpreter::GestureState toGestureState(
   }
 }
 
-- (IBAction)edgeGestureTriggered:(UIScreenEdgePanGestureRecognizer*)sender {
-  // LOG_TRACE(INFO) << "edgeGestureTriggered";
-}
-
-- (IBAction)swipeGestureTriggered:(UISwipeGestureRecognizer*)sender {
-  // LOG_TRACE(INFO) << "swipeGestureTriggered";
-}
-
 #pragma mark - UIGestureRecognizerDelegate
 
 // Allow panning and zooming to occur simultaneously.
 // Allow panning and long press to occur simultaneously.
 // Pinch requires 2 touches, and long press requires a single touch, so they are
 // mutually exclusive regardless of if panning is the initiating gesture.
+// Pinch and Scroll are both two-finger gestures. They are mutually exclusive
+// and whatever comes first should disable the other gesture recognizer.
 - (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer
     shouldRecognizeSimultaneouslyWithGestureRecognizer:
         (UIGestureRecognizer*)otherGestureRecognizer {
@@ -394,10 +251,6 @@ remoting::GestureInterpreter::GestureState toGestureState(
     return YES;
   }
 
-  if (gestureRecognizer == _panRecognizer &&
-      otherGestureRecognizer == _edgeGesture) {
-    return YES;
-  }
   // TODO(nicholss): If we return NO here, it dismisses the other reconizers.
   // As we add more types of reconizers, they need to be accounted for in the
   // above logic.