diff --git a/ui/animation/animation.ios.ts b/ui/animation/animation.ios.ts index 7b4cd9a78..aa28fb50a 100644 --- a/ui/animation/animation.ios.ts +++ b/ui/animation/animation.ios.ts @@ -136,21 +136,6 @@ export class Animation extends common.Animation implements definition.Animation this._iOSAnimationFunction = Animation._createiOSAnimationFunction(this._mergedPropertyAnimations, 0, this._playSequentially, animationFinishedCallback, this); } - _resolveAnimationCurve(curve: any): any { - switch (curve) { - case enums.AnimationCurve.easeIn: - return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseIn); - case enums.AnimationCurve.easeOut: - return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseOut); - case enums.AnimationCurve.easeInOut: - return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseInEaseOut); - case enums.AnimationCurve.linear: - return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionLinear); - default: - return undefined; - } - } - private static _createiOSAnimationFunction(propertyAnimations: Array, index: number, playSequentially: boolean, finishedCallback: (cancelled?: boolean) => void, that:Animation): Function { return (cancelled?: boolean) => { if (cancelled && finishedCallback) { @@ -350,6 +335,21 @@ export class Animation extends common.Animation implements definition.Animation } } +export function _resolveAnimationCurve(curve: any): any { + switch (curve) { + case enums.AnimationCurve.easeIn: + return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseIn); + case enums.AnimationCurve.easeOut: + return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseOut); + case enums.AnimationCurve.easeInOut: + return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionEaseInEaseOut); + case enums.AnimationCurve.linear: + return CAMediaTimingFunction.functionWithName(kCAMediaTimingFunctionLinear); + default: + return undefined; + } +} + export function _getTransformMismatchErrorMessage(view: viewModule.View): string { // Order is important: translate, rotate, scale var result: CGAffineTransform = CGAffineTransformIdentity;