Merge branch 'refactor-api'

christocracy · christocracy · commit 324581c62ae3 · 2016-10-17T14:07:59.000-04:00
diff --git a/README.md b/README.md
@@ -35,26 +35,54 @@ $ tns plugin add /path/to/nativescript-background-geolocation-lt
 
 ## iOS Setup
 
-Since iOS is more strict with apps running in the background, this plugin includes the dependency [nativescript-background-fetch](https://github.com/transistorsoft/nativescript-background-fetch) (also created by [Transistor Software](http://transistorsoft.com)).  This plugin automatically awakens a suspended app in the background, providing *exactly* 30s of running-time.  Actually implementing **`background-fetch`** in your application code is **optional** -- `background-geolocation` uses it automatically under-the-hood for its own purposes.  However, you **must** perform the plugin's [setup process](https://github.com/transistorsoft/nativescript-background-fetch#setup) in your **`app.ts`**:
+Since iOS is more strict with apps running in the background, this plugin requires you install [nativescript-background-fetch](https://github.com/transistorsoft/nativescript-background-fetch) (also created by [Transistor Software](http://transistorsoft.com)).  This plugin automatically awakens a suspended app in the background, providing *exactly* 30s of running-time.  Actually implementing **`background-fetch`** in your application code is **optional** -- `background-geolocation` uses it automatically under-the-hood for its own purposes.  However, you **must** perform the plugin's [setup process](https://github.com/transistorsoft/nativescript-background-fetch#setup) in your **`app.ts`**:
 
 **`app.ts`**
 ```diff
-import application = require("application");
+import * as app from 'application';
 
-+ if (application.ios) {
-+  class MyDelegate extends UIResponder {
-+    public static ObjCProtocols = [UIApplicationDelegate];      
++import {BackgroundFetch} from "nativescript-background-fetch";
+
++if (app.ios) {
++  class MyDelegate extends UIResponder implements UIApplicationDelegate {
++    public static ObjCProtocols = [UIApplicationDelegate];
 +      // BackgroundFetch delegate method
-+      public applicationPerformFetchWithCompletionHandler(application: UIApplication, completionHandler:any) {
-+        TSBackgroundFetch.sharedInstance().performFetchWithCompletionHandler(completionHandler);
++      public applicationPerformFetchWithCompletionHandler(application: any, completionHandler:any) {
++        BackgroundFetch.performFetchWithCompletionHandler(completionHandler);
 +      }
 +    }
-+    application.ios.delegate = MyDelegate;
-+}    
++    app.ios.delegate = MyDelegate;
++}
+
+app.start({ moduleName: 'main-page' });
+```
 
-application.start({ moduleName: "main-page" });
+**NOTE** If your build fails with the following errors:
+```
+app/app.ts(6,28): error TS2304: Cannot find name 'UIResponder'.
+app/app.ts(6,51): error TS2304: Cannot find name 'UIApplicationDelegate'.
+app/app.ts(7,36): error TS2304: Cannot find name 'UIApplicationDelegate'.
 ```
 
+This is because your app hasn't loaded the ios platform-declarations.  You can either load those (if you know how ;)) or simply configure your `tsconfig.json` to ignore errors:
+
+```diff
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "sourceMap": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "noEmitHelpers": true,
++        "noEmitOnError": false
+    },
+    "exclude": [
+        "node_modules",
+        "platforms"
+    ]
+}
+```
 
 ## Demo app
 The plugin hosts its own demo app in the `/demo` folder.  Install it like this:
diff --git a/background-geolocation.ios.d.ts b/background-geolocation.ios.d.ts
@@ -58,6 +58,7 @@ export declare class BackgroundGeolocation extends AbstractBackgroundGeolocation
     private static onActivityChange(activityName);
     private static onProviderChange(status);
     private static onSchedule(schedule);
+    private static getAdapter();
     private static getLocationManager();
     private static getJsObjectFromNSDictionary(dictionary);
     private static getJsArrayFromNSArray(array);
diff --git a/background-geolocation.ios.ts b/background-geolocation.ios.ts
@@ -418,6 +418,9 @@ export class BackgroundGeolocation extends AbstractBackgroundGeolocation {
     }
   }
 
+  private static getAdapter() {
+
+  }
   private static getLocationManager() {
     if (!this.locationManager) {
       this.locationManager = TSLocationManager.sharedInstance();
diff --git a/demo/app/app.ts b/demo/app/app.ts
@@ -1,4 +1,5 @@
 ﻿import * as application from "application";
+import {BackgroundFetch} from "nativescript-background-fetch";
 
 if(application.ios) {
   GMSServices.provideAPIKey("AIzaSyAttgr9w-Wwu4TWkeMAPsYwaYvH2ibSPjQ");
@@ -14,18 +15,16 @@ TNSFontIcon.loadCss();
 application.resources['fonticon'] = fonticon;
 
 if (application.ios) {
-	class MyDelegate extends UIResponder {
+	class MyDelegate extends UIResponder implements UIApplicationDelegate {
 		public static ObjCProtocols = [UIApplicationDelegate];
 
 	  public applicationPerformFetchWithCompletionHandler(application: UIApplication, completionHandler:any) {
 	    console.log('- AppDelegate Rx Fetch event');
-	    var fetchManager = TSBackgroundFetch.sharedInstance();
-	    fetchManager.performFetchWithCompletionHandler(completionHandler);
+	    BackgroundFetch.performFetchWithCompletionHandler(completionHandler);
 	  }
 	}
 	application.ios.delegate = MyDelegate;
 }
 
-
 application.start({ moduleName: "./pages/map/map-page" });
 
diff --git a/demo/app/pages/map/map-view-model.ts b/demo/app/pages/map/map-view-model.ts
@@ -216,13 +216,9 @@ export class MapModel extends observable.Observable {
   public onMapReady(args) {
     this._mapView = args.object;
 
-    console.log('<<<<<<<<<<<<<< onMapReady >>>>>>>>>>>>>>>');
-
     // If _state already exists, we're probably returning from a navigation-event.  just ignore: we're already configured.
     if (this._state) { return };
 
-    console.log('<<<<<<<<<<<<<<<<< configure >>>>>>>>>>>>>>>>>');
-
     // Listen to BackgroundGeolocation events
     BackgroundGeolocation.on('location', this.onLocation.bind(this), this.onLocationError.bind(this));
     BackgroundGeolocation.on('motionchange', this.onMotionChange.bind(this));
@@ -241,21 +237,6 @@ export class MapModel extends observable.Observable {
       this._enabled = state.enabled;
       this.notifyPropertyChange("isEnabled", state.enabled);
       this._isMoving  = this._state.isMoving;
-
-      BackgroundGeolocation.getLog(function(log) {
-        console.log('------------ log: ', log.length);
-
-        BackgroundGeolocation.destroyLog();
-        BackgroundGeolocation.getCount(function(count) {
-          console.log('-------- count: ', count);
-          BackgroundGeolocation.destroyLocations();
-        });
-
-        BackgroundGeolocation.getGeofences(function(geofences) {
-          console.log('---------- geofences: ', geofences.length);
-          BackgroundGeolocation.removeGeofences();
-        });
-      });
     }.bind(this));
   }
 
diff --git a/demo/package.json b/demo/package.json
@@ -8,14 +8,15 @@
   },
   "nativescript": {
     "id": "com.transistorsoft.backgroundgeolocation.nativescript",
-    "tns-android": {
-      "version": "2.1.0"
-    },
     "tns-ios": {
       "version": "2.3.0"
+    },
+    "tns-android": {
+      "version": "2.1.1"
     }
   },
   "dependencies": {
+    "nativescript-background-fetch": "^1.0.2",
     "nativescript-background-geolocation-lt": "file:..",
     "nativescript-fonticon": "^1.1.0",
     "nativescript-google-maps-sdk": "^1.3.13",
@@ -31,4 +32,4 @@
     "nativescript-dev-typescript": "^0.3.2",
     "typescript": "^1.8.10"
   }
-}
+}
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
@@ -6,6 +6,7 @@
         "target": "es5",
         "experimentalDecorators": true,
         "noEmitHelpers": true,
+        "noEmitOnError": false,
         "inlineSourceMap": true,
         "removeComments": false,
         "emitDecoratorMetadata": true
@@ -14,4 +15,4 @@
         "node_modules",
         "platforms"
     ]
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-background-geolocation-lt",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Sophisticated, battery-conscious, cross-platform background-geolocation with motion-detection and geofencing",
   "main": "background-geolocation.js",
   "typings": "background-geolocation.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,9 @@ export class BackgroundGeolocation extends AbstractBackgroundGeolocation {`
`418`	`418`	`}`
`419`	`419`	`}`
`420`	`420`
	`421`	`+ private static getAdapter() {`
	`422`	`+`
	`423`	`+ }`
`421`	`424`	`private static getLocationManager() {`
`422`	`425`	`if (!this.locationManager) {`
`423`	`426`	`this.locationManager = TSLocationManager.sharedInstance();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-background-geolocation-lt",`
`3`		`- "version": "1.2.2",`
	`3`	`+ "version": "1.2.3",`
`4`	`4`	`"description": "Sophisticated, battery-conscious, cross-platform background-geolocation with motion-detection and geofencing",`
`5`	`5`	`"main": "background-geolocation.js",`
`6`	`6`	`"typings": "background-geolocation.d.ts",`