| Index: samples-dev/swarm/swarm_ui_lib/touch/TouchHandler.dart
|
| diff --git a/samples-dev/swarm/swarm_ui_lib/touch/TouchHandler.dart b/samples-dev/swarm/swarm_ui_lib/touch/TouchHandler.dart
|
| index daca5d3f3123f562f3c6f9e05497f64da55a56e9..4b4ac48fa0ac94a0e6be88ee62f6e16170a864a6 100644
|
| --- a/samples-dev/swarm/swarm_ui_lib/touch/TouchHandler.dart
|
| +++ b/samples-dev/swarm/swarm_ui_lib/touch/TouchHandler.dart
|
| @@ -153,8 +153,9 @@ class TouchHandler {
|
| num _correctVelocity(num velocity) {
|
| num absVelocity = velocity.abs();
|
| if (absVelocity > _MAXIMUM_VELOCITY) {
|
| - absVelocity = _recentTouchesY.length < 6 ?
|
| - _VELOCITY_FOR_INCORRECT_EVENTS : _MAXIMUM_VELOCITY;
|
| + absVelocity = _recentTouchesY.length < 6
|
| + ? _VELOCITY_FOR_INCORRECT_EVENTS
|
| + : _MAXIMUM_VELOCITY;
|
| }
|
| return absVelocity * (velocity < 0 ? -1 : 1);
|
| }
|
| @@ -165,11 +166,14 @@ class TouchHandler {
|
| * phase.
|
| */
|
| void enable([bool capture = false]) {
|
| - Function onEnd = (e) { _onEnd(e.timeStamp, e); };
|
| - _addEventListeners(
|
| - _element,
|
| - (e) { _onStart(e); },
|
| - (e) { _onMove(e); }, onEnd, onEnd, capture);
|
| + Function onEnd = (e) {
|
| + _onEnd(e.timeStamp, e);
|
| + };
|
| + _addEventListeners(_element, (e) {
|
| + _onStart(e);
|
| + }, (e) {
|
| + _onMove(e);
|
| + }, onEnd, onEnd, capture);
|
| }
|
|
|
| /**
|
| @@ -218,7 +222,7 @@ class TouchHandler {
|
| * Return the touch of the last event.
|
| */
|
| Touch _getLastTouch() {
|
| - assert (_lastEvent != null); // Last event not set
|
| + assert(_lastEvent != null); // Last event not set
|
| return _lastEvent.touches[0];
|
| }
|
|
|
| @@ -274,8 +278,8 @@ class TouchHandler {
|
| _lastTouchY = clientY;
|
| if (!_dragging &&
|
| ((_totalMoveY > _MIN_TRACKING_FOR_DRAG && _draggable.verticalEnabled) ||
|
| - (_totalMoveX > _MIN_TRACKING_FOR_DRAG &&
|
| - _draggable.horizontalEnabled))) {
|
| + (_totalMoveX > _MIN_TRACKING_FOR_DRAG &&
|
| + _draggable.horizontalEnabled))) {
|
| _dragging = _draggable.onDragStart(e);
|
| if (!_dragging) {
|
| _endTracking();
|
| @@ -337,14 +341,13 @@ class TouchHandler {
|
| * or y component of the recent touch and the second item is the touch time
|
| * stamp. The time of the most recent event is specified by [recentTime].
|
| */
|
| - List<int> _removeOldTouches(List<int> recentTouches,
|
| - int recentTime) {
|
| + List<int> _removeOldTouches(List<int> recentTouches, int recentTime) {
|
| int count = 0;
|
| final len = recentTouches.length;
|
| - assert (len % 2 == 0);
|
| + assert(len % 2 == 0);
|
| while (count < len &&
|
| - recentTime - recentTouches[count + 1] > _MAX_TRACKING_TIME ||
|
| - (len - count) > _MAX_TRACKING_TOUCHES * 2) {
|
| + recentTime - recentTouches[count + 1] > _MAX_TRACKING_TIME ||
|
| + (len - count) > _MAX_TRACKING_TOUCHES * 2) {
|
| count += 2;
|
| }
|
| return count == 0 ? recentTouches : _removeFirstN(recentTouches, count);
|
| @@ -362,9 +365,11 @@ class TouchHandler {
|
| * stamp. The x or y component of the most recent move is specified by
|
| * [recentMove].
|
| */
|
| - List<int> _removeTouchesInWrongDirection(List<int> recentTouches,
|
| - int lastMove, int recentMove) {
|
| - if (lastMove !=0 && recentMove != 0 && recentTouches.length > 2 &&
|
| + List<int> _removeTouchesInWrongDirection(
|
| + List<int> recentTouches, int lastMove, int recentMove) {
|
| + if (lastMove != 0 &&
|
| + recentMove != 0 &&
|
| + recentTouches.length > 2 &&
|
| _xor(lastMove > 0, recentMove > 0)) {
|
| return _removeFirstN(recentTouches, recentTouches.length - 2);
|
| }
|
|
|