react-native-radar 3.10.0 → 3.10.2-beta.1

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.10.0'
+        versionName '3.10.1'
     }
     lintOptions {
         abortOnError false

package/dist/package.json

@@ -3,7 +3,7 @@
     "description": "React Native module for Radar, the leading geofencing and location tracking platform",
     "homepage": "https://radar.com",
     "license": "Apache-2.0",
-    "version": "3.10.0",
+    "version": "3.10.2-beta.1",
     "main": "dist/src/index.js",
     "files": [
         "android",

package/dist/src/@types/types.d.ts

@@ -20,6 +20,8 @@ export interface RadarTrackingOptions {
     desiredAccuracy: RadarTrackingOptionsDesiredAccuracy;
     stopDuration: number;
     stopDistance: number;
+    rampUpRadius?: number;
+    rampedUpInterval?: number;
     sync: "all" | "stopsAndExits" | "none";
     replay: "all" | "stops" | "none";
     useStoppedGeofence: boolean;

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.9.6"
+github "radarlabs/radar-sdk-ios" "3.9.8"

package/ios/RNRadar.m

@@ -39,7 +39,7 @@ RCT_EXPORT_MODULE();
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"events", @"location", @"clientLocation", @"error", @"log"];
+    return @[@"events", @"location", @"clientLocation", @"error", @"log", @"token"];
 }
 
 - (void)startObserving {
@@ -238,7 +238,7 @@ RCT_EXPORT_METHOD(getLocation:(NSString *)desiredAccuracy resolve:(RCTPromiseRes
 
 RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     RadarTrackingOptionsDesiredAccuracy desiredAccuracy;
-    BOOL beaconsTrackingOption = NO;
+    BOOL beacons = NO;
     desiredAccuracy = RadarTrackingOptionsDesiredAccuracyMedium;
 
     __block RCTPromiseResolveBlock resolver = resolve;
@@ -292,23 +292,28 @@ RCT_EXPORT_METHOD(trackOnce:(NSDictionary *)optionsDict resolve:(RCTPromiseResol
             }
         }
         
-        BOOL beacons = optionsDict[@"beacons"];
-
-        if (beacons) {
-            beaconsTrackingOption = beacons;
+        NSNumber *beaconsNumber = optionsDict[@"beacons"];
+        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
+            beacons = [beaconsNumber boolValue]; 
         }
         
-        [Radar trackOnceWithDesiredAccuracy:desiredAccuracy beacons:beaconsTrackingOption completionHandler:completionHandler];
+        [Radar trackOnceWithDesiredAccuracy:desiredAccuracy beacons:beacons completionHandler:completionHandler];
     }
 }
 
 RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-        BOOL beaconsTrackingOption = NO;
+    BOOL beacons = NO;
+    if (optionsDict != nil) {
+        NSNumber *beaconsNumber = optionsDict[@"beacons"];
+        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
+            beacons = [beaconsNumber boolValue]; 
+        }
+    }
 
-        __block RCTPromiseResolveBlock resolver = resolve;
-        __block RCTPromiseRejectBlock rejecter = reject;
+    __block RCTPromiseResolveBlock resolver = resolve;
+    __block RCTPromiseRejectBlock rejecter = reject;
 
-       RadarTrackCompletionHandler completionHandler = ^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
+    RadarTrackCompletionHandler completionHandler = ^(RadarStatus status, CLLocation * _Nullable location, NSArray<RadarEvent *> * _Nullable events, RadarUser * _Nullable user) {
         if (status == RadarStatusSuccess && resolver) {
             NSMutableDictionary *dict = [NSMutableDictionary new];
             [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
@@ -329,19 +334,17 @@ RCT_EXPORT_METHOD(trackVerified:(NSDictionary *)optionsDict resolve:(RCTPromiseR
         rejecter = nil;
     };
 
-    if (optionsDict != nil) {
-        BOOL beacons = optionsDict[@"beacons"];
-
-        if (beacons) {
-            beaconsTrackingOption = beacons;
-        }
-    }
-
-    [Radar trackVerifiedWithBeacons:beaconsTrackingOption completionHandler:completionHandler];
+    [Radar trackVerifiedWithBeacons:beacons completionHandler:completionHandler];
 }
 
 RCT_EXPORT_METHOD(trackVerifiedToken:(NSDictionary *)optionsDict resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    BOOL beaconsTrackingOption = NO;
+    BOOL beacons = NO;
+    if (optionsDict != nil) {
+        NSNumber *beaconsNumber = optionsDict[@"beacons"];
+        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
+            beacons = [beaconsNumber boolValue]; 
+        }
+    }
 
     __block RCTPromiseResolveBlock resolver = resolve;
     __block RCTPromiseRejectBlock rejecter = reject;
@@ -360,16 +363,8 @@ RCT_EXPORT_METHOD(trackVerifiedToken:(NSDictionary *)optionsDict resolve:(RCTPro
         resolver = nil;
         rejecter = nil;
     };
-    
-    if (optionsDict != nil) {
-        BOOL beacons = optionsDict[@"beacons"];
-
-        if (beacons) {
-            beaconsTrackingOption = beacons;
-        }
-    }
 
-    [Radar trackVerifiedTokenWithBeacons:beaconsTrackingOption completionHandler:completionHandler];
+    [Radar trackVerifiedTokenWithBeacons:beacons completionHandler:completionHandler];
 }
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {
@@ -390,18 +385,18 @@ RCT_EXPORT_METHOD(startTrackingCustom:(NSDictionary *)optionsDict) {
 }
 
 RCT_EXPORT_METHOD(startTrackingVerified:(NSDictionary *)optionsDict) {
-    BOOL tokenTrackingOption = NO;
-    BOOL beaconTrackingOption = NO;
+    BOOL token = NO;
+    BOOL beacons = NO;
     double interval = 1;
 
     if (optionsDict != nil) {
-        BOOL token = optionsDict[@"token"];
-        if (token) {
-            tokenTrackingOption = token;
+        NSNumber *tokenNumber = optionsDict[@"token"];
+        if (tokenNumber != nil && [tokenNumber isKindOfClass:[NSNumber class]]) {
+            token = [tokenNumber boolValue]; 
         }
-        BOOL beacons = optionsDict[@"beacons"];
-        if (beacons) {
-            beaconTrackingOption = beacons;
+        NSNumber *beaconsNumber = optionsDict[@"beacons"];
+        if (beaconsNumber != nil && [beaconsNumber isKindOfClass:[NSNumber class]]) {
+            beacons = [beaconsNumber boolValue]; 
         }
         NSNumber *intervalNumber = optionsDict[@"interval"];
         if (intervalNumber != nil && [intervalNumber isKindOfClass:[NSNumber class]]) {
@@ -409,7 +404,7 @@ RCT_EXPORT_METHOD(startTrackingVerified:(NSDictionary *)optionsDict) {
         }
     }
 
-    [Radar startTrackingVerified:tokenTrackingOption interval:interval beacons:beaconTrackingOption];
+    [Radar startTrackingVerified:token interval:interval beacons:beacons];
 }
 
 RCT_EXPORT_METHOD(mockTracking:(NSDictionary *)optionsDict) {

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "3.10.0",
+  "version": "3.10.2-beta.1",
   "main": "dist/src/index.js",
   "files": [
     "android",

package/react-native-radar.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.platform = :ios, "10.0"
 
   s.dependency "React"
-  s.dependency "RadarSDK", "~> 3.9.6"
+  s.dependency "RadarSDK", "~> 3.9.8"
 end

package/src/@types/types.ts

@@ -23,6 +23,8 @@ export interface RadarTrackingOptions {
   desiredAccuracy: RadarTrackingOptionsDesiredAccuracy;
   stopDuration: number;
   stopDistance: number;
+  rampUpRadius?: number;
+  rampedUpInterval?: number;
   sync: "all" | "stopsAndExits" | "none";
   replay: "all" | "stops" | "none";
   useStoppedGeofence: boolean;