chore: import cleanup

Author: NathanWalker

src/angular/index.ts

@@ -1,5 +1,6 @@
 import { Directive, NgModule } from '@angular/core';
 import { registerElement } from '@nativescript/angular';
+// @ts-ignore
 import { LottieView } from '@nativescript-community/ui-lottie';
 
 @Directive({ selector: 'LottieView' })

src/index.d.ts

@@ -1,5 +1,4 @@
-import { View } from '@nativescript/core/ui/core/view';
-import { Color } from '@nativescript/core/color';
+import { Color, View } from '@nativescript/core';
 
 export enum RenderMode {
     AUTOMATIC,

src/lottie.android.ts

@@ -5,10 +5,8 @@
  * Version 1.0.0                                           [email protected]
  **********************************************************************************/
 
-import { Color } from '@nativescript/core/color';
-import { File } from '@nativescript/core/file-system';
-import { View } from '@nativescript/core/ui/core/view';
-import { RESOURCE_PREFIX } from '@nativescript/core/utils/utils';
+import { Color, File } from '@nativescript/core';
+import { Utils } from '@nativescript/core';
 import {
     LottieViewBase,
     autoPlayProperty,
@@ -124,8 +122,8 @@ export class LottieView extends LottieViewBase {
             view.setAnimation(null);
         } else if (src[0] === '{') {
             view.setAnimationFromJson(src, null);
-        } else if (src.startsWith(RESOURCE_PREFIX)) {
-            const resName = src.replace(RESOURCE_PREFIX, '');
+        } else if (src.startsWith(Utils.RESOURCE_PREFIX)) {
+            const resName = src.replace(Utils.RESOURCE_PREFIX, '');
             view.setAnimation(resName);
         } else {
             if (!/.(json|zip|lottie)$/.test(src)) {

src/lottie.common.ts

@@ -5,10 +5,7 @@
  * Version 1.0.0                                           [email protected]
  **********************************************************************************/
 
-import { CoreTypes } from '@nativescript/core/core-types';
-import { Property } from '@nativescript/core/ui/core/properties';
-import { View } from '@nativescript/core/ui/core/view';
-import { booleanConverter } from '@nativescript/core/ui/core/view-base';
+import { CoreTypes, Property, View, booleanConverter } from '@nativescript/core';
 
 export class LottieViewBase extends View {
     public stretch: CoreTypes.ImageStretchType;

src/lottie.ios.ts

@@ -5,12 +5,9 @@
  * Version 1.0.0                                           [email protected]
  **********************************************************************************/
 
-import { Color } from '@nativescript/core/color';
+import { Color, Utils, knownFolders, path, View } from '@nativescript/core';
 import { LottieViewBase, autoPlayProperty, loopProperty, progressProperty, srcProperty, stretchProperty } from './lottie.common';
-import { RESOURCE_PREFIX, layout } from '@nativescript/core/utils/utils';
-import { knownFolders, path } from '@nativescript/core/file-system';
 import { clamp } from './utils';
-import { View } from '@nativescript/core/ui/core/view';
 
 const appPath = knownFolders.currentApp().path;
 
@@ -32,8 +29,8 @@ export class LottieView extends LottieViewBase {
             this.nativeViewProtected.compatibleAnimation = null;
         } else if (src[0] === '{') {
             this.nativeViewProtected.compatibleAnimation = CompatibleAnimation.alloc().initWithJson(src);
-        } else if (src.startsWith(RESOURCE_PREFIX)) {
-            const resName = src.replace(RESOURCE_PREFIX, '');
+        } else if (src.startsWith(Utils.RESOURCE_PREFIX)) {
+            const resName = src.replace(Utils.RESOURCE_PREFIX, '');
             if (resName.endsWith('.lottie')) {
                 DotLottie.objcLoadWithNameShouldCacheCompletion(resName.replace('.lottie', ''), true, (animation) => {
                     this.nativeViewProtected.animation = animation;
@@ -200,22 +197,22 @@ export class LottieView extends LottieViewBase {
     public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
         const intrinsicContentSize = this.nativeViewProtected.intrinsicContentSize;
         // We don't call super because we measure native view with specific size.
-        const width = layout.getMeasureSpecSize(widthMeasureSpec);
-        const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
+        const width = Utils.layout.getMeasureSpecSize(widthMeasureSpec);
+        const widthMode = Utils.layout.getMeasureSpecMode(widthMeasureSpec);
 
-        const height = layout.getMeasureSpecSize(heightMeasureSpec);
-        const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
+        const height = Utils.layout.getMeasureSpecSize(heightMeasureSpec);
+        const heightMode = Utils.layout.getMeasureSpecMode(heightMeasureSpec);
 
-        const nativeWidth = intrinsicContentSize ? layout.toDevicePixels(intrinsicContentSize.width) : 0;
-        const nativeHeight = intrinsicContentSize ? layout.toDevicePixels(intrinsicContentSize.height) : 0;
+        const nativeWidth = intrinsicContentSize ? Utils.layout.toDevicePixels(intrinsicContentSize.width) : 0;
+        const nativeHeight = intrinsicContentSize ? Utils.layout.toDevicePixels(intrinsicContentSize.height) : 0;
 
         let measureWidth = Math.max(nativeWidth, this.effectiveMinWidth);
         let measureHeight = Math.max(nativeHeight, this.effectiveMinHeight);
 
-        const finiteWidth: boolean = widthMode !== layout.UNSPECIFIED;
-        const finiteHeight: boolean = heightMode !== layout.UNSPECIFIED;
+        const finiteWidth: boolean = widthMode !== Utils.layout.UNSPECIFIED;
+        const finiteHeight: boolean = heightMode !== Utils.layout.UNSPECIFIED;
 
-        this._imageSourceAffectsLayout = widthMode !== layout.EXACTLY || heightMode !== layout.EXACTLY;
+        this._imageSourceAffectsLayout = widthMode !== Utils.layout.EXACTLY || heightMode !== Utils.layout.EXACTLY;
 
         if (nativeWidth !== 0 && nativeHeight !== 0 && (finiteWidth || finiteHeight)) {
             const scale = LottieView.computeScaleFactor(