Merge pull request #46 from nstudio/feat/dep-updates

chore: dep updates for {N} 7

Author: bradmartin

src/.npmignore

@@ -6,4 +6,5 @@ scripts/*
 platforms/android/*
 !platforms/android/include.gradle
 !platforms/android/*.aar
-!platforms/android/*.jar
+!platforms/android/*.jar
+*.tgz

src/loading-indicator.android.ts

@@ -1,9 +1,4 @@
-import * as application from '@nativescript/core/application';
-import { Color } from '@nativescript/core/color';
-import { ImageSource } from '@nativescript/core/image-source';
-import { screen } from '@nativescript/core/platform';
-import { Frame } from '@nativescript/core/ui/frame';
-import { ad as androidUtils } from '@nativescript/core/utils/utils';
+import { Application, Color, ImageSource, Screen, Frame, Utils } from '@nativescript/core';
 import { Mode, OptionsCommon } from './loading-indicator.common';
 
 export * from './loading-indicator.common';
@@ -45,7 +40,7 @@ export class LoadingIndicator {
   }
 
   show(options?: OptionsCommon) {
-    const context = androidUtils.getApplicationContext();
+    const context = Utils.android.getApplicationContext();
     if (context) {
       options = options || {};
       options.android = options.android || {};
@@ -193,7 +188,7 @@ export class LoadingIndicator {
           android.view.ViewGroup.LayoutParams.WRAP_CONTENT
         );
 
-    const defaultPadding = 10 * screen.mainScreen.scale;
+    const defaultPadding = 10 * Screen.mainScreen.scale;
     parentView.setPadding(
       defaultPadding,
       defaultPadding,
@@ -203,7 +198,7 @@ export class LoadingIndicator {
 
     // handle margin option
     if (options.margin !== undefined) {
-      const margin = options.margin * screen.mainScreen.scale;
+      const margin = options.margin * Screen.mainScreen.scale;
       parentViewParams.setMargins(margin, margin, margin, margin);
     }
 
@@ -317,8 +312,8 @@ export class LoadingIndicator {
         progressView.setBackgroundDrawable(this._getBackgroundDrawable());
         progressView.setLayoutParams(
           new android.widget.LinearLayout.LayoutParams(
-            60 * screen.mainScreen.scale,
-            60 * screen.mainScreen.scale
+            60 * Screen.mainScreen.scale,
+            60 * Screen.mainScreen.scale
           )
         );
         break;
@@ -330,8 +325,8 @@ export class LoadingIndicator {
         progressView.setBackgroundDrawable(this._getBackgroundDrawable());
         progressView.setLayoutParams(
           new android.widget.LinearLayout.LayoutParams(
-            60 * screen.mainScreen.scale,
-            60 * screen.mainScreen.scale
+            60 * Screen.mainScreen.scale,
+            60 * Screen.mainScreen.scale
           )
         );
         break;
@@ -388,8 +383,8 @@ export class LoadingIndicator {
         0
       );
     } else {
-      this._popOver.setWidth(screen.mainScreen.widthPixels);
-      this._popOver.setHeight(screen.mainScreen.heightPixels);
+      this._popOver.setWidth(Screen.mainScreen.widthPixels);
+      this._popOver.setHeight(Screen.mainScreen.heightPixels);
       this._popOver.showAtLocation(view, android.view.Gravity.CENTER, 0, 0);
     }
   }
@@ -643,8 +638,8 @@ export class LoadingIndicator {
     progressView.setBackgroundDrawable(this._getBackgroundDrawable());
     progressView.setLayoutParams(
       new android.widget.LinearLayout.LayoutParams(
-        60 * screen.mainScreen.scale,
-        60 * screen.mainScreen.scale
+        60 * Screen.mainScreen.scale,
+        60 * Screen.mainScreen.scale
       )
     );
     return progressView;
@@ -699,7 +694,7 @@ export class LoadingIndicator {
   }
 
   private _getResources() {
-    const ctx = application.android.foregroundActivity as android.app.Activity;
+    const ctx = Application.android.foregroundActivity as android.app.Activity;
     return ctx.getResources();
   }
 

src/loading-indicator.ios.ts

@@ -1,4 +1,4 @@
-import { Color } from '@nativescript/core/color';
+import { Color } from '@nativescript/core';
 import { Mode, OptionsCommon } from './loading-indicator.common';
 
 export * from './loading-indicator.common';

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/nativescript-loading-indicator",
-  "version": "3.0.4",
+  "version": "4.0.0",
   "description": "A NativeScript plugin for showing an overlayed loading indicator.",
   "main": "loading-indicator",
   "typings": "index.d.ts",
@@ -83,12 +83,12 @@
     "husky": "^4.2.0",
     "lint-staged": "^10.0.2",
     "prettier": "^1.19.1",
-    "@nativescript/core": "^6.3.2",
-    "tns-platform-declarations": "^6.3.2",
-    "typescript": "~3.7.4",
+    "@nativescript/core": "rc",
+    "@nativescript/types": "rc",
+    "typescript": "~3.9.0",
     "prompt": "^1.0.0",
     "rimraf": "^2.6.3",
-    "tslint": "^5.20.1",
+    "tslint": "^6.1.3",
     "semver": "^5.6.0"
   },
   "dependencies": {}

src/references.d.ts

@@ -1,3 +1,4 @@
-/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
-/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="./node_modules/@nativescript/core/global-types.d.ts" />
+/// <reference path="./node_modules/@nativescript/types/ios.d.ts" />
+/// <reference path="./node_modules/@nativescript/types/android.d.ts" />
 /// <reference path="./typings/objc!MBProgressHUD.d.ts" />

src/tsconfig.json

@@ -1,20 +1,22 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
+    "rootDir": ".",
+    "target": "ES2017",
+    "module": "esnext",
+    "sourceMap": true,
     "declaration": true,
-    "removeComments": true,
-    "noLib": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "noEmitOnError": true,
+    "noEmitHelpers": true,
+    "diagnostics": true,
     "skipLibCheck": true,
-    "lib": ["es6", "dom"],
-    "sourceMap": true,
+    "skipDefaultLibCheck": true,
+    "lib": ["es2017", "dom"],
     "pretty": false,
     "allowUnreachableCode": false,
     "allowUnusedLabels": false,
-    "noEmitHelpers": true,
-    "noEmitOnError": false,
     "noImplicitAny": false,
     "noImplicitReturns": true,
     "noImplicitUseStrict": false,