chore: cleanup reexports

nativescript-core/ui/layouts/absolute-layout/absolute-layout-common.ts

@@ -1,5 +1,8 @@
 import { AbsoluteLayout as AbsoluteLayoutDefinition } from ".";
-import { LayoutBase, View, Property, Length, zeroLength, CSSType } from "../layout-base";
+import { LayoutBase } from "../layout-base";
+import { View, CSSType } from "../../core/view";
+import { Property } from "../../core/properties";
+import { Length, zeroLength } from "../../styling/style-properties";
 
 export * from "../layout-base";
 

nativescript-core/ui/layouts/absolute-layout/index.android.ts

@@ -1,4 +1,6 @@
-import { AbsoluteLayoutBase, View, leftProperty, topProperty, Length } from "./absolute-layout-common";
+import { AbsoluteLayoutBase, leftProperty, topProperty } from "./absolute-layout-common";
+import { View } from "../../core/view";
+import { Length } from "../../styling/style-properties";
 
 export * from "./absolute-layout-common";
 

nativescript-core/ui/layouts/absolute-layout/index.ios.ts

@@ -1,4 +1,7 @@
-import { AbsoluteLayoutBase, View, layout, Length } from "./absolute-layout-common";
+import { AbsoluteLayoutBase } from "./absolute-layout-common";
+import { View } from "../../core/view";
+import { Length } from "../../styling/style-properties";
+import { layout } from "../../../utils/utils";
 
 export * from "./absolute-layout-common";
 

nativescript-core/ui/layouts/absolute-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "absolute-layout",
-  "main": "absolute-layout",
-  "types": "absolute-layout.d.ts"
-}

nativescript-core/ui/layouts/dock-layout/dock-layout-common.ts

@@ -1,5 +1,9 @@
 import { DockLayout as DockLayoutDefinition, Dock } from ".";
-import { LayoutBase, View, Property, isIOS, booleanConverter, makeValidator, makeParser, CSSType } from "../layout-base";
+import { LayoutBase } from "../layout-base";
+import { View, CSSType } from "../../core/view";
+import { Property, makeValidator, makeParser } from "../../core/properties";
+import { booleanConverter } from "../../core/view-base";
+import {  isIOS } from "../../../platform";
 
 function validateArgs(element: View): View {
     if (!element) {

nativescript-core/ui/layouts/dock-layout/index.android.ts

@@ -1,4 +1,5 @@
-import { DockLayoutBase, View, dockProperty, stretchLastChildProperty } from "./dock-layout-common";
+import { DockLayoutBase, dockProperty, stretchLastChildProperty } from "./dock-layout-common";
+import { View } from "../../core/view";
 
 export * from "./dock-layout-common";
 

nativescript-core/ui/layouts/dock-layout/index.ios.ts

@@ -1,4 +1,6 @@
-import { DockLayoutBase, View, layout } from "./dock-layout-common";
+import { DockLayoutBase } from "./dock-layout-common";
+import { View } from "../../core/view";
+import { layout } from "../../../utils/utils";
 
 export * from "./dock-layout-common";
 

nativescript-core/ui/layouts/dock-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "dock-layout",
-  "main": "dock-layout",
-  "types": "dock-layout.d.ts"
-}

nativescript-core/ui/layouts/flexbox-layout/flexbox-layout-common.ts

@@ -1,6 +1,8 @@
-import { LayoutBase, View, Style, CssProperty, isIOS, ShorthandProperty, makeValidator, makeParser, unsetValue, CSSType } from "../layout-base";
-
-export * from "../layout-base";
+import { LayoutBase } from "../layout-base";
+import { View, CSSType } from "../../core/view";
+import { CssProperty, ShorthandProperty, makeParser, makeValidator, unsetValue } from "../../core/properties";
+import { Style } from "../../styling/style";
+import { isIOS } from "../../../platform";
 
 export type Basis = "auto" | number;
 

nativescript-core/ui/layouts/flexbox-layout/index.android.ts

@@ -1,16 +1,16 @@
 import {
     FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent,
-    FlexboxLayoutBase, View,
-    Length,
+    FlexboxLayoutBase,
     orderProperty, Order,
     flexGrowProperty, FlexGrow,
     flexShrinkProperty, FlexShrink,
     flexWrapBeforeProperty, FlexWrapBefore,
     alignSelfProperty, AlignSelf,
-    flexDirectionProperty, flexWrapProperty, justifyContentProperty, alignItemsProperty, alignContentProperty,
-    minWidthProperty, minHeightProperty,
-    CssProperty
+    flexDirectionProperty, flexWrapProperty, justifyContentProperty, alignItemsProperty, alignContentProperty
 } from "./flexbox-layout-common";
+import { View } from "../../core/view";
+import { Length, minHeightProperty, minWidthProperty } from "../../styling/style-properties";
+import {  isIOS } from "../../../platform";
 
 export * from "./flexbox-layout-common";
 

nativescript-core/ui/layouts/flexbox-layout/index.ios.ts

@@ -1,9 +1,11 @@
 import {
     FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent,
-    FlexboxLayoutBase, View, layout,
+    FlexboxLayoutBase,
     FlexBasisPercent,
     orderProperty, flexGrowProperty, flexShrinkProperty, flexWrapBeforeProperty, alignSelfProperty
 } from "./flexbox-layout-common";
+import { View } from "../../core/view";
+import { layout } from "../../../utils/utils";
 
 export * from "./flexbox-layout-common";
 

nativescript-core/ui/layouts/flexbox-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "flexbox-layout",
-  "main": "flexbox-layout",
-  "types": "flexbox-layout.d.ts"
-}

nativescript-core/ui/layouts/grid-layout/grid-layout-common.ts

@@ -1,7 +1,8 @@
 import { GridLayout as GridLayoutDefinition, ItemSpec as ItemSpecDefinition } from ".";
-import { LayoutBase, View, Observable, Property, makeParser, makeValidator, CSSType } from "../layout-base";
-
-export * from "../layout-base";
+import { LayoutBase } from "../layout-base";
+import { View, CSSType } from "../../core/view";
+import { Property, makeParser, makeValidator } from "../../core/properties";
+import { Observable } from "../../../data/observable";
 
 function validateArgs(element: View): View {
     if (!element) {

nativescript-core/ui/layouts/grid-layout/index.android.ts

@@ -1,7 +1,9 @@
 import {
-    GridLayoutBase, ItemSpec as ItemSpecBase, View, layout,
+    GridLayoutBase, ItemSpec as ItemSpecBase,
     rowProperty, columnProperty, rowSpanProperty, columnSpanProperty, GridUnitType
 } from "./grid-layout-common";
+import { View } from "../../core/view";
+import { layout } from "../../../utils/utils";
 
 export * from "./grid-layout-common";
 

nativescript-core/ui/layouts/grid-layout/index.ios.ts

@@ -1,6 +1,8 @@
 import {
-    GridLayoutBase, ItemSpec, View, layout
+    GridLayoutBase, ItemSpec
 } from "./grid-layout-common";
+import { View } from "../../core/view";
+import { layout } from "../../../utils/utils";
 
 export * from "./grid-layout-common";
 

nativescript-core/ui/layouts/grid-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "grid-layout",
-  "main": "grid-layout",
-  "types": "grid-layout.d.ts"
-}

nativescript-core/ui/layouts/layout-base.android.ts

@@ -1,7 +1,7 @@
 import {
-    LayoutBaseCommon, clipToBoundsProperty, isPassThroughParentEnabledProperty,
-    paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty, Length
+    LayoutBaseCommon, clipToBoundsProperty, isPassThroughParentEnabledProperty
 } from "./layout-base-common";
+import {  Length, paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty } from '../styling/style-properties';
 
 export * from "./layout-base-common";
 

nativescript-core/ui/layouts/layout-base.ios.ts

@@ -1,6 +1,7 @@
 import {
-    LayoutBaseCommon, clipToBoundsProperty, isPassThroughParentEnabledProperty, View
+    LayoutBaseCommon, clipToBoundsProperty, isPassThroughParentEnabledProperty
 } from "./layout-base-common";
+import { View } from "../core/view";
 
 export * from "./layout-base-common";
 

nativescript-core/ui/layouts/package.json

@@ -1,5 +0,0 @@
-{
-	"name" : "layouts",
-	"main" : "index",
-	"types" : "index.d.ts"
-}

nativescript-core/ui/layouts/stack-layout/index.ios.ts

@@ -1,5 +1,8 @@
-import { StackLayoutBase, View, layout, VerticalAlignment, HorizontalAlignment } from "./stack-layout-common";
-import * as trace from "../../../trace";
+import { StackLayoutBase } from "./stack-layout-common";
+import { View } from "../../core/view";
+import { VerticalAlignment, HorizontalAlignment } from "../../styling/style-properties";
+import { layout } from "../../../utils/utils";
+import { Trace } from "../../../trace";
 
 export * from "./stack-layout-common";
 
@@ -59,7 +62,7 @@ export class StackLayout extends StackLayoutBase {
                 childSize = View.measureChild(this, child, childMeasureSpec, layout.makeMeasureSpec(remainingLength, measureSpec));
 
                 if (measureSpec === layout.AT_MOST && this.isUnsizedScrollableView(child)) {
-                    trace.write("Avoid using ListView or ScrollView with no explicit height set inside StackLayout. Doing so might result in poor user interface performance and poor user experience.", trace.categories.Layout, trace.messageType.warn);
+                    Trace.write("Avoid using ListView or ScrollView with no explicit height set inside StackLayout. Doing so might result in poor user interface performance and poor user experience.", Trace.categories.Layout, Trace.messageType.warn);
                 }
 
                 measureWidth = Math.max(measureWidth, childSize.measuredWidth);

nativescript-core/ui/layouts/stack-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "stack-layout",
-  "main": "stack-layout",
-  "types": "stack-layout.d.ts"
-}

nativescript-core/ui/layouts/stack-layout/stack-layout-common.ts

@@ -1,7 +1,8 @@
 import { StackLayout as StackLayoutDefinition, Orientation } from ".";
-import { LayoutBase, Property, isIOS, makeValidator, makeParser, CSSType } from "../layout-base";
-
-export * from "../layout-base";
+import { LayoutBase } from "../layout-base";
+import { CSSType } from "../../core/view";
+import { Property, makeParser, makeValidator } from "../../core/properties";
+import { isIOS } from "../../../platform";
 
 @CSSType("StackLayout")
 export class StackLayoutBase extends LayoutBase implements StackLayoutDefinition {

nativescript-core/ui/layouts/wrap-layout/index.android.ts

@@ -1,4 +1,5 @@
-import { WrapLayoutBase, orientationProperty, itemWidthProperty, itemHeightProperty, Length } from "./wrap-layout-common";
+import { WrapLayoutBase, orientationProperty, itemWidthProperty, itemHeightProperty } from "./wrap-layout-common";
+import { Length } from "../../styling/style-properties";
 
 export * from "./wrap-layout-common";
 

nativescript-core/ui/layouts/wrap-layout/index.ios.ts

@@ -1,4 +1,6 @@
-import { WrapLayoutBase, View, layout } from "./wrap-layout-common";
+import { WrapLayoutBase } from "./wrap-layout-common";
+import { View } from "../../core/view";
+import { layout } from "../../../utils/utils";
 
 export * from "./wrap-layout-common";
 

nativescript-core/ui/layouts/wrap-layout/package.json

@@ -1,5 +0,0 @@
-{
-  "name": "wrap-layout",
-  "main": "wrap-layout",
-  "types": "wrap-layout.d.ts"
-}

nativescript-core/ui/layouts/wrap-layout/wrap-layout-common.ts

@@ -1,5 +1,9 @@
 import { WrapLayout as WrapLayoutDefinition, Orientation } from ".";
-import { LayoutBase, Property, isIOS, Length, makeValidator, makeParser, CSSType } from "../layout-base";
+import { LayoutBase  } from "../layout-base";
+import { CSSType } from "../../core/view";
+import { Property, makeValidator, makeParser } from "../../core/properties";
+import { Length } from "../../styling/style-properties";
+import { isIOS } from "../../../platform";
 
 export * from "../layout-base";