Skip to content

Commit 2a61b37

Browse files
farfromrefugfarfromrefug
committed
fix: final N 8.4 refactoring
1 parent fed77e0 commit 2a61b37

File tree

2 files changed

+60
-62
lines changed

2 files changed

+60
-62
lines changed

‎src/gesturehandler/gesturehandler.android.ts‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { Application, View } from '@nativescript/core';
1+
import { Application, Utils, View } from '@nativescript/core';
22
import { GestureEventData, GestureTypes } from '@nativescript/core/ui/gestures';
33
import { Page } from '@nativescript/core/ui/page';
4-
import { layout } from '@nativescript/core/utils/layout-helper';
54
import {
65
HandlerOptions,
76
LongPressGestureHandlerOptions,
@@ -159,7 +158,7 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
159158
toNative(value) {
160159
const HIT_SLOP_NONE = GestureHandler.HIT_SLOP_NONE;
161160
if (typeof value === 'number') {
162-
const hitSlop = layout.toDevicePixels(value);
161+
const hitSlop = Utils.layout.toDevicePixels(value);
163162
return [hitSlop, hitSlop, hitSlop, hitSlop, HIT_SLOP_NONE, HIT_SLOP_NONE];
164163
} else {
165164
let left = HIT_SLOP_NONE,
@@ -169,30 +168,30 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
169168
let width = HIT_SLOP_NONE,
170169
height = HIT_SLOP_NONE;
171170
if (value.hasOwnProperty(KEY_HIT_SLOP_HORIZONTAL)) {
172-
const horizontalPad = layout.toDevicePixels(value[KEY_HIT_SLOP_HORIZONTAL]);
171+
const horizontalPad = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_HORIZONTAL]);
173172
left = right = horizontalPad;
174173
}
175174
if (value.hasOwnProperty(KEY_HIT_SLOP_VERTICAL)) {
176-
const verticalPad = layout.toDevicePixels(value[KEY_HIT_SLOP_VERTICAL]);
175+
const verticalPad = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_VERTICAL]);
177176
top = bottom = verticalPad;
178177
}
179178
if (value.hasOwnProperty(KEY_HIT_SLOP_LEFT)) {
180-
left = layout.toDevicePixels(value[KEY_HIT_SLOP_LEFT]);
179+
left = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_LEFT]);
181180
}
182181
if (value.hasOwnProperty(KEY_HIT_SLOP_TOP)) {
183-
top = layout.toDevicePixels(value[KEY_HIT_SLOP_TOP]);
182+
top = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_TOP]);
184183
}
185184
if (value.hasKey(KEY_HIT_SLOP_RIGHT)) {
186-
right = layout.toDevicePixels(value[KEY_HIT_SLOP_RIGHT]);
185+
right = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_RIGHT]);
187186
}
188187
if (value.hasOwnProperty(KEY_HIT_SLOP_BOTTOM)) {
189-
bottom = layout.toDevicePixels(value[KEY_HIT_SLOP_BOTTOM]);
188+
bottom = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_BOTTOM]);
190189
}
191190
if (value.hasOwnProperty(KEY_HIT_SLOP_WIDTH)) {
192-
width = layout.toDevicePixels(value[KEY_HIT_SLOP_WIDTH]);
191+
width = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_WIDTH]);
193192
}
194193
if (value.hasOwnProperty(KEY_HIT_SLOP_HEIGHT)) {
195-
height = layout.toDevicePixels(value[KEY_HIT_SLOP_HEIGHT]);
194+
height = Utils.layout.toDevicePixels(value[KEY_HIT_SLOP_HEIGHT]);
196195
}
197196
return [left, top, right, bottom, width, height];
198197
}
@@ -210,12 +209,12 @@ export abstract class Handler<T extends com.swmansion.gesturehandler.GestureHand
210209
const numberOfPointers = handler.getNumberOfPointers();
211210
const positions = [];
212211
for (let index = 0; index < numberOfPointers; index++) {
213-
positions.push(layout.toDeviceIndependentPixels(handler.getXAtIndex(index)));
214-
positions.push(layout.toDeviceIndependentPixels(handler.getYAtIndex(index)));
212+
positions.push(Utils.layout.toDeviceIndependentPixels(handler.getXAtIndex(index)));
213+
positions.push(Utils.layout.toDeviceIndependentPixels(handler.getYAtIndex(index)));
215214
}
216215
return {
217-
// x: layout.toDeviceIndependentPixels(handler.getX()),
218-
// y: layout.toDeviceIndependentPixels(handler.getY()),
216+
// x: Utils.layout.toDeviceIndependentPixels(handler.getX()),
217+
// y: Utils.layout.toDeviceIndependentPixels(handler.getY()),
219218
positions,
220219
numberOfPointers,
221220
};
@@ -318,34 +317,34 @@ export class TapGestureHandler extends Handler<com.swmansion.gesturehandler.TapG
318317
@nativeProperty maxDelayMs: number;
319318
@nativeProperty({ nativeSetterName: 'setMaxDx' }) maxDeltaX: number;
320319
@nativeProperty({ nativeSetterName: 'setMaxDy' }) maxDeltaY: number;
321-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) maxDist: number;
320+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) maxDist: number;
322321
@nativeProperty({ nativeSetterName: 'setMinNumberOfPointers' }) minPointers: number;
323322
createNative(options) {
324323
return new com.swmansion.gesturehandler.TapGestureHandler();
325324
}
326325
getExtraData(handler: com.swmansion.gesturehandler.TapGestureHandler) {
327326
return Object.assign(super.getExtraData(handler), {
328-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
329-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
330-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
331-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
327+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
328+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
329+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
330+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
332331
});
333332
}
334333
}
335334

336335
export class PanGestureHandler extends Handler<com.swmansion.gesturehandler.PanGestureHandler, PanGestureHandlerOptions> {
337-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minDist: number;
338-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetXStart: number;
339-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetXEnd: number;
340-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetXStart: number;
341-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetXEnd: number;
342-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetYStart: number;
343-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) activeOffsetYEnd: number;
344-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetYStart: number;
345-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) failOffsetYEnd: number;
346-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minVelocity: number;
347-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minVelocityX: number;
348-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minVelocityY: number;
336+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minDist: number;
337+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetXStart: number;
338+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetXEnd: number;
339+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetXStart: number;
340+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetXEnd: number;
341+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetYStart: number;
342+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) activeOffsetYEnd: number;
343+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetYStart: number;
344+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) failOffsetYEnd: number;
345+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minVelocity: number;
346+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minVelocityX: number;
347+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minVelocityY: number;
349348
@nativeProperty minPointers: number;
350349
@nativeProperty maxPointers: number;
351350
@nativeProperty({ nativeSetterName: 'setAverageTouches' }) avgTouches: number;
@@ -356,32 +355,32 @@ export class PanGestureHandler extends Handler<com.swmansion.gesturehandler.PanG
356355
}
357356
getExtraData(handler: com.swmansion.gesturehandler.PanGestureHandler) {
358357
return Object.assign(super.getExtraData(handler), {
359-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
360-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
361-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
362-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
363-
translationX: layout.toDeviceIndependentPixels(handler.getTranslationX()),
364-
translationY: layout.toDeviceIndependentPixels(handler.getTranslationY()),
365-
velocityX: layout.toDeviceIndependentPixels(handler.getVelocityX()),
366-
velocityY: layout.toDeviceIndependentPixels(handler.getVelocityY()),
358+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
359+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
360+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
361+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
362+
translationX: Utils.layout.toDeviceIndependentPixels(handler.getTranslationX()),
363+
translationY: Utils.layout.toDeviceIndependentPixels(handler.getTranslationY()),
364+
velocityX: Utils.layout.toDeviceIndependentPixels(handler.getVelocityX()),
365+
velocityY: Utils.layout.toDeviceIndependentPixels(handler.getVelocityY()),
367366
});
368367
}
369368
}
370369

371370
export class PinchGestureHandler extends Handler<com.swmansion.gesturehandler.PinchGestureHandler, PinchGestureHandlerOptions> {
372-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) minSpan: number;
371+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) minSpan: number;
373372
createNative(options) {
374373
return new com.swmansion.gesturehandler.PinchGestureHandler();
375374
}
376375
getExtraData(handler: com.swmansion.gesturehandler.PinchGestureHandler) {
377376
return Object.assign(super.getExtraData(handler), {
378-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
379-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
380-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
381-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
377+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
378+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
379+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
380+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
382381
scale: handler.getScale(),
383-
focalX: layout.toDeviceIndependentPixels(handler.getFocalPointX()),
384-
focalY: layout.toDeviceIndependentPixels(handler.getFocalPointY()),
382+
focalX: Utils.layout.toDeviceIndependentPixels(handler.getFocalPointX()),
383+
focalY: Utils.layout.toDeviceIndependentPixels(handler.getFocalPointY()),
385384
velocity: handler.getVelocity(),
386385
});
387386
}
@@ -435,17 +434,17 @@ export class FlingGestureHandler extends Handler<com.swmansion.gesturehandler.Fl
435434
}
436435
export class LongPressGestureHandler extends Handler<com.swmansion.gesturehandler.LongPressGestureHandler, LongPressGestureHandlerOptions> {
437436
@nativeProperty minDurationMs: number;
438-
@nativeProperty({ converter: { fromNative: layout.toDevicePixels } }) maxDist: number;
437+
@nativeProperty({ converter: { fromNative: Utils.layout.toDevicePixels } }) maxDist: number;
439438
createNative(options) {
440439
const context = Application.android.context as android.content.Context;
441440
return new com.swmansion.gesturehandler.LongPressGestureHandler(context);
442441
}
443442
getExtraData(handler: com.swmansion.gesturehandler.LongPressGestureHandler) {
444443
return Object.assign(super.getExtraData(handler), {
445-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
446-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
447-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
448-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
444+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
445+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
446+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
447+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
449448
});
450449
}
451450
}
@@ -455,13 +454,13 @@ export class RotationGestureHandler extends Handler<com.swmansion.gesturehandler
455454
}
456455
getExtraData(handler: com.swmansion.gesturehandler.RotationGestureHandler) {
457456
return Object.assign(super.getExtraData(handler), {
458-
x: layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
459-
y: layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
460-
absoluteX: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
461-
absoluteY: layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
457+
x: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionX()),
458+
y: Utils.layout.toDeviceIndependentPixels(handler.getLastRelativePositionY()),
459+
absoluteX: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionX()),
460+
absoluteY: Utils.layout.toDeviceIndependentPixels(handler.getLastAbsolutePositionY()),
462461
rotation: handler.getRotation(),
463-
anchorX: layout.toDeviceIndependentPixels(handler.getAnchorX()),
464-
anchorY: layout.toDeviceIndependentPixels(handler.getAnchorY()),
462+
anchorX: Utils.layout.toDeviceIndependentPixels(handler.getAnchorX()),
463+
anchorY: Utils.layout.toDeviceIndependentPixels(handler.getAnchorY()),
465464
velocity: handler.getVelocity(),
466465
});
467466
}

‎src/gesturehandler/gestures_override.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { EventData, View } from '@nativescript/core';
1+
import { EventData, Utils, View } from '@nativescript/core';
22
import { GestureEventData, GestureStateTypes, GestureTypes, GesturesObserver as NGesturesObserver, SwipeDirection, TouchAction, toString as gestureToString } from '@nativescript/core/ui/gestures';
3-
import { layout } from '@nativescript/core/utils/layout-helper';
43
import { Handler, Manager } from './gesturehandler';
54
import { GestureHandlerStateEvent, GestureHandlerTouchEvent, GestureState, GestureStateEventData, HandlerType, ROOT_GESTURE_HANDLER_TAG } from './gesturehandler.common';
65

@@ -270,11 +269,11 @@ class Pointer implements Pointer {
270269
}
271270

272271
getX(): number {
273-
return this.event.getX(this.android) / layout.getDisplayDensity();
272+
return this.event.getX(this.android) / Utils.layout.getDisplayDensity();
274273
}
275274

276275
getY(): number {
277-
return this.event.getY(this.android) / layout.getDisplayDensity();
276+
return this.event.getY(this.android) / Utils.layout.getDisplayDensity();
278277
}
279278
}
280279
class GesturePointer {

0 commit comments

Comments
 (0)