react-native-radar 3.8.4 → 3.8.6

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.8.2'
+        versionName '3.8.7'
     }
     lintOptions {
         abortOnError false
@@ -45,5 +45,5 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.8.5'
+    api 'io.radar:sdk:3.8.7'
 }

package/android/src/main/java/io/radar/react/RNRadarModule.java

@@ -78,9 +78,13 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void initialize(String publishableKey) {
-        Radar.initialize(getReactApplicationContext(), publishableKey);
-        Radar.setReceiver(receiver);
+    public void initialize(String publishableKey, boolean fraud) {
+        if (fraud) {
+            Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
+        } else {
+            Radar.initialize(getReactApplicationContext(), publishableKey);
+            Radar.setReceiver(receiver);
+        }
     }
 
     @ReactMethod
@@ -373,6 +377,34 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         });
     }
 
+    @ReactMethod
+    public void trackVerifiedToken(final Promise promise) {
+        Radar.trackVerifiedToken(new Radar.RadarTrackTokenCallback() {
+            @Override
+            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable String token) {
+                if (promise == null) {
+                    return;
+                }
+
+                try {
+                    if (status == Radar.RadarStatus.SUCCESS) {
+                        WritableMap map = Arguments.createMap();
+                        map.putString("status", status.toString());
+                        if (token != null) {
+                            map.putString("token", token);
+                        }
+                        promise.resolve(map);
+                    } else {
+                        promise.reject(status.toString(), status.toString());
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "Exception", e);
+                    promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void startTrackingEfficient() {
         Radar.startTracking(RadarTrackingOptions.EFFICIENT);

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.8.4"
+github "radarlabs/radar-sdk-ios" "3.8.5"

package/ios/RNRadar.m

@@ -91,7 +91,7 @@ RCT_EXPORT_MODULE();
     }
 }
 
-RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey) {
+RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -319,6 +319,27 @@ RCT_EXPORT_METHOD(trackVerified:(RCTPromiseResolveBlock)resolve reject:(RCTPromi
     [Radar trackVerifiedWithCompletionHandler:completionHandler];
 }
 
+RCT_EXPORT_METHOD(trackVerifiedToken:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+        __block RCTPromiseResolveBlock resolver = resolve;
+        __block RCTPromiseRejectBlock rejecter = reject;
+
+       RadarTrackTokenCompletionHandler completionHandler = ^(RadarStatus status, NSString * _Nullable token) {
+        if (status == RadarStatusSuccess && resolver) {
+            NSMutableDictionary *dict = [NSMutableDictionary new];
+            [dict setObject:[Radar stringForStatus:status] forKey:@"status"];
+            if (token) {
+                [dict setObject:token forKey:@"token"];
+            }
+            resolver(dict);
+        } else if (rejecter) {
+            rejecter([Radar stringForStatus:status], [Radar stringForStatus:status], nil);
+        }
+        resolver = nil;
+        rejecter = nil;
+    }; 
+
+    [Radar trackVerifiedTokenWithCompletionHandler:completionHandler];
+}
 
 RCT_EXPORT_METHOD(startTrackingEfficient) {
     [Radar startTrackingWithOptions:RadarTrackingOptions.presetEfficient];

package/js/index.native.js

@@ -6,8 +6,8 @@ if (!NativeModules.RNRadar && (Platform.OS === 'ios' || Platform.OS === 'android
 
 const eventEmitter = new NativeEventEmitter(NativeModules.RNRadar);
 
-const initialize = (publishableKey) => {
-  NativeModules.RNRadar.initialize(publishableKey);
+const initialize = (publishableKey, fraud = false) => {
+  NativeModules.RNRadar.initialize(publishableKey, fraud);
 };
 
 const setLogLevel = (level) => {
@@ -70,6 +70,10 @@ const trackVerified = () => (
   NativeModules.RNRadar.trackVerified()
 );
 
+const trackVerifiedToken = () => (
+  NativeModules.RNRadar.trackVerifiedToken()
+);
+
 const startTrackingEfficient = () => (
   NativeModules.RNRadar.startTrackingEfficient()
 );
@@ -205,6 +209,7 @@ const Radar = {
   getLocation,
   trackOnce,
   trackVerified,
+  trackVerifiedToken,
   startTrackingEfficient,
   startTrackingResponsive,
   startTrackingContinuous,

package/js/index.web.js

@@ -91,6 +91,10 @@ const trackVerified = () => {
   // not implemented
 };
 
+const trackVerifiedToken = () => {
+  // not implemented
+};
+
 const startTrackingEfficient = () => {  
   // not implemented
 };
@@ -376,6 +380,7 @@ const Radar = {
   getLocation,
   trackOnce,
   trackVerified,
+  trackVerifiedToken,
   startTrackingEfficient,
   startTrackingResponsive,
   startTrackingContinuous,

package/js/ui/autocomplete.jsx

@@ -44,6 +44,7 @@ const autocompleteUI = ({ options = {} }) => {
   const timerRef = useRef(null);
   const textInputRef = useRef(null);
 
+
   const config = { ...defaultAutocompleteOptions, ...options };
   const style = config.style || {};
 
@@ -171,7 +172,7 @@ const autocompleteUI = ({ options = {} }) => {
       style.modalInputContainer
     ),
     resultList: StyleSheet.compose(defaultStyles.resultList, style.resultList),
-    resultItem: StyleSheet.compose(defaultStyles.resultItem, style.resultItem),
+    resultItem: StyleSheet.compose({...defaultStyles.resultItem, pressedBackgroundColor: '#F6FAFC'}, style.resultItem),
     addressContainer: StyleSheet.compose(
       defaultStyles.addressContainer,
       style.addressContainer

package/js/ui/map.jsx

@@ -66,17 +66,29 @@ const RadarMap = ({ mapOptions, children }) => {
     >
       <MapLibreGL.CircleLayer
         id="user-location-inner"
-        style={styles.userLocation.pulse}
+        style={{
+          circleRadius: 15,
+          circleColor: '#000257',
+          circleOpacity: 0.2,
+          circlePitchAlignment: 'map',
+        }}
       />
       <MapLibreGL.CircleLayer
         id="user-location-middle"
-        style={styles.userLocation.background}
+        style={{
+          circleRadius: 9,
+          circleColor: '#fff',
+          circlePitchAlignment: 'map',
+        }}
       />
       <MapLibreGL.CircleLayer
         id="user-location-outer"
-        style={styles.userLocation.foreground}
+        style={{
+          circleRadius: 6,
+          circleColor: '#000257',
+          circlePitchAlignment: 'map',
+        }}
       />
-
     </MapLibreGL.ShapeSource>
   );
 

package/js/ui/styles.js

@@ -62,7 +62,6 @@ const styles = StyleSheet.create({
     paddingHorizontal: 16,
     fontSize: 12,
     backgroundColor: 'white',
-    pressedBackgroundColor: '#F6FAFC',
   },
   addressContainer: {
     flexDirection: 'row',
@@ -121,24 +120,6 @@ const styles = StyleSheet.create({
     height: 50,
     resizeMode: 'contain',
   },
-  userLocation: {
-    pulse: {
-      circleRadius: 15,
-      circleColor: '#000257',
-      circleOpacity: 0.2,
-      circlePitchAlignment: 'map',
-    },
-    background: {
-      circleRadius: 9,
-      circleColor: '#fff',
-      circlePitchAlignment: 'map',
-    },
-    foreground: {
-      circleRadius: 6,
-      circleColor: '#000257',
-      circlePitchAlignment: 'map',
-    },
-  },
 });
 
 export default styles;

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.8.4",
+  "version": "3.8.6",
   "main": "js/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.8.4"
+  s.dependency "RadarSDK", "~> 3.8.5"
 end