Merge pull request #246 from UnityTech/longpressup

Longpressup

Author: Yuncong Zhang

Runtime/gestures/long_press.cs

@@ -65,10 +65,16 @@ public LongPressGestureRecognizer(object debugOwner = null, PointerDeviceKind? k
             base(deadline: Constants.kLongPressTimeout, debugOwner: debugOwner, kind: kind) {
         }
 
+        bool _longPressAccepted = false;
+
         public GestureLongPressCallback onLongPress;
 
+        public GestureLongPressUpCallback onLongPressUp;
+
         protected override void didExceedDeadline() {
             this.resolve(GestureDisposition.accepted);
+            this._longPressAccepted = true;
+
             if (this.onLongPress != null) {
                 this.invokeCallback<object>("onLongPress", () => {
                     this.onLongPress();
@@ -79,7 +85,19 @@ protected override void didExceedDeadline() {
 
         protected override void handlePrimaryPointer(PointerEvent evt) {
             if (evt is PointerUpEvent) {
-                this.resolve(GestureDisposition.rejected);
+                if (this._longPressAccepted && this.onLongPressUp != null) {
+                    this._longPressAccepted = false;
+                    this.invokeCallback<object>("onLongPressUp", () => {
+                        this.onLongPressUp();
+                        return null;
+                    });
+                }
+                else {
+                    this.resolve(GestureDisposition.rejected);
+                }
+            }
+            else if (evt is PointerDownEvent || evt is PointerCancelEvent) {
+                this._longPressAccepted = false;
             }
         }
 
@@ -101,7 +119,7 @@ public LongPressDragGestureRecognizer(object debugOwner = null) : base(
         Offset _longPressOrigin;
 
         TimeSpan? _longPressStartTimestamp;
-        
+
         public GestureLongPressDragStartCallback onLongPressStart;
 
         public GestureLongPressDragUpdateCallback onLongPressDragUpdate;

Runtime/widgets/gesture_detector.cs

@@ -113,9 +113,9 @@ public GestureDetector(
                         throw new UIWidgetsError(
                             "Incorrect GestureDetector arguments.\n" +
                             "Having both a pan gesture recognizer and a scale gesture recognizer is redundant; scale is a superset of pan. Just use the scale gesture recognizer."
-                            );
+                        );
                     }
-                    
+
                     string recognizer = havePan ? "pan" : "scale";
                     if (haveVerticalDrag && haveHorizontalDrag) {
                         throw new UIWidgetsError(
@@ -125,7 +125,7 @@ public GestureDetector(
                         );
                     }
                 }
-                
+
                 if (haveLongPress && haveLongPressDrag) {
                     throw new UIWidgetsError(
                         "Incorrect GestureDetector arguments.\n" +
@@ -235,7 +235,10 @@ public override Widget build(BuildContext context) {
                 gestures[typeof(LongPressGestureRecognizer)] =
                     new GestureRecognizerFactoryWithHandlers<LongPressGestureRecognizer>(
                         () => new LongPressGestureRecognizer(debugOwner: this),
-                        instance => { instance.onLongPress = this.onLongPress; }
+                        instance => {
+                            instance.onLongPress = this.onLongPress;
+                            instance.onLongPressUp = this.onLongPressUp;
+                        }
                     );
             }
 

Samples/UIWidgetSample/LongPressSample.cs

@@ -1,20 +1,17 @@
-using Unity.UIWidgets.animation;
-using Unity.UIWidgets.engine;
 using Unity.UIWidgets.material;
 using Unity.UIWidgets.widgets;
 using UnityEngine;
 
 namespace UIWidgetsSample {
-    public class LongPressSample: UIWidgetsSamplePanel {
-        
-        protected override Widget createWidget()  {
+    public class LongPressSample : UIWidgetsSamplePanel {
+        protected override Widget createWidget() {
             return new WidgetsApp(
                 home: new LongPressSampleWidget(),
                 pageRouteBuilder: this.pageRouteBuilder);
         }
     }
 
-    public class LongPressSampleWidget: StatefulWidget {
+    public class LongPressSampleWidget : StatefulWidget {
         public override State createState() {
             return new _LongPressSampleWidgetState();
         }
@@ -23,15 +20,11 @@ public override State createState() {
     class _LongPressSampleWidgetState : State<LongPressSampleWidget> {
         public override Widget build(BuildContext context) {
             return new GestureDetector(
-                onLongPressDragStart: (value) => {
-                    Debug.Log($"Long Press Drag Start: {value}");
-                },
-                onLongPressDragUpdate: (value) => {
-                    Debug.Log($"Long Press Drag Update: {value}");
-                },
-                onLongPressDragUp: (value) => {
-                    Debug.Log($"Long Press Drag Up: {value}");
-                },
+                onLongPressDragStart: (value) => { Debug.Log($"Long Press Drag Start: {value}"); },
+                onLongPressDragUpdate: (value) => { Debug.Log($"Long Press Drag Update: {value}"); },
+                onLongPressDragUp: (value) => { Debug.Log($"Long Press Drag Up: {value}"); },
+                onLongPressUp: () => { Debug.Log($"Long Press Up"); },
+                onLongPress: () => { Debug.Log($"Long Press"); },
                 child: new Center(
                     child: new Container(
                         width: 200,