@rafaelaugusto/jolt 0.1.0-beta.4 → 0.1.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +24 -1
- package/dist/animate.d.ts +3 -2
- package/dist/animate.d.ts.map +1 -1
- package/dist/animate.js +11 -3
- package/dist/animate.js.map +1 -1
- package/dist/decoration.d.ts +18 -0
- package/dist/decoration.d.ts.map +1 -0
- package/dist/decoration.js +155 -0
- package/dist/decoration.js.map +1 -0
- package/dist/driver/android-color.d.ts +3 -0
- package/dist/driver/android-color.d.ts.map +1 -1
- package/dist/driver/android-color.js +20 -18
- package/dist/driver/android-color.js.map +1 -1
- package/dist/driver/android-decoration.d.ts +22 -0
- package/dist/driver/android-decoration.d.ts.map +1 -0
- package/dist/driver/android-decoration.js +139 -0
- package/dist/driver/android-decoration.js.map +1 -0
- package/dist/driver/android-playback.d.ts +13 -0
- package/dist/driver/android-playback.d.ts.map +1 -0
- package/dist/driver/android-playback.js +141 -0
- package/dist/driver/android-playback.js.map +1 -0
- package/dist/driver/android.d.ts.map +1 -1
- package/dist/driver/android.js +23 -36
- package/dist/driver/android.js.map +1 -1
- package/dist/driver/index.d.ts +7 -0
- package/dist/driver/index.d.ts.map +1 -1
- package/dist/driver/index.js.map +1 -1
- package/dist/driver/ios-color.d.ts +2 -0
- package/dist/driver/ios-color.d.ts.map +1 -1
- package/dist/driver/ios-color.js +19 -8
- package/dist/driver/ios-color.js.map +1 -1
- package/dist/driver/ios-decoration.d.ts +17 -0
- package/dist/driver/ios-decoration.d.ts.map +1 -0
- package/dist/driver/ios-decoration.js +271 -0
- package/dist/driver/ios-decoration.js.map +1 -0
- package/dist/driver/ios-playback.d.ts +10 -0
- package/dist/driver/ios-playback.d.ts.map +1 -0
- package/dist/driver/ios-playback.js +33 -0
- package/dist/driver/ios-playback.js.map +1 -0
- package/dist/driver/ios-shadow.d.ts +6 -0
- package/dist/driver/ios-shadow.d.ts.map +1 -0
- package/dist/driver/ios-shadow.js +52 -0
- package/dist/driver/ios-shadow.js.map +1 -0
- package/dist/driver/ios.d.ts.map +1 -1
- package/dist/driver/ios.js +75 -40
- package/dist/driver/ios.js.map +1 -1
- package/dist/engine.d.ts +48 -2
- package/dist/engine.d.ts.map +1 -1
- package/dist/engine.js +210 -18
- package/dist/engine.js.map +1 -1
- package/dist/haptics.d.ts +4 -1
- package/dist/haptics.d.ts.map +1 -1
- package/dist/haptics.js +27 -3
- package/dist/haptics.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/playback-group.d.ts +6 -0
- package/dist/playback-group.d.ts.map +1 -0
- package/dist/playback-group.js +113 -0
- package/dist/playback-group.js.map +1 -0
- package/dist/playback.d.ts +25 -0
- package/dist/playback.d.ts.map +1 -0
- package/dist/playback.js +35 -0
- package/dist/playback.js.map +1 -0
- package/dist/properties.d.ts +2 -1
- package/dist/properties.d.ts.map +1 -1
- package/dist/properties.js +14 -1
- package/dist/properties.js.map +1 -1
- package/dist/sequence.d.ts.map +1 -1
- package/dist/sequence.js +6 -0
- package/dist/sequence.js.map +1 -1
- package/dist/track.d.ts.map +1 -1
- package/dist/track.js +10 -1
- package/dist/track.js.map +1 -1
- package/dist/transition.d.ts.map +1 -1
- package/dist/transition.js +4 -1
- package/dist/transition.js.map +1 -1
- package/dist/types.d.ts +15 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/platforms/android/java/org/rafaelaugusto/jolt/ColorTarget.java +2 -2
- package/platforms/android/java/org/rafaelaugusto/jolt/DecorationTarget.java +154 -0
- package/platforms/android/proguard-rules.pro +1 -0
- package/src/animate.ts +18 -5
- package/src/decoration.ts +180 -0
- package/src/driver/android-color.ts +22 -20
- package/src/driver/android-decoration.ts +182 -0
- package/src/driver/android-playback.ts +157 -0
- package/src/driver/android.ts +43 -43
- package/src/driver/index.ts +13 -0
- package/src/driver/ios-color.ts +19 -10
- package/src/driver/ios-decoration.ts +332 -0
- package/src/driver/ios-playback.ts +37 -0
- package/src/driver/ios-shadow.ts +50 -0
- package/src/driver/ios.ts +85 -46
- package/src/engine.ts +220 -20
- package/src/haptics.ts +25 -2
- package/src/index.ts +1 -0
- package/src/playback-group.ts +110 -0
- package/src/playback.ts +62 -0
- package/src/properties.ts +18 -2
- package/src/sequence.ts +5 -0
- package/src/track.ts +9 -1
- package/src/transition.ts +4 -1
- package/src/types.ts +15 -0
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { Utils } from '@nativescript/core';
|
|
2
|
+
import { isWritingDecoration, radiusKeys, widthKeys, validateDecorationTarget, } from '../decoration.js';
|
|
3
|
+
import { androidPlayback } from './android-playback.js';
|
|
4
|
+
const playing = new WeakMap();
|
|
5
|
+
const ids = { borderRadius: 0, borderWidth: 1, elevation: 2, translationZ: 3 };
|
|
6
|
+
export function syncAndroidDecoration(view) {
|
|
7
|
+
for (const handle of playing.get(view)?.values() ?? [])
|
|
8
|
+
handle.target.setValue(handle.target.getValue());
|
|
9
|
+
}
|
|
10
|
+
export const presentedAndroidDecoration = (view, property) => {
|
|
11
|
+
const target = playing.get(view)?.get(property)?.target;
|
|
12
|
+
return target ? target.getValue() / Utils.layout.getDisplayDensity() : undefined;
|
|
13
|
+
};
|
|
14
|
+
export function playAndroidDecoration(view, track, onEnd) {
|
|
15
|
+
const property = track.property;
|
|
16
|
+
const density = Utils.layout.getDisplayDensity();
|
|
17
|
+
const bridge = globalThis;
|
|
18
|
+
let target;
|
|
19
|
+
try {
|
|
20
|
+
target = new bridge.org.rafaelaugusto.jolt.DecorationTarget(view.nativeViewProtected, ids[property], track.values[0] * density, view.borderTopColor?.argb ?? 0);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
onEnd(false);
|
|
24
|
+
return {
|
|
25
|
+
cancel() { },
|
|
26
|
+
control() { },
|
|
27
|
+
elapsed: () => 0,
|
|
28
|
+
target: {
|
|
29
|
+
getValue: () => track.to * density,
|
|
30
|
+
setValue() { },
|
|
31
|
+
isSupported: () => false,
|
|
32
|
+
acquire() { },
|
|
33
|
+
release() { },
|
|
34
|
+
},
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
const frames = Array.create(android.animation.Keyframe, track.values.length);
|
|
38
|
+
track.values.forEach((value, index) => {
|
|
39
|
+
frames[index] = android.animation.Keyframe.ofFloat(track.times[index], value * density);
|
|
40
|
+
});
|
|
41
|
+
const holders = Array.create(android.animation.PropertyValuesHolder, 1);
|
|
42
|
+
holders[0] = android.animation.PropertyValuesHolder.ofKeyframe('value', frames);
|
|
43
|
+
const animator = android.animation.ObjectAnimator.ofPropertyValuesHolder(target, holders);
|
|
44
|
+
animator.setDuration(Math.max(track.duration, 1));
|
|
45
|
+
animator.setStartDelay(track.delay);
|
|
46
|
+
animator.setInterpolator(new android.view.animation.LinearInterpolator());
|
|
47
|
+
if (track.repeat > 0) {
|
|
48
|
+
animator.setRepeatCount(Number.isFinite(track.repeat)
|
|
49
|
+
? track.repeat
|
|
50
|
+
: android.animation.ValueAnimator.INFINITE);
|
|
51
|
+
animator.setRepeatMode(track.reverse
|
|
52
|
+
? android.animation.ValueAnimator.REVERSE
|
|
53
|
+
: android.animation.ValueAnimator.RESTART);
|
|
54
|
+
}
|
|
55
|
+
let stopped = false;
|
|
56
|
+
const changes = [
|
|
57
|
+
...radiusKeys,
|
|
58
|
+
...widthKeys,
|
|
59
|
+
'clipPath',
|
|
60
|
+
'cornerShape',
|
|
61
|
+
'boxShadow',
|
|
62
|
+
'androidElevation',
|
|
63
|
+
].map((name) => `${name}Change`);
|
|
64
|
+
const cleanup = () => {
|
|
65
|
+
if (stopped)
|
|
66
|
+
return;
|
|
67
|
+
stopped = true;
|
|
68
|
+
view.off('unloaded', cancel);
|
|
69
|
+
for (const event of changes)
|
|
70
|
+
view.style.off(event, external);
|
|
71
|
+
target.release();
|
|
72
|
+
if (playing.get(view)?.get(property) === handle)
|
|
73
|
+
playing.get(view)?.delete(property);
|
|
74
|
+
};
|
|
75
|
+
let player;
|
|
76
|
+
const cancel = () => {
|
|
77
|
+
if (!stopped) {
|
|
78
|
+
cleanup();
|
|
79
|
+
player?.cancel();
|
|
80
|
+
onEnd(false);
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
const external = (event) => {
|
|
84
|
+
if (isWritingDecoration(view))
|
|
85
|
+
return;
|
|
86
|
+
const own = property === 'borderRadius'
|
|
87
|
+
? radiusKeys
|
|
88
|
+
: property === 'borderWidth'
|
|
89
|
+
? widthKeys
|
|
90
|
+
: property === 'elevation'
|
|
91
|
+
? ['androidElevation']
|
|
92
|
+
: [];
|
|
93
|
+
void Promise.resolve().then(() => {
|
|
94
|
+
if (stopped)
|
|
95
|
+
return;
|
|
96
|
+
if (own.some((name) => event.eventName === `${name}Change`))
|
|
97
|
+
return cancel();
|
|
98
|
+
try {
|
|
99
|
+
validateDecorationTarget(view, property);
|
|
100
|
+
}
|
|
101
|
+
catch {
|
|
102
|
+
cancel();
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
};
|
|
106
|
+
const handle = {
|
|
107
|
+
target,
|
|
108
|
+
elapsed: () => player?.elapsed() ?? 0,
|
|
109
|
+
control(time, paused, command) {
|
|
110
|
+
player?.control(time, paused, command);
|
|
111
|
+
},
|
|
112
|
+
cancel() {
|
|
113
|
+
cleanup();
|
|
114
|
+
player?.cancel();
|
|
115
|
+
},
|
|
116
|
+
};
|
|
117
|
+
const entries = playing.get(view) ?? new Map();
|
|
118
|
+
playing.set(view, entries);
|
|
119
|
+
entries.set(property, handle);
|
|
120
|
+
view.on('unloaded', cancel);
|
|
121
|
+
for (const event of changes)
|
|
122
|
+
view.style.on(event, external);
|
|
123
|
+
if (target.isSupported()) {
|
|
124
|
+
target.acquire();
|
|
125
|
+
target.setValue(track.values[0] * density);
|
|
126
|
+
player = androidPlayback(animator, track, () => {
|
|
127
|
+
if (!stopped) {
|
|
128
|
+
cleanup();
|
|
129
|
+
onEnd();
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
cleanup();
|
|
135
|
+
onEnd(false);
|
|
136
|
+
}
|
|
137
|
+
return handle;
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=android-decoration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"android-decoration.js","sourceRoot":"","sources":["../../src/driver/android-decoration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { Track } from '../track.js';
|
|
2
|
+
import type { PlaybackClock, PlaybackCommand } from '../playback.js';
|
|
3
|
+
export interface AndroidPlayback {
|
|
4
|
+
cancel(): void;
|
|
5
|
+
elapsed(): number;
|
|
6
|
+
control(elapsed: number, paused: boolean, command?: PlaybackCommand): void;
|
|
7
|
+
}
|
|
8
|
+
/** Reuse native keyframes when seeking, including rewinding into a start delay. */
|
|
9
|
+
export declare function androidPlayback(animator: android.animation.ValueAnimator, track: Track, onEnd: () => void, onStart?: () => void, onRelease?: () => void): AndroidPlayback;
|
|
10
|
+
/** Share one native clock among active animations. Pause it when every owner
|
|
11
|
+
* is paused, and dispose it when the last owner settles. No frame callbacks. */
|
|
12
|
+
export declare function androidClockFactory(): (_duration: number) => PlaybackClock;
|
|
13
|
+
//# sourceMappingURL=android-playback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"android-playback.d.ts","sourceRoot":"","sources":["../../src/driver/android-playback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEpE,MAAM,WAAW,eAAe;IAC9B,MAAM,IAAI,IAAI,CAAA;IACd,OAAO,IAAI,MAAM,CAAA;IACjB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAC3E;AAED,mFAAmF;AACnF,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,aAAa,EACzC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,MAAM,IAAI,EACjB,OAAO,CAAC,EAAE,MAAM,IAAI,EACpB,SAAS,CAAC,EAAE,MAAM,IAAI,GACrB,eAAe,CAyEjB;AAED;gFACgF;AAChF,wBAAgB,mBAAmB,gBAqBd,MAAM,KAAG,aAAa,CA0C1C"}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
/** Reuse native keyframes when seeking, including rewinding into a start delay. */
|
|
2
|
+
export function androidPlayback(animator, track, onEnd, onStart, onRelease) {
|
|
3
|
+
let suppressed = false;
|
|
4
|
+
let stopped = false;
|
|
5
|
+
let started = false;
|
|
6
|
+
let acquired = false;
|
|
7
|
+
let origin = 0;
|
|
8
|
+
let delay = track.delay;
|
|
9
|
+
let held;
|
|
10
|
+
animator.addListener(new android.animation.Animator.AnimatorListener({
|
|
11
|
+
onAnimationStart() {
|
|
12
|
+
if (!suppressed && !stopped) {
|
|
13
|
+
started = true;
|
|
14
|
+
if (!acquired) {
|
|
15
|
+
acquired = true;
|
|
16
|
+
onStart?.();
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
},
|
|
20
|
+
onAnimationRepeat() { },
|
|
21
|
+
onAnimationCancel() {
|
|
22
|
+
if (!suppressed && !stopped)
|
|
23
|
+
onRelease?.();
|
|
24
|
+
},
|
|
25
|
+
onAnimationEnd() {
|
|
26
|
+
if (suppressed || stopped || held !== undefined)
|
|
27
|
+
return;
|
|
28
|
+
stopped = true;
|
|
29
|
+
onRelease?.();
|
|
30
|
+
onEnd();
|
|
31
|
+
},
|
|
32
|
+
}));
|
|
33
|
+
const elapsed = () => held ?? (started ? origin + delay + animator.getCurrentPlayTime() : origin);
|
|
34
|
+
const control = (position, paused, command = 'seek') => {
|
|
35
|
+
if (stopped)
|
|
36
|
+
return;
|
|
37
|
+
if (command === 'pause') {
|
|
38
|
+
held = position;
|
|
39
|
+
animator.pause();
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
if (command === 'play') {
|
|
43
|
+
held = undefined;
|
|
44
|
+
animator.resume();
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
suppressed = true;
|
|
48
|
+
animator.cancel();
|
|
49
|
+
started = false;
|
|
50
|
+
origin = Math.min(position, track.delay);
|
|
51
|
+
delay = Math.max(0, track.delay - position);
|
|
52
|
+
animator.setStartDelay(delay);
|
|
53
|
+
held = paused ? position : undefined;
|
|
54
|
+
suppressed = false;
|
|
55
|
+
animator.start();
|
|
56
|
+
if (paused)
|
|
57
|
+
animator.pause();
|
|
58
|
+
if (position >= track.delay)
|
|
59
|
+
animator.setCurrentPlayTime(Math.max(0, position - track.delay));
|
|
60
|
+
};
|
|
61
|
+
animator.start();
|
|
62
|
+
return {
|
|
63
|
+
elapsed,
|
|
64
|
+
control,
|
|
65
|
+
cancel() {
|
|
66
|
+
if (stopped)
|
|
67
|
+
return;
|
|
68
|
+
stopped = true;
|
|
69
|
+
onRelease?.();
|
|
70
|
+
animator.cancel();
|
|
71
|
+
},
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
/** Share one native clock among active animations. Pause it when every owner
|
|
75
|
+
* is paused, and dispose it when the last owner settles. No frame callbacks. */
|
|
76
|
+
export function androidClockFactory() {
|
|
77
|
+
let animator;
|
|
78
|
+
let owners = 0, running = 0, accumulated = 0;
|
|
79
|
+
const now = () => accumulated + (animator?.getCurrentPlayTime() ?? 0);
|
|
80
|
+
const start = () => {
|
|
81
|
+
if (animator)
|
|
82
|
+
return;
|
|
83
|
+
const values = Array.create('float', 2);
|
|
84
|
+
values[0] = 0;
|
|
85
|
+
values[1] = 1;
|
|
86
|
+
animator = android.animation.ValueAnimator.ofFloat(values);
|
|
87
|
+
animator.setDuration(60_000);
|
|
88
|
+
animator.setRepeatCount(android.animation.ValueAnimator.INFINITE);
|
|
89
|
+
animator.start();
|
|
90
|
+
};
|
|
91
|
+
const stop = () => {
|
|
92
|
+
accumulated = now();
|
|
93
|
+
animator?.cancel();
|
|
94
|
+
animator = undefined;
|
|
95
|
+
};
|
|
96
|
+
return (_duration) => {
|
|
97
|
+
start();
|
|
98
|
+
owners++;
|
|
99
|
+
running++;
|
|
100
|
+
let offset = 0, anchor = now(), paused = false, stopped = false;
|
|
101
|
+
const time = () => offset + (paused || stopped ? 0 : now() - anchor);
|
|
102
|
+
const pause = () => {
|
|
103
|
+
if (paused || stopped)
|
|
104
|
+
return;
|
|
105
|
+
offset = time();
|
|
106
|
+
paused = true;
|
|
107
|
+
// getCurrentPlayTime keeps counting while a ValueAnimator is paused and
|
|
108
|
+
// corrects itself only on its next frame. Start a fresh marker on resume
|
|
109
|
+
// so command-time reads cannot jump forward and then backward.
|
|
110
|
+
if (--running === 0)
|
|
111
|
+
stop();
|
|
112
|
+
};
|
|
113
|
+
return {
|
|
114
|
+
time,
|
|
115
|
+
pause,
|
|
116
|
+
play() {
|
|
117
|
+
if (!paused || stopped)
|
|
118
|
+
return;
|
|
119
|
+
if (running++ === 0)
|
|
120
|
+
start();
|
|
121
|
+
anchor = now();
|
|
122
|
+
paused = false;
|
|
123
|
+
},
|
|
124
|
+
seek(ms) {
|
|
125
|
+
offset = ms;
|
|
126
|
+
anchor = now();
|
|
127
|
+
},
|
|
128
|
+
cancel() {
|
|
129
|
+
if (stopped)
|
|
130
|
+
return;
|
|
131
|
+
pause();
|
|
132
|
+
stopped = true;
|
|
133
|
+
if (--owners === 0) {
|
|
134
|
+
stop();
|
|
135
|
+
accumulated = 0;
|
|
136
|
+
}
|
|
137
|
+
},
|
|
138
|
+
};
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
//# sourceMappingURL=android-playback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"android-playback.js","sourceRoot":"","sources":["../../src/driver/android-playback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../src/driver/android.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../src/driver/android.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AA+DxC,wBAAgB,mBAAmB,IAAI,MAAM,CAsI5C"}
|
package/dist/driver/android.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { androidPlayback, androidClockFactory, } from './android-playback.js';
|
|
2
|
+
import { isDecorationProperty } from '../decoration.js';
|
|
3
|
+
import { syncAndroidDecoration, playAndroidDecoration, presentedAndroidDecoration, } from './android-decoration.js';
|
|
1
4
|
import { Utils } from '@nativescript/core';
|
|
2
5
|
import { isColorProperty } from '../color.js';
|
|
3
|
-
import { playAndroidColor, presentedAndroidColor } from './android-color.js';
|
|
6
|
+
import { playAndroidColor, presentedAndroidColor, syncAndroidColor, } from './android-color.js';
|
|
4
7
|
/** Own only layers we create; keep app-configured hardware/software layers and paints intact. */
|
|
5
8
|
function fadeLayer(view, nativeView) {
|
|
6
9
|
const { View, ViewGroup } = android.view;
|
|
@@ -54,10 +57,18 @@ export function createAndroidDriver() {
|
|
|
54
57
|
rotateX: View.ROTATION_X,
|
|
55
58
|
rotateY: View.ROTATION_Y,
|
|
56
59
|
};
|
|
60
|
+
const clock = androidClockFactory();
|
|
57
61
|
const interpolator = new android.view.animation.LinearInterpolator();
|
|
58
62
|
return {
|
|
59
63
|
now: () => android.os.SystemClock.uptimeMillis(),
|
|
64
|
+
clock,
|
|
65
|
+
control(_view, handle, elapsed, paused, command) {
|
|
66
|
+
;
|
|
67
|
+
handle.control(elapsed, paused, command);
|
|
68
|
+
},
|
|
60
69
|
play(view, track, _startedAt, onEnd) {
|
|
70
|
+
if (isDecorationProperty(track.property))
|
|
71
|
+
return playAndroidDecoration(view, track, onEnd);
|
|
61
72
|
if (isColorProperty(track.property))
|
|
62
73
|
return playAndroidColor(view, track, onEnd);
|
|
63
74
|
const nativeView = view.nativeViewProtected;
|
|
@@ -72,9 +83,6 @@ export function createAndroidDriver() {
|
|
|
72
83
|
const holders = Array.create(android.animation.PropertyValuesHolder, 1);
|
|
73
84
|
holders[0] = android.animation.PropertyValuesHolder.ofKeyframe(nativeProperties[track.property], keyframes);
|
|
74
85
|
const animator = android.animation.ObjectAnimator.ofPropertyValuesHolder(nativeView, holders);
|
|
75
|
-
let cancelled = false;
|
|
76
|
-
let ended = false;
|
|
77
|
-
let started = false;
|
|
78
86
|
let restoreLayer;
|
|
79
87
|
const releaseLayer = () => {
|
|
80
88
|
restoreLayer?.();
|
|
@@ -91,46 +99,25 @@ export function createAndroidDriver() {
|
|
|
91
99
|
? android.animation.ValueAnimator.REVERSE
|
|
92
100
|
: android.animation.ValueAnimator.RESTART);
|
|
93
101
|
}
|
|
94
|
-
animator.addListener(new android.animation.Animator.AnimatorListener({
|
|
95
|
-
onAnimationStart() {
|
|
96
|
-
started = true;
|
|
97
|
-
if (!cancelled &&
|
|
98
|
-
!ended &&
|
|
99
|
-
track.property === 'opacity' &&
|
|
100
|
-
track.values.some((value) => value !== track.values[0]))
|
|
101
|
-
restoreLayer = fadeLayer(view, nativeView);
|
|
102
|
-
},
|
|
103
|
-
onAnimationRepeat() { },
|
|
104
|
-
onAnimationCancel() {
|
|
105
|
-
cancelled = true;
|
|
106
|
-
releaseLayer();
|
|
107
|
-
},
|
|
108
|
-
onAnimationEnd() {
|
|
109
|
-
if (ended)
|
|
110
|
-
return;
|
|
111
|
-
ended = true;
|
|
112
|
-
releaseLayer();
|
|
113
|
-
onEnd();
|
|
114
|
-
},
|
|
115
|
-
}));
|
|
116
102
|
accessors[track.property].set(nativeView, track.values[0] * scale);
|
|
117
|
-
animator
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
cancelled = true;
|
|
123
|
-
releaseLayer();
|
|
124
|
-
animator.cancel();
|
|
125
|
-
},
|
|
126
|
-
};
|
|
103
|
+
return androidPlayback(animator, track, onEnd, () => {
|
|
104
|
+
if (track.property === 'opacity' &&
|
|
105
|
+
track.values.some((value) => value !== track.values[0]))
|
|
106
|
+
restoreLayer = fadeLayer(view, nativeView);
|
|
107
|
+
}, releaseLayer);
|
|
127
108
|
},
|
|
128
109
|
stop(_view, handle) {
|
|
129
110
|
;
|
|
130
111
|
handle.cancel();
|
|
131
112
|
},
|
|
113
|
+
sync(view) {
|
|
114
|
+
syncAndroidDecoration(view);
|
|
115
|
+
syncAndroidColor(view);
|
|
116
|
+
},
|
|
132
117
|
elapsed: (handle) => handle.elapsed(),
|
|
133
118
|
presented(view, property) {
|
|
119
|
+
if (isDecorationProperty(property))
|
|
120
|
+
return presentedAndroidDecoration(view, property);
|
|
134
121
|
if (isColorProperty(property))
|
|
135
122
|
return presentedAndroidColor(view, property);
|
|
136
123
|
const nativeView = view.nativeViewProtected;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android.js","sourceRoot":"","sources":["../../src/driver/android.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAa,MAAM,oBAAoB,CAAA;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"android.js","sourceRoot":"","sources":["../../src/driver/android.ts"],"names":[],"mappings":"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"}
|
package/dist/driver/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { PlaybackClock, PlaybackCommand } from '../playback.js';
|
|
1
2
|
import { type View } from '@nativescript/core';
|
|
2
3
|
import type { Property } from '../properties.js';
|
|
3
4
|
import type { Track } from '../track.js';
|
|
@@ -7,6 +8,12 @@ export interface Driver {
|
|
|
7
8
|
/** Starts the track at `startedAt + track.delay` and calls `onEnd` once, however it ends. */
|
|
8
9
|
play(view: View, track: Track, startedAt: number, onEnd: (finished?: boolean) => void): unknown;
|
|
9
10
|
stop(view: View, handle: unknown): void;
|
|
11
|
+
/** A native elapsed-time marker when system animation speed affects time. */
|
|
12
|
+
clock?(duration: number): PlaybackClock;
|
|
13
|
+
/** Move only this native track to an elapsed time, optionally holding it. */
|
|
14
|
+
control?(view: View, handle: unknown, elapsed: number, paused: boolean, command?: PlaybackCommand): void;
|
|
15
|
+
/** Reapply native presentation after a Core model write rebuilds its drawable/layers. */
|
|
16
|
+
sync?(view: View, excluding?: Property): void;
|
|
10
17
|
/** Track time, including its delay, when the native clock differs from `now()`. */
|
|
11
18
|
elapsed?(handle: unknown): number;
|
|
12
19
|
/** The value on screen, when the platform knows it better than the track does. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAIxC,MAAM,WAAW,MAAM;IACrB,mEAAmE;IACnE,GAAG,IAAI,MAAM,CAAA;IACb,6FAA6F;IAC7F,IAAI,CACF,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,GAClC,OAAO,CAAA;IACV,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IACvC,mFAAmF;IACnF,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAA;IACjC,kFAAkF;IAClF,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAA;IAC7D,mFAAmF;IACnF,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CACpD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,cAGrD;AAID,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,QAEjD"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AACpE,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAIxC,MAAM,WAAW,MAAM;IACrB,mEAAmE;IACnE,GAAG,IAAI,MAAM,CAAA;IACb,6FAA6F;IAC7F,IAAI,CACF,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,GAClC,OAAO,CAAA;IACV,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IACvC,6EAA6E;IAC7E,KAAK,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,CAAA;IACvC,6EAA6E;IAC7E,OAAO,CAAC,CACN,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,eAAe,GACxB,IAAI,CAAA;IACP,yFAAyF;IACzF,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;IAC7C,mFAAmF;IACnF,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAA;IACjC,kFAAkF;IAClF,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAA;IAC7D,mFAAmF;IACnF,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAA;CACpD;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,cAGrD;AAID,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,QAEjD"}
|
package/dist/driver/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/driver/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAa,MAAM,oBAAoB,CAAA;AAGzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAiC1C,MAAM,UAAU,KAAK,CAAC,EAAU,EAAE,QAAoB;IACpD,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACtC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;AAClC,CAAC;AAED,IAAI,MAA0B,CAAA;AAE9B,MAAM,UAAU,SAAS;IACvB,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAA;AAC3E,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAwB;IAChD,MAAM,GAAG,IAAI,CAAA;AACf,CAAC"}
|
|
@@ -2,6 +2,8 @@ import { type View } from '@nativescript/core';
|
|
|
2
2
|
import { type ColorProperty } from '../color.js';
|
|
3
3
|
import type { Track } from '../track.js';
|
|
4
4
|
interface ColorHandle {
|
|
5
|
+
elapsed(): number;
|
|
6
|
+
control(elapsed: number, paused: boolean): void;
|
|
5
7
|
stop(): void;
|
|
6
8
|
presented(): number | undefined;
|
|
7
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-color.d.ts","sourceRoot":"","sources":["../../src/driver/ios-color.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAGrD,OAAO,EAAa,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"ios-color.d.ts","sourceRoot":"","sources":["../../src/driver/ios-color.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAA;AAGrD,OAAO,EAAa,KAAK,aAAa,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAexC,UAAU,WAAW;IACnB,OAAO,IAAI,MAAM,CAAA;IACjB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;IAC/C,IAAI,IAAI,IAAI,CAAA;IACZ,SAAS,IAAI,MAAM,GAAG,SAAS,CAAA;CAChC;AAWD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,aAAa,GACtB,MAAM,GAAG,SAAS,CAQpB;AAED,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,QAE1C;AAED,+EAA+E;AAC/E,wBAAgB,YAAY,CAC1B,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,IAAI,GAClC,WAAW,CA2Ob"}
|
package/dist/driver/ios-color.js
CHANGED
|
@@ -2,6 +2,7 @@ import { Color } from '@nativescript/core';
|
|
|
2
2
|
import { colorProperty } from '@nativescript/core/ui/styling/style-properties';
|
|
3
3
|
import { formattedTextProperty, textProperty } from '@nativescript/core/ui/text-base';
|
|
4
4
|
import { readColor } from '../color.js';
|
|
5
|
+
import { iosPlayback } from './ios-playback.js';
|
|
5
6
|
const playing = new WeakMap();
|
|
6
7
|
const labelOf = (view) => {
|
|
7
8
|
const native = view.nativeViewProtected;
|
|
@@ -12,9 +13,9 @@ const labelOf = (view) => {
|
|
|
12
13
|
: undefined;
|
|
13
14
|
};
|
|
14
15
|
export function presentedIOSColor(view, property) {
|
|
15
|
-
const
|
|
16
|
-
if (
|
|
17
|
-
return
|
|
16
|
+
const active = playing.get(view)?.get(property);
|
|
17
|
+
if (active)
|
|
18
|
+
return active.presented();
|
|
18
19
|
if (property === 'color' && !view.color) {
|
|
19
20
|
const label = labelOf(view);
|
|
20
21
|
if (label?.textColor)
|
|
@@ -28,6 +29,7 @@ export function stopIOSColorText(view) {
|
|
|
28
29
|
}
|
|
29
30
|
/** Core Animation paints a solid layer through an exact UILabel alpha mask. */
|
|
30
31
|
export function playIOSColor(view, track, startedAt, onEnd) {
|
|
32
|
+
const timing = iosPlayback(track, startedAt);
|
|
31
33
|
const property = track.property;
|
|
32
34
|
let target;
|
|
33
35
|
let restore;
|
|
@@ -74,13 +76,24 @@ export function playIOSColor(view, track, startedAt, onEnd) {
|
|
|
74
76
|
};
|
|
75
77
|
const handle = {
|
|
76
78
|
stop: cancel,
|
|
79
|
+
elapsed: timing.elapsed,
|
|
80
|
+
control(time, paused) {
|
|
81
|
+
if (!stopped) {
|
|
82
|
+
timing.control(time, paused);
|
|
83
|
+
attach();
|
|
84
|
+
}
|
|
85
|
+
},
|
|
77
86
|
presented() {
|
|
87
|
+
// A new CA copy commits at the end of the turn. After controls, the engine
|
|
88
|
+
// clock is authoritative even before presentationLayer catches up.
|
|
89
|
+
if (timing.controlled)
|
|
90
|
+
return undefined;
|
|
78
91
|
if (!target)
|
|
79
92
|
return track.values[0];
|
|
80
93
|
const layer = target.layer.presentationLayer();
|
|
81
94
|
// Before CA commits its first frame, the model already contains the target.
|
|
82
95
|
if (!layer)
|
|
83
|
-
return track.valueAt(
|
|
96
|
+
return track.valueAt(timing.elapsed());
|
|
84
97
|
const color = layer[target.path];
|
|
85
98
|
return color
|
|
86
99
|
? Color.fromIosColor(UIColor.colorWithCGColor(color)).argb >>> 0
|
|
@@ -154,9 +167,7 @@ export function playIOSColor(view, track, startedAt, onEnd) {
|
|
|
154
167
|
animation.values = NSArray.arrayWithArray(track.values.map((color) => new Color(color).ios.CGColor));
|
|
155
168
|
animation.keyTimes = NSArray.arrayWithArray(track.times);
|
|
156
169
|
animation.duration = Math.max(track.duration, 1) / 1000;
|
|
157
|
-
|
|
158
|
-
animation.fillMode = kCAFillModeBackwards;
|
|
159
|
-
animation.removedOnCompletion = track.repeat !== Infinity;
|
|
170
|
+
timing.configure(animation, layer);
|
|
160
171
|
if (animation.respondsToSelector('setPreferredFrameRateRange:')) {
|
|
161
172
|
const maximum = Math.min(120, native.window?.screen.maximumFramesPerSecond ??
|
|
162
173
|
UIScreen.mainScreen.maximumFramesPerSecond);
|
|
@@ -167,7 +178,7 @@ export function playIOSColor(view, track, startedAt, onEnd) {
|
|
|
167
178
|
animation.repeatCount = track.reverse ? (track.repeat + 1) / 2 : track.repeat + 1;
|
|
168
179
|
}
|
|
169
180
|
CATransaction.begin();
|
|
170
|
-
if (track.repeat !== Infinity)
|
|
181
|
+
if (!timing.paused && track.repeat !== Infinity)
|
|
171
182
|
CATransaction.setCompletionBlock(() => {
|
|
172
183
|
if (!stopped && instance === generation) {
|
|
173
184
|
cleanup();
|