@nstudio/nativescript-loading-indicator 4.0.0 → 4.1.0

package/index.d.ts

@@ -99,5 +99,5 @@ export enum Mode {
   DeterminateHorizontalBar = 2,
   AnnularDeterminate = 3,
   CustomView = 4,
-  Text = 5
+  Text = 5,
 }

package/loading-indicator.android.js

@@ -1,4 +1,4 @@
-import { Application, Color, ImageSource, Screen, Frame, Utils } from '@nativescript/core';
+import { Application, Color, Frame, ImageSource, Screen, } from '@nativescript/core';
 import { Mode } from './loading-indicator.common';
 export * from './loading-indicator.common';
 const R_ATTR_PROGRESS_BAR_STYLE_HORIZONTAL = 0x01010078;
@@ -21,20 +21,23 @@ export class LoadingIndicator {
         this._isCreatingPopOver = false;
     }
     show(options) {
-        const context = Utils.android.getApplicationContext();
+        const context = Application.android.foregroundActivity || Application.android.startActivity;
         if (context) {
             options = options || {};
             options.android = options.android || {};
-            options.userInteractionEnabled = options.userInteractionEnabled !== undefined;
+            options.userInteractionEnabled =
+                options.userInteractionEnabled !== undefined;
             if (!this._popOver) {
                 this._isCreatingPopOver = true;
                 new Promise((resolve) => {
                     this._createPopOver(context, options);
                     this._loadersInstances.push(this._popOver);
                     resolve();
-                }).then(() => {
+                })
+                    .then(() => {
                     this._isCreatingPopOver = false;
-                }).catch((error) => {
+                })
+                    .catch((error) => {
                     // Ensure this is left in a clean state.
                     this._isCreatingPopOver = false;
                     const message = error && error.message ? `: ${error.message}` : '';
@@ -111,7 +114,7 @@ export class LoadingIndicator {
                     }
                 }
                 return true;
-            }
+            },
         }));
         const defaultBackgroundColor = android.graphics.Color.WHITE;
         // handle dimming background option
@@ -124,7 +127,7 @@ export class LoadingIndicator {
         parentView.setOnTouchListener(new android.view.View.OnTouchListener({
             onTouch(view, event) {
                 return true;
-            }
+            },
         }));
         // Use the ViewCompatNamespace to properly map to `ViewCompat` for AndroidX and support lib versions to avoid breaking change
         ViewCompatNamespace.ViewCompat.setElevation(parentView, 9.0);
@@ -341,7 +344,8 @@ export class LoadingIndicator {
              * acquired child is the correct class.
              */
             let progressView = parentView.getChildAt(0);
-            if (progressView instanceof android.widget.ProgressBar === false || progressView === undefined) {
+            if (progressView instanceof android.widget.ProgressBar === false ||
+                progressView === undefined) {
                 progressView = new android.widget.ProgressBar(context);
             }
             if (options.color) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstudio/nativescript-loading-indicator",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "A NativeScript plugin for showing an overlayed loading indicator.",
   "main": "loading-indicator",
   "typings": "index.d.ts",
@@ -18,20 +18,20 @@
     "tsc": "tsc -skipLibCheck",
     "build": "npm run tsc && npm run build.native",
     "build.native": "node scripts/build-native.js",
-    "postclone": "npm i && node scripts/postclone.js && cd ../demo && npm i && npx rimraf -- package-lock.json && cd ../src",
+    "postclone": "npm run npm-i && node scripts/postclone.js && cd ../demo && npm run npm-i && npx rimraf -- package-lock.json && cd ../src",
+    "npm-i": "npm i --legacy-peer-deps",
     "test.android": "npm run tsc && npm run tslint && cd ../demo && tns build android && tns test android --justlaunch",
     "test.ios": "npm run tsc && npm run tslint && cd ../demo && tns build ios && tns test ios --justlaunch",
     "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude '**/platforms/**' --exclude \"**/typings/**\"",
-    "plugin.tscwatch": "npm run tsc -- -w",
     "demo.ios": "npm run tsc && cd ../demo && tns run ios",
     "demo.android": "npm run tsc && cd ../demo && tns run android",
     "demo.reset": "cd ../demo && npx rimraf -- hooks node_modules platforms package-lock.json",
-    "demo-angular.ios": "npm i && cd ../demo-angular && tns run ios",
-    "demo-angular.android": "npm i && cd ../demo-angular && tns run android",
+    "demo-angular.ios": "npm run npm-i && cd ../demo-angular && tns run ios",
+    "demo-angular.android": "npm run npm-i && cd ../demo-angular && tns run android",
     "demo-angular.reset": "cd ../demo-angular && npx rimraf -- hooks node_modules platforms package-lock.json",
     "plugin.prepare": "npm run build && cd ../demo && tns plugin remove nativescript-loading-indicator && tns plugin add ../src",
-    "clean": "npm run demo.reset && npx rimraf -- node_modules package-lock.json && npm i",
-    "ci.tslint": "npm i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**' --exclude '**/typings/**'",
+    "clean": "npm run demo.reset && npx rimraf node_modules package-lock.json && npm run npm-i",
+    "ci.tslint": "npm run npm-i && tslint '**/*.ts' --config '../tslint.json' --exclude '**/node_modules/**' --exclude '**/platforms/**' --exclude '**/typings/**'",
     "prepack": "npm run build.native",
     "generate.typings.ios": "cd ../demo && TNS_DEBUG_METADATA_PATH=\"$(pwd)/metadata\" tns build ios && TNS_TYPESCRIPT_DECLARATIONS_PATH=\"$(pwd)/typings\" tns build ios && echo 'Now look for your library typings in demo/typings!'"
   },
@@ -80,14 +80,14 @@
   "homepage": "https://github.com/nstudio/nativescript-loading-indicator",
   "readmeFilename": "README.md",
   "devDependencies": {
-    "husky": "^4.2.0",
-    "lint-staged": "^10.0.2",
-    "prettier": "^1.19.1",
-    "@nativescript/core": "rc",
-    "@nativescript/types": "rc",
-    "typescript": "~3.9.0",
+    "husky": "~4.3.0",
+    "lint-staged": "~10.5.0",
+    "prettier": "~2.2.1",
+    "@nativescript/core": "~8.0.0",
+    "@nativescript/types": "~8.0.0",
+    "typescript": "~4.1.0",
     "prompt": "^1.0.0",
-    "rimraf": "^2.6.3",
+    "rimraf": "^3.0.2",
     "tslint": "^6.1.3",
     "semver": "^5.6.0"
   },

package/references.d.ts

@@ -1,4 +1,3 @@
 /// <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="./node_modules/@nativescript/types/index.d.ts" />
 /// <reference path="./typings/objc!MBProgressHUD.d.ts" />