From f838f11844f4eeb2ecbd5352c083705aa299eec2 Mon Sep 17 00:00:00 2001
From: Nedyalko Nikolov <nedyalko.nikolov@telerik.com>
Date: Tue, 26 May 2015 10:25:42 +0300
Subject: [PATCH] Refactored gestures to support more scenarios in android.

---
 apps/tests/app/testPage.ts                    | 19 ++++-
 apps/tests/app/testPage.xml                   |  7 +-
 .../xml-declaration/xml-declaration-tests.ts  |  3 +-
 ui/core/view-common.ts                        | 21 ++++-
 ui/core/view.android.ts                       | 76 +++++++++++++++++
 ui/core/view.d.ts                             |  2 +-
 ui/gestures/gestures.android.ts               | 81 +++++--------------
 ui/gestures/gestures.d.ts                     |  5 ++
 ui/gestures/gestures.ios.ts                   |  3 +-
 9 files changed, 144 insertions(+), 73 deletions(-)

diff --git a/apps/tests/app/testPage.ts b/apps/tests/app/testPage.ts
index 5247b38e7..1fed0b680 100644
--- a/apps/tests/app/testPage.ts
+++ b/apps/tests/app/testPage.ts
@@ -1,5 +1,22 @@
 import frame = require("ui/frame");
+import pageModule = require("ui/page");
+import textViewModule = require("ui/text-view");
 
 export function buttonTap(args) { 
-    frame.topmost().goBack();
+    console.log("tap");
+}
+
+export function doubleTap(args) {
+    console.log("doubleTap");
+}
+
+export function checkRecognizers(args) {
+    var testTextView = <textViewModule.TextView>(page.getViewById("testTextView"));
+    console.log("testTextView: " + testTextView.ios.gestureRecognizers);
+}
+
+var page: pageModule.Page;
+
+export function pageLoaded(args) {
+    page = <pageModule.Page>args.object;
 }
\ No newline at end of file
diff --git a/apps/tests/app/testPage.xml b/apps/tests/app/testPage.xml
index 25cbf430b..fe6f1930b 100644
--- a/apps/tests/app/testPage.xml
+++ b/apps/tests/app/testPage.xml
@@ -1,3 +1,6 @@
-<Page xmlns="http://www.nativescript.org/tns.xsd">
-  <Button text="Back" tap="buttonTap"/>
+<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded">
+	<StackLayout>
+		<TextView text="TEST FOR GESTURES" id="testTextView" style="font-size: 50" tap="buttonTap" doubleTap="doubleTap"/>
+		<Button text="CLICK" tap="checkRecognizers" />
+	</StackLayout>
 </Page>
diff --git a/apps/tests/xml-declaration/xml-declaration-tests.ts b/apps/tests/xml-declaration/xml-declaration-tests.ts
index 269def545..247f51fc9 100644
--- a/apps/tests/xml-declaration/xml-declaration-tests.ts
+++ b/apps/tests/xml-declaration/xml-declaration-tests.ts
@@ -18,6 +18,7 @@ import listViewModule = require("ui/list-view");
 import helper = require("../ui/helper");
 import viewModule = require("ui/core/view");
 import platform = require("platform");
+import gesturesModule = require("ui/gestures");
 
 export function test_load_IsDefined() {
     TKUnit.assert(types.isFunction(builder.load), "ui/builder should have load method!");
@@ -186,7 +187,7 @@ export function test_parse_ShouldParseBindingsToGestures() {
     p.bindingContext = context;
     var lbl = <labelModule.Label>p.content;
 
-    var observer = (<any>lbl)._gesturesObserver;
+    var observer = (<any>lbl)._gestureObservers[gesturesModule.GestureTypes.tap][0];
 
     TKUnit.assert(observer !== undefined, "Expected result: true.");
     TKUnit.assert(observer._context === context, "Context should be equal to binding context. Actual result: " + observer._context);
diff --git a/ui/core/view-common.ts b/ui/core/view-common.ts
index a67d2d027..ea8c661f0 100644
--- a/ui/core/view-common.ts
+++ b/ui/core/view-common.ts
@@ -132,7 +132,7 @@ export class View extends proxy.ProxyObject implements definition.View {
 
     public _cssClasses: Array<string> = [];
 
-    private _gesturesObserver: gestures.GesturesObserver;
+    public _gestureObservers = {};
     private _updatingInheritedProperties: boolean;
 
     public _options: definition.Options;
@@ -147,9 +147,22 @@ export class View extends proxy.ProxyObject implements definition.View {
         this._visualState = visualStateConstants.Normal;
     }
 
-    observe(type: number, callback: (args: gestures.GestureEventData) => void, thisArg?: any): gestures.GesturesObserver {
-        this._gesturesObserver = gestures.observe(this, type, callback, thisArg);
-        return this._gesturesObserver;
+    observe(type: number, callback: (args: gestures.GestureEventData) => void, thisArg?: any): void {
+        var gesturesList = this._getGesturesList(type, true);
+        gesturesList.push(gestures.observe(this, type, callback, thisArg));
+    }
+
+    private _getGesturesList(gestureType: number, createIfNeeded): Array<gestures.GesturesObserver> {
+        if (!gestureType) {
+            throw new Error("GestureType must be a valid gesture!");
+        }
+
+        var list = this._gestureObservers[gestureType];
+        if (!list && createIfNeeded) {
+            list = [];
+            this._gestureObservers[gestureType] = list;
+        }
+        return list;
     }
 
     getViewById<T extends View>(id: string): T {
diff --git a/ui/core/view.android.ts b/ui/core/view.android.ts
index ca8eab479..da02dd2a3 100644
--- a/ui/core/view.android.ts
+++ b/ui/core/view.android.ts
@@ -4,6 +4,7 @@ import trace = require("trace");
 import utils = require("utils/utils");
 import dependencyObservable = require("ui/core/dependency-observable");
 import proxy = require("ui/core/proxy");
+import gestures = require("ui/gestures");
 
 // merge the exports of the common file with the exports of this file
 declare var exports;
@@ -77,6 +78,81 @@ export class View extends viewCommon.View {
         this._updateOnTouchListener(this.isUserInteractionEnabled);
     }
 
+    public onLoaded() {
+        super.onLoaded();
+        this.setOnTouchListener();
+    }
+
+    public onUnloaded() {
+        super.onUnloaded();
+        if (this.android && this.android.setOnTouchListener) {
+            this.android.setOnTouchListener(null);
+        }
+    }
+
+    private setOnTouchListener() {
+        if (this.android && this.android.setOnTouchListener && Object.keys(this._gestureObservers).length > 0) {
+            var that = new WeakRef(this);
+            if (this.android.setClickable) {
+                this.android.setClickable(true);
+            }
+            this.android.setOnTouchListener(new android.view.View.OnTouchListener({
+                onTouch: function (view: android.view.View, motionEvent: android.view.MotionEvent) {
+                    var owner = that.get();
+                    if (!owner) {
+                        return false;
+                    }
+                    var i;
+                    for (var prop in owner._gestureObservers) {
+                        if (owner._gestureObservers.hasOwnProperty(prop)) {
+                            for (i = 0; i < owner._gestureObservers[prop].length; i++) {
+                                var gestureObserver = owner._gestureObservers[prop][i];
+                                if (gestureObserver._simpleGestureDetector) {
+                                    gestureObserver._simpleGestureDetector.onTouchEvent(motionEvent);
+                                }
+
+                                if (gestureObserver._scaleGestureDetector) {
+                                    gestureObserver._scaleGestureDetector.onTouchEvent(motionEvent);
+                                }
+
+                                if (gestureObserver._swipeGestureDetector) {
+                                    gestureObserver._swipeGestureDetector.onTouchEvent(motionEvent);
+                                }
+
+                                if (gestureObserver._panGestureDetector) {
+                                    gestureObserver._panGestureDetector.onTouchEvent(motionEvent);
+                                }
+
+                                if (gestureObserver.type & gestures.GestureTypes.rotation && motionEvent.getPointerCount() === 2) {
+
+                                    var deltaX = motionEvent.getX(0) - motionEvent.getX(1);
+                                    var deltaY = motionEvent.getY(0) - motionEvent.getY(1);
+                                    var radians = Math.atan(deltaY / deltaX);
+                                    var degrees = radians * (180 / Math.PI);
+
+                                    var args = <gestures.RotationGestureEventData>{
+                                        type: gestures.GestureTypes.rotation,
+                                        view: owner,
+                                        android: motionEvent,
+                                        rotation: degrees,
+                                        ios: null
+                                    }
+
+                                    //var observer = that.get();
+                                    if (gestureObserver.callback) {
+                                        gestureObserver.callback.call(gestureObserver._context, args);
+                                    }
+
+                                }
+                            }
+                        }
+                    }
+                    return owner.android.onTouchEvent(motionEvent);
+                }
+            }));
+        }
+    }
+
     public _addViewCore(view: viewCommon.View) {
         if (this._context) {
             view._onAttached(this._context);
diff --git a/ui/core/view.d.ts b/ui/core/view.d.ts
index f981f3cf1..23155e898 100644
--- a/ui/core/view.d.ts
+++ b/ui/core/view.d.ts
@@ -355,7 +355,7 @@ declare module "ui/core/view" {
          */
         public focus(): boolean;
 
-        observe(type: number, callback: (args: gestures.GestureEventData) => void, thisArg?: any): gestures.GesturesObserver;
+        observe(type: number, callback: (args: gestures.GestureEventData) => void, thisArg?: any);
 
         /**
          * A basic method signature to hook an event listener (shortcut alias to the addEventListener method).
diff --git a/ui/gestures/gestures.android.ts b/ui/gestures/gestures.android.ts
index c45cf5ed3..2acf7d453 100644
--- a/ui/gestures/gestures.android.ts
+++ b/ui/gestures/gestures.android.ts
@@ -24,6 +24,7 @@ export class GesturesObserver implements definition.GesturesObserver {
 
     private _onTargetLoaded: (data: observable.EventData) => void;
     private _onTargetUnloaded: (data: observable.EventData) => void;
+    public type: definition.GestureTypes;
 
     constructor(callback: (args: definition.GestureEventData) => void) {
         this._callback = callback;
@@ -35,6 +36,7 @@ export class GesturesObserver implements definition.GesturesObserver {
 
     public observe(target: view.View, type: definition.GestureTypes, thisArg?: any) {
         if (target) {
+            this.type = type;
             this._target = target;
             this._context = thisArg;
             this._onTargetLoaded = args => {
@@ -70,9 +72,6 @@ export class GesturesObserver implements definition.GesturesObserver {
 
     private _dettach() {
         trace.write(this._target + "._detach() android:" + this._target.android, "gestures");
-        if (this._target && this._target.android) {
-            this._target.android.setOnTouchListener(null);
-        }
 
         this._onTouchListener = null;
         this._simpleGestureDetector = null;
@@ -86,7 +85,7 @@ export class GesturesObserver implements definition.GesturesObserver {
         this._dettach();
 
         if (type & definition.GestureTypes.tap || type & definition.GestureTypes.doubleTap || type & definition.GestureTypes.longPress) {
-            this._simpleGestureDetector = new android.support.v4.view.GestureDetectorCompat(target._context, new TapAndDoubleTapGestureListener(this, this._target));
+            this._simpleGestureDetector = new android.support.v4.view.GestureDetectorCompat(target._context, new TapAndDoubleTapGestureListener(this, this._target, type));
         }
 
         if (type & definition.GestureTypes.pinch) {
@@ -100,58 +99,6 @@ export class GesturesObserver implements definition.GesturesObserver {
         if (type & definition.GestureTypes.pan) {
             this._panGestureDetector = new android.support.v4.view.GestureDetectorCompat(target._context, new PanGestureListener(this, this._target));
         }
-
-        var that = new WeakRef(this);
-
-        this._onTouchListener = new android.view.View.OnTouchListener({
-            onTouch: function (view: android.view.View, motionEvent: android.view.MotionEvent) {
-                var owner = that.get();
-                if (!owner) {
-                    return false;
-                }
-
-                if (owner._simpleGestureDetector) {
-                    owner._simpleGestureDetector.onTouchEvent(motionEvent);
-                }
-
-                if (owner._scaleGestureDetector) {
-                    owner._scaleGestureDetector.onTouchEvent(motionEvent);
-                }
-
-                if (owner._swipeGestureDetector) {
-                    owner._swipeGestureDetector.onTouchEvent(motionEvent);
-                }
-
-                if (owner._panGestureDetector) {
-                    owner._panGestureDetector.onTouchEvent(motionEvent);
-                }
-
-                if (type & definition.GestureTypes.rotation && motionEvent.getPointerCount() === 2) {
-
-                    var deltaX = motionEvent.getX(0) - motionEvent.getX(1);
-                    var deltaY = motionEvent.getY(0) - motionEvent.getY(1);
-                    var radians = Math.atan(deltaY / deltaX);
-                    var degrees = radians * (180 / Math.PI);
-
-                    var args = <definition.RotationGestureEventData>{
-                        type: definition.GestureTypes.rotation,
-                        view: owner._target,
-                        android: motionEvent,
-                        rotation: degrees,
-                    }
-
-                    var observer = that.get();
-                    if (observer && observer.callback) {
-                        observer.callback.call(observer._context, args);
-                    }
-
-                }
-
-                return true;
-            }
-        });
-
-        target.android.setOnTouchListener(this._onTouchListener);
     }
 }
 
@@ -193,24 +140,30 @@ function _executeCallback(observer: GesturesObserver, args: definition.GestureEv
 class TapAndDoubleTapGestureListener extends android.view.GestureDetector.SimpleOnGestureListener {
     private _observer: GesturesObserver;
     private _target: view.View;
+    private _type: number;
 
-    constructor(observer: GesturesObserver, target: view.View) {
+    constructor(observer: GesturesObserver, target: view.View, type: number) {
         super();
 
         this._observer = observer;
         this._target = target;
+        this._type = type;
         return global.__native(this);
     }
 
     public onSingleTapConfirmed(motionEvent: android.view.MotionEvent): boolean {
-        var args = _getArgs(definition.GestureTypes.tap, this._target, motionEvent);
-        _executeCallback(this._observer, args);
+        if (this._type === definition.GestureTypes.tap) {
+            var args = _getArgs(definition.GestureTypes.tap, this._target, motionEvent);
+            _executeCallback(this._observer, args);
+        }
         return true;
     }
 
     public onDoubleTap(motionEvent: android.view.MotionEvent): boolean {
-        var args = _getArgs(definition.GestureTypes.doubleTap, this._target, motionEvent);
-        _executeCallback(this._observer, args);
+        if (this._type === definition.GestureTypes.doubleTap) {
+            var args = _getArgs(definition.GestureTypes.doubleTap, this._target, motionEvent);
+            _executeCallback(this._observer, args);
+        }
         return true;
     }
 
@@ -219,8 +172,10 @@ class TapAndDoubleTapGestureListener extends android.view.GestureDetector.Simple
     }
 
     public onLongPress(motionEvent: android.view.MotionEvent): boolean {
-        var args = _getArgs(definition.GestureTypes.longPress, this._target, motionEvent);
-        _executeCallback(this._observer, args);
+        if (this._type === definition.GestureTypes.longPress) {
+            var args = _getArgs(definition.GestureTypes.longPress, this._target, motionEvent);
+            _executeCallback(this._observer, args);
+        }
         return true;
     }
 }
diff --git a/ui/gestures/gestures.d.ts b/ui/gestures/gestures.d.ts
index c8d6fa0b7..07f153acf 100644
--- a/ui/gestures/gestures.d.ts
+++ b/ui/gestures/gestures.d.ts
@@ -132,6 +132,11 @@ declare module "ui/gestures" {
          * Disconnects the gesture observer.
          */
         disconnect();
+
+        /**
+         * Gesture type attached to the observer.
+         */
+        type: GestureTypes;
     }
 
     /**
diff --git a/ui/gestures/gestures.ios.ts b/ui/gestures/gestures.ios.ts
index d867c28c8..09510c002 100644
--- a/ui/gestures/gestures.ios.ts
+++ b/ui/gestures/gestures.ios.ts
@@ -58,6 +58,7 @@ class UIGestureRecognizerImpl extends NSObject {
 export class GesturesObserver implements definition.GesturesObserver {
     public _callback: (args: definition.GestureEventData) => void;
     public _target: view.View;
+    public type: definition.GestureTypes;
     private _recognizers: {};
     private _context: any;
 
@@ -71,6 +72,7 @@ export class GesturesObserver implements definition.GesturesObserver {
 
     public observe(target: view.View, type: definition.GestureTypes, thisArg?: any) {
         if (target) {
+            this.type = type;
             this._target = target;
             this._context = thisArg;
             this._onTargetLoaded = args => {
@@ -89,7 +91,6 @@ export class GesturesObserver implements definition.GesturesObserver {
                 this._attach(target, type);
             }
         }
-
     }
 
     private _attach(target: view.View, type: definition.GestureTypes) {