react-native-acoustic-connect-beta 18.0.18 → 18.0.20

package/nitrogen/generated/android/AcousticConnectRN+autolinking.cmake

@@ -2,7 +2,7 @@
 # AcousticConnectRN+autolinking.cmake
 # This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 # https://github.com/mrousavy/nitro
-# Copyright © 2026 Marc Rousavy @ Margelo
+# Copyright © Marc Rousavy @ Margelo
 #
 
 # This is a CMake file that adds all files generated by Nitrogen
@@ -13,6 +13,12 @@
 # include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/AcousticConnectRN+autolinking.cmake)
 # ```
 
+# Define a flag to check if we are building properly
+add_definitions(-DBUILDING_ACOUSTICCONNECTRN_WITH_GENERATED_CMAKE_PROJECT)
+
+# Enable Raw Props parsing in react-native (for Nitro Views)
+add_definitions(-DRN_SERIALIZABLE_STATE)
+
 # Add all headers that were generated by Nitrogen
 include_directories(
   "../nitrogen/generated/shared/c++"
@@ -30,14 +36,13 @@ target_sources(
   ../nitrogen/generated/shared/c++/HybridAcousticConnectRNSpec.cpp
   # Android-specific Nitrogen C++ sources
   ../nitrogen/generated/android/c++/JHybridAcousticConnectRNSpec.cpp
+  ../nitrogen/generated/android/c++/JVariant_NullType_String.cpp
+  ../nitrogen/generated/android/c++/JVariant_Boolean_String_Double.cpp
 )
 
-# Define a flag to check if we are building properly
-add_definitions(-DBUILDING_ACOUSTICCONNECTRN_WITH_GENERATED_CMAKE_PROJECT)
-
 # From node_modules/react-native/ReactAndroid/cmake-utils/folly-flags.cmake
 # Used in node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
- target_compile_definitions(
+target_compile_definitions(
   AcousticConnectRN PRIVATE
   -DFOLLY_NO_CONFIG=1
   -DFOLLY_HAVE_CLOCK_GETTIME=1

package/nitrogen/generated/android/AcousticConnectRN+autolinking.gradle

@@ -2,7 +2,7 @@
 /// AcousticConnectRN+autolinking.gradle
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 /// This is a Gradle file that adds all files generated by Nitrogen

package/nitrogen/generated/android/AcousticConnectRNOnLoad.cpp

@@ -2,7 +2,7 @@
 /// AcousticConnectRNOnLoad.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #ifndef BUILDING_ACOUSTICCONNECTRN_WITH_GENERATED_CMAKE_PROJECT
@@ -16,31 +16,39 @@
 #include <NitroModules/HybridObjectRegistry.hpp>
 
 #include "JHybridAcousticConnectRNSpec.hpp"
-#include <NitroModules/JNISharedPtr.hpp>
 #include <NitroModules/DefaultConstructableObject.hpp>
 
 namespace margelo::nitro::acousticconnectrn {
 
 int initialize(JavaVM* vm) {
+  return facebook::jni::initialize(vm, []() {
+    ::margelo::nitro::acousticconnectrn::registerAllNatives();
+  });
+}
+
+struct JHybridAcousticConnectRNSpecImpl: public jni::JavaClass<JHybridAcousticConnectRNSpecImpl, JHybridAcousticConnectRNSpec::JavaPart> {
+  static constexpr auto kJavaDescriptor = "Lcom/acousticconnectrn/HybridAcousticConnectRN;";
+  static std::shared_ptr<JHybridAcousticConnectRNSpec> create() {
+    static const auto constructorFn = javaClassStatic()->getConstructor<JHybridAcousticConnectRNSpecImpl::javaobject()>();
+    jni::local_ref<JHybridAcousticConnectRNSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
+    return javaPart->getJHybridAcousticConnectRNSpec();
+  }
+};
+
+void registerAllNatives() {
   using namespace margelo::nitro;
   using namespace margelo::nitro::acousticconnectrn;
-  using namespace facebook;
-
-  return facebook::jni::initialize(vm, [] {
-    // Register native JNI methods
-    margelo::nitro::acousticconnectrn::JHybridAcousticConnectRNSpec::registerNatives();
-
-    // Register Nitro Hybrid Objects
-    HybridObjectRegistry::registerHybridObjectConstructor(
-      "AcousticConnectRN",
-      []() -> std::shared_ptr<HybridObject> {
-        static DefaultConstructableObject<JHybridAcousticConnectRNSpec::javaobject> object("com/acousticconnectrn/HybridAcousticConnectRN");
-        auto instance = object.create();
-        auto globalRef = jni::make_global(instance);
-        return JNISharedPtr::make_shared_from_jni<JHybridAcousticConnectRNSpec>(globalRef);
-      }
-    );
-  });
+
+  // Register native JNI methods
+  margelo::nitro::acousticconnectrn::JHybridAcousticConnectRNSpec::CxxPart::registerNatives();
+
+  // Register Nitro Hybrid Objects
+  HybridObjectRegistry::registerHybridObjectConstructor(
+    "AcousticConnectRN",
+    []() -> std::shared_ptr<HybridObject> {
+      return JHybridAcousticConnectRNSpecImpl::create();
+    }
+  );
 }
 
 } // namespace margelo::nitro::acousticconnectrn

package/nitrogen/generated/android/AcousticConnectRNOnLoad.hpp

@@ -2,24 +2,33 @@
 /// AcousticConnectRNOnLoad.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include <jni.h>
+#include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
 namespace margelo::nitro::acousticconnectrn {
 
+  [[deprecated("Use registerNatives() instead.")]]
+  int initialize(JavaVM* vm);
+
   /**
-   * Initializes the native (C++) part of AcousticConnectRN, and autolinks all Hybrid Objects.
-   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`).
+   * Register the native (C++) part of AcousticConnectRN, and autolinks all Hybrid Objects.
+   * Call this in your `JNI_OnLoad` function (probably inside `cpp-adapter.cpp`),
+   * inside a `facebook::jni::initialize(vm, ...)` call.
    * Example:
    * ```cpp (cpp-adapter.cpp)
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-   *   return margelo::nitro::acousticconnectrn::initialize(vm);
+   *   return facebook::jni::initialize(vm, []() {
+   *     // register all AcousticConnectRN HybridObjects
+   *     margelo::nitro::acousticconnectrn::registerNatives();
+   *     // any other custom registrations go here.
+   *   });
    * }
    * ```
    */
-  int initialize(JavaVM* vm);
+  void registerAllNatives();
 
 } // namespace margelo::nitro::acousticconnectrn

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

@@ -2,34 +2,49 @@
 /// JHybridAcousticConnectRNSpec.cpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #include "JHybridAcousticConnectRNSpec.hpp"
 
 
 
-#include <optional>
+#include <NitroModules/Null.hpp>
 #include <string>
 #include <variant>
-#include "JVariant_String_Double_Boolean.hpp"
+#include <optional>
+#include "JVariant_NullType_String.hpp"
+#include <NitroModules/JNull.hpp>
+#include "JVariant_Boolean_String_Double.hpp"
 #include <unordered_map>
 
 namespace margelo::nitro::acousticconnectrn {
 
-  jni::local_ref<JHybridAcousticConnectRNSpec::jhybriddata> JHybridAcousticConnectRNSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+  std::shared_ptr<JHybridAcousticConnectRNSpec> JHybridAcousticConnectRNSpec::JavaPart::getJHybridAcousticConnectRNSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridAcousticConnectRNSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridAcousticConnectRNSpec!");
+    }
+    return castHybridObject;
+  }
+
+  jni::local_ref<JHybridAcousticConnectRNSpec::CxxPart::jhybriddata> JHybridAcousticConnectRNSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
     return makeCxxInstance(jThis);
   }
 
-  void JHybridAcousticConnectRNSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridAcousticConnectRNSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridObject> JHybridAcousticConnectRNSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridAcousticConnectRNSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridAcousticConnectRNSpec::JavaPart!");
+    }
+    return std::make_shared<JHybridAcousticConnectRNSpec>(castJavaPart);
   }
 
-  size_t JHybridAcousticConnectRNSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  void JHybridAcousticConnectRNSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridAcousticConnectRNSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -37,128 +52,128 @@ namespace margelo::nitro::acousticconnectrn {
 
   // Methods
   bool JHybridAcousticConnectRNSpec::setBooleanConfigItemForKey(const std::string& key, bool value, const std::string& moduleName) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, jboolean /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setBooleanConfigItemForKey");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, jboolean /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setBooleanConfigItemForKey");
     auto __result = method(_javaPart, jni::make_jstring(key), value, jni::make_jstring(moduleName));
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::setStringItemForKey(const std::string& key, const std::string& value, const std::string& moduleName) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setStringItemForKey");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setStringItemForKey");
     auto __result = method(_javaPart, jni::make_jstring(key), jni::make_jstring(value), jni::make_jstring(moduleName));
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::setNumberItemForKey(const std::string& key, double value, const std::string& moduleName) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, double /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setNumberItemForKey");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, double /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setNumberItemForKey");
     auto __result = method(_javaPart, jni::make_jstring(key), value, jni::make_jstring(moduleName));
     return static_cast<bool>(__result);
   }
-  bool JHybridAcousticConnectRNSpec::setConfigItemForKey(const std::string& key, const std::variant<std::string, double, bool>& value, const std::string& moduleName) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, jni::alias_ref<JVariant_String_Double_Boolean> /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setConfigItemForKey");
-    auto __result = method(_javaPart, jni::make_jstring(key), JVariant_String_Double_Boolean::fromCpp(value), jni::make_jstring(moduleName));
+  bool JHybridAcousticConnectRNSpec::setConfigItemForKey(const std::string& key, const std::variant<bool, std::string, double>& value, const std::string& moduleName) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* key */, jni::alias_ref<JVariant_Boolean_String_Double> /* value */, jni::alias_ref<jni::JString> /* moduleName */)>("setConfigItemForKey");
+    auto __result = method(_javaPart, jni::make_jstring(key), JVariant_Boolean_String_Double::fromCpp(value), jni::make_jstring(moduleName));
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::getBooleanConfigItemForKey(bool theDefault, const std::string& key, const std::string& moduleName) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jboolean /* theDefault */, jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* moduleName */)>("getBooleanConfigItemForKey");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jboolean /* theDefault */, jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* moduleName */)>("getBooleanConfigItemForKey");
     auto __result = method(_javaPart, theDefault, jni::make_jstring(key), jni::make_jstring(moduleName));
     return static_cast<bool>(__result);
   }
-  std::optional<std::string> JHybridAcousticConnectRNSpec::getStringItemForKey(const std::string& theDefault, const std::string& key, const std::string& moduleName) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>(jni::alias_ref<jni::JString> /* theDefault */, jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* moduleName */)>("getStringItemForKey");
+  std::optional<std::variant<nitro::NullType, std::string>> JHybridAcousticConnectRNSpec::getStringItemForKey(const std::string& theDefault, const std::string& key, const std::string& moduleName) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JVariant_NullType_String>(jni::alias_ref<jni::JString> /* theDefault */, jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* moduleName */)>("getStringItemForKey");
     auto __result = method(_javaPart, jni::make_jstring(theDefault), jni::make_jstring(key), jni::make_jstring(moduleName));
-    return __result != nullptr ? std::make_optional(__result->toStdString()) : std::nullopt;
+    return __result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt;
   }
   double JHybridAcousticConnectRNSpec::getNumberItemForKey(double theDefault, const std::string& key, const std::string& moduleName) {
-    static const auto method = javaClassStatic()->getMethod<double(double /* theDefault */, jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* moduleName */)>("getNumberItemForKey");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<double(double /* theDefault */, jni::alias_ref<jni::JString> /* key */, jni::alias_ref<jni::JString> /* moduleName */)>("getNumberItemForKey");
     auto __result = method(_javaPart, theDefault, jni::make_jstring(key), jni::make_jstring(moduleName));
     return __result;
   }
-  bool JHybridAcousticConnectRNSpec::logCustomEvent(const std::string& eventName, const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values, double level) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* eventName */, jni::alias_ref<jni::JMap<jni::JString, JVariant_String_Double_Boolean>> /* values */, double /* level */)>("logCustomEvent");
-    auto __result = method(_javaPart, jni::make_jstring(eventName), [&]() -> jni::local_ref<jni::JMap<jni::JString, JVariant_String_Double_Boolean>> {
-      auto __map = jni::JHashMap<jni::JString, JVariant_String_Double_Boolean>::create(values.size());
+  bool JHybridAcousticConnectRNSpec::logCustomEvent(const std::string& eventName, const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values, double level) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* eventName */, jni::alias_ref<jni::JMap<jni::JString, JVariant_Boolean_String_Double>> /* values */, double /* level */)>("logCustomEvent");
+    auto __result = method(_javaPart, jni::make_jstring(eventName), [&]() -> jni::local_ref<jni::JMap<jni::JString, JVariant_Boolean_String_Double>> {
+      auto __map = jni::JHashMap<jni::JString, JVariant_Boolean_String_Double>::create(values.size());
       for (const auto& __entry : values) {
-        __map->put(jni::make_jstring(__entry.first), JVariant_String_Double_Boolean::fromCpp(__entry.second));
+        __map->put(jni::make_jstring(__entry.first), JVariant_Boolean_String_Double::fromCpp(__entry.second));
       }
       return __map;
     }(), level);
     return static_cast<bool>(__result);
   }
-  bool JHybridAcousticConnectRNSpec::logSignal(const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values, double level) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JMap<jni::JString, JVariant_String_Double_Boolean>> /* values */, double /* level */)>("logSignal");
-    auto __result = method(_javaPart, [&]() -> jni::local_ref<jni::JMap<jni::JString, JVariant_String_Double_Boolean>> {
-      auto __map = jni::JHashMap<jni::JString, JVariant_String_Double_Boolean>::create(values.size());
+  bool JHybridAcousticConnectRNSpec::logSignal(const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values, double level) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JMap<jni::JString, JVariant_Boolean_String_Double>> /* values */, double /* level */)>("logSignal");
+    auto __result = method(_javaPart, [&]() -> jni::local_ref<jni::JMap<jni::JString, JVariant_Boolean_String_Double>> {
+      auto __map = jni::JHashMap<jni::JString, JVariant_Boolean_String_Double>::create(values.size());
       for (const auto& __entry : values) {
-        __map->put(jni::make_jstring(__entry.first), JVariant_String_Double_Boolean::fromCpp(__entry.second));
+        __map->put(jni::make_jstring(__entry.first), JVariant_Boolean_String_Double::fromCpp(__entry.second));
       }
       return __map;
     }(), level);
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logExceptionEvent(const std::string& message, const std::string& stackInfo, bool unhandled) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* message */, jni::alias_ref<jni::JString> /* stackInfo */, jboolean /* unhandled */)>("logExceptionEvent");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* message */, jni::alias_ref<jni::JString> /* stackInfo */, jboolean /* unhandled */)>("logExceptionEvent");
     auto __result = method(_javaPart, jni::make_jstring(message), jni::make_jstring(stackInfo), unhandled);
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logLocation() {
-    static const auto method = javaClassStatic()->getMethod<jboolean()>("logLocation");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean()>("logLocation");
     auto __result = method(_javaPart);
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logLocationWithLatitudeLongitude(double latitude, double longitude, double level) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(double /* latitude */, double /* longitude */, double /* level */)>("logLocationWithLatitudeLongitude");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(double /* latitude */, double /* longitude */, double /* level */)>("logLocationWithLatitudeLongitude");
     auto __result = method(_javaPart, latitude, longitude, level);
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logClickEvent(double target, const std::string& controlId) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(double /* target */, jni::alias_ref<jni::JString> /* controlId */)>("logClickEvent");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(double /* target */, jni::alias_ref<jni::JString> /* controlId */)>("logClickEvent");
     auto __result = method(_javaPart, target, jni::make_jstring(controlId));
     return static_cast<bool>(__result);
   }
-  bool JHybridAcousticConnectRNSpec::logTextChangeEvent(double target, const std::string& controlId, const std::optional<std::string>& text) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(double /* target */, jni::alias_ref<jni::JString> /* controlId */, jni::alias_ref<jni::JString> /* text */)>("logTextChangeEvent");
-    auto __result = method(_javaPart, target, jni::make_jstring(controlId), text.has_value() ? jni::make_jstring(text.value()) : nullptr);
+  bool JHybridAcousticConnectRNSpec::logTextChangeEvent(double target, const std::string& controlId, const std::optional<std::variant<nitro::NullType, std::string>>& text) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(double /* target */, jni::alias_ref<jni::JString> /* controlId */, jni::alias_ref<JVariant_NullType_String> /* text */)>("logTextChangeEvent");
+    auto __result = method(_javaPart, target, jni::make_jstring(controlId), text.has_value() ? JVariant_NullType_String::fromCpp(text.value()) : nullptr);
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::setCurrentScreenName(const std::string& logicalPageName) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* logicalPageName */)>("setCurrentScreenName");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* logicalPageName */)>("setCurrentScreenName");
     auto __result = method(_javaPart, jni::make_jstring(logicalPageName));
     return static_cast<bool>(__result);
   }
-  bool JHybridAcousticConnectRNSpec::logScreenViewContextLoad(const std::optional<std::string>& logicalPageName, const std::optional<std::string>& referrer) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* logicalPageName */, jni::alias_ref<jni::JString> /* referrer */)>("logScreenViewContextLoad");
-    auto __result = method(_javaPart, logicalPageName.has_value() ? jni::make_jstring(logicalPageName.value()) : nullptr, referrer.has_value() ? jni::make_jstring(referrer.value()) : nullptr);
+  bool JHybridAcousticConnectRNSpec::logScreenViewContextLoad(const std::optional<std::variant<nitro::NullType, std::string>>& logicalPageName, const std::optional<std::variant<nitro::NullType, std::string>>& referrer) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<JVariant_NullType_String> /* logicalPageName */, jni::alias_ref<JVariant_NullType_String> /* referrer */)>("logScreenViewContextLoad");
+    auto __result = method(_javaPart, logicalPageName.has_value() ? JVariant_NullType_String::fromCpp(logicalPageName.value()) : nullptr, referrer.has_value() ? JVariant_NullType_String::fromCpp(referrer.value()) : nullptr);
     return static_cast<bool>(__result);
   }
-  bool JHybridAcousticConnectRNSpec::logScreenViewContextUnload(const std::optional<std::string>& logicalPageName, const std::optional<std::string>& referrer) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* logicalPageName */, jni::alias_ref<jni::JString> /* referrer */)>("logScreenViewContextUnload");
-    auto __result = method(_javaPart, logicalPageName.has_value() ? jni::make_jstring(logicalPageName.value()) : nullptr, referrer.has_value() ? jni::make_jstring(referrer.value()) : nullptr);
+  bool JHybridAcousticConnectRNSpec::logScreenViewContextUnload(const std::optional<std::variant<nitro::NullType, std::string>>& logicalPageName, const std::optional<std::variant<nitro::NullType, std::string>>& referrer) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<JVariant_NullType_String> /* logicalPageName */, jni::alias_ref<JVariant_NullType_String> /* referrer */)>("logScreenViewContextUnload");
+    auto __result = method(_javaPart, logicalPageName.has_value() ? JVariant_NullType_String::fromCpp(logicalPageName.value()) : nullptr, referrer.has_value() ? JVariant_NullType_String::fromCpp(referrer.value()) : nullptr);
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logScreenLayout(const std::string& name, double delay) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* name */, double /* delay */)>("logScreenLayout");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* name */, double /* delay */)>("logScreenLayout");
     auto __result = method(_javaPart, jni::make_jstring(name), delay);
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logDialogShowEvent(const std::string& dialogId, const std::string& dialogTitle, const std::string& dialogType) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* dialogTitle */, jni::alias_ref<jni::JString> /* dialogType */)>("logDialogShowEvent");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* dialogTitle */, jni::alias_ref<jni::JString> /* dialogType */)>("logDialogShowEvent");
     auto __result = method(_javaPart, jni::make_jstring(dialogId), jni::make_jstring(dialogTitle), jni::make_jstring(dialogType));
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logDialogDismissEvent(const std::string& dialogId, const std::string& dismissReason) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* dismissReason */)>("logDialogDismissEvent");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* dismissReason */)>("logDialogDismissEvent");
     auto __result = method(_javaPart, jni::make_jstring(dialogId), jni::make_jstring(dismissReason));
     return static_cast<bool>(__result);
   }
   bool JHybridAcousticConnectRNSpec::logDialogButtonClickEvent(const std::string& dialogId, const std::string& buttonText, double buttonIndex) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* buttonText */, double /* buttonIndex */)>("logDialogButtonClickEvent");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* buttonText */, double /* buttonIndex */)>("logDialogButtonClickEvent");
     auto __result = method(_javaPart, jni::make_jstring(dialogId), jni::make_jstring(buttonText), buttonIndex);
     return static_cast<bool>(__result);
   }
-  bool JHybridAcousticConnectRNSpec::logDialogCustomEvent(const std::string& dialogId, const std::string& eventName, const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values) {
-    static const auto method = javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* eventName */, jni::alias_ref<jni::JMap<jni::JString, JVariant_String_Double_Boolean>> /* values */)>("logDialogCustomEvent");
-    auto __result = method(_javaPart, jni::make_jstring(dialogId), jni::make_jstring(eventName), [&]() -> jni::local_ref<jni::JMap<jni::JString, JVariant_String_Double_Boolean>> {
-      auto __map = jni::JHashMap<jni::JString, JVariant_String_Double_Boolean>::create(values.size());
+  bool JHybridAcousticConnectRNSpec::logDialogCustomEvent(const std::string& dialogId, const std::string& eventName, const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean(jni::alias_ref<jni::JString> /* dialogId */, jni::alias_ref<jni::JString> /* eventName */, jni::alias_ref<jni::JMap<jni::JString, JVariant_Boolean_String_Double>> /* values */)>("logDialogCustomEvent");
+    auto __result = method(_javaPart, jni::make_jstring(dialogId), jni::make_jstring(eventName), [&]() -> jni::local_ref<jni::JMap<jni::JString, JVariant_Boolean_String_Double>> {
+      auto __map = jni::JHashMap<jni::JString, JVariant_Boolean_String_Double>::create(values.size());
       for (const auto& __entry : values) {
-        __map->put(jni::make_jstring(__entry.first), JVariant_String_Double_Boolean::fromCpp(__entry.second));
+        __map->put(jni::make_jstring(__entry.first), JVariant_Boolean_String_Double::fromCpp(__entry.second));
       }
       return __map;
     }());

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

@@ -2,7 +2,7 @@
 /// HybridAcousticConnectRNSpec.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
-/// Copyright © 2026 Marc Rousavy @ Margelo
+/// Copyright © Marc Rousavy @ Margelo
 ///
 
 #pragma once
@@ -18,30 +18,33 @@ namespace margelo::nitro::acousticconnectrn {
 
   using namespace facebook;
 
-  class JHybridAcousticConnectRNSpec: public jni::HybridClass<JHybridAcousticConnectRNSpec, JHybridObject>,
-                                      public virtual HybridAcousticConnectRNSpec {
+  class JHybridAcousticConnectRNSpec: public virtual HybridAcousticConnectRNSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/HybridAcousticConnectRNSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridAcousticConnectRNSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridAcousticConnectRNSpec::TAG),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/HybridAcousticConnectRNSpec;";
+      std::shared_ptr<JHybridAcousticConnectRNSpec> getJHybridAcousticConnectRNSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/HybridAcousticConnectRNSpec$CxxPart;";
+      static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
+      static void registerNatives();
+      using HybridBase::HybridBase;
+    protected:
+      std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
+    };
 
   public:
+    explicit JHybridAcousticConnectRNSpec(const jni::local_ref<JHybridAcousticConnectRNSpec::JavaPart>& javaPart):
+      HybridObject(HybridAcousticConnectRNSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridAcousticConnectRNSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-
-  public:
-    inline const jni::global_ref<JHybridAcousticConnectRNSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridAcousticConnectRNSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -54,30 +57,28 @@ namespace margelo::nitro::acousticconnectrn {
     bool setBooleanConfigItemForKey(const std::string& key, bool value, const std::string& moduleName) override;
     bool setStringItemForKey(const std::string& key, const std::string& value, const std::string& moduleName) override;
     bool setNumberItemForKey(const std::string& key, double value, const std::string& moduleName) override;
-    bool setConfigItemForKey(const std::string& key, const std::variant<std::string, double, bool>& value, const std::string& moduleName) override;
+    bool setConfigItemForKey(const std::string& key, const std::variant<bool, std::string, double>& value, const std::string& moduleName) override;
     bool getBooleanConfigItemForKey(bool theDefault, const std::string& key, const std::string& moduleName) override;
-    std::optional<std::string> getStringItemForKey(const std::string& theDefault, const std::string& key, const std::string& moduleName) override;
+    std::optional<std::variant<nitro::NullType, std::string>> getStringItemForKey(const std::string& theDefault, const std::string& key, const std::string& moduleName) override;
     double getNumberItemForKey(double theDefault, const std::string& key, const std::string& moduleName) override;
-    bool logCustomEvent(const std::string& eventName, const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values, double level) override;
-    bool logSignal(const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values, double level) override;
+    bool logCustomEvent(const std::string& eventName, const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values, double level) override;
+    bool logSignal(const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values, double level) override;
     bool logExceptionEvent(const std::string& message, const std::string& stackInfo, bool unhandled) override;
     bool logLocation() override;
     bool logLocationWithLatitudeLongitude(double latitude, double longitude, double level) override;
     bool logClickEvent(double target, const std::string& controlId) override;
-    bool logTextChangeEvent(double target, const std::string& controlId, const std::optional<std::string>& text) override;
+    bool logTextChangeEvent(double target, const std::string& controlId, const std::optional<std::variant<nitro::NullType, std::string>>& text) override;
     bool setCurrentScreenName(const std::string& logicalPageName) override;
-    bool logScreenViewContextLoad(const std::optional<std::string>& logicalPageName, const std::optional<std::string>& referrer) override;
-    bool logScreenViewContextUnload(const std::optional<std::string>& logicalPageName, const std::optional<std::string>& referrer) override;
+    bool logScreenViewContextLoad(const std::optional<std::variant<nitro::NullType, std::string>>& logicalPageName, const std::optional<std::variant<nitro::NullType, std::string>>& referrer) override;
+    bool logScreenViewContextUnload(const std::optional<std::variant<nitro::NullType, std::string>>& logicalPageName, const std::optional<std::variant<nitro::NullType, std::string>>& referrer) override;
     bool logScreenLayout(const std::string& name, double delay) override;
     bool logDialogShowEvent(const std::string& dialogId, const std::string& dialogTitle, const std::string& dialogType) override;
     bool logDialogDismissEvent(const std::string& dialogId, const std::string& dismissReason) override;
     bool logDialogButtonClickEvent(const std::string& dialogId, const std::string& buttonText, double buttonIndex) override;
-    bool logDialogCustomEvent(const std::string& dialogId, const std::string& eventName, const std::unordered_map<std::string, std::variant<std::string, double, bool>>& values) override;
+    bool logDialogCustomEvent(const std::string& dialogId, const std::string& eventName, const std::unordered_map<std::string, std::variant<bool, std::string, double>>& values) override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridAcousticConnectRNSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridAcousticConnectRNSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::acousticconnectrn

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

@@ -0,0 +1,30 @@
+///
+/// JVariant_Boolean_String_Double.cpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#include "JVariant_Boolean_String_Double.hpp"
+
+namespace margelo::nitro::acousticconnectrn {
+  /**
+   * Converts JVariant_Boolean_String_Double to std::variant<bool, std::string, double>
+   */
+  std::variant<bool, std::string, double> JVariant_Boolean_String_Double::toCpp() const {
+    if (isInstanceOf(JVariant_Boolean_String_Double_impl::First::javaClassStatic())) {
+      // It's a `bool`
+      auto jniValue = static_cast<const JVariant_Boolean_String_Double_impl::First*>(this)->getValue();
+      return static_cast<bool>(jniValue);
+    } else if (isInstanceOf(JVariant_Boolean_String_Double_impl::Second::javaClassStatic())) {
+      // It's a `std::string`
+      auto jniValue = static_cast<const JVariant_Boolean_String_Double_impl::Second*>(this)->getValue();
+      return jniValue->toStdString();
+    } else if (isInstanceOf(JVariant_Boolean_String_Double_impl::Third::javaClassStatic())) {
+      // It's a `double`
+      auto jniValue = static_cast<const JVariant_Boolean_String_Double_impl::Third*>(this)->getValue();
+      return jniValue;
+    }
+    throw std::invalid_argument("Variant is unknown Kotlin instance!");
+  }
+} // namespace margelo::nitro::acousticconnectrn

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

@@ -0,0 +1,83 @@
+///
+/// JVariant_Boolean_String_Double.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <variant>
+
+#include <string>
+#include <variant>
+
+namespace margelo::nitro::acousticconnectrn {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ std::variant and the Java class "Variant_Boolean_String_Double".
+   */
+  class JVariant_Boolean_String_Double: public jni::JavaClass<JVariant_Boolean_String_Double> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_Boolean_String_Double;";
+
+    static jni::local_ref<JVariant_Boolean_String_Double> create_0(jboolean value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_Boolean_String_Double(jboolean)>("create");
+      return method(javaClassStatic(), value);
+    }
+    static jni::local_ref<JVariant_Boolean_String_Double> create_1(jni::alias_ref<jni::JString> value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_Boolean_String_Double(jni::alias_ref<jni::JString>)>("create");
+      return method(javaClassStatic(), value);
+    }
+    static jni::local_ref<JVariant_Boolean_String_Double> create_2(double value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_Boolean_String_Double(double)>("create");
+      return method(javaClassStatic(), value);
+    }
+
+    static jni::local_ref<JVariant_Boolean_String_Double> fromCpp(const std::variant<bool, std::string, double>& variant) {
+      switch (variant.index()) {
+        case 0: return create_0(std::get<0>(variant));
+        case 1: return create_1(jni::make_jstring(std::get<1>(variant)));
+        case 2: return create_2(std::get<2>(variant));
+        default: throw std::invalid_argument("Variant holds unknown index! (" + std::to_string(variant.index()) + ")");
+      }
+    }
+
+    [[nodiscard]] std::variant<bool, std::string, double> toCpp() const;
+  };
+
+  namespace JVariant_Boolean_String_Double_impl {
+    class First final: public jni::JavaClass<First, JVariant_Boolean_String_Double> {
+    public:
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_Boolean_String_Double$First;";
+    
+      [[nodiscard]] jboolean getValue() const {
+        static const auto field = javaClassStatic()->getField<jboolean>("value");
+        return getFieldValue(field);
+      }
+    };
+    
+    class Second final: public jni::JavaClass<Second, JVariant_Boolean_String_Double> {
+    public:
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_Boolean_String_Double$Second;";
+    
+      [[nodiscard]] jni::local_ref<jni::JString> getValue() const {
+        static const auto field = javaClassStatic()->getField<jni::JString>("value");
+        return getFieldValue(field);
+      }
+    };
+    
+    class Third final: public jni::JavaClass<Third, JVariant_Boolean_String_Double> {
+    public:
+      static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/acousticconnectrn/Variant_Boolean_String_Double$Third;";
+    
+      [[nodiscard]] double getValue() const {
+        static const auto field = javaClassStatic()->getField<double>("value");
+        return getFieldValue(field);
+      }
+    };
+  } // namespace JVariant_Boolean_String_Double_impl
+} // namespace margelo::nitro::acousticconnectrn