react-native-radar 3.23.5 → 3.23.6-beta.2

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.3"
+  s.dependency "RadarSDK", "3.25.0"
 
  install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -1,4 +1,4 @@
-def radar_sdk_version = '3.23.2'
+def radar_sdk_version = '3.24.1'
 
 buildscript {
   ext.getExtOrDefault = {name ->

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

@@ -143,7 +143,7 @@ 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.5")
+        editor.putString("x_platform_sdk_version", "3.23.6-beta.2")
         editor.apply()
 
         Radar.initialize(reactApplicationContext, publishableKey, radarReceiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, radarInAppMessageReceiver, currentActivity)

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

@@ -102,7 +102,7 @@ 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.5");
+        editor.putString("x_platform_sdk_version", "3.23.6-beta.2");
         editor.apply();
         Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, inAppMessageReceiver, getCurrentActivity());
         if (fraud) { 

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

@@ -541,18 +541,3 @@ export interface RadarTrackingOptionsForegroundService {
     iconColor?: string;
 }
 export type RadarTripStatus = "unknown" | "started" | "approaching" | "arrived" | "expired" | "completed" | "canceled";
-export interface RadarMapOptions {
-    mapStyle?: string;
-    showUserLocation?: boolean;
-    onRegionDidChange?: (feature: RadarMapRegionChangeEvent) => void;
-    onDidFinishLoadingMap?: () => void;
-    onWillStartLoadingMap?: () => void;
-    onDidFailLoadingMap?: () => void;
-}
-export interface RadarMapRegionChangeEvent {
-    center: [number, number];
-    zoom: number;
-    bounds?: [number, number, number, number];
-    bearing?: number;
-    pitch?: number;
-}

package/dist/index.d.ts

@@ -5,8 +5,5 @@ declare let RadarRNWeb: any;
 export { RadarRNWeb };
 declare let Autocomplete: any;
 export { Autocomplete };
-declare let Map: any;
-export { Map };
-export type { RadarMapProps } from "./ui/map";
 export * from "./@types/types";
 export * from "./@types/RadarNativeInterface";

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Map = exports.Autocomplete = exports.RadarRNWeb = void 0;
+exports.Autocomplete = exports.RadarRNWeb = void 0;
 const react_native_1 = require("react-native");
 let nativeModule;
 nativeModule =
@@ -26,7 +26,5 @@ let RadarRNWeb = react_native_1.Platform.OS === "web" ? require("./index.web").d
 exports.RadarRNWeb = RadarRNWeb;
 let Autocomplete = react_native_1.Platform.OS !== "web" ? require("./ui/autocomplete").default : {};
 exports.Autocomplete = Autocomplete;
-let Map = react_native_1.Platform.OS !== "web" ? require("./ui/map").default : {};
-exports.Map = Map;
 __exportStar(require("./@types/types"), exports);
 __exportStar(require("./@types/RadarNativeInterface"), exports);

package/dist/ui/styles.d.ts

@@ -150,23 +150,4 @@ declare namespace styles {
         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/dist/ui/styles.js

@@ -107,19 +107,5 @@ const styles = react_native_1.StyleSheet.create({
         height: 15,
         resizeMode: 'contain',
     },
-    mapContainer: {
-        flex: 1,
-    },
-    map: {
-        flex: 1,
-    },
-    mapLogo: {
-        position: 'absolute',
-        bottom: -10,
-        left: 5,
-        width: 50,
-        height: 50,
-        resizeMode: 'contain',
-    },
 });
 exports.default = styles;

package/dist/version.d.ts

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

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.5';
+exports.VERSION = '3.23.6-beta.2';

package/ios/RNRadar.mm

@@ -186,7 +186,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.5" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.23.6-beta.2" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 

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.5",
+  "version": "3.23.6-beta.2",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -56,15 +56,11 @@
     ]
   },
   "peerDependencies": {
-    "@maplibre/maplibre-react-native": ">=10.2.1",
     "expo": ">=43.0.5",
     "react": ">= 16.8.6",
     "react-native": ">= 0.60.0"
   },
   "peerDependenciesMeta": {
-    "@maplibre/maplibre-react-native": {
-      "optional": true
-    },
     "expo": {
       "optional": true
     }

package/plugin/build/withRadarAndroid.js

@@ -45,6 +45,7 @@ const withRadarAndroid = (config, args) => {
     return withAppBuildGradle(config, (config) => {
         if (config.modResults.language === "groovy") {
             config.modResults.contents = modifyAppBuildGradle(config.modResults.contents, args.androidFraud ?? false);
+            config.modResults.contents = addCoreLibraryDesugaring(config.modResults.contents);
         }
         else {
             throw new Error("Cannot configure Sentry in the app gradle because the build.gradle is not groovy");
@@ -91,5 +92,45 @@ function modifyAppBuildGradle(buildGradle, androidFraud) {
         replacementString +=
             "\n\n" + '    implementation "com.google.android.play:integrity:1.2.0"';
     }
-    return buildGradle.replace(pattern, (match) => match + replacementString);
+    buildGradle = buildGradle.replace(pattern, (match) => match + replacementString);
+    return buildGradle;
+}
+function addCoreLibraryDesugaring(buildGradle) {
+    if (buildGradle.includes('coreLibraryDesugaringEnabled true')) {
+        return buildGradle;
+    }
+    const androidBlockRegex = /android\s*\{([\s\S]*?)^\}/m;
+    const compileOptionsRegex = /compileOptions\s*\{([\s\S]*?)^\s*\}/m;
+    const androidMatch = buildGradle.match(androidBlockRegex);
+    if (androidMatch) {
+        const androidBlock = androidMatch[0];
+        const androidBlockContent = androidMatch[1];
+        const compileOptionsMatch = androidBlockContent.match(compileOptionsRegex);
+        if (compileOptionsMatch) {
+            if (!/coreLibraryDesugaringEnabled\s+true/.test(compileOptionsMatch[0])) {
+                const updatedCompileOptions = compileOptionsMatch[0].replace(/^\s*\}/m, '        coreLibraryDesugaringEnabled true\n    }');
+                const updatedAndroidBlock = androidBlock.replace(compileOptionsMatch[0], updatedCompileOptions);
+                buildGradle = buildGradle.replace(androidBlock, updatedAndroidBlock);
+            }
+        }
+        else {
+            const insertIndex = buildGradle.indexOf(androidMatch[0]) + androidMatch[0].indexOf('{') + 1;
+            buildGradle =
+                buildGradle.slice(0, insertIndex) +
+                    '\n    compileOptions {\n        coreLibraryDesugaringEnabled true\n    }\n' +
+                    buildGradle.slice(insertIndex);
+        }
+    }
+    if (!buildGradle.includes('coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5"')) {
+        const dependenciesPattern = '\ndependencies {\n';
+        const dependenciesIndex = buildGradle.indexOf(dependenciesPattern);
+        if (dependenciesIndex !== -1) {
+            const dependenciesPivot = dependenciesIndex + dependenciesPattern.length;
+            buildGradle =
+                buildGradle.slice(0, dependenciesPivot) +
+                    '    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5"\n\n' +
+                    buildGradle.slice(dependenciesPivot);
+        }
+    }
+    return buildGradle;
 }

package/src/@types/types.ts

@@ -846,20 +846,3 @@ export type RadarTripStatus =
   | "expired"
   | "completed"
   | "canceled";
-
-export interface RadarMapOptions {
-  mapStyle?: string;
-  showUserLocation?: boolean;
-  onRegionDidChange?: (feature: RadarMapRegionChangeEvent) => void;
-  onDidFinishLoadingMap?: () => void;
-  onWillStartLoadingMap?: () => void;
-  onDidFailLoadingMap?: () => void;
-}
-
-export interface RadarMapRegionChangeEvent {
-  center: [number, number];
-  zoom: number;
-  bounds?: [number, number, number, number];
-  bearing?: number;
-  pitch?: number;
-}

package/src/index.tsx

@@ -18,10 +18,5 @@ let Autocomplete =
   Platform.OS !== "web" ? require("./ui/autocomplete").default : {};
 export { Autocomplete };
 
-let Map = Platform.OS !== "web" ? require("./ui/map").default : {};
-export { Map };
-
-export type { RadarMapProps } from "./ui/map";
-
 export * from "./@types/types";
 export * from "./@types/RadarNativeInterface";

package/src/ui/styles.js

@@ -106,20 +106,6 @@ const styles = StyleSheet.create({
     height: 15,
     resizeMode: 'contain',
   },
-  mapContainer: {
-    flex: 1,
-  },
-  map: {
-    flex: 1,
-  },
-  mapLogo: {
-    position: 'absolute',
-    bottom: -10,
-    left: 5,
-    width: 50,
-    height: 50,
-    resizeMode: 'contain',
-  },
 });
 
 export default styles;

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.5';
+export const VERSION = '3.23.6-beta.2';

package/dist/ui/map.d.ts

@@ -1,21 +0,0 @@
-import React from 'react';
-import { RadarMapOptions } from '../@types/types';
-export interface RadarMapProps {
-    /**
-     * Configuration options for the RadarMap component
-     */
-    mapOptions?: RadarMapOptions;
-    /**
-     * Child components to render within the map
-     */
-    children?: React.ReactNode;
-}
-/**
- * TypeScript wrapper for the RadarMap component that provides type safety
- * while delegating the implementation to the JavaScript version.
- *
- * @param props - The props for the RadarMap component
- * @returns The RadarMap component with proper TypeScript typing
- */
-declare const RadarMap: React.FC<RadarMapProps>;
-export default RadarMap;

package/dist/ui/map.js

@@ -1,18 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
-const RadarMapJS = require('./map.jsx').default;
-/**
- * TypeScript wrapper for the RadarMap component that provides type safety
- * while delegating the implementation to the JavaScript version.
- *
- * @param props - The props for the RadarMap component
- * @returns The RadarMap component with proper TypeScript typing
- */
-const RadarMap = (props) => {
-    return react_1.default.createElement(RadarMapJS, props);
-};
-exports.default = RadarMap;

package/dist/ui/map.jsx

@@ -1,139 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { View, Image } from 'react-native';
-import Radar from '../index.native';
-import { getHost, getPublishableKey } from '../helpers';
-import styles from './styles';
-
-let MapLibreGL;
-try {
-  MapLibreGL = require('@maplibre/maplibre-react-native');
-} catch (e) {
-  MapLibreGL = null;
-}
-
-const DEFAULT_STYLE = 'radar-default-v1';
-
-const createStyleURL = async (style = DEFAULT_STYLE) => {
-  const host = await getHost();
-  const publishableKey = await getPublishableKey();
-  return `${host}/maps/styles/${style}?publishableKey=${publishableKey}`;
-};
-
-/**
- * RadarMap component for displaying maps with Radar integration
- * @param {Object} props - Component props
- * @param {Object} [props.mapOptions] - Map configuration options
- * @param {string} [props.mapOptions.mapStyle] - Map style identifier (defaults to 'radar-default-v1')
- * @param {boolean} [props.mapOptions.showUserLocation] - Whether to show the user's location on the map (default: true)
- * @param {function} [props.mapOptions.onRegionDidChange] - Callback fired when the map region changes
- * @param {Object} props.mapOptions.onRegionDidChange.feature - The region feature data
- * @param {function} [props.mapOptions.onDidFinishLoadingMap] - Callback fired when the map finishes loading
- * @param {function} [props.mapOptions.onWillStartLoadingMap] - Callback fired when the map starts loading
- * @param {function} [props.mapOptions.onDidFailLoadingMap] - Callback fired when the map fails to load
- * @param {React.ReactNode} [props.children] - Child components to render within the map
- * @returns {React.Component|null} The RadarMap component or null if dependencies are missing
- */
-
-const RadarMap = ({ mapOptions, children }) => {
-  const [styleURL, setStyleURL] = useState(null);
-  const [userLocation, setUserLocation] = useState(null);
-
-  useEffect(() => {
-    createStyleURL(mapOptions?.mapStyle || DEFAULT_STYLE).then((result) => {
-      setStyleURL(result);
-    });
-  }, [mapOptions]);
-
-  useEffect(() => {
-    Radar.getLocation().then((result) => {
-      if (result?.location?.latitude && result?.location?.longitude) {
-        setUserLocation({
-          latitude: result.location.latitude,
-          longitude: result.location.longitude,
-        });
-      }
-    }).catch((err) => {
-      // eslint-disable-next-line no-console
-      console.warn(`Radar SDK: Failed to get location: ${err}`);
-    });
-  }, [mapOptions]);
-
-  if (!styleURL) {
-    return null;
-  }
-
-  if (!MapLibreGL) {
-    return null;
-  }
-
-  const geoJSONUserLocation = {
-    type: 'FeatureCollection',
-    features: userLocation?.longitude !== undefined ? [
-      {
-        type: 'Feature',
-        geometry: {
-          type: 'Point',
-          coordinates: [userLocation.longitude, userLocation.latitude],
-        },
-      },
-    ] : [],
-  };
-
-  const userLocationMapIndicator = (
-    <MapLibreGL.ShapeSource
-      id="user-location"
-      shape={geoJSONUserLocation}
-    >
-      <MapLibreGL.CircleLayer
-        id="user-location-inner"
-        style={{
-          circleRadius: 15,
-          circleColor: '#000257',
-          circleOpacity: 0.2,
-          circlePitchAlignment: 'map',
-        }}
-      />
-      <MapLibreGL.CircleLayer
-        id="user-location-middle"
-        style={{
-          circleRadius: 9,
-          circleColor: '#fff',
-          circlePitchAlignment: 'map',
-        }}
-      />
-      <MapLibreGL.CircleLayer
-        id="user-location-outer"
-        style={{
-          circleRadius: 6,
-          circleColor: '#000257',
-          circlePitchAlignment: 'map',
-        }}
-      />
-    </MapLibreGL.ShapeSource>
-  );
-
-  return (
-    <View style={styles.mapContainer}>
-      <MapLibreGL.MapView
-        style={styles.map}
-        pitchEnabled={false}
-        compassEnabled={false}
-        logoEnabled={false}
-        attributionEnabled
-        onRegionDidChange={mapOptions?.onRegionDidChange ? mapOptions.onRegionDidChange : null}
-        onDidFinishLoadingMap={mapOptions?.onDidFinishLoadingMap ? mapOptions.onDidFinishLoadingMap : null}
-        onWillStartLoadingMap={mapOptions?.onWillStartLoadingMap ? mapOptions.onWillStartLoadingMap : null}
-        onDidFailLoadingMap={mapOptions?.onDidFailLoadingMap ? mapOptions.onDidFailLoadingMap : null}
-        mapStyle={styleURL}>
-        {mapOptions?.showUserLocation !== false && userLocationMapIndicator}
-        {children}
-      </MapLibreGL.MapView>
-      <Image
-        source={require('./map-logo.png')}
-        style={styles.mapLogo}
-      />
-    </View>
-  );
-};
-
-export default RadarMap;

package/src/ui/map.jsx

@@ -1,139 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { View, Image } from 'react-native';
-import Radar from '../index.native';
-import { getHost, getPublishableKey } from '../helpers';
-import styles from './styles';
-
-let MapLibreGL;
-try {
-  MapLibreGL = require('@maplibre/maplibre-react-native');
-} catch (e) {
-  MapLibreGL = null;
-}
-
-const DEFAULT_STYLE = 'radar-default-v1';
-
-const createStyleURL = async (style = DEFAULT_STYLE) => {
-  const host = await getHost();
-  const publishableKey = await getPublishableKey();
-  return `${host}/maps/styles/${style}?publishableKey=${publishableKey}`;
-};
-
-/**
- * RadarMap component for displaying maps with Radar integration
- * @param {Object} props - Component props
- * @param {Object} [props.mapOptions] - Map configuration options
- * @param {string} [props.mapOptions.mapStyle] - Map style identifier (defaults to 'radar-default-v1')
- * @param {boolean} [props.mapOptions.showUserLocation] - Whether to show the user's location on the map (default: true)
- * @param {function} [props.mapOptions.onRegionDidChange] - Callback fired when the map region changes
- * @param {Object} props.mapOptions.onRegionDidChange.feature - The region feature data
- * @param {function} [props.mapOptions.onDidFinishLoadingMap] - Callback fired when the map finishes loading
- * @param {function} [props.mapOptions.onWillStartLoadingMap] - Callback fired when the map starts loading
- * @param {function} [props.mapOptions.onDidFailLoadingMap] - Callback fired when the map fails to load
- * @param {React.ReactNode} [props.children] - Child components to render within the map
- * @returns {React.Component|null} The RadarMap component or null if dependencies are missing
- */
-
-const RadarMap = ({ mapOptions, children }) => {
-  const [styleURL, setStyleURL] = useState(null);
-  const [userLocation, setUserLocation] = useState(null);
-
-  useEffect(() => {
-    createStyleURL(mapOptions?.mapStyle || DEFAULT_STYLE).then((result) => {
-      setStyleURL(result);
-    });
-  }, [mapOptions]);
-
-  useEffect(() => {
-    Radar.getLocation().then((result) => {
-      if (result?.location?.latitude && result?.location?.longitude) {
-        setUserLocation({
-          latitude: result.location.latitude,
-          longitude: result.location.longitude,
-        });
-      }
-    }).catch((err) => {
-      // eslint-disable-next-line no-console
-      console.warn(`Radar SDK: Failed to get location: ${err}`);
-    });
-  }, [mapOptions]);
-
-  if (!styleURL) {
-    return null;
-  }
-
-  if (!MapLibreGL) {
-    return null;
-  }
-
-  const geoJSONUserLocation = {
-    type: 'FeatureCollection',
-    features: userLocation?.longitude !== undefined ? [
-      {
-        type: 'Feature',
-        geometry: {
-          type: 'Point',
-          coordinates: [userLocation.longitude, userLocation.latitude],
-        },
-      },
-    ] : [],
-  };
-
-  const userLocationMapIndicator = (
-    <MapLibreGL.ShapeSource
-      id="user-location"
-      shape={geoJSONUserLocation}
-    >
-      <MapLibreGL.CircleLayer
-        id="user-location-inner"
-        style={{
-          circleRadius: 15,
-          circleColor: '#000257',
-          circleOpacity: 0.2,
-          circlePitchAlignment: 'map',
-        }}
-      />
-      <MapLibreGL.CircleLayer
-        id="user-location-middle"
-        style={{
-          circleRadius: 9,
-          circleColor: '#fff',
-          circlePitchAlignment: 'map',
-        }}
-      />
-      <MapLibreGL.CircleLayer
-        id="user-location-outer"
-        style={{
-          circleRadius: 6,
-          circleColor: '#000257',
-          circlePitchAlignment: 'map',
-        }}
-      />
-    </MapLibreGL.ShapeSource>
-  );
-
-  return (
-    <View style={styles.mapContainer}>
-      <MapLibreGL.MapView
-        style={styles.map}
-        pitchEnabled={false}
-        compassEnabled={false}
-        logoEnabled={false}
-        attributionEnabled
-        onRegionDidChange={mapOptions?.onRegionDidChange ? mapOptions.onRegionDidChange : null}
-        onDidFinishLoadingMap={mapOptions?.onDidFinishLoadingMap ? mapOptions.onDidFinishLoadingMap : null}
-        onWillStartLoadingMap={mapOptions?.onWillStartLoadingMap ? mapOptions.onWillStartLoadingMap : null}
-        onDidFailLoadingMap={mapOptions?.onDidFailLoadingMap ? mapOptions.onDidFailLoadingMap : null}
-        mapStyle={styleURL}>
-        {mapOptions?.showUserLocation !== false && userLocationMapIndicator}
-        {children}
-      </MapLibreGL.MapView>
-      <Image
-        source={require('./map-logo.png')}
-        style={styles.mapLogo}
-      />
-    </View>
-  );
-};
-
-export default RadarMap;

package/src/ui/map.tsx

@@ -1,28 +0,0 @@
-import React from 'react';
-import { RadarMapOptions } from '../@types/types';
-
-const RadarMapJS = require('./map.jsx').default;
-
-export interface RadarMapProps {
-  /**
-   * Configuration options for the RadarMap component
-   */
-  mapOptions?: RadarMapOptions;
-  /**
-   * Child components to render within the map
-   */
-  children?: React.ReactNode;
-}
-
-/**
- * TypeScript wrapper for the RadarMap component that provides type safety
- * while delegating the implementation to the JavaScript version.
- * 
- * @param props - The props for the RadarMap component
- * @returns The RadarMap component with proper TypeScript typing
- */
-const RadarMap: React.FC<RadarMapProps> = (props) => {
-  return React.createElement(RadarMapJS, props);
-};
-
-export default RadarMap;