react-native-radar 3.18.1-beta.1 → 3.18.2

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.18.1-beta.1'
+        versionName '3.18.2'
     }
     lintOptions {
         abortOnError false
@@ -45,6 +45,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.18.0'
+    api 'io.radar:sdk:3.18.3'
 }
 

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

@@ -96,7 +96,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "3.18.1-beta.1");
+        editor.putString("x_platform_sdk_version", "3.18.2");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
@@ -782,12 +782,12 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
     }
 
     @ReactMethod
-    public void getContext(final Promise promise) {
+    public void getContext(@Nullable ReadableMap locationMap, final Promise promise) {
         if (promise == null) {
             return;
         }
 
-        Radar.getContext(new Radar.RadarContextCallback() {
+        Radar.RadarContextCallback callback = new Radar.RadarContextCallback() {
             @Override
             public void onComplete(@NonNull Radar.RadarStatus status, @Nullable Location location, @Nullable RadarContext context) {
                 if (status == Radar.RadarStatus.SUCCESS) {
@@ -809,44 +809,18 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
                     promise.reject(status.toString(), status.toString());
                 }
             }
-        });
-    }
+        };
 
-    @ReactMethod
-    public void getContext(ReadableMap locationMap, final Promise promise) {
-        if (promise == null) {
-            return;
+        if (locationMap == null) {
+            Radar.getContext(callback);
+        } else {
+            double latitude = locationMap.getDouble("latitude");
+            double longitude = locationMap.getDouble("longitude");
+            Location location = new Location("RNRadarModule");
+            location.setLatitude(latitude);
+            location.setLongitude(longitude);
+            Radar.getContext(location, callback);
         }
-
-        double latitude = locationMap.getDouble("latitude");
-        double longitude = locationMap.getDouble("longitude");
-        Location location = new Location("RNRadarModule");
-        location.setLatitude(latitude);
-        location.setLongitude(longitude);
-
-        Radar.getContext(location, new Radar.RadarContextCallback() {
-            @Override
-            public void onComplete(@NonNull Radar.RadarStatus status, @Nullable Location location, @Nullable RadarContext context) {
-                if (status == Radar.RadarStatus.SUCCESS) {
-                    try {
-                        WritableMap map = Arguments.createMap();
-                        map.putString("status", status.toString());
-                        if (location != null) {
-                            map.putMap("location", RNRadarUtils.mapForJson(Radar.jsonForLocation(location)));
-                        }
-                        if (context != null) {
-                            map.putMap("context", RNRadarUtils.mapForJson(context.toJson()));
-                        }
-                        promise.resolve(map);
-                    } catch (JSONException e) {
-                        Log.e(TAG, "JSONException", e);
-                        promise.reject(Radar.RadarStatus.ERROR_SERVER.toString(), Radar.RadarStatus.ERROR_SERVER.toString());
-                    }
-                } else {
-                    promise.reject(status.toString(), status.toString());
-                }
-            }
-        });
     }
 
     @ReactMethod

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

@@ -365,6 +365,10 @@ export interface RadarGeofence {
     geometryRadius?: number;
     geometryCenter?: RadarCoordinate;
     coordinates?: number[][];
+    operatingHours?: RadarOperatingHours;
+}
+export interface RadarOperatingHours {
+    [day: string]: string[][];
 }
 export interface RadarBeacon {
     _id: string;

package/dist/ui/styles.d.ts

@@ -1,2 +1,172 @@
 export default styles;
-declare const styles: any;
+declare namespace styles {
+    namespace container {
+        let width: "100%";
+        let height: "100%";
+        let alignItems: "center";
+        let paddingTop: number;
+    }
+    namespace inputContainer {
+        export let flexDirection: "row";
+        let alignItems_1: "center";
+        export { alignItems_1 as alignItems };
+        export let marginHorizontal: number;
+        export let backgroundColor: string;
+        export let borderRadius: number;
+        export let borderColor: string;
+        export let borderWidth: number;
+        let width_1: "95%";
+        export { width_1 as width };
+    }
+    namespace modalInputContainer {
+        let flexDirection_1: "row";
+        export { flexDirection_1 as flexDirection };
+        let alignItems_2: "center";
+        export { alignItems_2 as alignItems };
+        let marginHorizontal_1: number;
+        export { marginHorizontal_1 as marginHorizontal };
+        let backgroundColor_1: string;
+        export { backgroundColor_1 as backgroundColor };
+        let borderRadius_1: number;
+        export { borderRadius_1 as borderRadius };
+        let borderColor_1: string;
+        export { borderColor_1 as borderColor };
+        let borderWidth_1: number;
+        export { borderWidth_1 as borderWidth };
+    }
+    namespace inputIcon {
+        export let marginLeft: number;
+        let height_1: number;
+        export { height_1 as height };
+        let width_2: number;
+        export { width_2 as width };
+        let backgroundColor_2: string;
+        export { backgroundColor_2 as backgroundColor };
+    }
+    namespace closeIcon {
+        export let marginRight: number;
+        let height_2: number;
+        export { height_2 as height };
+        let width_3: number;
+        export { width_3 as width };
+        let backgroundColor_3: string;
+        export { backgroundColor_3 as backgroundColor };
+    }
+    namespace input {
+        export let flex: number;
+        let backgroundColor_4: string;
+        export { backgroundColor_4 as backgroundColor };
+        let height_3: number;
+        export { height_3 as height };
+        export let fontSize: number;
+        export let paddingHorizontal: number;
+        let borderRadius_2: number;
+        export { borderRadius_2 as borderRadius };
+    }
+    namespace resultListWrapper {
+        let width_4: "100%";
+        export { width_4 as width };
+        export let marginBottom: number;
+        let backgroundColor_5: string;
+        export { backgroundColor_5 as backgroundColor };
+        let borderRadius_3: number;
+        export { borderRadius_3 as borderRadius };
+        export let paddingVertical: number;
+    }
+    namespace resultList {
+        let width_5: "100%";
+        export { width_5 as width };
+    }
+    namespace resultItem {
+        export let paddingRight: number;
+        let paddingVertical_1: number;
+        export { paddingVertical_1 as paddingVertical };
+        let paddingHorizontal_1: number;
+        export { paddingHorizontal_1 as paddingHorizontal };
+        let fontSize_1: number;
+        export { fontSize_1 as fontSize };
+        let backgroundColor_6: string;
+        export { backgroundColor_6 as backgroundColor };
+    }
+    namespace addressContainer {
+        let flexDirection_2: "row";
+        export { flexDirection_2 as flexDirection };
+        let alignItems_3: "center";
+        export { alignItems_3 as alignItems };
+    }
+    namespace pinIconContainer {
+        let width_6: number;
+        export { width_6 as width };
+        let marginRight_1: number;
+        export { marginRight_1 as marginRight };
+    }
+    namespace pinIcon {
+        let height_4: number;
+        export { height_4 as height };
+        let width_7: number;
+        export { width_7 as width };
+    }
+    namespace addressTextContainer {
+        let flex_1: number;
+        export { flex_1 as flex };
+    }
+    namespace addressText {
+        let fontSize_2: number;
+        export { fontSize_2 as fontSize };
+        export let lineHeight: number;
+        export let color: string;
+        export let fontWeight: "600";
+    }
+    namespace addressSubtext {
+        let fontSize_3: number;
+        export { fontSize_3 as fontSize };
+        let color_1: string;
+        export { color_1 as color };
+    }
+    namespace footerContainer {
+        let flexDirection_3: "row";
+        export { flexDirection_3 as flexDirection };
+        let alignItems_4: "center";
+        export { alignItems_4 as alignItems };
+        let paddingVertical_2: number;
+        export { paddingVertical_2 as paddingVertical };
+        let marginRight_2: number;
+        export { marginRight_2 as marginRight };
+        export let alignSelf: "flex-end";
+    }
+    namespace footerText {
+        export let marginTop: number;
+        let marginRight_3: number;
+        export { marginRight_3 as marginRight };
+        let fontSize_4: number;
+        export { fontSize_4 as fontSize };
+        let color_2: string;
+        export { color_2 as color };
+    }
+    namespace logo {
+        let width_8: number;
+        export { width_8 as width };
+        let height_5: number;
+        export { height_5 as height };
+        export let resizeMode: "contain";
+    }
+    namespace mapContainer {
+        let flex_2: number;
+        export { flex_2 as flex };
+    }
+    namespace map {
+        let flex_3: number;
+        export { flex_3 as flex };
+    }
+    namespace mapLogo {
+        export let position: "absolute";
+        export let bottom: number;
+        export let left: number;
+        let width_9: number;
+        export { width_9 as width };
+        let height_6: number;
+        export { height_6 as height };
+        let resizeMode_1: "contain";
+        export { resizeMode_1 as resizeMode };
+    }
+}

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.18.0"
+github "radarlabs/radar-sdk-ios" "3.18.3"

package/ios/RNRadar.m

@@ -102,7 +102,7 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.1-beta.1" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.2" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -193,7 +193,7 @@ RCT_EXPORT_METHOD(requestPermissions:(BOOL)background resolve:(RCTPromiseResolve
 
     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
     if (background && status == kCLAuthorizationStatusAuthorizedWhenInUse) {
-        // Do nothing in this version
+        [locationManager requestAlwaysAuthorization];
     } else if (status == kCLAuthorizationStatusNotDetermined) {
         [locationManager requestWhenInUseAuthorization];
     } else {
@@ -1152,9 +1152,9 @@ RCT_EXPORT_METHOD(logConversion:(NSDictionary *)optionsDict resolve:(RCTPromiseR
     };
     
     if (revenue) {
-        [Radar logConversionWithName:name metadata:metadata completionHandler:completionHandler];
-    } else {
         [Radar logConversionWithName:name revenue:revenue metadata:metadata completionHandler:completionHandler];
+    } else {
+        [Radar logConversionWithName:name metadata:metadata completionHandler:completionHandler];
     }
 }
 

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.18.1-beta.1",
+  "version": "3.18.2",
   "main": "dist/index.js",
   "files": [
     "/android",
@@ -34,6 +34,9 @@
     "modulePathIgnorePatterns": [
       "example",
       "example2"
+    ],
+    "setupFiles": [
+      "./test/jest.setup.js"
     ]
   },
   "peerDependencies": {
@@ -65,15 +68,15 @@
     "eslint-plugin-jest": "^22.1.2",
     "eslint-plugin-jsx-a11y": "^6.1.1",
     "eslint-plugin-react": "^7.11.1",
-    "expo": "^47.0.0",
-    "expo-module-scripts": "^3.4.1",
-    "jest": "^23.6.0",
-    "jest-junit": "^5.2.0",
+    "expo": "^51.0.0",
+    "expo-module-scripts": "^3.5.2",
+    "jest": "^29.7.0",
+    "jest-junit": "^16.0.0",
     "logkitty": ">=0.7.1",
     "metro-react-native-babel-preset": "^0.51.1",
     "npm-run-all": "^4.1.5",
-    "react": "16.8.6",
-    "react-native": "0.60.0",
+    "react": "^18.2.0",
+    "react-native": "^0.74.5",
     "typescript": "^5.3.3"
   },
   "bugs": {

package/plugin/build/withRadarIOS.js

@@ -51,7 +51,7 @@ const withRadarIOS = (config, args) => {
                 const filePath = path_1.default.join(config.modRequest.platformProjectRoot, 'Podfile');
                 const contents = await promises_1.default.readFile(filePath, 'utf-8');
                 // Check if the pod declaration already exists
-                if (contents.indexOf("pod 'RadarSDKMotion', '3.18.0'") === -1) {
+                if (contents.indexOf("pod 'RadarSDKMotion', '3.18.3'") === -1) {
                     // Find the target block
                     const targetRegex = /target '(\w+)' do/g;
                     const match = targetRegex.exec(contents);
@@ -60,7 +60,7 @@ const withRadarIOS = (config, args) => {
                         const targetEndIndex = contents.indexOf('end', targetStartIndex) + 3;
                         // Insert the pod declaration within the target block
                         const targetBlock = contents.substring(targetStartIndex, targetEndIndex);
-                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.18.0'`);
+                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.18.3'`);
                         const newContents = contents.replace(targetBlock, updatedTargetBlock);
                         // Write the updated contents back to the Podfile
                         await promises_1.default.writeFile(filePath, newContents);

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.18.0"
+  s.dependency "RadarSDK", "~> 3.18.3"
 end