react-native-google-maps-plus 1.10.2-dev.1 → 1.10.2-dev.2

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

@@ -12,6 +12,7 @@
 
 #include "RNIndoorBuilding.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNIndoorBuilding.hpp"
 #include <optional>
 #include "RNIndoorLevel.hpp"
@@ -24,7 +25,7 @@ namespace margelo::nitro::rngooglemapsplus {
   using namespace facebook;
 
   /**
-   * Represents the Java/Kotlin callback `(indoorBuilding: RNIndoorBuilding) -> Unit`.
+   * Represents the Java/Kotlin callback `(building: RNIndoorBuilding) -> Unit`.
    * This can be passed around between C++ and Java/Kotlin.
    */
   struct JFunc_void_RNIndoorBuilding: public jni::JavaClass<JFunc_void_RNIndoorBuilding> {
@@ -35,18 +36,18 @@ namespace margelo::nitro::rngooglemapsplus {
     /**
      * Invokes the function this `JFunc_void_RNIndoorBuilding` instance holds through JNI.
      */
-    void invoke(const RNIndoorBuilding& indoorBuilding) const {
-      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNIndoorBuilding> /* indoorBuilding */)>("invoke");
-      method(self(), JRNIndoorBuilding::fromCpp(indoorBuilding));
+    void invoke(const RNIndoorBuilding& building) const {
+      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNIndoorBuilding> /* building */)>("invoke");
+      method(self(), JRNIndoorBuilding::fromCpp(building));
     }
   };
 
   /**
    * An implementation of Func_void_RNIndoorBuilding that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNIndoorBuilding_cxx final: public jni::HybridClass<JFunc_void_RNIndoorBuilding_cxx, JFunc_void_RNIndoorBuilding> {
+  class JFunc_void_RNIndoorBuilding_cxx final: public jni::HybridClass<JFunc_void_RNIndoorBuilding_cxx, JFunc_void_RNIndoorBuilding> {
   public:
-    static jni::local_ref<JFunc_void_RNIndoorBuilding::javaobject> fromCpp(const std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>& func) {
+    static jni::local_ref<JFunc_void_RNIndoorBuilding::javaobject> fromCpp(const std::function<void(const RNIndoorBuilding& /* building */)>& func) {
       return JFunc_void_RNIndoorBuilding_cxx::newObjectCxxArgs(func);
     }
 
@@ -54,13 +55,13 @@ namespace margelo::nitro::rngooglemapsplus {
     /**
      * Invokes the C++ `std::function<...>` this `JFunc_void_RNIndoorBuilding_cxx` instance holds.
      */
-    void invoke_cxx(jni::alias_ref<JRNIndoorBuilding> indoorBuilding) {
-      _func(indoorBuilding->toCpp());
+    void invoke_cxx(jni::alias_ref<JRNIndoorBuilding> building) {
+      _func(building->toCpp());
     }
 
   public:
     [[nodiscard]]
-    inline const std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>& getFunction() const {
+    inline const std::function<void(const RNIndoorBuilding& /* building */)>& getFunction() const {
       return _func;
     }
 
@@ -71,11 +72,11 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   private:
-    explicit JFunc_void_RNIndoorBuilding_cxx(const std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>& func): _func(func) { }
+    explicit JFunc_void_RNIndoorBuilding_cxx(const std::function<void(const RNIndoorBuilding& /* building */)>& func): _func(func) { }
 
   private:
     friend HybridBase;
-    std::function<void(const RNIndoorBuilding& /* indoorBuilding */)> _func;
+    std::function<void(const RNIndoorBuilding& /* building */)> _func;
   };
 
 } // namespace margelo::nitro::rngooglemapsplus

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

@@ -12,6 +12,7 @@
 
 #include "RNIndoorLevel.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNIndoorLevel.hpp"
 #include <string>
 #include <optional>
@@ -21,7 +22,7 @@ namespace margelo::nitro::rngooglemapsplus {
   using namespace facebook;
 
   /**
-   * Represents the Java/Kotlin callback `(indoorLevel: RNIndoorLevel) -> Unit`.
+   * Represents the Java/Kotlin callback `(level: RNIndoorLevel) -> Unit`.
    * This can be passed around between C++ and Java/Kotlin.
    */
   struct JFunc_void_RNIndoorLevel: public jni::JavaClass<JFunc_void_RNIndoorLevel> {
@@ -32,18 +33,18 @@ namespace margelo::nitro::rngooglemapsplus {
     /**
      * Invokes the function this `JFunc_void_RNIndoorLevel` instance holds through JNI.
      */
-    void invoke(const RNIndoorLevel& indoorLevel) const {
-      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNIndoorLevel> /* indoorLevel */)>("invoke");
-      method(self(), JRNIndoorLevel::fromCpp(indoorLevel));
+    void invoke(const RNIndoorLevel& level) const {
+      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JRNIndoorLevel> /* level */)>("invoke");
+      method(self(), JRNIndoorLevel::fromCpp(level));
     }
   };
 
   /**
    * An implementation of Func_void_RNIndoorLevel that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNIndoorLevel_cxx final: public jni::HybridClass<JFunc_void_RNIndoorLevel_cxx, JFunc_void_RNIndoorLevel> {
+  class JFunc_void_RNIndoorLevel_cxx final: public jni::HybridClass<JFunc_void_RNIndoorLevel_cxx, JFunc_void_RNIndoorLevel> {
   public:
-    static jni::local_ref<JFunc_void_RNIndoorLevel::javaobject> fromCpp(const std::function<void(const RNIndoorLevel& /* indoorLevel */)>& func) {
+    static jni::local_ref<JFunc_void_RNIndoorLevel::javaobject> fromCpp(const std::function<void(const RNIndoorLevel& /* level */)>& func) {
       return JFunc_void_RNIndoorLevel_cxx::newObjectCxxArgs(func);
     }
 
@@ -51,13 +52,13 @@ namespace margelo::nitro::rngooglemapsplus {
     /**
      * Invokes the C++ `std::function<...>` this `JFunc_void_RNIndoorLevel_cxx` instance holds.
      */
-    void invoke_cxx(jni::alias_ref<JRNIndoorLevel> indoorLevel) {
-      _func(indoorLevel->toCpp());
+    void invoke_cxx(jni::alias_ref<JRNIndoorLevel> level) {
+      _func(level->toCpp());
     }
 
   public:
     [[nodiscard]]
-    inline const std::function<void(const RNIndoorLevel& /* indoorLevel */)>& getFunction() const {
+    inline const std::function<void(const RNIndoorLevel& /* level */)>& getFunction() const {
       return _func;
     }
 
@@ -68,11 +69,11 @@ namespace margelo::nitro::rngooglemapsplus {
     }
 
   private:
-    explicit JFunc_void_RNIndoorLevel_cxx(const std::function<void(const RNIndoorLevel& /* indoorLevel */)>& func): _func(func) { }
+    explicit JFunc_void_RNIndoorLevel_cxx(const std::function<void(const RNIndoorLevel& /* level */)>& func): _func(func) { }
 
   private:
     friend HybridBase;
-    std::function<void(const RNIndoorLevel& /* indoorLevel */)> _func;
+    std::function<void(const RNIndoorLevel& /* level */)> _func;
   };
 
 } // namespace margelo::nitro::rngooglemapsplus

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

@@ -12,6 +12,7 @@
 
 #include "RNLatLng.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNLatLng.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
@@ -39,7 +40,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_RNLatLng that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNLatLng_cxx final: public jni::HybridClass<JFunc_void_RNLatLng_cxx, JFunc_void_RNLatLng> {
+  class JFunc_void_RNLatLng_cxx final: public jni::HybridClass<JFunc_void_RNLatLng_cxx, JFunc_void_RNLatLng> {
   public:
     static jni::local_ref<JFunc_void_RNLatLng::javaobject> fromCpp(const std::function<void(const RNLatLng& /* coordinate */)>& func) {
       return JFunc_void_RNLatLng_cxx::newObjectCxxArgs(func);

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

@@ -12,6 +12,7 @@
 
 #include "RNLocation.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNLocation.hpp"
 #include "RNLatLng.hpp"
 #include "JRNLatLng.hpp"
@@ -47,7 +48,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_RNLocation that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNLocation_cxx final: public jni::HybridClass<JFunc_void_RNLocation_cxx, JFunc_void_RNLocation> {
+  class JFunc_void_RNLocation_cxx final: public jni::HybridClass<JFunc_void_RNLocation_cxx, JFunc_void_RNLocation> {
   public:
     static jni::local_ref<JFunc_void_RNLocation::javaobject> fromCpp(const std::function<void(const RNLocation& /* location */)>& func) {
       return JFunc_void_RNLocation_cxx::newObjectCxxArgs(func);

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

@@ -12,6 +12,7 @@
 
 #include "RNLocationErrorCode.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNLocationErrorCode.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
@@ -39,7 +40,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_RNLocationErrorCode that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNLocationErrorCode_cxx final: public jni::HybridClass<JFunc_void_RNLocationErrorCode_cxx, JFunc_void_RNLocationErrorCode> {
+  class JFunc_void_RNLocationErrorCode_cxx final: public jni::HybridClass<JFunc_void_RNLocationErrorCode_cxx, JFunc_void_RNLocationErrorCode> {
   public:
     static jni::local_ref<JFunc_void_RNLocationErrorCode::javaobject> fromCpp(const std::function<void(RNLocationErrorCode /* error */)>& func) {
       return JFunc_void_RNLocationErrorCode_cxx::newObjectCxxArgs(func);

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

@@ -12,6 +12,7 @@
 
 #include "RNMapErrorCode.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNMapErrorCode.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
@@ -39,7 +40,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_RNMapErrorCode that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNMapErrorCode_cxx final: public jni::HybridClass<JFunc_void_RNMapErrorCode_cxx, JFunc_void_RNMapErrorCode> {
+  class JFunc_void_RNMapErrorCode_cxx final: public jni::HybridClass<JFunc_void_RNMapErrorCode_cxx, JFunc_void_RNMapErrorCode> {
   public:
     static jni::local_ref<JFunc_void_RNMapErrorCode::javaobject> fromCpp(const std::function<void(RNMapErrorCode /* error */)>& func) {
       return JFunc_void_RNMapErrorCode_cxx::newObjectCxxArgs(func);

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

@@ -13,6 +13,7 @@
 #include "RNRegion.hpp"
 #include "RNCamera.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNRegion.hpp"
 #include "RNLatLng.hpp"
 #include "JRNLatLng.hpp"
@@ -45,7 +46,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_RNRegion_RNCamera that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNRegion_RNCamera_cxx final: public jni::HybridClass<JFunc_void_RNRegion_RNCamera_cxx, JFunc_void_RNRegion_RNCamera> {
+  class JFunc_void_RNRegion_RNCamera_cxx final: public jni::HybridClass<JFunc_void_RNRegion_RNCamera_cxx, JFunc_void_RNRegion_RNCamera> {
   public:
     static jni::local_ref<JFunc_void_RNRegion_RNCamera::javaobject> fromCpp(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */)>& func) {
       return JFunc_void_RNRegion_RNCamera_cxx::newObjectCxxArgs(func);

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

@@ -13,6 +13,7 @@
 #include "RNRegion.hpp"
 #include "RNCamera.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNRegion.hpp"
 #include "RNLatLng.hpp"
 #include "JRNLatLng.hpp"
@@ -45,7 +46,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_RNRegion_RNCamera_bool that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_RNRegion_RNCamera_bool_cxx final: public jni::HybridClass<JFunc_void_RNRegion_RNCamera_bool_cxx, JFunc_void_RNRegion_RNCamera_bool> {
+  class JFunc_void_RNRegion_RNCamera_bool_cxx final: public jni::HybridClass<JFunc_void_RNRegion_RNCamera_bool_cxx, JFunc_void_RNRegion_RNCamera_bool> {
   public:
     static jni::local_ref<JFunc_void_RNRegion_RNCamera_bool::javaobject> fromCpp(const std::function<void(const RNRegion& /* region */, const RNCamera& /* camera */, bool /* isGesture */)>& func) {
       return JFunc_void_RNRegion_RNCamera_bool_cxx::newObjectCxxArgs(func);

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

@@ -11,6 +11,7 @@
 #include <functional>
 
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 
 namespace margelo::nitro::rngooglemapsplus {
 
@@ -37,7 +38,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_bool that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_bool_cxx final: public jni::HybridClass<JFunc_void_bool_cxx, JFunc_void_bool> {
+  class JFunc_void_bool_cxx final: public jni::HybridClass<JFunc_void_bool_cxx, JFunc_void_bool> {
   public:
     static jni::local_ref<JFunc_void_bool::javaobject> fromCpp(const std::function<void(bool /* ready */)>& func) {
       return JFunc_void_bool_cxx::newObjectCxxArgs(func);

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

@@ -12,6 +12,7 @@
 
 #include <string>
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 
 namespace margelo::nitro::rngooglemapsplus {
 
@@ -38,7 +39,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_std__string that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_std__string_cxx final: public jni::HybridClass<JFunc_void_std__string_cxx, JFunc_void_std__string> {
+  class JFunc_void_std__string_cxx final: public jni::HybridClass<JFunc_void_std__string_cxx, JFunc_void_std__string> {
   public:
     static jni::local_ref<JFunc_void_std__string::javaobject> fromCpp(const std::function<void(const std::string& /* id */)>& func) {
       return JFunc_void_std__string_cxx::newObjectCxxArgs(func);

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

@@ -13,6 +13,7 @@
 #include <string>
 #include "RNLatLng.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNLatLng.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
@@ -40,7 +41,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_std__string_RNLatLng that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_std__string_RNLatLng_cxx final: public jni::HybridClass<JFunc_void_std__string_RNLatLng_cxx, JFunc_void_std__string_RNLatLng> {
+  class JFunc_void_std__string_RNLatLng_cxx final: public jni::HybridClass<JFunc_void_std__string_RNLatLng_cxx, JFunc_void_std__string_RNLatLng> {
   public:
     static jni::local_ref<JFunc_void_std__string_RNLatLng::javaobject> fromCpp(const std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>& func) {
       return JFunc_void_std__string_RNLatLng_cxx::newObjectCxxArgs(func);

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

@@ -13,6 +13,7 @@
 #include <string>
 #include "RNLatLng.hpp"
 #include <functional>
+#include <NitroModules/JNICallable.hpp>
 #include "JRNLatLng.hpp"
 
 namespace margelo::nitro::rngooglemapsplus {
@@ -40,7 +41,7 @@ namespace margelo::nitro::rngooglemapsplus {
   /**
    * An implementation of Func_void_std__string_std__string_RNLatLng that is backed by a C++ implementation (using `std::function<...>`)
    */
-  struct JFunc_void_std__string_std__string_RNLatLng_cxx final: public jni::HybridClass<JFunc_void_std__string_std__string_RNLatLng_cxx, JFunc_void_std__string_std__string_RNLatLng> {
+  class JFunc_void_std__string_std__string_RNLatLng_cxx final: public jni::HybridClass<JFunc_void_std__string_std__string_RNLatLng_cxx, JFunc_void_std__string_std__string_RNLatLng> {
   public:
     static jni::local_ref<JFunc_void_std__string_std__string_RNLatLng::javaobject> fromCpp(const std::function<void(const std::string& /* placeId */, const std::string& /* name */, const RNLatLng& /* coordinate */)>& func) {
       return JFunc_void_std__string_std__string_RNLatLng_cxx::newObjectCxxArgs(func);

package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp

@@ -160,6 +160,7 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
 #include "RNMapErrorCode.hpp"
 #include <functional>
 #include "JFunc_void_RNMapErrorCode.hpp"
+#include <NitroModules/JNICallable.hpp>
 #include "JRNMapErrorCode.hpp"
 #include "JFunc_void_bool.hpp"
 #include "RNRegion.hpp"
@@ -542,9 +543,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNMapErrorCode error) -> void {
-          return __resultRef->invoke(error);
-        };
+        return JNICallable<JFunc_void_RNMapErrorCode, void(RNMapErrorCode)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -561,9 +560,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](bool ready) -> void {
-          return __resultRef->invoke(ready);
-        };
+        return JNICallable<JFunc_void_bool, void(bool)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -580,9 +577,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNRegion region, RNCamera camera) -> void {
-          return __resultRef->invoke(region,camera);
-        };
+        return JNICallable<JFunc_void_RNRegion_RNCamera, void(RNRegion, RNCamera)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -599,9 +594,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNLocation location) -> void {
-          return __resultRef->invoke(location);
-        };
+        return JNICallable<JFunc_void_RNLocation, void(RNLocation)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -618,9 +611,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNLocationErrorCode error) -> void {
-          return __resultRef->invoke(error);
-        };
+        return JNICallable<JFunc_void_RNLocationErrorCode, void(RNLocationErrorCode)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -637,9 +628,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNLatLng coordinate) -> void {
-          return __resultRef->invoke(coordinate);
-        };
+        return JNICallable<JFunc_void_RNLatLng, void(RNLatLng)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -656,9 +645,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNLatLng coordinate) -> void {
-          return __resultRef->invoke(coordinate);
-        };
+        return JNICallable<JFunc_void_RNLatLng, void(RNLatLng)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -675,9 +662,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string placeId, std::string name, RNLatLng coordinate) -> void {
-          return __resultRef->invoke(placeId,name,coordinate);
-        };
+        return JNICallable<JFunc_void_std__string_std__string_RNLatLng, void(std::string, std::string, RNLatLng)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -694,9 +679,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
-          return __resultRef->invoke(id);
-        };
+        return JNICallable<JFunc_void_std__string, void(std::string)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -713,9 +696,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
-          return __resultRef->invoke(id);
-        };
+        return JNICallable<JFunc_void_std__string, void(std::string)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -732,9 +713,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
-          return __resultRef->invoke(id);
-        };
+        return JNICallable<JFunc_void_std__string, void(std::string)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -751,9 +730,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
-          return __resultRef->invoke(id);
-        };
+        return JNICallable<JFunc_void_std__string, void(std::string)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -770,9 +747,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id, RNLatLng location) -> void {
-          return __resultRef->invoke(id,location);
-        };
+        return JNICallable<JFunc_void_std__string_RNLatLng, void(std::string, RNLatLng)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -789,9 +764,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id, RNLatLng location) -> void {
-          return __resultRef->invoke(id,location);
-        };
+        return JNICallable<JFunc_void_std__string_RNLatLng, void(std::string, RNLatLng)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -808,9 +781,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id, RNLatLng location) -> void {
-          return __resultRef->invoke(id,location);
-        };
+        return JNICallable<JFunc_void_std__string_RNLatLng, void(std::string, RNLatLng)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -818,41 +789,37 @@ namespace margelo::nitro::rngooglemapsplus {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string_RNLatLng::javaobject> /* onMarkerDragEnd */)>("setOnMarkerDragEnd_cxx");
     method(_javaPart, onMarkerDragEnd.has_value() ? JFunc_void_std__string_RNLatLng_cxx::fromCpp(onMarkerDragEnd.value()) : nullptr);
   }
-  std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> JHybridRNGoogleMapsPlusViewSpec::getOnIndoorBuildingFocused() {
+  std::optional<std::function<void(const RNIndoorBuilding& /* building */)>> JHybridRNGoogleMapsPlusViewSpec::getOnIndoorBuildingFocused() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNIndoorBuilding::javaobject>()>("getOnIndoorBuildingFocused_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNIndoorBuilding& /* indoorBuilding */)> {
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNIndoorBuilding& /* building */)> {
       if (__result->isInstanceOf(JFunc_void_RNIndoorBuilding_cxx::javaClassStatic())) [[likely]] {
         auto downcast = jni::static_ref_cast<JFunc_void_RNIndoorBuilding_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNIndoorBuilding indoorBuilding) -> void {
-          return __resultRef->invoke(indoorBuilding);
-        };
+        return JNICallable<JFunc_void_RNIndoorBuilding, void(RNIndoorBuilding)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) {
+  void JHybridRNGoogleMapsPlusViewSpec::setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* building */)>>& onIndoorBuildingFocused) {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNIndoorBuilding::javaobject> /* onIndoorBuildingFocused */)>("setOnIndoorBuildingFocused_cxx");
     method(_javaPart, onIndoorBuildingFocused.has_value() ? JFunc_void_RNIndoorBuilding_cxx::fromCpp(onIndoorBuildingFocused.value()) : nullptr);
   }
-  std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> JHybridRNGoogleMapsPlusViewSpec::getOnIndoorLevelActivated() {
+  std::optional<std::function<void(const RNIndoorLevel& /* level */)>> JHybridRNGoogleMapsPlusViewSpec::getOnIndoorLevelActivated() {
     static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNIndoorLevel::javaobject>()>("getOnIndoorLevelActivated_cxx");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNIndoorLevel& /* indoorLevel */)> {
+    return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNIndoorLevel& /* level */)> {
       if (__result->isInstanceOf(JFunc_void_RNIndoorLevel_cxx::javaClassStatic())) [[likely]] {
         auto downcast = jni::static_ref_cast<JFunc_void_RNIndoorLevel_cxx::javaobject>(__result);
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNIndoorLevel indoorLevel) -> void {
-          return __resultRef->invoke(indoorLevel);
-        };
+        return JNICallable<JFunc_void_RNIndoorLevel, void(RNIndoorLevel)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
-  void JHybridRNGoogleMapsPlusViewSpec::setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) {
+  void JHybridRNGoogleMapsPlusViewSpec::setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* level */)>>& onIndoorLevelActivated) {
     static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNIndoorLevel::javaobject> /* onIndoorLevelActivated */)>("setOnIndoorLevelActivated_cxx");
     method(_javaPart, onIndoorLevelActivated.has_value() ? JFunc_void_RNIndoorLevel_cxx::fromCpp(onIndoorLevelActivated.value()) : nullptr);
   }
@@ -865,9 +832,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
-          return __resultRef->invoke(id);
-        };
+        return JNICallable<JFunc_void_std__string, void(std::string)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -884,9 +849,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
-          return __resultRef->invoke(id);
-        };
+        return JNICallable<JFunc_void_std__string, void(std::string)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -903,9 +866,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](std::string id) -> void {
-          return __resultRef->invoke(id);
-        };
+        return JNICallable<JFunc_void_std__string, void(std::string)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -922,9 +883,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNLocation location) -> void {
-          return __resultRef->invoke(location);
-        };
+        return JNICallable<JFunc_void_RNLocation, void(RNLocation)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -941,9 +900,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](bool pressed) -> void {
-          return __resultRef->invoke(pressed);
-        };
+        return JNICallable<JFunc_void_bool, void(bool)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -960,9 +917,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNRegion region, RNCamera camera, bool isGesture) -> void {
-          return __resultRef->invoke(region,camera,isGesture);
-        };
+        return JNICallable<JFunc_void_RNRegion_RNCamera_bool, void(RNRegion, RNCamera, bool)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -979,9 +934,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNRegion region, RNCamera camera, bool isGesture) -> void {
-          return __resultRef->invoke(region,camera,isGesture);
-        };
+        return JNICallable<JFunc_void_RNRegion_RNCamera_bool, void(RNRegion, RNCamera, bool)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }
@@ -998,9 +951,7 @@ namespace margelo::nitro::rngooglemapsplus {
         return downcast->cthis()->getFunction();
       } else {
         auto __resultRef = jni::make_global(__result);
-        return [__resultRef](RNRegion region, RNCamera camera, bool isGesture) -> void {
-          return __resultRef->invoke(region,camera,isGesture);
-        };
+        return JNICallable<JFunc_void_RNRegion_RNCamera_bool, void(RNRegion, RNCamera, bool)>(std::move(__resultRef));
       }
     }()) : std::nullopt;
   }

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

@@ -118,10 +118,10 @@ namespace margelo::nitro::rngooglemapsplus {
     void setOnMarkerDrag(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDrag) override;
     std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>> getOnMarkerDragEnd() override;
     void setOnMarkerDragEnd(const std::optional<std::function<void(const std::string& /* id */, const RNLatLng& /* location */)>>& onMarkerDragEnd) override;
-    std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>> getOnIndoorBuildingFocused() override;
-    void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* indoorBuilding */)>>& onIndoorBuildingFocused) override;
-    std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>> getOnIndoorLevelActivated() override;
-    void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* indoorLevel */)>>& onIndoorLevelActivated) override;
+    std::optional<std::function<void(const RNIndoorBuilding& /* building */)>> getOnIndoorBuildingFocused() override;
+    void setOnIndoorBuildingFocused(const std::optional<std::function<void(const RNIndoorBuilding& /* building */)>>& onIndoorBuildingFocused) override;
+    std::optional<std::function<void(const RNIndoorLevel& /* level */)>> getOnIndoorLevelActivated() override;
+    void setOnIndoorLevelActivated(const std::optional<std::function<void(const RNIndoorLevel& /* level */)>>& onIndoorLevelActivated) override;
     std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowPress() override;
     void setOnInfoWindowPress(const std::optional<std::function<void(const std::string& /* id */)>>& onInfoWindowPress) override;
     std::optional<std::function<void(const std::string& /* id */)>> getOnInfoWindowClose() override;