Merge pull request #273 from UnityTech/yczhang1.5.4

[To 1.5.4] Finish src/widgets.

Author: zhuxingwei

Runtime/gestures/binding.cs

@@ -63,7 +63,7 @@ void _handlePointerEvent(PointerEvent evt) {
             }
 
             HitTestResult hitTestResult = null;
-            if (evt is PointerDownEvent || evt is PointerSignalResolver) {
+            if (evt is PointerDownEvent || evt is PointerSignalEvent) {
                 D.assert(!this._hitTests.ContainsKey(evt.pointer));
                 hitTestResult = new HitTestResult();
                 this.hitTest(hitTestResult, evt.position);

Runtime/gestures/long_press.cs

@@ -6,168 +6,123 @@ namespace Unity.UIWidgets.gestures {
 
     public delegate void GestureLongPressUpCallback();
 
-    public delegate void GestureLongPressDragStartCallback(GestureLongPressDragStartDetails details);
+    public delegate void GestureLongPressStartCallback(LongPressStartDetails details);
 
-    public delegate void GestureLongPressDragUpdateCallback(GestureLongPressDragUpdateDetails details);
+    public delegate void GestureLongPressMoveUpdateCallback(LongPressMoveUpdateDetails details);
 
-    public delegate void GestureLongPressDragUpCallback(GestureLongPressDragUpDetails details);
+    public delegate void GestureLongPressEndCallback(LongPressEndDetails details);
 
-    public class GestureLongPressDragStartDetails {
-        public GestureLongPressDragStartDetails(
-            TimeSpan? sourceTimeStamp = null,
+    public class LongPressStartDetails {
+        public LongPressStartDetails(
             Offset globalPosition = null
         ) {
-            this.sourceTimeStamp = sourceTimeStamp;
             this.globalPosition = globalPosition ?? Offset.zero;
         }
 
-
-        public readonly TimeSpan? sourceTimeStamp;
-
         public readonly Offset globalPosition;
     }
 
-    public class GestureLongPressDragUpdateDetails {
-        public GestureLongPressDragUpdateDetails(
-            TimeSpan? sourceTimeStamp = null,
+    public class LongPressMoveUpdateDetails {
+        public LongPressMoveUpdateDetails(
             Offset globalPosition = null,
             Offset offsetFromOrigin = null
         ) {
-            this.sourceTimeStamp = sourceTimeStamp;
             this.globalPosition = globalPosition ?? Offset.zero;
             this.offsetFromOrigin = offsetFromOrigin ?? Offset.zero;
         }
 
-        public readonly TimeSpan? sourceTimeStamp;
-
         public readonly Offset globalPosition;
 
         public readonly Offset offsetFromOrigin;
     }
 
-    public class GestureLongPressDragUpDetails {
-        public GestureLongPressDragUpDetails(
-            TimeSpan? sourceTimeStamp = null,
+    public class LongPressEndDetails {
+        public LongPressEndDetails(
             Offset globalPosition = null
         ) {
-            this.sourceTimeStamp = sourceTimeStamp;
             this.globalPosition = globalPosition ?? Offset.zero;
         }
 
-        public readonly TimeSpan? sourceTimeStamp;
-
         public readonly Offset globalPosition;
     }
 
 
     public class LongPressGestureRecognizer : PrimaryPointerGestureRecognizer {
-        public LongPressGestureRecognizer(object debugOwner = null, PointerDeviceKind? kind = null) :
-            base(deadline: Constants.kLongPressTimeout, debugOwner: debugOwner, kind: kind) {
-        }
+        public LongPressGestureRecognizer(
+            float? postAcceptSlopTolerance = null,
+            object debugOwner = null,
+            PointerDeviceKind? kind = null) : base(
+            deadline: Constants.kLongPressTimeout,
+            postAcceptSlopTolerance: postAcceptSlopTolerance,
+            kind: kind,
+            debugOwner: debugOwner) { }
 
         bool _longPressAccepted = false;
 
+        Offset _longPressOrigin;
+
         public GestureLongPressCallback onLongPress;
 
+        public GestureLongPressStartCallback onLongPressStart;
+
+        public GestureLongPressMoveUpdateCallback onLongPressMoveUpdate;
+
         public GestureLongPressUpCallback onLongPressUp;
 
+        public GestureLongPressEndCallback onLongPressEnd;
+
         protected override void didExceedDeadline() {
             this.resolve(GestureDisposition.accepted);
             this._longPressAccepted = true;
-
+            base.acceptGesture(this.primaryPointer);
             if (this.onLongPress != null) {
                 this.invokeCallback<object>("onLongPress", () => {
                     this.onLongPress();
                     return null;
                 });
             }
-        }
 
-        protected override void handlePrimaryPointer(PointerEvent evt) {
-            if (evt is PointerUpEvent) {
-                if (this._longPressAccepted && this.onLongPressUp != null) {
-                    this._longPressAccepted = false;
-                    this.invokeCallback<object>("onLongPressUp", () => {
-                        this.onLongPressUp();
+            if (this.onLongPressStart != null) {
+                this.invokeCallback<object>("onLongPressStart",
+                    () => {
+                        this.onLongPressStart(new LongPressStartDetails(globalPosition: this._longPressOrigin));
                         return null;
                     });
-                }
-                else {
-                    this.resolve(GestureDisposition.rejected);
-                }
-            }
-            else if (evt is PointerDownEvent || evt is PointerCancelEvent) {
-                this._longPressAccepted = false;
-            }
-        }
-
-        public override string debugDescription {
-            get { return "long press"; }
-        }
-    }
-
-    public class LongPressDragGestureRecognizer : PrimaryPointerGestureRecognizer {
-        public LongPressDragGestureRecognizer(object debugOwner = null) : base(
-            deadline: Constants.kLongPressTimeout,
-            postAcceptSlopTolerance: null,
-            debugOwner: debugOwner
-        ) {
-        }
-
-        bool _longPressAccepted = false;
-
-        Offset _longPressOrigin;
-
-        TimeSpan? _longPressStartTimestamp;
-
-        public GestureLongPressDragStartCallback onLongPressStart;
-
-        public GestureLongPressDragUpdateCallback onLongPressDragUpdate;
-
-        public GestureLongPressDragUpCallback onLongPressUp;
-
-        protected override void didExceedDeadline() {
-            this.resolve(GestureDisposition.accepted);
-            this._longPressAccepted = true;
-            base.acceptGesture(this.primaryPointer);
-            if (this.onLongPressStart != null) {
-                this.invokeCallback<object>("onLongPressStart", () => {
-                    this.onLongPressStart(new GestureLongPressDragStartDetails(
-                        sourceTimeStamp: this._longPressStartTimestamp,
-                        globalPosition: this._longPressOrigin
-                    ));
-                    return null;
-                });
             }
         }
 
-        protected override void handlePrimaryPointer(PointerEvent e) {
-            if (e is PointerUpEvent) {
-                if (this._longPressAccepted == true && this.onLongPressUp != null) {
-                    this._longPressAccepted = false;
-                    this.invokeCallback<object>("onLongPressUp", () => {
-                        this.onLongPressUp(new GestureLongPressDragUpDetails(
-                            sourceTimeStamp: e.timeStamp,
-                            globalPosition: e.position
-                        ));
-                        return null;
-                    });
+        protected override void handlePrimaryPointer(PointerEvent evt) {
+            if (evt is PointerUpEvent) {
+                if (this._longPressAccepted) {
+                    if (this.onLongPressUp != null) {
+                        this.invokeCallback<object>("onLongPressUp", () => {
+                            this.onLongPressUp();
+                            return null;
+                        });
+                    }
+
+                    if (this.onLongPressEnd != null) {
+                        this.invokeCallback<object>("onLongPressEnd", () => {
+                            this.onLongPressEnd(new LongPressEndDetails(globalPosition: evt.position));
+                            return null;
+                        });
+                    }
+
+                    this._longPressAccepted = true;
                 }
                 else {
                     this.resolve(GestureDisposition.rejected);
                 }
             }
-            else if (e is PointerDownEvent) {
+            else if (evt is PointerDownEvent || evt is PointerCancelEvent) {
                 this._longPressAccepted = false;
-                this._longPressStartTimestamp = e.timeStamp;
-                this._longPressOrigin = e.position;
+                this._longPressOrigin = evt.position;
             }
-            else if (e is PointerMoveEvent && this._longPressAccepted && this.onLongPressDragUpdate != null) {
-                this.invokeCallback<object>("onLongPressDrag", () => {
-                    this.onLongPressDragUpdate(new GestureLongPressDragUpdateDetails(
-                        sourceTimeStamp: e.timeStamp,
-                        globalPosition: e.position,
-                        offsetFromOrigin: e.position - this._longPressOrigin
+            else if (evt is PointerMoveEvent && this._longPressAccepted && this.onLongPressMoveUpdate != null) {
+                this.invokeCallback<object>("onLongPressMoveUpdate", () => {
+                    this.onLongPressMoveUpdate(new LongPressMoveUpdateDetails(
+                        globalPosition: evt.position,
+                        offsetFromOrigin: evt.position - this._longPressOrigin
                     ));
                     return null;
                 });
@@ -177,15 +132,8 @@ protected override void handlePrimaryPointer(PointerEvent e) {
         public override void acceptGesture(int pointer) {
         }
 
-        protected override void didStopTrackingLastPointer(int pointer) {
-            this._longPressAccepted = false;
-            this._longPressOrigin = null;
-            this._longPressStartTimestamp = null;
-            base.didStopTrackingLastPointer(pointer);
-        }
-
         public override string debugDescription {
-            get { return "long press drag"; }
+            get { return "long press"; }
         }
     }
 }

Runtime/material/app.cs

@@ -106,13 +106,19 @@ public override State createState() {
 
 
     class _MaterialAppState : State<MaterialApp> {
+        HeroController _heroController;
+        
         public override void initState() {
             base.initState();
+            this._heroController = new HeroController(createRectTween: this._createRectTween);
             this._updateNavigator();
         }
 
         public override void didUpdateWidget(StatefulWidget oldWidget) {
             base.didUpdateWidget(oldWidget);
+            if (this.widget.navigatorKey != (oldWidget as MaterialApp).navigatorKey) {
+                this._heroController = new HeroController(createRectTween: this._createRectTween);
+            }
             this._updateNavigator();
         }
 
@@ -124,6 +130,7 @@ void _updateNavigator() {
                 this.widget.onGenerateRoute != null ||
                 this.widget.onUnknownRoute != null) {
                 this._navigatorObservers = new List<NavigatorObserver>(this.widget.navigatorObservers);
+                this._navigatorObservers.Add(this._heroController);
             }
             else {
                 this._navigatorObservers = null;