javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 20:11:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(android): fix circular reexports (#7399)

Browse Source
This commit is contained in:
Vasil Chimev
2019-06-24 19:32:03 +03:00
committed by Manol Donev
parent 7c3141b6a5
commit 2723744091
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tns-core-modules/ui/animation/animation-common.ts
View File

@ -14,7 +14,6 @@ import { isEnabled as traceEnabled, write as traceWrite, categories as traceCate
import { PercentLength } from "../styling/style-properties"; import { PercentLength } from "../styling/style-properties";
export { Color, traceEnabled, traceWrite, traceCategories, traceType }; export { Color, traceEnabled, traceWrite, traceCategories, traceType };
export { AnimationPromise } from ".";
export module Properties { export module Properties {
export const opacity = "opacity"; export const opacity = "opacity";
@ -90,7 +89,7 @@ export abstract class AnimationBase implements AnimationBaseDefinition {
protected _rejectAlreadyPlaying(): AnimationPromiseDefinition { protected _rejectAlreadyPlaying(): AnimationPromiseDefinition {
const reason = "Animation is already playing."; const reason = "Animation is already playing.";
traceWrite(reason, traceCategories.Animation, traceType.warn); traceWrite(reason, traceCategories.Animation, traceType.warn);
return <AnimationPromiseDefinition>new Promise<void>((resolve, reject) => { return <AnimationPromiseDefinition>new Promise<void>((resolve, reject) => {
reject(reason); reject(reason);
}); });

4
tns-core-modules/ui/animation/animation.android.ts
View File

@ -1,8 +1,8 @@
// Definitions. // Definitions.
import { AnimationDefinition } from "."; import { AnimationDefinition, AnimationPromise } from ".";
import { View } from "../core/view"; import { View } from "../core/view";
import { AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, AnimationPromise, Color, traceWrite, traceEnabled, traceCategories, traceType } from "./animation-common"; import { AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, Color, traceWrite, traceEnabled, traceCategories, traceType } from "./animation-common";
import { import {
opacityProperty, backgroundColorProperty, rotateProperty, opacityProperty, backgroundColorProperty, rotateProperty,
translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty,

8
tns-core-modules/ui/animation/animation.ios.ts
View File

@ -1,7 +1,7 @@
import { AnimationDefinition } from "."; import { AnimationDefinition, AnimationPromise } from ".";
import { View } from "../core/view"; import { View } from "../core/view";
import { AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, AnimationPromise, traceWrite, traceEnabled, traceCategories, traceType } from "./animation-common"; import { AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, traceWrite, traceEnabled, traceCategories, traceType } from "./animation-common";
import { import {
opacityProperty, backgroundColorProperty, rotateProperty, opacityProperty, backgroundColorProperty, rotateProperty,
translateXProperty, translateYProperty, scaleXProperty, scaleYProperty, translateXProperty, translateYProperty, scaleXProperty, scaleYProperty,
@ -318,7 +318,7 @@ export class Animation extends AnimationBase {
} }
break; break;
case Properties.translate: case Properties.translate:
animation._originalValue = {x: animation.target.translateX, y: animation.target.translateY}; animation._originalValue = { x: animation.target.translateX, y: animation.target.translateY };
animation._propertyResetCallback = (value, valueSource) => { animation._propertyResetCallback = (value, valueSource) => {
animation.target.style[setLocal ? translateXProperty.name : translateXProperty.keyframe] = value.x; animation.target.style[setLocal ? translateXProperty.name : translateXProperty.keyframe] = value.x;
animation.target.style[setLocal ? translateYProperty.name : translateYProperty.keyframe] = value.y; animation.target.style[setLocal ? translateYProperty.name : translateYProperty.keyframe] = value.y;
@ -334,7 +334,7 @@ export class Animation extends AnimationBase {
if (toValue.y === 0) { if (toValue.y === 0) {
toValue.y = 0.001; toValue.y = 0.001;
} }
animation._originalValue = {x: animation.target.scaleX, y: animation.target.scaleY}; animation._originalValue = { x: animation.target.scaleX, y: animation.target.scaleY };
animation._propertyResetCallback = (value, valueSource) => { animation._propertyResetCallback = (value, valueSource) => {
animation.target.style[setLocal ? scaleXProperty.name : scaleXProperty.keyframe] = value.x; animation.target.style[setLocal ? scaleXProperty.name : scaleXProperty.keyframe] = value.x;
animation.target.style[setLocal ? scaleYProperty.name : scaleYProperty.keyframe] = value.y; animation.target.style[setLocal ? scaleYProperty.name : scaleYProperty.keyframe] = value.y;