Updates to support Nativescript 7

demo/app/app.css

@@ -1 +1,4 @@
 @import '~nativescript-theme-core/css/core.light.css';
+.ns-dark Button{
+	color:black;
+}

demo/app/app.ts

@@ -1,2 +1,2 @@
-import * as application from 'tns-core-modules/application';
-application.run({ moduleName: "app-root" });
+import { Application as application } from '@nativescript/core';
+application.run({ moduleName: "app-root" });

demo/app/background-service.ts

@@ -1,8 +1,6 @@
 import * as geolocation from "nativescript-geolocation";
-import { Accuracy } from "tns-core-modules/ui/enums";
-import * as application from "tns-core-modules/application";
-import { device } from "tns-core-modules/platform";
-import * as Toast from "nativescript-toast";
+import { Accuracy } from "@nativescript/core/ui/enums";
+import {Application as application, Device as device } from "@nativescript/core";
 
 let watchId;
 
@@ -19,8 +17,10 @@ function _startWatch() {
         watchId = geolocation.watchLocation(
             function (loc) {
                 if (loc) {
-                    let toast = Toast.makeText('Background Location: \n' + loc.latitude + ', ' + loc.longitude);
-                    toast.show();
+
+                    android.widget.Toast.makeText(application.android.context, 'Background Location: \n' + loc.latitude + ', ' + loc.longitude, android.widget.Toast.LENGTH_SHORT).show();
+                    // let toast = new Toasty({text:'Background Location: \n' + loc.latitude + ', ' + loc.longitude});
+                    // toast.show();
                     console.log('Background Location: ' + loc.latitude + ' ' + loc.longitude);
                 }
             },
@@ -42,7 +42,8 @@ application.on(application.exitEvent, _clearWatch);
 export function getBackgroundServiceClass() {
     if (application.android) {
         if (device.sdkVersion < "26") {
-            @JavaProxy("com.nativescript.location.BackgroundService")
+            @NativeClass()
+            @JavaProxy('com.nativescript.location.BackgroundService')
             class BackgroundService extends (<any>android).app.Service {
                 constructor() {
                     super();
@@ -70,7 +71,8 @@ export function getBackgroundServiceClass() {
             }
             return BackgroundService;
         } else {
-            @JavaProxy("com.nativescript.location.BackgroundService26")
+            @NativeClass()
+            @JavaProxy('com.nativescript.location.BackgroundService26')
             class BackgroundService26 extends (<any>android.app).job.JobService {
                 constructor() {
                     super();

demo/app/main-page.ts

@@ -1,11 +1,7 @@
 import * as geolocation from "nativescript-geolocation";
-import { Accuracy } from "tns-core-modules/ui/enums";
-import { EventData } from "tns-core-modules/data/observable";
-import { Page } from "tns-core-modules/ui/page";
+import { Accuracy } from "@nativescript/core/ui/enums";
+import { EventData, Page, Application as application, Device as device, Utils as utils } from "@nativescript/core";
 import { MainViewModel } from "./main-view-model";
-const utils = require("tns-core-modules/utils/utils");
-import * as application from "tns-core-modules/application";
-import { device } from "tns-core-modules/platform";
 import { BackgroundServiceClass } from "./background-service";
 
 let page: Page;

demo/app/main-view-model.ts

@@ -1,6 +1,5 @@
 import * as geolocation from "nativescript-geolocation";
-import { Observable } from "tns-core-modules/data/observable";
-import { ObservableArray } from "tns-core-modules/data/observable-array";
+import { Observable, ObservableArray } from "@nativescript/core";
 
 export class MainViewModel extends Observable {
     private _locations: ObservableArray<geolocation.Location>;

demo/nativescript.config.ts

@@ -0,0 +1,14 @@
+import { NativeScriptConfig } from '@nativescript/core';
+
+export default {
+  id: 'org.nativescript.demo',
+  appResourcesPath: 'app/App_Resources',
+  android: {
+    v8Flags: '--expose_gc',
+    markingMode: 'none',
+    requireModules: {
+      0: 'nativescript-geolocation',
+    },
+  },
+  appPath: 'app',
+} as NativeScriptConfig;

demo/package.json

@@ -1,34 +1,27 @@
 {
-  "nativescript": {
-    "id": "org.nativescript.demo",
-    "tns-android": {
-      "version": "6.2.0"
-    },
-    "tns-ios": {
-      "version": "6.2.0"
-    }
-  },
   "dependencies": {
+    "@nativescript/core": "7.0.0",
+    "@nativescript/webpack": "3.0.0",
     "nativescript-geolocation": "../src",
     "nativescript-theme-core": "^1.0.4",
-    "nativescript-toast": "~2.0.0",
-    "nativescript-unit-test-runner": "0.7.0",
-    "tns-core-modules": "^6.0.0"
+    "nativescript-unit-test-runner": "0.7.0"
   },
   "devDependencies": {
+    "@nativescript/android": "7.0.0",
+    "@nativescript/ios": "7.0.1",
+    "@nativescript/types": "7.0.0",
     "jasmine-core": "^2.5.2",
     "karma": "4.1.0",
     "karma-jasmine": "2.0.1",
     "karma-nativescript-launcher": "^0.4.0",
+    "karma-webpack": "3.0.5",
     "nativescript-css-loader": "~0.26.0",
-    "nativescript-dev-webpack": "^1.3.0",
-    "tns-platform-declarations": "^6.0.0",
     "tslint": "~5.11.0",
-    "karma-webpack": "3.0.5",
-    "typescript": "~3.4.5"
+    "typescript": "3.9.7"
   },
   "scripts": {
     "ci.tslint": "npm i && tslint --config '../tslint.json' 'app/**/*.ts' --exclude '**/node_modules/**'",
     "build.plugin": "cd ../src && npm run build"
-  }
+  },
+  "main": "app.js"
 }

demo/tsconfig.json

@@ -1,16 +1,17 @@
 {
     "compilerOptions": {
-        "target": "es5",
-        "module": "commonjs",
+        "target": "es2017",
+        "module": "esnext",
         "declaration": false,
-        "removeComments": true,
+        "removeComments": false,
         "noLib": false,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "lib": [
             "es6",
             "dom",
-            "es2015.iterable"
+            "es2015.iterable",
+            "es2017"
         ],
         "pretty": true,
         "allowUnreachableCode": false,
@@ -30,7 +31,8 @@
             "~/*": [
                 "app/*"
             ]
-        }
+        },
+        "moduleResolution": "node"
     },
     "include": [
         "../src",

src/geolocation.android.ts

@@ -1,6 +1,5 @@
-import { on as applicationOn, android as androidAppInstance, AndroidApplication, uncaughtErrorEvent, UnhandledErrorEventData } from "application";
-import { Accuracy } from "tns-core-modules/ui/enums";
-import { setTimeout, clearTimeout } from "tns-core-modules/timer";
+import { Application, AndroidApplication, UnhandledErrorEventData, Enums } from "@nativescript/core";
+import { setTimeout, clearTimeout } from "@nativescript/core/timer";
 import { LocationBase, defaultGetLocationTimeout, fastestTimeUpdate, minTimeUpdate } from "./geolocation.common";
 import { Options, successCallbackType, errorCallbackType } from "./location-monitor";
 import * as permissions from "nativescript-permissions";
@@ -18,10 +17,10 @@ let attachedForErrorHandling = false;
 function _ensureLocationClient() {
     // Wrapped in a function as we should not access java object there because of the snapshots.
     fusedLocationClient = fusedLocationClient ||
-        com.google.android.gms.location.LocationServices.getFusedLocationProviderClient(androidAppInstance.context);
+        com.google.android.gms.location.LocationServices.getFusedLocationProviderClient(Application.android.context);
 }
 
-androidAppInstance.on(AndroidApplication.activityResultEvent, function (args: any) {
+Application.android.on(AndroidApplication.activityResultEvent, function (args: any) {
     if (args.requestCode === REQUEST_ENABLE_LOCATION) {
         if (args.resultCode === 0) {
             if (_onEnableLocationFail) {
@@ -34,13 +33,13 @@ androidAppInstance.on(AndroidApplication.activityResultEvent, function (args: an
 });
 
 function isAirplaneModeOn(): boolean {
-    return android.provider.Settings.System.getInt(androidAppInstance.context.getContentResolver(),
+    return android.provider.Settings.System.getInt(Application.android.context.getContentResolver(),
         android.provider.Settings.System.AIRPLANE_MODE_ON) !== 0;
 }
 
 function isProviderEnabled(provider: string): boolean {
     try {
-        const locationManager: android.location.LocationManager = (<android.content.Context>androidAppInstance.context)
+        const locationManager: android.location.LocationManager = (<android.content.Context>Application.android.context)
             .getSystemService(android.content.Context.LOCATION_SERVICE);
         return locationManager.isProviderEnabled(provider);
     } catch (ex) {
@@ -115,7 +114,7 @@ function _getLocationRequest(options: Options): any {
     if (options.updateDistance) {
         mLocationRequest.setSmallestDisplacement(options.updateDistance);
     }
-    if (options.desiredAccuracy === Accuracy.high) {
+    if (options.desiredAccuracy === Enums.Accuracy.high) {
         mLocationRequest.setPriority(com.google.android.gms.location.LocationRequest.PRIORITY_HIGH_ACCURACY);
     } else {
         mLocationRequest.setPriority(com.google.android.gms.location.LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
@@ -178,7 +177,7 @@ export function watchLocation(successCallback: successCallbackType, errorCallbac
 
     if (!attachedForErrorHandling) {
         attachedForErrorHandling = true;
-        applicationOn(uncaughtErrorEvent, errorHandler.bind(this));
+        Application.on(Application.uncaughtErrorEvent, errorHandler.bind(this));
     }
 
     let locationRequest = _getLocationRequest(options);
@@ -215,7 +214,7 @@ export function enableLocationRequest(always?: boolean): Promise<void> {
                                 // on REQUEST_ENABLE_LOCATION Activity Result
                                 _onEnableLocationSuccess = resolve;
                                 _onEnableLocationFail = reject;
-                                return ex.startResolutionForResult(androidAppInstance.foregroundActivity, REQUEST_ENABLE_LOCATION);
+                                return ex.startResolutionForResult(Application.android.foregroundActivity, REQUEST_ENABLE_LOCATION);
                             } catch (sendEx) {
                                 // Ignore the error.
                                 return resolve();
@@ -240,7 +239,7 @@ function _makeGooglePlayServicesAvailable(): Promise<void> {
             return;
         }
         let googleApiAvailability = com.google.android.gms.common.GoogleApiAvailability.getInstance();
-        googleApiAvailability.makeGooglePlayServicesAvailable(androidAppInstance.foregroundActivity)
+        googleApiAvailability.makeGooglePlayServicesAvailable(Application.android.foregroundActivity)
             .addOnSuccessListener(_getTaskSuccessListener(resolve))
             .addOnFailureListener(_getTaskFailListener(reject));
     });
@@ -253,7 +252,7 @@ function _isGooglePlayServicesAvailable(): boolean {
 
     let isLocationServiceEnabled = true;
     let googleApiAvailability = com.google.android.gms.common.GoogleApiAvailability.getInstance();
-    let resultCode = googleApiAvailability.isGooglePlayServicesAvailable(androidAppInstance.context);
+    let resultCode = googleApiAvailability.isGooglePlayServicesAvailable(Application.android.context);
     if (resultCode !== com.google.android.gms.common.ConnectionResult.SUCCESS) {
         isLocationServiceEnabled = false;
     }
@@ -268,12 +267,12 @@ function _isLocationServiceEnabled(options?: Options): Promise<boolean> {
             return;
         }
 
-        options = options || { desiredAccuracy: Accuracy.high, updateTime: 0, updateDistance: 0, maximumAge: 0, timeout: 0 };
+        options = options || { desiredAccuracy: Enums.Accuracy.high, updateTime: 0, updateDistance: 0, maximumAge: 0, timeout: 0 };
         let locationRequest = _getLocationRequest(options);
         let locationSettingsBuilder = new com.google.android.gms.location.LocationSettingsRequest.Builder();
         locationSettingsBuilder.addLocationRequest(locationRequest);
         locationSettingsBuilder.setAlwaysShow(true);
-        let locationSettingsClient = com.google.android.gms.location.LocationServices.getSettingsClient(androidAppInstance.context);
+        let locationSettingsClient = com.google.android.gms.location.LocationServices.getSettingsClient(Application.android.context);
         locationSettingsClient.checkLocationSettings(locationSettingsBuilder.build())
             .addOnSuccessListener(_getTaskSuccessListener(resolve))
             .addOnFailureListener(_getTaskFailListener(reject));

src/geolocation.ios.ts

@@ -1,6 +1,5 @@
-import { Accuracy } from "tns-core-modules/ui/enums";
-import { setTimeout, clearTimeout } from "tns-core-modules/timer";
-import { on as applicationOn, uncaughtErrorEvent, UnhandledErrorEventData } from "tns-core-modules/application";
+import { Enums, Device, Application, UnhandledErrorEventData} from "@nativescript/core";
+import { setTimeout, clearTimeout } from "@nativescript/core/timer";
 
 import {
     LocationBase,
@@ -12,13 +11,13 @@ import {
     successCallbackType,
     errorCallbackType
 } from "./location-monitor";
-import * as Platform from "platform";
 
 const locationManagers = {};
 const locationListeners = {};
 let watchId = 0;
 let attachedForErrorHandling = false;
 
+@NativeClass
 class LocationListenerImpl extends NSObject implements CLLocationManagerDelegate {
     public static ObjCProtocols = [CLLocationManagerDelegate]; // tslint:disable-line:variable-name
 
@@ -140,7 +139,7 @@ function errorHandler(errData: UnhandledErrorEventData) {
 }
 
 function getVersionMaj () {
-    return parseInt(Platform.device.osVersion.split(".")[0]);
+    return parseInt(Device.osVersion.split(".")[0]);
 }
 
 // options - desiredAccuracy, updateDistance, minimumUpdateTime, maximumAge, timeout
@@ -184,7 +183,7 @@ export function getCurrentLocation(options: Options): Promise<Location> {
                             return;
                         }
 
-                        if (options.desiredAccuracy !== Accuracy.any && !initLocation) {
+                        if (options.desiredAccuracy !== Enums.Accuracy.any && !initLocation) {
                             // regardless of desired accuracy ios returns first location as quick as possible even if not as accurate as requested
                             initLocation = location;
                             return;
@@ -223,7 +222,7 @@ export function watchLocation(successCallback: successCallbackType,
     options: Options): number {
     if (!attachedForErrorHandling) {
         attachedForErrorHandling = true;
-        applicationOn(uncaughtErrorEvent, errorHandler.bind(this));
+        Application.on(Application.uncaughtErrorEvent, errorHandler.bind(this));
     }
 
     let zonedSuccessCallback = (<any>global).zonedCallback(successCallback);
@@ -359,7 +358,7 @@ export class LocationMonitor {
     static createiOSLocationManager(locListener: any, options: Options): CLLocationManager {
         let iosLocManager = new CLLocationManager();
         iosLocManager.delegate = locListener;
-        iosLocManager.desiredAccuracy = options ? options.desiredAccuracy : Accuracy.high;
+        iosLocManager.desiredAccuracy = options ? options.desiredAccuracy : Enums.Accuracy.high;
         iosLocManager.distanceFilter = options ? options.updateDistance : minRangeUpdate;
         locationManagers[locListener.id] = iosLocManager;
         locationListeners[locListener.id] = locListener;
@@ -384,7 +383,7 @@ function getIOSLocationManager(locListener: any, options: Options): CLLocationMa
         let manager = new iosLocationManager();
 
         manager.delegate = locListener;
-        manager.desiredAccuracy = options ? options.desiredAccuracy : Accuracy.high;
+        manager.desiredAccuracy = options ? options.desiredAccuracy : Enums.Accuracy.high;
         manager.distanceFilter = options ? options.updateDistance : minRangeUpdate;
 
         locationManagers[locListener.id] = manager;

src/package.json

@@ -6,8 +6,8 @@
     "typings": "index.d.ts",
     "nativescript": {
         "platforms": {
-            "android": "4.0.0",
-            "ios": "4.0.0"
+            "android": "7.0.0",
+            "ios": "7.0.0"
         }
     },
     "scripts": {
@@ -38,9 +38,10 @@
     "homepage": "https://github.com/NativeScript/nativescript-geolocation",
     "readmeFilename": "README.md",
     "devDependencies": {
-        "tns-core-modules": "^5.0.0",
-        "tns-platform-declarations": "^5.0.0",
-        "typescript": "~3.1.6",
+        "@nativescript/core": "7.0.0",
+        "@nativescript/types": "7.0.0",
+        "@nativescript/webpack": "~3.0.0",
+        "typescript": "~3.9.0",
         "prompt": "~1.0.0",
         "rimraf": "~2.6.2",
         "tslint": "~5.11.0"

src/references.d.ts

@@ -1,2 +1 @@
-/// <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/types/index.d.ts" />

src/tsconfig.json

@@ -1,7 +1,8 @@
 {
     "compilerOptions": {
-        "target": "es5",
-        "module": "commonjs",
+        "target": "ES2017",
+        "module": "esnext",
+        "moduleResolution": "node",
         "declaration": false,
         "removeComments": true,
         "preserveConstEnums": true,