refactoring circular imports

tns-core-modules/ui/animation/animation-common.ts

@@ -1,16 +1,20 @@
-import {
+// Definitions.
+import {
     CubicBezierAnimationCurve as CubicBezierAnimationCurveDefinition,
     AnimationPromise as AnimationPromiseDefinition,
     Animation as AnimationBaseDefinition,
     AnimationDefinition,
     Pair
 } from "ui/animation";
+import { View } from "ui/core/view";
+
+// Types.
+import { Color } from "color";
+import { isEnabled as traceEnabled, write as traceWrite, categories as traceCategories } from "trace";
+
+export { Color, traceEnabled, traceWrite, traceCategories };
 export { AnimationPromise } from "ui/animation";
 
-import { View, Color, traceEnabled, traceWrite, traceCategories } from "ui/core/view";
-
-export * from "ui/core/view";
-
 export module Properties {
     export var opacity = "opacity";
     export var backgroundColor = "backgroundColor";

tns-core-modules/ui/animation/animation.android.ts

@@ -1,10 +1,9 @@
 import { AnimationDefinition } from "ui/animation";
+import { AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, AnimationPromise, Color, traceWrite, traceEnabled, traceCategories } from "./animation-common";
 import {
-    AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, AnimationPromise,
     opacityProperty, backgroundColorProperty, rotateProperty,
-    translateXProperty, translateYProperty,
-    scaleXProperty, scaleYProperty, Color, traceWrite, traceEnabled, traceCategories
-} from "./animation-common";
+    translateXProperty, translateYProperty, scaleXProperty, scaleYProperty
+} from "ui/styling/style-properties";
 
 import { CacheLayerType, layout } from "utils/utils";
 import lazy from "utils/lazy";

tns-core-modules/ui/animation/animation.ios.ts

@@ -1,9 +1,11 @@
 import { AnimationDefinition } from "ui/animation";
+import { View } from "ui/core/view";
+
+import { AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, AnimationPromise, traceWrite, traceEnabled, traceCategories } from "./animation-common";
 import {
-    AnimationBase, Properties, PropertyAnimation, CubicBezierAnimationCurve, AnimationPromise, View, opacityProperty, backgroundColorProperty, rotateProperty,
-    translateXProperty, translateYProperty,
-    scaleXProperty, scaleYProperty, traceEnabled, traceWrite, traceCategories, Length
-} from "./animation-common";
+    Length, opacityProperty, backgroundColorProperty, rotateProperty,
+    translateXProperty, translateYProperty, scaleXProperty, scaleYProperty
+} from "ui/styling/style-properties";
 
 import { ios } from "utils/utils";
 

tns-core-modules/ui/animation/keyframe-animation.ts

@@ -1,3 +1,4 @@
+// Definitions.
 import {
     KeyframeDeclaration as KeyframeDeclarationDefinition,
     KeyframeInfo as KeyframeInfoDefinition,
@@ -5,19 +6,17 @@ import {
     KeyframeAnimation as KeyframeAnimationDefinition
 } from "ui/animation/keyframe-animation";
 
-import {
-    View,
-    backgroundColorProperty,
-    scaleXProperty,
-    scaleYProperty,
-    translateXProperty,
-    translateYProperty,
-    rotateProperty,
-    opacityProperty,
-    unsetValue,
-    Color
-} from "ui/core/view";
+import { View, Color } from "ui/core/view";
+
+// Types.
+import { unsetValue } from "ui/core/properties";
 import { Animation } from "ui/animation";
+import {
+    backgroundColorProperty,
+    scaleXProperty, scaleYProperty,
+    translateXProperty, translateYProperty,
+    rotateProperty, opacityProperty
+} from "ui/styling/style-properties";
 
 export class KeyframeDeclaration implements KeyframeDeclarationDefinition {
     public property: string;