react-native-maps 1.21.0-alpha.11 → 1.21.0-alpha.110

package/android/build.gradle

@@ -1,85 +1,105 @@
 def safeExtGet(prop, fallback) {
-  rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
 buildscript {
-  // The Android Gradle plugin is only required when opening the android folder stand-alone.
-  // This avoids unnecessary downloads and potential conflicts when the library is included as a
-  // module dependency in an application project.
-  if (project == rootProject) {
-    repositories {
-      google()
-      mavenCentral()
+    def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '2.0.21'
+    // The Android Gradle plugin is only required when opening the android folder stand-alone.
+    // This avoids unnecessary downloads and potential conflicts when the library is included as a
+    // module dependency in an application project.
+    if (project == rootProject) {
+        repositories {
+            google()
+            mavenCentral()
+        }
+        dependencies {
+            classpath("com.android.tools.build:gradle:8.7.2")
+            classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}")
+        }
     }
-    dependencies {
-      classpath("com.android.tools.build:gradle:7.6.3")
-    }
-  }
 }
 
 def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  def major = parsed[0].toInteger()
-  def minor = parsed[1].toInteger()
+    def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+    def major = parsed[0].toInteger()
+    def minor = parsed[1].toInteger()
 
-  // Namespace support was added in 7.3.0
-  if (major == 7 && minor >= 3) {
-    return true
-  }
+    // Namespace support was added in 7.3.0
+    if (major == 7 && minor >= 3) {
+        return true
+    }
 
-  return major >= 8
+    return major >= 8
 }
 
 def isNewArchitectureEnabled() {
-  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+    return project.hasProperty("newArchEnabled") && (project.newArchEnabled == "true" || project.newArchEnabled == true)
 }
 
 apply plugin: 'com.android.library'
 if (isNewArchitectureEnabled()) {
-  apply plugin: 'com.facebook.react'
+    apply plugin: 'com.facebook.react'
 }
 apply plugin: 'kotlin-android'
 
 android {
-  if (supportsNamespace()) {
-    namespace "com.rnmaps.maps"
-  }
-
-  compileSdk safeExtGet('compileSdkVersion', 34)
-
-  defaultConfig {
-    minSdkVersion safeExtGet('minSdkVersion', 21)
-    targetSdkVersion safeExtGet('targetSdkVersion', 34)
-
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-  }
-  packagingOptions {
-    excludes = [
-            "META-INF",
-            "META-INF/**",
-            ]
-  }
+    if (supportsNamespace()) {
+        namespace "com.rnmaps.maps"
+    }
+
+    if (rootProject.hasProperty("ndkPath")) {
+        ndkPath rootProject.ext.ndkPath
+    }
+    if (rootProject.hasProperty("ndkVersion")) {
+        ndkVersion rootProject.ext.ndkVersion
+    }
+
+    compileSdk safeExtGet('compileSdkVersion', 35)
+
+    defaultConfig {
+        minSdkVersion safeExtGet('minSdkVersion', 21)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
+
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+        ndk {
+            abiFilters(*reactNativeArchitectures())
+        }
+    }
+    packagingOptions {
+        excludes = [
+                "META-INF",
+                "META-INF/**",
+                "**/libreact_render*.so",
+        ]
+    }
+
+    buildFeatures {
+        buildConfig = true
+        prefab = true
+    }
+}
+
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
 repositories {
-  mavenLocal()
-  mavenCentral()
-  maven {
-    // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-    url "$rootDir/../node_modules/react-native/android"
-  }
-  maven {
-    // Android JSC is installed from npm
-    url "$rootDir/../node_modules/jsc-android/dist"
-  }
-  google()
+    mavenLocal()
+    mavenCentral()
+    maven {
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        url "$projectDir/../node_modules/react-native/android"
+    }
+    google()
 }
 
 dependencies {
-  implementation 'com.facebook.react:react-native:+'
-  implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.2.0')}"
-  implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.2.0')}"
-  implementation "com.google.android.gms:play-services-location:21.0.1"
-  implementation 'com.google.maps.android:android-maps-utils:3.8.2'
-  implementation "androidx.work:work-runtime:2.7.1"
+    implementation 'com.facebook.react:react-native:+'
+    implementation "com.google.android.gms:play-services-base:${safeExtGet('googlePlayServicesBaseVersion', '18.5.0')}"
+    implementation "com.google.android.gms:play-services-maps:${safeExtGet('googlePlayServicesMapsVersion', '19.1.0')}"
+    implementation "com.google.android.gms:play-services-location:${safeExtGet('googlePlayServicesLocationVersion', '21.3.0')}"
+    implementation 'com.google.maps.android:android-maps-utils:3.10.0'
+    implementation "androidx.work:work-runtime:2.9.1"
 }

package/android/gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

package/android/src/main/java/com/rnmaps/fabric/CalloutManager.java

@@ -0,0 +1,77 @@
+package com.rnmaps.fabric;
+
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.LayoutShadowNode;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsCalloutManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsCalloutManagerInterface;
+import com.rnmaps.maps.MapCallout;
+import com.rnmaps.maps.SizeReportingShadowNode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@ReactModule(name = CalloutManager.REACT_CLASS)
+public class CalloutManager extends ViewGroupManager<MapCallout> implements RNMapsCalloutManagerInterface<MapCallout> {
+
+    public CalloutManager(ReactApplicationContext context){
+        super(context);
+    }
+    private final RNMapsCalloutManagerDelegate<MapCallout, CalloutManager> delegate =
+            new RNMapsCalloutManagerDelegate<>(this);
+
+    @Override
+    public ViewManagerDelegate<MapCallout> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public MapCallout createViewInstance(ThemedReactContext context) {
+        return new MapCallout(context);
+    }
+
+
+    public static final String REACT_CLASS = "RNMapsCallout";
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        return MapCallout.getExportedCustomBubblingEventTypeConstants();
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return new HashMap<>();
+    }
+
+
+    @Override
+    public void setAlphaHitTest(MapCallout view, boolean value) {
+    /// do nothing
+    }
+
+    @Override
+    public void setTooltip(MapCallout view, boolean value) {
+            view.setTooltip(value);
+    }
+    @Override
+    public LayoutShadowNode createShadowNodeInstance() {
+        // we use a custom shadow node that emits the width/height of the view
+        // after layout with the updateExtraData method. Without this, we can't generate
+        // a bitmap of the appropriate width/height of the rendered view.
+        return new SizeReportingShadowNode();
+    }
+
+}

package/android/src/main/java/com/rnmaps/fabric/CircleManager.java

@@ -0,0 +1,94 @@
+package com.rnmaps.fabric;
+
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.ViewGroupManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsCircleManagerDelegate;
+import com.facebook.react.viewmanagers.RNMapsCircleManagerInterface;
+import com.rnmaps.maps.MapCircle;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@ReactModule(name = CircleManager.REACT_CLASS)
+public class CircleManager extends ViewGroupManager<MapCircle> implements RNMapsCircleManagerInterface<MapCircle> {
+    public CircleManager(ReactApplicationContext context) {
+        super(context);
+    }
+
+    private final RNMapsCircleManagerDelegate<MapCircle, CircleManager> delegate =
+            new RNMapsCircleManagerDelegate<>(this);
+
+    @Override
+    public ViewManagerDelegate<MapCircle> getDelegate() {
+        return delegate;
+    }
+
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    @Override
+    public MapCircle createViewInstance(ThemedReactContext context) {
+        return new MapCircle(context);
+    }
+
+
+    public static final String REACT_CLASS = "RNMapsCircle";
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+        return MapCircle.getExportedCustomBubblingEventTypeConstants();
+    }
+
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        return new HashMap<>();
+    }
+
+
+
+    @Override
+    public void setZIndex(MapCircle view, float value) {
+        view.setZIndex(value);
+    }
+
+    @Override
+    public void setCenter(MapCircle view, @Nullable ReadableMap value) {
+        view.setCenter(value);
+    }
+
+    @Override
+    public void setFillColor(MapCircle view, @Nullable Integer value) {
+        view.setFillColor(value);
+    }
+
+    @Override
+    public void setRadius(MapCircle view, double value) {
+        view.setRadius(value);
+    }
+
+    @Override
+    public void setStrokeColor(MapCircle view, @Nullable Integer value) {
+        view.setStrokeColor(value);
+    }
+
+    @Override
+    public void setStrokeWidth(MapCircle view, float value) {
+            view.setStrokeWidth(value);
+    }
+
+    @Override
+    public void setTappable(MapCircle view, boolean value) {
+            view.setTappable(value);
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/JSONUtil.java

@@ -0,0 +1,86 @@
+package com.rnmaps.fabric;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Iterator;
+
+public class JSONUtil {
+    public static WritableMap convertJsonToWritable(JSONObject jsonObject) throws JSONException {
+        WritableMap map = Arguments.createMap();
+        Iterator<String> iterator = jsonObject.keys();
+
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+            Object value = jsonObject.get(key);
+
+            if (value == JSONObject.NULL) {
+                map.putNull(key);
+            }
+            // Check primitive types first
+            else if (value instanceof Integer) {
+                map.putInt(key, jsonObject.getInt(key));
+            }
+            else if (value instanceof Long) {
+                map.putDouble(key, ((Long) value).doubleValue());
+            }
+            else if (value instanceof Double) {
+                map.putDouble(key, jsonObject.getDouble(key));
+            }
+            else if (value instanceof Boolean) {
+                map.putBoolean(key, jsonObject.getBoolean(key));
+            }
+            else if (value instanceof String) {
+                map.putString(key, jsonObject.getString(key));
+            }
+            // Check complex types
+            else if (value instanceof JSONObject) {
+                map.putMap(key, convertJsonToWritable(jsonObject.getJSONObject(key)));
+            }
+            else if (value instanceof JSONArray) {
+                map.putArray(key, convertJsonArrayToWritable(jsonObject.getJSONArray(key)));
+            }
+        }
+
+        return map;
+    }
+    public static WritableArray convertJsonArrayToWritable(JSONArray jsonArray) throws JSONException {
+        WritableArray array = Arguments.createArray();
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            Object value = jsonArray.get(i);
+
+            if (value == JSONObject.NULL) {
+                array.pushNull();
+            }
+            else if (value instanceof Integer) {
+                array.pushInt((Integer) value);
+            }
+            else if (value instanceof Long) {
+                array.pushDouble(((Long) value).doubleValue());
+            }
+            else if (value instanceof Double) {
+                array.pushDouble((Double) value);
+            }
+            else if (value instanceof Boolean) {
+                array.pushBoolean((Boolean) value);
+            }
+            else if (value instanceof String) {
+                array.pushString((String) value);
+            }
+            else if (value instanceof JSONObject) {
+                array.pushMap(convertJsonToWritable((JSONObject) value));
+            }
+            else if (value instanceof JSONArray) {
+                array.pushArray(convertJsonArrayToWritable((JSONArray) value));
+            }
+        }
+
+        return array;
+    }
+}