Support typescript, Update compile versions, Fix errors

.gitignore

@@ -37,6 +37,7 @@ local.properties
 #
 node_modules/
 npm-debug.log
+package-lock.json
 
 # BUCK
 buck-out/

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Asser Data S/A
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -2,43 +2,64 @@
 
 React Native pedometer support for iOS version 8.0 and higher and Android. The module is CMPedometer wrapper. More info about CMPedometer can be found in https://developer.apple.com/library/ios/documentation/CoreMotion/Reference/CMPedometer_class/
 
-## Basic usage
+#### _Note_
+
+- Currently typescript is supported.
+
+### Installation
+
+1. `npm install --save @JWWon/react-native-universal-pedometer`
+
+> or `yarn add JWWon/react-native-universal-pedometer`
+
+2. `react-native link @JWWon/react-native-universal-pedometer`
+
+> It will automatically do all necessary settings
+
+##### iOS Configuration
+
+add **NSMotionUsageDescription** on `ios/<your-project>/info.plist`
+
+```
+// info.plist
+<dict>
+	...
+	<key>NSMotionUsageDescription</key>
+	<string></string>
+</dict>
+```
+
+### General Usage
+
+```js
+import Pedometer from '@JWWon/react-native-universal-pedometer';
+```
+
+or
 
 ```js
-// Import the react-native-pedometer module
-import Pedometer from 'react-native-universal-pedometer';
-
-// determine pedometer availability
-Pedometer.isStepCountingAvailable((error, isAvailable) => {
-  // do something
-});
-
-Pedometer.isDistanceAvailable((error, isAvailable) => {
-  // do something
-});
-
-Pedometer.isFloorCountingAvailable((error, isAvailable) => {
-  // do something
-});
-
-Pedometer.isCadenceAvailable((error, isAvailable) => {
-  // do something
-});
-
-// start tracking from current time
-const now = new Date();
-Pedometer.startPedometerUpdatesFromDate(now.getTime(), (pedometerData) => {
-  // do something with pedometer data
-});
-
-// query pedometer data from selected date to other selected date
-const startDate = new Date();
-startDate.setHours(0,0,0,0);
-const endDate = new Date();
-Pedometer.queryPedometerDataBetweenDates(startDate.getTime(), endDate.getTime(), (pedometerData) => {
-  // do something with pedometer data
-});
-
-// stop pedometer updates
-Pedometer.stopPedometerUpdates();
+var Pedometer = require('@JWWon/react-native-universal-pedometer');
 ```
+
+### Methods
+
+| Method Name                      | Arguments                                                    | Notes                                                        |
+| -------------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| `isStepCountingAvailable`        | callback: `Callback`                                         |                                                              |
+| `isDistanceAvailable`            | callback: `Callback`                                         |                                                              |
+| `isFloorCountingAvailable`       | callback: `Callback`                                         |                                                              |
+| `isPaceAvailable`                | callback: `Callback`                                         |                                                              |
+| `isCadenceAvailable`             | callback: `Callback`                                         |                                                              |
+| `startPedometerUpdatesFromDate`  | date: `Date.getTime()`, listener: `Listener`                 | start tracking from current time                             |
+| `queryPedometerDataBetweenDates` | startDate: `Date.getTime()`, endDate: `Date.getTime()`, listener: `Listener` | query pedometer data from selected date to other selected date |
+| `stopPedometerUpdates`           |                                                              | stop pedometer updates                                       |
+
+### Types
+
+| Type Name                 | Interface                                                    |
+| ------------------------- | ------------------------------------------------------------ |
+| `PedometerInterface`      | `{ startDate: nubmer; endDate: number; numberOfSteps: number; distance: number; }` |
+| `PedometerErrorInterface` | `{ code: number; message: string; }`                         |
+| `Callback`                | `(error: string or null, avaliable: boolean) => any`         |
+| `Listener`                | `(data: PedometerInterface or PedometerErrorInterface) => any` |
+

android/build.gradle

@@ -1,14 +1,17 @@
 apply plugin: 'com.android.library'
 
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion safeExtGet('compileSdkVersion', 27)
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 27)
+        versionCode 2
+        versionName "1.0.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -19,5 +22,5 @@ android {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:+'
+    implementation 'com.facebook.react:react-native:+'
 }

index.d.ts

@@ -0,0 +1,28 @@
+export interface PedometerInterface {
+  startDate: number;
+  endDate: number;
+  numberOfSteps: number;
+  distance: number;
+}
+
+export interface PedometerErrorInterface {
+  code: number;
+  message: string;
+}
+
+type Callback = (error: string | null, available: boolean) => any;
+
+type Listener = (data: PedometerInterface | PedometerErrorInterface) => any;
+
+declare const _default: {
+  isStepCountingAvailable: (callback: Callback) => void;
+  isDistanceAvailable: (callback: Callback) => void;
+  isFloorCountingAvailable: (callback: Callback) => void;
+  isPaceAvailable: (callback: Callback) => void;
+  isCadenceAvailable: (callback: Callback) => void;
+  startPedometerUpdatesFromDate: (date: number, listener: Listener) => void;
+  queryPedometerDataBetweenDates: (startDate: number, endDate: number, listener: Listener) => void;
+  stopPedometerUpdates: () => void;
+};
+
+export default _default;

index.js

@@ -1,57 +1,42 @@
 'use strict';
 
-import {NativeModules, NativeEventEmitter} from 'react-native';
+import { NativeEventEmitter, NativeModules } from 'react-native';
 
-const {BMDPedometer} = NativeModules;
+const { BMDPedometer } = NativeModules;
 
-const EventEmitter = new NativeEventEmitter(BMDPedometer);
-let subscription;
-let stepsSubscription;
+const PedometerEmitter = new NativeEventEmitter(BMDPedometer);
 
 export default {
-    isStepCountingAvailable: callback => {
-        BMDPedometer.isStepCountingAvailable(callback);
-    },
-
-    isDistanceAvailable: callback => {
-        BMDPedometer.isDistanceAvailable(callback);
-    },
-
-    isFloorCountingAvailable: callback => {
-        BMDPedometer.isFloorCountingAvailable(callback);
-    },
-
-    isCadenceAvailable: callback => {
-        BMDPedometer.isCadenceAvailable(callback);
-    },
-
-    startPedometerUpdatesFromDate: (date, handler) => {
-        BMDPedometer.startPedometerUpdatesFromDate(date);
-
-        subscription = EventEmitter.addListener('pedometerDataDidUpdate', handler);
-    },
-
-    startStepsDetection: (handler) => {
-        BMDPedometer.startStepsDetection();
-
-        stepsSubscription = EventEmitter.addListener('pedometerWasStep', handler);
-    },
-
-
-
-    queryPedometerDataBetweenDates: (startDate, endDate, handler) => {
-        BMDPedometer.queryPedometerDataBetweenDates(startDate, endDate, handler);
-    },
-
-    stopPedometerUpdates: () => {
-        BMDPedometer.stopPedometerUpdates();
-
-        if (subscription) {
-            subscription.remove();
-        }
-
-        if (stepsSubscription) {
-            stepsSubscription.remove();
-        }
-    }
+  isStepCountingAvailable: callback => {
+    BMDPedometer.isStepCountingAvailable(callback);
+  },
+
+  isDistanceAvailable: callback => {
+    BMDPedometer.isDistanceAvailable(callback);
+  },
+
+  isFloorCountingAvailable: callback => {
+    BMDPedometer.isFloorCountingAvailable(callback);
+  },
+
+  isPaceAvailable: callback => {
+    BMDPedometer.isPaceAvailable(callback);
+  },
+
+  isCadenceAvailable: callback => {
+    BMDPedometer.isCadenceAvailable(callback);
+  },
+
+  startPedometerUpdatesFromDate: (date, listener) => {
+    BMDPedometer.startPedometerUpdatesFromDate(date);
+    PedometerEmitter.addListener('pedometerDataDidUpdate', listener);
+  },
+
+  queryPedometerDataBetweenDates: (startDate, endDate, listener) => {
+    BMDPedometer.queryPedometerDataBetweenDates(startDate, endDate, listener);
+  },
+
+  stopPedometerUpdates: () => {
+    BMDPedometer.stopPedometerUpdates();
+  }
 };

ios/BMDPedometer.xcodeproj/project.pbxproj

@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		43D42B5F203B089B00EC7462 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D42B5E203B089B00EC7462 /* CoreMotion.framework */; };
 		43D42B61203B08AA00EC7462 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43D42B60203B08AA00EC7462 /* CoreLocation.framework */; };
-		43D42B77203B2CB600EC7462 /* SOStepDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D42B75203B2CB600EC7462 /* SOStepDetector.m */; };
 		844442DC1CB01D4A00E10B29 /* BMDPedometer.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 844442DB1CB01D4A00E10B29 /* BMDPedometer.h */; };
 		844442DE1CB01D4A00E10B29 /* BMDPedometer.m in Sources */ = {isa = PBXBuildFile; fileRef = 844442DD1CB01D4A00E10B29 /* BMDPedometer.m */; };
 /* End PBXBuildFile section */
@@ -31,8 +30,6 @@
 /* Begin PBXFileReference section */
 		43D42B5E203B089B00EC7462 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
 		43D42B60203B08AA00EC7462 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		43D42B75203B2CB600EC7462 /* SOStepDetector.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOStepDetector.m; sourceTree = "<group>"; };
-		43D42B76203B2CB600EC7462 /* SOStepDetector.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOStepDetector.h; sourceTree = "<group>"; };
 		844442D81CB01D4A00E10B29 /* libBMDPedometer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBMDPedometer.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		844442DB1CB01D4A00E10B29 /* BMDPedometer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BMDPedometer.h; sourceTree = "<group>"; };
 		844442DD1CB01D4A00E10B29 /* BMDPedometer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BMDPedometer.m; sourceTree = "<group>"; };
@@ -88,8 +85,6 @@
 		844442DA1CB01D4A00E10B29 /* BMDPedometer */ = {
 			isa = PBXGroup;
 			children = (
-				43D42B76203B2CB600EC7462 /* SOStepDetector.h */,
-				43D42B75203B2CB600EC7462 /* SOStepDetector.m */,
 				844442DB1CB01D4A00E10B29 /* BMDPedometer.h */,
 				844442DD1CB01D4A00E10B29 /* BMDPedometer.m */,
 			);
@@ -154,7 +149,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				844442DE1CB01D4A00E10B29 /* BMDPedometer.m in Sources */,
-				43D42B77203B2CB600EC7462 /* SOStepDetector.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/BMDPedometer/BMDPedometer.h

@@ -1,8 +1,8 @@
 #import <Foundation/Foundation.h>
+#import <CoreMotion/CoreMotion.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
-#import "SOStepDetector.h"
 
 @interface BMDPedometer : RCTEventEmitter<RCTBridgeModule>
-
+@property (nonatomic, readonly) CMPedometer *pedometer;
 @end