react-native-radar 3.23.0-beta.2 → 3.23.0

package/README.md

@@ -18,6 +18,8 @@ See an example app in `example/`.
 
 Setup Radar public key check pre-commit hook with `cp -r hooks .git` to prevent accidental key leak when working with the Example app.
 
+Android: compile with java 17
+
 To run example app with local `react-native-radar` dependency:
 
 - install node dependencies with `npm ci` and typescript if needed with `npm install -g typescript`.

package/Radar.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,cpp}"
   s.private_header_files = "ios/**/*.h"
 
-  s.dependency "RadarSDK", "~> 3.23.0-beta.2"
+  s.dependency "RadarSDK", "3.23.1"
 
  install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -83,7 +83,7 @@ dependencies {
   // Keep Kotlin stdlib internal to this module
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  api 'io.radar:sdk:3.23.0-beta.1'
+  api 'io.radar:sdk:3.23.2'
 }
 
 react {

package/android/src/main/java/com/radar/RadarModuleImpl.java

@@ -129,6 +129,26 @@ public class RadarModuleImpl {
         JSONObject metaJson =  Radar.getMetadata();
         promise.resolve(RadarUtils.mapForJson(metaJson));
     }
+    
+    public void setTags(ReadableArray tags) throws JSONException {
+        Radar.setTags(RadarUtils.stringArrayForArray(tags));
+    }
+
+    public void getTags(final Promise promise) throws JSONException {
+        if (promise == null) {
+            return;
+        }
+
+        promise.resolve(RadarUtils.arrayForStringArray(Radar.getTags()));
+    }
+
+    public void addTags(ReadableArray tags) throws JSONException {
+        Radar.addTags(RadarUtils.stringArrayForArray(tags));
+    }
+
+    public void removeTags(ReadableArray tags) throws JSONException {
+        Radar.removeTags(RadarUtils.stringArrayForArray(tags));
+    }
 
     public void setProduct(String product) {
         Radar.setProduct(product);

package/android/src/main/java/com/radar/RadarUtils.java

@@ -150,6 +150,18 @@ public class RadarUtils {
         }
         return arr;
     }
+
+    static ReadableArray arrayForStringArray(String[] arr) {
+        if (arr == null) {
+            return null;
+        }
+        WritableArray array = new WritableNativeArray();
+        for (String s : arr) {
+            array.pushString(s);
+        }
+        return array;
+    }
+
     static Map<String, String> stringStringMap(ReadableMap readableMap) {
         if (readableMap == null) {
             return null;

package/android/src/newarch/java/com/radar/RadarModule.kt

@@ -31,6 +31,7 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableArray
 import org.json.JSONException
 
 @ReactModule(name = RadarModule.NAME)
@@ -104,13 +105,16 @@ class RadarModule(reactContext: ReactApplicationContext) :
     override fun initialize(publishableKey: String, fraud: Boolean): Unit {
         val editor = reactApplicationContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit()
         editor.putString("x_platform_sdk_type", "ReactNative")
-        editor.putString("x_platform_sdk_version", "3.23.0-beta.1")
+        editor.putString("x_platform_sdk_version", "3.23.0")
         editor.apply()
 
-        Radar.initialize(reactApplicationContext, publishableKey, null, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, currentActivity)
         if (fraud) {
+            Radar.initialize(reactApplicationContext, publishableKey, radarReceiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud)
             Radar.setVerifiedReceiver(radarVerifiedReceiver)
-        } 
+        } else {
+            Radar.initialize(reactApplicationContext, publishableKey)
+            Radar.setReceiver(radarReceiver)
+        }
     }
 
     override fun setLogLevel(level: String): Unit {
@@ -141,6 +145,22 @@ class RadarModule(reactContext: ReactApplicationContext) :
         radarModuleImpl.getMetadata(promise)
     }
 
+    override fun setTags(tags: ReadableArray): Unit {
+        radarModuleImpl.setTags(tags)
+    }
+
+    override fun getTags(promise: Promise): Unit {
+        radarModuleImpl.getTags(promise)
+    }
+
+    override fun addTags(tags: ReadableArray): Unit {
+        radarModuleImpl.addTags(tags)
+    }
+
+    override fun removeTags(tags: ReadableArray): Unit {
+        radarModuleImpl.removeTags(tags)
+    }
+
     override fun setProduct(product: String): Unit {
         radarModuleImpl.setProduct(product)
     }

package/android/src/oldarch/java/com/radar/RadarModule.java

@@ -98,11 +98,14 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         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.23.0-beta.2");
+        editor.putString("x_platform_sdk_version", "3.23.0");
         editor.apply();
-        Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, getCurrentActivity());
-        if (fraud) { 
+        if (fraud) {
+            Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);
             Radar.setVerifiedReceiver(verifiedReceiver);
+        } else {
+            Radar.initialize(getReactApplicationContext(), publishableKey);
+            Radar.setReceiver(receiver);
         }
     }
 
@@ -146,6 +149,26 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         radarModuleImpl.getMetadata(promise);
     }
 
+    @ReactMethod
+    public void setTags(ReadableArray tags) throws JSONException {
+        radarModuleImpl.setTags(tags);
+    }
+
+    @ReactMethod
+    public void getTags(final Promise promise) throws JSONException {
+        radarModuleImpl.getTags(promise);
+    }
+
+    @ReactMethod
+    public void addTags(ReadableArray tags) throws JSONException {
+        radarModuleImpl.addTags(tags);
+    }
+
+    @ReactMethod
+    public void removeTags(ReadableArray tags) throws JSONException {
+        radarModuleImpl.removeTags(tags);
+    }
+
     @ReactMethod
     public void setAnonymousTrackingEnabled(boolean enabled) {
         radarModuleImpl.setAnonymousTrackingEnabled(enabled);

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

@@ -8,6 +8,10 @@ export interface RadarNativeInterface {
     getDescription: () => Promise<string>;
     setMetadata: (metadata: RadarMetadata) => void;
     getMetadata: () => Promise<RadarMetadata>;
+    setTags: (tags: string[]) => void;
+    getTags: () => Promise<string[]>;
+    addTags: (tags: string[]) => void;
+    removeTags: (tags: string[]) => void;
     setProduct(product: string): void;
     getProduct: () => Promise<string>;
     setAnonymousTrackingEnabled: (enabled: boolean) => void;

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

@@ -420,6 +420,7 @@ export interface RadarRegion {
 export interface RadarAddress {
     addressLabel?: string;
     borough?: string;
+    categories?: string[];
     city?: string;
     confidence?: string;
     country?: string;

package/dist/NativeRadar.d.ts

@@ -34,6 +34,10 @@ export interface Spec extends TurboModule {
     getDescription(): Promise<string>;
     setMetadata(metadata: Object): void;
     getMetadata(): Promise<Object>;
+    setTags(tags: Array<string>): void;
+    getTags(): Promise<Array<string>>;
+    addTags(tags: Array<string>): void;
+    removeTags(tags: Array<string>): void;
     setProduct(product: string): void;
     getProduct(): Promise<string>;
     setAnonymousTrackingEnabled(enabled: boolean): void;

package/dist/index.native.js

@@ -169,6 +169,18 @@ const Radar = {
     getMetadata: function () {
         return NativeRadar.getMetadata();
     },
+    setTags: function (tags) {
+        return NativeRadar.setTags(tags);
+    },
+    getTags: function () {
+        return NativeRadar.getTags();
+    },
+    addTags: function (tags) {
+        return NativeRadar.addTags(tags);
+    },
+    removeTags: function (tags) {
+        return NativeRadar.removeTags(tags);
+    },
     setProduct: function (product) {
         return NativeRadar.setProduct(product);
     },

package/dist/ui/map.js

@@ -122,7 +122,7 @@ const RadarMap = ({ mapOptions, children }) => {
         }}/>
     </MapLibreGL.ShapeSource>);
     return (<react_native_1.View style={styles_1.default.mapContainer}>
-      <MapLibreGL.MapView style={styles_1.default.map} pitchEnabled={false} compassEnabled={false} logoEnabled={false} attributionEnabled onRegionDidChange={(mapOptions === null || mapOptions === void 0 ? void 0 : mapOptions.onRegionDidChange) ? mapOptions.onRegionDidChange : null} styleURL={styleURL}>
+      <MapLibreGL.MapView style={styles_1.default.map} pitchEnabled={false} compassEnabled={false} logoEnabled={false} attributionEnabled onRegionDidChange={(mapOptions === null || mapOptions === void 0 ? void 0 : mapOptions.onRegionDidChange) ? mapOptions.onRegionDidChange : null} mapStyle={styleURL}>
         {userLocationMapIndicator}
         {children}
       </MapLibreGL.MapView>

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.23.0-beta.2";
+export declare const VERSION = "3.23.0";

package/dist/version.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-exports.VERSION = '3.23.0-beta.2';
+exports.VERSION = '3.23.0';

package/ios/RNRadar.mm

@@ -139,7 +139,7 @@ RCT_EXPORT_MODULE()
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.23.0-beta.2" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.23.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 
@@ -183,6 +183,22 @@ RCT_EXPORT_METHOD(getMetadata:(RCTPromiseResolveBlock)resolve reject:(RCTPromise
     resolve([Radar getMetadata]);
 }
 
+RCT_EXPORT_METHOD(setTags:(NSArray<NSString *> *)tags) {
+    [Radar setTags:tags];
+}
+
+RCT_EXPORT_METHOD(getTags:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+    resolve([Radar getTags]);
+}
+
+RCT_EXPORT_METHOD(addTags:(NSArray<NSString *> *)tags) {
+    [Radar addTags:tags];
+}
+
+RCT_EXPORT_METHOD(removeTags:(NSArray<NSString *> *)tags) {
+    [Radar removeTags:tags];
+}
+
 RCT_EXPORT_METHOD(setProduct:(NSString *)product) {
     [Radar setProduct:product];
 }

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.23.0-beta.2",
+  "version": "3.23.0",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -80,6 +80,7 @@
     "@react-native/eslint-config": "^0.78.0",
     "@release-it/conventional-changelog": "^9.0.2",
     "@types/jest": "^29.5.5",
+    "@types/node": "^24.3.0",
     "@types/react": "^19.0.0",
     "commitlint": "^19.6.1",
     "del-cli": "^5.1.0",

package/plugin/build/withRadarIOS.js

@@ -4,7 +4,6 @@ exports.withRadarIOS = void 0;
 const { withInfoPlist, withDangerousMod } = require("expo/config-plugins");
 const fs = require('fs/promises');
 const path = require('path');
-const pkg = require("../../package.json");
 const withRadarIOS = (config, args) => {
     config = withInfoPlist(config, (config) => {
         config.modResults.NSLocationWhenInUseUsageDescription =
@@ -49,7 +48,7 @@ const withRadarIOS = (config, args) => {
                 const filePath = path.join(config.modRequest.platformProjectRoot, 'Podfile');
                 const contents = await fs.readFile(filePath, 'utf-8');
                 // Check if the pod declaration already exists
-                if (contents.indexOf(`pod 'RadarSDKMotion', '${pkg.version}'`) === -1) {
+                if (contents.indexOf("pod 'RadarSDKMotion', '3.20.1'") === -1) {
                     // Find the target block
                     const targetRegex = /target '(\w+)' do/g;
                     const match = targetRegex.exec(contents);
@@ -59,7 +58,7 @@ const withRadarIOS = (config, args) => {
                         // Insert the pod declaration within the target block
                         const targetBlock = contents.substring(targetStartIndex, targetEndIndex);
                         // Just for this version of the SDK, we will be using 3.21.1 of the SDKMotion pod. There is no difference between the source code of 3.21.2 and 3.21.1 for RadarSDKMotion.
-                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '${pkg.version}'`);
+                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.20.1'`);
                         const newContents = contents.replace(targetBlock, updatedTargetBlock);
                         // Write the updated contents back to the Podfile
                         await fs.writeFile(filePath, newContents);

package/src/@types/RadarNativeInterface.ts

@@ -53,6 +53,10 @@ export interface RadarNativeInterface {
   getDescription: () => Promise<string>;
   setMetadata: (metadata: RadarMetadata) => void;
   getMetadata: () => Promise<RadarMetadata>;
+  setTags: (tags: string[]) => void;
+  getTags: () => Promise<string[]>;
+  addTags: (tags: string[]) => void;
+  removeTags: (tags: string[]) => void;
   setProduct(product: string): void;
   getProduct: () => Promise<string>;
   setAnonymousTrackingEnabled: (enabled: boolean) => void;

package/src/@types/types.ts

@@ -696,6 +696,7 @@ export interface RadarRegion {
 export interface RadarAddress {
   addressLabel?: string;
   borough?: string;
+  categories?: string[];
   city?: string;
   confidence?: string;
   country?: string;

package/src/NativeRadar.ts

@@ -42,6 +42,10 @@ export interface Spec extends TurboModule {
   getDescription(): Promise<string>;
   setMetadata(metadata: Object): void;
   getMetadata(): Promise<Object>;
+  setTags(tags: Array<string>): void;
+  getTags(): Promise<Array<string>>;
+  addTags(tags: Array<string>): void;
+  removeTags(tags: Array<string>): void;
   setProduct(product: string): void;
   getProduct(): Promise<string>;
   setAnonymousTrackingEnabled(enabled: boolean): void;

package/src/index.native.ts

@@ -268,6 +268,18 @@ const Radar: RadarNativeInterface = {
   getMetadata: function (): Promise<RadarMetadata> {
     return NativeRadar.getMetadata() as Promise<RadarMetadata>;
   },
+  setTags: function (tags: string[]): void {
+    return NativeRadar.setTags(tags);
+  },
+  getTags: function (): Promise<string[]> {
+    return NativeRadar.getTags() as Promise<string[]>;
+  },
+  addTags: function (tags: string[]): void {
+    return NativeRadar.addTags(tags);
+  },
+  removeTags: function (tags: string[]): void {
+    return NativeRadar.removeTags(tags);
+  },
   setProduct: function (product: string): void {
     return NativeRadar.setProduct(product);
   },

package/src/ui/map.jsx

@@ -106,8 +106,7 @@ const RadarMap = ({ mapOptions, children }) => {
         logoEnabled={false}
         attributionEnabled
         onRegionDidChange={mapOptions?.onRegionDidChange ? mapOptions.onRegionDidChange : null}
-        styleURL={styleURL}
-      >
+        mapStyle={styleURL}>
         {userLocationMapIndicator}
         {children}
       </MapLibreGL.MapView>

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-export const VERSION = '3.23.0-beta.2';
+export const VERSION = '3.23.0';