From f91eaa698162081fcca705aa90b1f6f972861051 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Wed, 7 Aug 2019 16:23:58 +0300 Subject: [PATCH] chore: use scoped-packages --- app/app.module.ts | 4 +--- app/groceries/groceries.component.ts | 8 +++----- app/groceries/groceries.module.ts | 3 +-- app/login/login.component.ts | 10 +++------- app/login/login.module.ts | 3 +-- app/main.ts | 2 +- app/shared/backend.service.ts | 8 ++++---- app/shared/dialog-util.ts | 4 ++-- app/shared/status-bar-util.ts | 9 ++++----- package.json | 4 ++++ 10 files changed, 24 insertions(+), 31 deletions(-) diff --git a/app/app.module.ts b/app/app.module.ts index 27a4b058..3ff4417b 100644 --- a/app/app.module.ts +++ b/app/app.module.ts @@ -1,7 +1,5 @@ -import { NativeScriptModule } from "nativescript-angular/nativescript.module"; +import { NativeScriptModule, NativeScriptHttpClientModule, NativeScriptRouterModule } from "@nativescript/angular"; import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; -import { NativeScriptHttpClientModule } from "nativescript-angular/http-client"; -import { NativeScriptRouterModule } from "nativescript-angular/router"; import { authProviders, appRoutes } from "./app.routing"; import { AppComponent } from "./app.component"; diff --git a/app/groceries/groceries.component.ts b/app/groceries/groceries.component.ts index fadc3015..45213e87 100644 --- a/app/groceries/groceries.component.ts +++ b/app/groceries/groceries.component.ts @@ -1,8 +1,6 @@ import { Component, ElementRef, OnInit, ViewChild } from "@angular/core"; import { Router } from "@angular/router"; -import { action } from "tns-core-modules/ui/dialogs"; -import { Page } from "tns-core-modules/ui/page"; -import { TextField } from "tns-core-modules/ui/text-field"; +import { action, Page, TextField } from "@nativescript/ui"; import * as SocialShare from "nativescript-social-share"; import { GroceryService } from "./shared"; @@ -25,7 +23,7 @@ export class GroceriesComponent implements OnInit { constructor(private router: Router, private store: GroceryService, private loginService: LoginService, - private page: Page) {} + private page: Page) { } ngOnInit() { this.page.actionBarHidden = true; @@ -108,7 +106,7 @@ export class GroceriesComponent implements OnInit { share() { let items = this.store.items.value; let list = []; - for (let i = 0, size = items.length; i < size ; i++) { + for (let i = 0, size = items.length; i < size; i++) { list.push(items[i].name); } SocialShare.shareText(list.join(", ").trim()); diff --git a/app/groceries/groceries.module.ts b/app/groceries/groceries.module.ts index 5c0ced11..55779733 100644 --- a/app/groceries/groceries.module.ts +++ b/app/groceries/groceries.module.ts @@ -1,5 +1,4 @@ -import { NativeScriptCommonModule } from "nativescript-angular/common"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptCommonModule, NativeScriptFormsModule } from "@nativescript/angular"; import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; import { groceriesRouting } from "./groceries.routing"; import { GroceriesComponent } from "./groceries.component"; diff --git a/app/login/login.component.ts b/app/login/login.component.ts index ad9c6b28..4e764f9b 100644 --- a/app/login/login.component.ts +++ b/app/login/login.component.ts @@ -1,11 +1,7 @@ import { Component, ElementRef, OnInit, ViewChild } from "@angular/core"; import { Router } from "@angular/router"; -import { Color } from "tns-core-modules/color"; -import { connectionType, getConnectionType } from "tns-core-modules/connectivity"; -import { Animation } from "tns-core-modules/ui/animation"; -import { View } from "tns-core-modules/ui/core/view"; -import { prompt } from "tns-core-modules/ui/dialogs"; -import { Page } from "tns-core-modules/ui/page"; +import { Color, connectionType, getConnectionType } from "@nativescript/core"; +import { Animation, View, prompt, Page } from "@nativescript/ui"; import { alert, LoginService, User } from "../shared"; @@ -146,7 +142,7 @@ export class LoginComponent implements OnInit { initialContainer.animate({ opacity: 0, duration: 500 - }).then(function() { + }).then(function () { // After the animation completes, hide the initial container and // show the main container and logo. The main container and logo will // not immediately appear because their opacity is set to 0 in CSS. diff --git a/app/login/login.module.ts b/app/login/login.module.ts index 60fa987e..c907406c 100644 --- a/app/login/login.module.ts +++ b/app/login/login.module.ts @@ -1,5 +1,4 @@ -import { NativeScriptCommonModule } from "nativescript-angular/common"; -import { NativeScriptFormsModule } from "nativescript-angular/forms"; +import { NativeScriptCommonModule, NativeScriptFormsModule } from "@nativescript/angular"; import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core"; import { loginRouting } from "./login.routing"; diff --git a/app/main.ts b/app/main.ts index 639bfd51..3bf87380 100644 --- a/app/main.ts +++ b/app/main.ts @@ -1,4 +1,4 @@ -import { platformNativeScriptDynamic } from "nativescript-angular/platform"; +import { platformNativeScriptDynamic } from "@nativescript/angular"; import { AppModule } from "./app.module"; platformNativeScriptDynamic().bootstrapModule(AppModule); diff --git a/app/shared/backend.service.ts b/app/shared/backend.service.ts index 462fb23d..f25eaa90 100644 --- a/app/shared/backend.service.ts +++ b/app/shared/backend.service.ts @@ -1,5 +1,5 @@ import { Injectable } from "@angular/core"; -import { getString, setString } from "tns-core-modules/application-settings"; +import { nsSettings } from "@nativescript/core"; const tokenKey = "token"; @@ -10,14 +10,14 @@ export class BackendService { static apiUrl = ""; static isLoggedIn(): boolean { - return !!getString(tokenKey); + return !!nsSettings.getString(tokenKey); } static get token(): string { - return getString(tokenKey); + return nsSettings.getString(tokenKey); } static set token(theToken: string) { - setString(tokenKey, theToken); + nsSettings.setString(tokenKey, theToken); } } diff --git a/app/shared/dialog-util.ts b/app/shared/dialog-util.ts index 7c4c70e8..4eadb02b 100644 --- a/app/shared/dialog-util.ts +++ b/app/shared/dialog-util.ts @@ -1,7 +1,7 @@ -import * as dialogsModule from "tns-core-modules/ui/dialogs"; +import { nsDialogs } from "@nativescript/ui"; export function alert(message: string) { - return dialogsModule.alert({ + return nsDialogs.alert({ title: "Groceries", okButtonText: "OK", message: message diff --git a/app/shared/status-bar-util.ts b/app/shared/status-bar-util.ts index c0688fa6..341850b4 100644 --- a/app/shared/status-bar-util.ts +++ b/app/shared/status-bar-util.ts @@ -1,5 +1,4 @@ -import * as application from "tns-core-modules/application"; -import * as platform from "tns-core-modules/platform"; +import { nsApp, device } from "@nativescript/core"; declare var android: any; @@ -7,10 +6,10 @@ export function setStatusBarColors() { // Make the Android status bar transparent. // See http://bradmartin.net/2016/03/10/fullscreen-and-navigation-bar-color-in-a-nativescript-android-app/ // for details on the technique used. - if (application.android && platform.device.sdkVersion >= "21") { - application.android.on("activityStarted", () => { + if (nsApp.android && device.sdkVersion >= "21") { + nsApp.android.on("activityStarted", () => { const View = android.view.View; - const window = application.android.startActivity.getWindow(); + const window = nsApp.android.startActivity.getWindow(); window.setStatusBarColor(0x000000); const decorView = window.getDecorView(); diff --git a/package.json b/package.json index ea776208..c1b924bb 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "update-ns-webpack": "update-ns-webpack" }, "dependencies": { + "@angular/animations": "~8.0.0", "@angular/common": "~8.0.0", "@angular/compiler": "~8.0.0", "@angular/core": "~8.0.0", @@ -48,6 +49,9 @@ "@angular/platform-browser": "~8.0.0", "@angular/platform-browser-dynamic": "~8.0.0", "@angular/router": "~8.0.0", + "@nativescript/angular": "file:../nativescript/scoped-packages/nativescript-angular-1.0.0.tgz", + "@nativescript/core": "file:../nativescript/scoped-packages/nativescript-core-1.0.0.tgz", + "@nativescript/ui": "file:../nativescript/scoped-packages/nativescript-ui-1.0.0.tgz", "email-validator": "^2.0.4", "nativescript-angular": "~8.0.0", "nativescript-iqkeyboardmanager": "~1.3.0",