react-native-google-maps-plus 1.5.0 → 1.6.0

package/README.md

@@ -22,6 +22,27 @@ React-native wrapper for android & IOS google maps sdk
 yarn add react-native-google-maps-plus react-native-nitro-modules
 ```
 
+### Expo Projects
+
+Add your keys to the `app.json`.
+The config plugin automatically injects them into your native Android and iOS builds during `expo prebuild`.
+
+```json
+{
+  "expo": {
+    "plugins": [
+      [
+        "react-native-google-maps-plus",
+        {
+          "googleMapsAndroidApiKey": "YOUR_ANDROID_MAPS_API_KEY",
+          "googleMapsIosApiKey": "YOUR_IOS_MAPS_API_KEY"
+        }
+      ]
+    ]
+  }
+}
+```
+
 # Dependencies
 
 This package builds on native libraries for SVG rendering and Google Maps integration:

package/app.plugin.js

@@ -0,0 +1 @@
+module.exports = require('./expoConfig/build');

package/expoConfig/build/android/withAndroidGoogleMapsPlus.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var config_plugins_1 = require("@expo/config-plugins");
+var Manifest_1 = require("@expo/config-plugins/build/android/Manifest");
+var withMapsAndroid = function (config, props) {
+    return (0, config_plugins_1.withAndroidManifest)(config, function (conf) {
+        var _a, _b;
+        var manifest = conf.modResults;
+        var mainApplication = (0, Manifest_1.getMainApplicationOrThrow)(manifest);
+        var apiKey = (_b = (_a = props.googleMapsAndroidApiKey) !== null && _a !== void 0 ? _a : process.env.GOOGLE_MAPS_API_KEY_ANDROID) !== null && _b !== void 0 ? _b : null;
+        if (apiKey) {
+            (0, Manifest_1.addMetaDataItemToMainApplication)(mainApplication, 'com.google.android.geo.API_KEY', apiKey);
+        }
+        else {
+            (0, Manifest_1.removeMetaDataItemFromMainApplication)(mainApplication, 'com.google.android.geo.API_KEY');
+            console.warn('[react-native-google-maps-plus] No Android API key provided. Removed existing entry.');
+        }
+        return conf;
+    });
+};
+exports.default = withMapsAndroid;

package/expoConfig/build/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var fs_1 = __importDefault(require("fs"));
+var path_1 = __importDefault(require("path"));
+var pkg = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname, '../../package.json'), 'utf8'));
+var config_plugins_1 = require("@expo/config-plugins");
+var withIosGoogleMapsPlus_1 = __importDefault(require("./ios/withIosGoogleMapsPlus"));
+var withAndroidGoogleMapsPlus_1 = __importDefault(require("./android/withAndroidGoogleMapsPlus"));
+var withGoogleMapsPlus = function (config, props) {
+    config = (0, withAndroidGoogleMapsPlus_1.default)(config, props);
+    config = (0, withIosGoogleMapsPlus_1.default)(config, props);
+    return config;
+};
+module.exports = (0, config_plugins_1.createRunOncePlugin)(withGoogleMapsPlus, pkg.name, pkg.version);

package/expoConfig/build/ios/withIosGoogleMapsPlus.js

@@ -0,0 +1,91 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var config_plugins_1 = require("@expo/config-plugins");
+var generateCode_1 = require("@expo/config-plugins/build/utils/generateCode");
+var withIosGoogleMapsPlus = function (config, props) {
+    config = (0, config_plugins_1.withInfoPlist)(config, function (conf) {
+        var _a, _b;
+        var apiKey = (_b = (_a = props.googleMapsIosApiKey) !== null && _a !== void 0 ? _a : process.env.GOOGLE_MAPS_API_KEY_IOS) !== null && _b !== void 0 ? _b : null;
+        if (!apiKey) {
+            console.warn('[react-native-google-maps-plus] No iOS API key provided. Google Maps may fail to initialize.');
+        }
+        if (apiKey) {
+            conf.modResults.MAPS_API_KEY = apiKey;
+        }
+        return conf;
+    });
+    config = (0, config_plugins_1.withPodfile)(config, function (conf) {
+        var src = conf.modResults.contents;
+        if (!src.includes('use_modular_headers!')) {
+            src = (0, generateCode_1.mergeContents)({
+                tag: 'react-native-google-maps-modular-headers',
+                src: src,
+                newSrc: 'use_modular_headers!',
+                anchor: /use_frameworks!|platform\s+:ios.*/,
+                offset: 1,
+                comment: '#',
+            }).contents;
+        }
+        var patchSnippet = "\n  # Force iOS 16+ to avoid deployment target warnings\n  installer.pods_project.targets.each do |target|\n    target.build_configurations.each do |config|\n      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'\n    end\n  end\n\n  # --- SVGKit Patch ---\n  require 'fileutils'\n  svgkit_path = File.join(installer.sandbox.pod_dir('SVGKit'), 'Source')\n\n  # --- Patch Node.h imports ---\n  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|\n    FileUtils.chmod(\"u+w\", file)\n    text = File.read(file)\n    new_contents = text.gsub('#import \"Node.h\"', '#import \"SVGKit/Node.h\"')\n    File.open(file, 'w') { |f| f.write(new_contents) }\n  end\n\n  # --- Patch CSSValue.h imports ---\n  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|\n    FileUtils.chmod(\"u+w\", file)\n    text = File.read(file)\n    new_contents = text.gsub('#import \"CSSValue.h\"', '#import \"SVGKit/CSSValue.h\"')\n    File.open(file, 'w') { |f| f.write(new_contents) }\n  end\n\n  # --- Patch SVGLength.h imports ---\n  Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|\n    FileUtils.chmod(\"u+w\", file)\n    text = File.read(file)\n    new_contents = text.gsub('#import \"SVGLength.h\"', '#import \"SVGKit/SVGLength.h\"')\n    File.open(file, 'w') { |f| f.write(new_contents) }\n  end\n  ";
+        if (src.includes('post_install do |installer|')) {
+            src = src.replace(/post_install do \|installer\|([\s\S]*?)end/, function (match, inner) {
+                if (inner.includes('SVGKit Patch'))
+                    return match; // idempotent
+                return "post_install do |installer|".concat(inner, "\n").concat(patchSnippet, "\nend");
+            });
+        }
+        else {
+            src += "\npost_install do |installer|\n".concat(patchSnippet, "\nend\n");
+        }
+        conf.modResults.contents = src;
+        return conf;
+    });
+    config = (0, config_plugins_1.withAppDelegate)(config, function (conf) {
+        var language = conf.modResults.language;
+        if (language !== 'swift') {
+            console.warn('[react-native-google-maps-plus] AppDelegate is not Swift; skipping GMSServices injection.');
+            return conf;
+        }
+        var src = conf.modResults.contents;
+        if (!src.includes('import GoogleMaps')) {
+            src = (0, generateCode_1.mergeContents)({
+                tag: 'react-native-google-maps-import',
+                src: src,
+                newSrc: 'import GoogleMaps',
+                anchor: /^import React/m,
+                offset: 1,
+                comment: '//',
+            }).contents;
+        }
+        var initSnippet = "\n    if let apiKey = Bundle.main.object(forInfoDictionaryKey: \"MAPS_API_KEY\") as? String {\n      GMSServices.provideAPIKey(apiKey)\n    }";
+        try {
+            src = (0, generateCode_1.mergeContents)({
+                tag: 'react-native-google-maps-init',
+                src: src,
+                newSrc: initSnippet,
+                anchor: /return\s+super\.application\s*\(\s*application\s*,\s*didFinishLaunchingWithOptions:\s*launchOptions\s*\)/,
+                offset: -1,
+                comment: '//',
+            }).contents;
+        }
+        catch (error) {
+            if (error.code === 'ERR_NO_MATCH') {
+                src = (0, generateCode_1.mergeContents)({
+                    tag: 'react-native-google-maps-init',
+                    src: src,
+                    newSrc: initSnippet,
+                    anchor: /didFinishLaunchingWithOptions[^{]*\{/,
+                    offset: 1,
+                    comment: '//',
+                }).contents;
+            }
+            else {
+                throw error;
+            }
+        }
+        conf.modResults.contents = src;
+        return conf;
+    });
+    return config;
+};
+exports.default = withIosGoogleMapsPlus;

package/expoConfig/build/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/nitrogen/generated/android/c++/JRNAndroidLocationConfig.hpp

@@ -52,7 +52,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNAndroidLocationConfig::javaobject> fromCpp(const RNAndroidLocationConfig& value) {
-      return newInstance(
+      using JSignature = JRNAndroidLocationConfig(jni::alias_ref<JRNAndroidLocationPriority>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.priority.has_value() ? JRNAndroidLocationPriority::fromCpp(value.priority.value()) : nullptr,
         value.interval.has_value() ? jni::JDouble::valueOf(value.interval.value()) : nullptr,
         value.minUpdateInterval.has_value() ? jni::JDouble::valueOf(value.minUpdateInterval.value()) : nullptr

package/nitrogen/generated/android/c++/JRNCamera.hpp

@@ -55,7 +55,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNCamera::javaobject> fromCpp(const RNCamera& value) {
-      return newInstance(
+      using JSignature = JRNCamera(jni::alias_ref<JRNLatLng>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.center.has_value() ? JRNLatLng::fromCpp(value.center.value()) : nullptr,
         value.zoom.has_value() ? jni::JDouble::valueOf(value.zoom.value()) : nullptr,
         value.bearing.has_value() ? jni::JDouble::valueOf(value.bearing.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNCircle.hpp

@@ -68,7 +68,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNCircle::javaobject> fromCpp(const RNCircle& value) {
-      return newInstance(
+      using JSignature = JRNCircle(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, double, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.id),
         value.pressable.has_value() ? jni::JBoolean::valueOf(value.pressable.value()) : nullptr,
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNHeatmap.hpp

@@ -77,7 +77,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNHeatmap::javaobject> fromCpp(const RNHeatmap& value) {
-      return newInstance(
+      using JSignature = JRNHeatmap(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JArrayClass<JRNHeatmapPoint>>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNHeatmapGradient>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.id),
         value.pressable.has_value() ? jni::JBoolean::valueOf(value.pressable.value()) : nullptr,
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNHeatmapGradient.hpp

@@ -65,7 +65,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNHeatmapGradient::javaobject> fromCpp(const RNHeatmapGradient& value) {
-      return newInstance(
+      using JSignature = JRNHeatmapGradient(jni::alias_ref<jni::JArrayClass<jni::JString>>, jni::alias_ref<jni::JArrayDouble>, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         [&]() {
           size_t __size = value.colors.size();
           jni::local_ref<jni::JArrayClass<jni::JString>> __array = jni::JArrayClass<jni::JString>::newArray(__size);

package/nitrogen/generated/android/c++/JRNHeatmapPoint.hpp

@@ -50,7 +50,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNHeatmapPoint::javaobject> fromCpp(const RNHeatmapPoint& value) {
-      return newInstance(
+      using JSignature = JRNHeatmapPoint(double, double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.latitude,
         value.longitude,
         value.weight

package/nitrogen/generated/android/c++/JRNIOSLocationConfig.hpp

@@ -49,7 +49,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNIOSLocationConfig::javaobject> fromCpp(const RNIOSLocationConfig& value) {
-      return newInstance(
+      using JSignature = JRNIOSLocationConfig(jni::alias_ref<JRNIOSLocationAccuracy>, jni::alias_ref<jni::JDouble>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.desiredAccuracy.has_value() ? JRNIOSLocationAccuracy::fromCpp(value.desiredAccuracy.value()) : nullptr,
         value.distanceFilterMeters.has_value() ? jni::JDouble::valueOf(value.distanceFilterMeters.value()) : nullptr
       );

package/nitrogen/generated/android/c++/JRNIndoorBuilding.hpp

@@ -66,7 +66,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNIndoorBuilding::javaobject> fromCpp(const RNIndoorBuilding& value) {
-      return newInstance(
+      using JSignature = JRNIndoorBuilding(jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JArrayClass<JRNIndoorLevel>>, jni::alias_ref<jni::JBoolean>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.activeLevelIndex.has_value() ? jni::JDouble::valueOf(value.activeLevelIndex.value()) : nullptr,
         value.defaultLevelIndex.has_value() ? jni::JDouble::valueOf(value.defaultLevelIndex.value()) : nullptr,
         [&]() {

package/nitrogen/generated/android/c++/JRNIndoorLevel.hpp

@@ -54,7 +54,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNIndoorLevel::javaobject> fromCpp(const RNIndoorLevel& value) {
-      return newInstance(
+      using JSignature = JRNIndoorLevel(double, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.index,
         value.name.has_value() ? jni::make_jstring(value.name.value()) : nullptr,
         value.shortName.has_value() ? jni::make_jstring(value.shortName.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNInitialProps.hpp

@@ -55,7 +55,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNInitialProps::javaobject> fromCpp(const RNInitialProps& value) {
-      return newInstance(
+      using JSignature = JRNInitialProps(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRNCamera>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.mapId.has_value() ? jni::make_jstring(value.mapId.value()) : nullptr,
         value.liteMode.has_value() ? jni::JBoolean::valueOf(value.liteMode.value()) : nullptr,
         value.camera.has_value() ? JRNCamera::fromCpp(value.camera.value()) : nullptr

package/nitrogen/generated/android/c++/JRNKMLayer.hpp

@@ -47,7 +47,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNKMLayer::javaobject> fromCpp(const RNKMLayer& value) {
-      return newInstance(
+      using JSignature = JRNKMLayer(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.id),
         jni::make_jstring(value.kmlString)
       );

package/nitrogen/generated/android/c++/JRNLatLng.hpp

@@ -47,7 +47,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNLatLng::javaobject> fromCpp(const RNLatLng& value) {
-      return newInstance(
+      using JSignature = JRNLatLng(double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.latitude,
         value.longitude
       );

package/nitrogen/generated/android/c++/JRNLatLngBounds.hpp

@@ -48,7 +48,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNLatLngBounds::javaobject> fromCpp(const RNLatLngBounds& value) {
-      return newInstance(
+      using JSignature = JRNLatLngBounds(jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNLatLng>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         JRNLatLng::fromCpp(value.northEast),
         JRNLatLng::fromCpp(value.southWest)
       );

package/nitrogen/generated/android/c++/JRNLocation.hpp

@@ -72,7 +72,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNLocation::javaobject> fromCpp(const RNLocation& value) {
-      return newInstance(
+      using JSignature = JRNLocation(jni::alias_ref<JRNLatLng>, double, double, double, double, double, jni::alias_ref<JRNLocationAndroid>, jni::alias_ref<JRNLocationIOS>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         JRNLatLng::fromCpp(value.center),
         value.altitude,
         value.accuracy,

package/nitrogen/generated/android/c++/JRNLocationAndroid.hpp

@@ -66,7 +66,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNLocationAndroid::javaobject> fromCpp(const RNLocationAndroid& value) {
-      return newInstance(
+      using JSignature = JRNLocationAndroid(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.provider.has_value() ? jni::make_jstring(value.provider.value()) : nullptr,
         value.elapsedRealtimeNanos.has_value() ? jni::JDouble::valueOf(value.elapsedRealtimeNanos.value()) : nullptr,
         value.bearingAccuracyDegrees.has_value() ? jni::JDouble::valueOf(value.bearingAccuracyDegrees.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNLocationConfig.hpp

@@ -55,7 +55,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNLocationConfig::javaobject> fromCpp(const RNLocationConfig& value) {
-      return newInstance(
+      using JSignature = JRNLocationConfig(jni::alias_ref<JRNAndroidLocationConfig>, jni::alias_ref<JRNIOSLocationConfig>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.android.has_value() ? JRNAndroidLocationConfig::fromCpp(value.android.value()) : nullptr,
         value.ios.has_value() ? JRNIOSLocationConfig::fromCpp(value.ios.value()) : nullptr
       );

package/nitrogen/generated/android/c++/JRNLocationIOS.hpp

@@ -62,7 +62,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNLocationIOS::javaobject> fromCpp(const RNLocationIOS& value) {
-      return newInstance(
+      using JSignature = JRNLocationIOS(jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.horizontalAccuracy.has_value() ? jni::JDouble::valueOf(value.horizontalAccuracy.value()) : nullptr,
         value.verticalAccuracy.has_value() ? jni::JDouble::valueOf(value.verticalAccuracy.value()) : nullptr,
         value.speedAccuracy.has_value() ? jni::JDouble::valueOf(value.speedAccuracy.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNLocationPermissionResult.hpp

@@ -51,7 +51,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNLocationPermissionResult::javaobject> fromCpp(const RNLocationPermissionResult& value) {
-      return newInstance(
+      using JSignature = JRNLocationPermissionResult(jni::alias_ref<JRNAndroidLocationPermissionResult>, jni::alias_ref<JRNIOSPermissionResult>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.android.has_value() ? JRNAndroidLocationPermissionResult::fromCpp(value.android.value()) : nullptr,
         value.ios.has_value() ? JRNIOSPermissionResult::fromCpp(value.ios.value()) : nullptr
       );

package/nitrogen/generated/android/c++/JRNMapPadding.hpp

@@ -53,7 +53,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNMapPadding::javaobject> fromCpp(const RNMapPadding& value) {
-      return newInstance(
+      using JSignature = JRNMapPadding(double, double, double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.top,
         value.left,
         value.bottom,

package/nitrogen/generated/android/c++/JRNMapUiSettings.hpp

@@ -74,7 +74,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNMapUiSettings::javaobject> fromCpp(const RNMapUiSettings& value) {
-      return newInstance(
+      using JSignature = JRNMapUiSettings(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.allGesturesEnabled.has_value() ? jni::JBoolean::valueOf(value.allGesturesEnabled.value()) : nullptr,
         value.compassEnabled.has_value() ? jni::JBoolean::valueOf(value.compassEnabled.value()) : nullptr,
         value.indoorLevelPickerEnabled.has_value() ? jni::JBoolean::valueOf(value.indoorLevelPickerEnabled.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNMapZoomConfig.hpp

@@ -47,7 +47,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNMapZoomConfig::javaobject> fromCpp(const RNMapZoomConfig& value) {
-      return newInstance(
+      using JSignature = JRNMapZoomConfig(jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JDouble>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.min.has_value() ? jni::JDouble::valueOf(value.min.value()) : nullptr,
         value.max.has_value() ? jni::JDouble::valueOf(value.max.value()) : nullptr
       );

package/nitrogen/generated/android/c++/JRNMarker.hpp

@@ -87,7 +87,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNMarker::javaobject> fromCpp(const RNMarker& value) {
-      return newInstance(
+      using JSignature = JRNMarker(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNPosition>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNPosition>, jni::alias_ref<JRNMarkerSvg>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.id),
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
         JRNLatLng::fromCpp(value.coordinate),

package/nitrogen/generated/android/c++/JRNMarkerSvg.hpp

@@ -50,7 +50,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNMarkerSvg::javaobject> fromCpp(const RNMarkerSvg& value) {
-      return newInstance(
+      using JSignature = JRNMarkerSvg(double, double, jni::alias_ref<jni::JString>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.width,
         value.height,
         jni::make_jstring(value.svgString)

package/nitrogen/generated/android/c++/JRNPolygon.hpp

@@ -92,7 +92,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNPolygon::javaobject> fromCpp(const RNPolygon& value) {
-      return newInstance(
+      using JSignature = JRNPolygon(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JArrayClass<JRNLatLng>>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JArrayClass<JRNPolygonHole>>, jni::alias_ref<jni::JBoolean>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.id),
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
         value.pressable.has_value() ? jni::JBoolean::valueOf(value.pressable.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNPolygonHole.hpp

@@ -55,7 +55,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNPolygonHole::javaobject> fromCpp(const RNPolygonHole& value) {
-      return newInstance(
+      using JSignature = JRNPolygonHole(jni::alias_ref<jni::JArrayClass<JRNLatLng>>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         [&]() {
           size_t __size = value.coordinates.size();
           jni::local_ref<jni::JArrayClass<JRNLatLng>> __array = jni::JArrayClass<JRNLatLng>::newArray(__size);

package/nitrogen/generated/android/c++/JRNPolyline.hpp

@@ -85,7 +85,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNPolyline::javaobject> fromCpp(const RNPolyline& value) {
-      return newInstance(
+      using JSignature = JRNPolyline(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JArrayClass<JRNLatLng>>, jni::alias_ref<JRNLineCapType>, jni::alias_ref<JRNLineJoinType>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         jni::make_jstring(value.id),
         value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
         value.pressable.has_value() ? jni::JBoolean::valueOf(value.pressable.value()) : nullptr,

package/nitrogen/generated/android/c++/JRNPosition.hpp

@@ -47,7 +47,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNPosition::javaobject> fromCpp(const RNPosition& value) {
-      return newInstance(
+      using JSignature = JRNPosition(double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.x,
         value.y
       );

package/nitrogen/generated/android/c++/JRNRegion.hpp

@@ -51,7 +51,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNRegion::javaobject> fromCpp(const RNRegion& value) {
-      return newInstance(
+      using JSignature = JRNRegion(jni::alias_ref<JRNLatLng>, double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         JRNLatLng::fromCpp(value.center),
         value.latitudeDelta,
         value.longitudeDelta

package/nitrogen/generated/android/c++/JRNSize.hpp

@@ -47,7 +47,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNSize::javaobject> fromCpp(const RNSize& value) {
-      return newInstance(
+      using JSignature = JRNSize(double, double);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.width,
         value.height
       );

package/nitrogen/generated/android/c++/JRNSnapshotOptions.hpp

@@ -59,7 +59,11 @@ namespace margelo::nitro::rngooglemapsplus {
      */
     [[maybe_unused]]
     static jni::local_ref<JRNSnapshotOptions::javaobject> fromCpp(const RNSnapshotOptions& value) {
-      return newInstance(
+      using JSignature = JRNSnapshotOptions(jni::alias_ref<JRNSize>, jni::alias_ref<JRNSnapshotFormat>, double, jni::alias_ref<JRNSnapshotResultType>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
         value.size.has_value() ? JRNSize::fromCpp(value.size.value()) : nullptr,
         JRNSnapshotFormat::fromCpp(value.format),
         value.quality,

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec.kt

@@ -59,6 +59,6 @@ abstract class HybridRNGoogleMapsPlusModuleSpec: HybridObject() {
   private external fun initHybrid(): HybridData
 
   companion object {
-    private const val TAG = "HybridRNGoogleMapsPlusModuleSpec"
+    protected const val TAG = "HybridRNGoogleMapsPlusModuleSpec"
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt

@@ -424,6 +424,6 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
   private external fun initHybrid(): HybridData
 
   companion object {
-    private const val TAG = "HybridRNGoogleMapsPlusViewSpec"
+    protected const val TAG = "HybridRNGoogleMapsPlusViewSpec"
   }
 }