chore: fixed all imports for N 7

Author: farfromrefug

src/appbar/angular/appbar.directive.ts

@@ -1,6 +1,6 @@
 import { AfterViewInit, Directive } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Page } from '@nativescript/core/ui/page/page';
+import { Page } from '@nativescript/core/ui/page';
 import { addCss, ios as iosApp } from '@nativescript/core/application';
 import { themer } from 'nativescript-material-core/core';
 

src/bottomnavigationbar/bottomnavigationbar-common.ts

@@ -1,5 +1,9 @@
-import { AddChildFromBuilder, booleanConverter, Color, CssProperty, CSSType, Property, Style, View } from '@nativescript/core/ui/core/view';
+import { AddChildFromBuilder, CSSType, View } from '@nativescript/core/ui/core/view';
+import { booleanConverter } from '@nativescript/core/ui/core/view-base';
 
+import { Color } from '@nativescript/core/color';
+import { CssProperty, Property } from '@nativescript/core/ui/core/properties';
+import { Style } from '@nativescript/core/ui/styling/style';
 import { ImageSource } from '@nativescript/core/image-source';
 
 import { cssProperty } from 'nativescript-material-core/cssproperties';
@@ -48,7 +52,7 @@ export interface TabReselectedEventData extends EventData {
 export enum TitleVisibility {
     Selected = 0,
     Always = 1,
-    Never = 2
+    Never = 2,
 }
 
 @CSSType('BottomNavigationBar')
@@ -71,7 +75,7 @@ export abstract class BottomNavigationBarBase extends View implements AddChildFr
 
     onLoaded() {
         super.onLoaded();
-        this._items.forEach(child => {
+        this._items.forEach((child) => {
             this.loadView(child);
             return true;
         });
@@ -89,7 +93,7 @@ export abstract class BottomNavigationBarBase extends View implements AddChildFr
         let eventData: TabPressedEventData = {
             eventName: BottomNavigationBarBase.tabPressedEvent,
             object: this,
-            index
+            index,
         };
         this.notify(eventData);
         this.removeBadge(index);
@@ -100,7 +104,7 @@ export abstract class BottomNavigationBarBase extends View implements AddChildFr
             eventName: BottomNavigationBarBase.tabSelectedEvent,
             object: this,
             oldIndex: this.selectedTabIndex,
-            newIndex: index
+            newIndex: index,
         };
         this.selectedTabIndex = index;
         this.notify(eventData);
@@ -111,7 +115,7 @@ export abstract class BottomNavigationBarBase extends View implements AddChildFr
         let eventData: TabReselectedEventData = {
             eventName: BottomNavigationBarBase.tabReselectedEvent,
             object: this,
-            index
+            index,
         };
         this.notify(eventData);
     }
@@ -139,7 +143,7 @@ export abstract class BottomNavigationBarBase extends View implements AddChildFr
 
 export const tabsProperty = new Property<BottomNavigationBarBase, BottomNavigationTabBase[]>({
     name: 'tabs',
-    affectsLayout: true
+    affectsLayout: true,
 });
 
 tabsProperty.register(BottomNavigationBarBase);
@@ -149,7 +153,7 @@ export const titleVisibilityProperty = new Property<BottomNavigationBarBase, Tit
     equalityComparer: (x, y) => x === y,
     affectsLayout: true,
     defaultValue: TitleVisibility.Selected,
-    valueConverter: v => TitleVisibility[v]
+    valueConverter: (v) => TitleVisibility[v],
 });
 
 titleVisibilityProperty.register(BottomNavigationBarBase);
@@ -159,7 +163,7 @@ export const activeColorCssProperty = new CssProperty<Style, Color>({
     cssName: 'active-color',
     equalityComparer: Color.equals,
     defaultValue: new Color('black'),
-    valueConverter: v => new Color(v)
+    valueConverter: (v) => new Color(v),
 });
 activeColorCssProperty.register(Style);
 
@@ -168,7 +172,7 @@ export const inactiveColorCssProperty = new CssProperty<Style, Color>({
     cssName: 'inactive-color',
     equalityComparer: Color.equals,
     defaultValue: new Color('gray'),
-    valueConverter: v => new Color(v)
+    valueConverter: (v) => new Color(v),
 });
 inactiveColorCssProperty.register(Style);
 
@@ -209,15 +213,15 @@ export abstract class BottomNavigationTabBase extends View implements BottomNavi
 export const isSelectableProperty = new Property<BottomNavigationTabBase, boolean>({
     name: 'isSelectable',
     defaultValue: true,
-    valueConverter: booleanConverter
+    valueConverter: booleanConverter,
 });
 
 isSelectableProperty.register(BottomNavigationTabBase);
 
 export const iconProperty = new Property<BottomNavigationTabBase, ImageSource>({
     name: 'icon',
     affectsLayout: true,
-    valueConverter: ImageSource.fromFileOrResourceSync
+    valueConverter: ImageSource.fromFileOrResourceSync,
 });
 
 iconProperty.register(BottomNavigationTabBase);

src/bottomnavigationbar/bottomnavigationbar.android.ts

@@ -201,10 +201,10 @@ export class BottomNavigationBar extends BottomNavigationBarBase {
 export class BottomNavigationTab extends BottomNavigationTabBase {
     nativeViewProtected: android.view.MenuItem;
     index: number = android.view.Menu.NONE;
-    _isPaddingRelative = true; // trick because tns-core-modules expect us to be a view
+    _isPaddingRelative = true; // trick because @nativescript/core expect us to be a view
     createNativeView() {
         const view = (this.parent as BottomNavigationBar).nativeViewProtected.getMenu().add(android.view.Menu.NONE, this.index, android.view.Menu.NONE, this.title);
-        // trick because tns-core-modules expect us to be a view
+        // trick because @nativescript/core expect us to be a view
         (view as any).defaultPaddings = { top: 0, left: 0, bottom: 0, right: 0 };
         return view;
     }

src/bottomnavigationbar/bottomnavigationbar.d.ts

@@ -1,4 +1,5 @@
-import { Color, EventData } from '@nativescript/core/ui/core/view';
+import { Color } from '@nativescript/core/color';
+import { EventData } from '@nativescript/core/data/observable';
 
 import { BottomNavigationBarBase, BottomNavigationTabBase, TabPressedEventData, TabReselectedEventData, TabSelectedEventData, TitleVisibility } from './bottomnavigationbar-common';
 import { ImageSource } from '@nativescript/core/image-source';

src/bottomnavigationbar/bottomnavigationbar.ios.ts

@@ -1,6 +1,8 @@
 import { screen } from '@nativescript/core/platform';
 import { ios } from '@nativescript/core/application';
-import { backgroundColorProperty, Color, layout } from '@nativescript/core/ui/core/view';
+import { layout } from '@nativescript/core/utils/utils';
+import { backgroundColorProperty } from '@nativescript/core/ui/styling/style-properties';
+import { Color } from '@nativescript/core/color';
 import { ImageSource } from '@nativescript/core/image-source';
 import { getRippleColor, themer } from 'nativescript-material-core/core';
 

src/bottomsheet/bottomsheet-common.ts

@@ -1,9 +1,8 @@
-import { View } from '@nativescript/core/ui/core/view';
-import { Frame } from '@nativescript/core/ui/frame';
-import { EventData } from '@nativescript/core/data/observable';
-import { eachDescendant, ViewBase } from '@nativescript/core/ui/core/view-base';
-import { getSystemCssClasses, MODAL_ROOT_VIEW_CSS_CLASS } from '@nativescript/core/css/system-classes';
 import { Builder } from "@nativescript/core";
+import { getSystemCssClasses, MODAL_ROOT_VIEW_CSS_CLASS } from '@nativescript/core/css/system-classes';
+import { EventData } from '@nativescript/core/data/observable';
+import { View } from '@nativescript/core/ui/core/view';
+import { ViewBase } from '@nativescript/core/ui/core/view-base';
 
 declare module '@nativescript/core/ui/core/view/view' {
     interface View {

src/bottomsheet/bottomsheet.android.ts

@@ -1,8 +1,8 @@
-import { View, Color } from '@nativescript/core/ui/core/view';
+import { android as androidApp, AndroidActivityBackPressedEventData } from '@nativescript/core/application';
 import { fromObject } from '@nativescript/core/data/observable';
-import { BottomSheetOptions, ViewWithBottomSheetBase } from './bottomsheet-common';
+import { View } from '@nativescript/core/ui/core/view';
 import { applyMixins } from 'nativescript-material-core/core';
-import { android as androidApp, AndroidActivityBackPressedEventData } from '@nativescript/core/application';
+import { BottomSheetOptions, ViewWithBottomSheetBase } from './bottomsheet-common';
 
 interface BottomSheetDataOptions {
     owner: View;

src/bottomsheet/bottomsheet.ios.ts

@@ -1,13 +1,12 @@
-import { ViewWithBottomSheetBase } from './bottomsheet-common';
-import { ios, traceCategories, traceError, traceMessageType, traceWrite, View } from '@nativescript/core/ui/core/view';
-import { ViewBase } from '@nativescript/core/ui/core/view-base';
-import { layout } from '@nativescript/core/utils/utils';
-import { BottomSheetOptions } from './bottomsheet';
 import { fromObject } from '@nativescript/core/data/observable';
-import { applyMixins } from 'nativescript-material-core/core';
-import { ios as iosUtils } from '@nativescript/core/utils/utils';
+import { ios, View } from '@nativescript/core/ui/core/view';
+import { categories, error, messageType, write } from '@nativescript/core/trace';
 import { ios as iosView } from '@nativescript/core/ui/core/view/view-helper';
 import { Page } from '@nativescript/core/ui/page';
+import { ios as iosUtils, layout } from '@nativescript/core/utils/utils';
+import { applyMixins } from 'nativescript-material-core/core';
+import { BottomSheetOptions } from './bottomsheet';
+import { ViewWithBottomSheetBase } from './bottomsheet-common';
 
 const majorVersion = iosUtils.MajorVersion;
 
@@ -85,7 +84,7 @@ function initLayoutGuide(controller: UIViewController) {
 function layoutView(controller: IUILayoutViewController, owner: View): void {
     let layoutGuide = controller.view.safeAreaLayoutGuide;
     if (!layoutGuide) {
-        traceWrite(`safeAreaLayoutGuide during layout of ${owner}. Creating fallback constraints, but layout might be wrong.`, traceCategories.Layout, traceMessageType.error);
+        write(`safeAreaLayoutGuide during layout of ${owner}. Creating fallback constraints, but layout might be wrong.`, categories.Layout, messageType.error);
 
         layoutGuide = initLayoutGuide(controller);
     }
@@ -340,18 +339,18 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
         options.context = options.context || {};
         const parentWithController = ios.getParentWithViewController(parent);
         if (!parentWithController) {
-            traceWrite(`Could not find parent with viewController for ${parent} while showing bottom sheet view.`, traceCategories.ViewHierarchy, traceMessageType.error);
+            write(`Could not find parent with viewController for ${parent} while showing bottom sheet view.`, categories.ViewHierarchy, messageType.error);
             return;
         }
 
         const parentController = parentWithController.viewController;
         if (parentController.presentedViewController) {
-            traceWrite('Parent is already presenting view controller. Close the current bottom sheet page before showing another one!', traceCategories.ViewHierarchy, traceMessageType.error);
+            write('Parent is already presenting view controller. Close the current bottom sheet page before showing another one!', categories.ViewHierarchy, messageType.error);
             return;
         }
 
         if (!parentController.view || !parentController.view.window) {
-            traceWrite('Parent page is not part of the window hierarchy.', traceCategories.ViewHierarchy, traceMessageType.error);
+            write('Parent page is not part of the window hierarchy.', categories.ViewHierarchy, messageType.error);
             return;
         }
         this._setupAsRootView({});
@@ -434,7 +433,7 @@ export class ViewWithBottomSheet extends ViewWithBottomSheetBase {
     protected _hideNativeBottomSheet(parent: View, whenClosedCallback: () => void) {
         const parentWithController = ios.getParentWithViewController(parent);
         if (!parent || !parentWithController) {
-            traceError('Trying to hide bottom-sheet view but no parent with viewController specified.');
+            error('Trying to hide bottom-sheet view but no parent with viewController specified.');
             return;
         }
 

src/button/button.android.ts

@@ -1,12 +1,11 @@
-import { createStateListAnimator, getEnabledColorStateList, getLayout, isPostLollipop } from 'nativescript-material-core/android/utils';
-import { dynamicElevationOffsetProperty, elevationProperty, rippleColorProperty, verticalTextAlignmentProperty } from 'nativescript-material-core/cssproperties';
 import { Color } from '@nativescript/core/color';
+import { profile } from '@nativescript/core/profiling';
 import { Background } from '@nativescript/core/ui/styling/background';
-import { TextBase } from '@nativescript/core/ui/text-base';
 import { androidDynamicElevationOffsetProperty, androidElevationProperty, backgroundInternalProperty, Length } from '@nativescript/core/ui/styling/style-properties';
-import { ButtonBase } from './button-common';
 import { VerticalTextAlignment } from 'nativescript-material-core';
-import { profile } from '@nativescript/core/profiling/profiling';
+import { createStateListAnimator, getEnabledColorStateList, getLayout, isPostLollipop } from 'nativescript-material-core/android/utils';
+import { dynamicElevationOffsetProperty, elevationProperty, rippleColorProperty, verticalTextAlignmentProperty } from 'nativescript-material-core/cssproperties';
+import { ButtonBase } from './button-common';
 
 let LayoutInflater: typeof android.view.LayoutInflater;
 

src/button/button.ios.ts

@@ -1,5 +1,3 @@
-import { getRippleColor, themer } from 'nativescript-material-core/core';
-import { dynamicElevationOffsetProperty, elevationProperty, rippleColorProperty } from 'nativescript-material-core/cssproperties';
 import { Color } from '@nativescript/core/color';
 import { screen } from '@nativescript/core/platform';
 import { Background } from '@nativescript/core/ui/styling/background';
@@ -13,6 +11,8 @@ import {
     fontInternalProperty
 } from '@nativescript/core/ui/styling/style-properties';
 import { layout } from '@nativescript/core/utils/utils';
+import { getRippleColor, themer } from 'nativescript-material-core/core';
+import { dynamicElevationOffsetProperty, elevationProperty, rippleColorProperty } from 'nativescript-material-core/cssproperties';
 import { ButtonBase } from './button-common';
 
 let buttonScheme: MDCButtonScheme;