@rive-app/react-native 0.2.8 → 0.3.1

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridViewModelPropertySpec: public jni::HybridClass<JHybridViewModelPropertySpec, JHybridObject>,
-                                      public virtual HybridViewModelPropertySpec {
+  class JHybridViewModelPropertySpec: public virtual HybridViewModelPropertySpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelPropertySpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridViewModelPropertySpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridViewModelPropertySpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelPropertySpec;";
+      std::shared_ptr<JHybridViewModelPropertySpec> getJHybridViewModelPropertySpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelPropertySpec$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 JHybridViewModelPropertySpec(const jni::local_ref<JHybridViewModelPropertySpec::JavaPart>& javaPart):
+      HybridObject(HybridViewModelPropertySpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridViewModelPropertySpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridViewModelPropertySpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridViewModelPropertySpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -58,9 +57,7 @@ namespace margelo::nitro::rive {
     
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridViewModelPropertySpec::javaobject> _javaPart;
+    jni::global_ref<JHybridViewModelPropertySpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive

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

@@ -18,76 +18,70 @@ namespace margelo::nitro::rive { class HybridViewModelInstanceSpec; }
 
 namespace margelo::nitro::rive {
 
-  jni::local_ref<JHybridViewModelSpec::jhybriddata> JHybridViewModelSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridViewModelSpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridViewModelSpec::initHybrid),
-    });
+  std::shared_ptr<JHybridViewModelSpec> JHybridViewModelSpec::JavaPart::getJHybridViewModelSpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridViewModelSpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridViewModelSpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridViewModelSpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridViewModelSpec::CxxPart::jhybriddata> JHybridViewModelSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridViewModelSpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelSpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridViewModelSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridViewModelSpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridViewModelSpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridViewModelSpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridViewModelSpec>(castJavaPart);
   }
 
-  std::string JHybridViewModelSpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridViewModelSpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridViewModelSpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
   double JHybridViewModelSpec::getPropertyCount() {
-    static const auto method = javaClassStatic()->getMethod<double()>("getPropertyCount");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<double()>("getPropertyCount");
     auto __result = method(_javaPart);
     return __result;
   }
   double JHybridViewModelSpec::getInstanceCount() {
-    static const auto method = javaClassStatic()->getMethod<double()>("getInstanceCount");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<double()>("getInstanceCount");
     auto __result = method(_javaPart);
     return __result;
   }
   std::string JHybridViewModelSpec::getModelName() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getModelName");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getModelName");
     auto __result = method(_javaPart);
     return __result->toStdString();
   }
 
   // Methods
   std::optional<std::shared_ptr<HybridViewModelInstanceSpec>> JHybridViewModelSpec::createInstanceByIndex(double index) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::javaobject>(double /* index */)>("createInstanceByIndex");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::JavaPart>(double /* index */)>("createInstanceByIndex");
     auto __result = method(_javaPart, index);
-    return __result != nullptr ? std::make_optional(__result->cthis()->shared_cast<JHybridViewModelInstanceSpec>()) : std::nullopt;
+    return __result != nullptr ? std::make_optional(__result->getJHybridViewModelInstanceSpec()) : std::nullopt;
   }
   std::optional<std::shared_ptr<HybridViewModelInstanceSpec>> JHybridViewModelSpec::createInstanceByName(const std::string& name) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::javaobject>(jni::alias_ref<jni::JString> /* name */)>("createInstanceByName");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::JavaPart>(jni::alias_ref<jni::JString> /* name */)>("createInstanceByName");
     auto __result = method(_javaPart, jni::make_jstring(name));
-    return __result != nullptr ? std::make_optional(__result->cthis()->shared_cast<JHybridViewModelInstanceSpec>()) : std::nullopt;
+    return __result != nullptr ? std::make_optional(__result->getJHybridViewModelInstanceSpec()) : std::nullopt;
   }
   std::optional<std::shared_ptr<HybridViewModelInstanceSpec>> JHybridViewModelSpec::createDefaultInstance() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::javaobject>()>("createDefaultInstance");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::JavaPart>()>("createDefaultInstance");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional(__result->cthis()->shared_cast<JHybridViewModelInstanceSpec>()) : std::nullopt;
+    return __result != nullptr ? std::make_optional(__result->getJHybridViewModelInstanceSpec()) : std::nullopt;
   }
   std::optional<std::shared_ptr<HybridViewModelInstanceSpec>> JHybridViewModelSpec::createInstance() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::javaobject>()>("createInstance");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridViewModelInstanceSpec::JavaPart>()>("createInstance");
     auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional(__result->cthis()->shared_cast<JHybridViewModelInstanceSpec>()) : std::nullopt;
+    return __result != nullptr ? std::make_optional(__result->getJHybridViewModelInstanceSpec()) : std::nullopt;
   }
 
 } // namespace margelo::nitro::rive

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

@@ -18,34 +18,33 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridViewModelSpec: public jni::HybridClass<JHybridViewModelSpec, JHybridObject>,
-                              public virtual HybridViewModelSpec {
+  class JHybridViewModelSpec: public virtual HybridViewModelSpec, public virtual JHybridObject {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelSpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridViewModelSpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridViewModelSpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelSpec;";
+      std::shared_ptr<JHybridViewModelSpec> getJHybridViewModelSpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelSpec$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 JHybridViewModelSpec(const jni::local_ref<JHybridViewModelSpec::JavaPart>& javaPart):
+      HybridObject(HybridViewModelSpec::TAG),
+      JHybridObject(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridViewModelSpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridViewModelSpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridViewModelSpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -63,9 +62,7 @@ namespace margelo::nitro::rive {
     std::optional<std::shared_ptr<HybridViewModelInstanceSpec>> createInstance() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridViewModelSpec::javaobject> _javaPart;
+    jni::global_ref<JHybridViewModelSpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive

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

@@ -17,53 +17,47 @@
 
 namespace margelo::nitro::rive {
 
-  jni::local_ref<JHybridViewModelStringPropertySpec::jhybriddata> JHybridViewModelStringPropertySpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridViewModelStringPropertySpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridViewModelStringPropertySpec::initHybrid),
-    });
+  std::shared_ptr<JHybridViewModelStringPropertySpec> JHybridViewModelStringPropertySpec::JavaPart::getJHybridViewModelStringPropertySpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridViewModelStringPropertySpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridViewModelStringPropertySpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridViewModelStringPropertySpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridViewModelStringPropertySpec::CxxPart::jhybriddata> JHybridViewModelStringPropertySpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridViewModelStringPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelStringPropertySpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridViewModelStringPropertySpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridViewModelStringPropertySpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridViewModelStringPropertySpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridViewModelStringPropertySpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridViewModelStringPropertySpec>(castJavaPart);
   }
 
-  std::string JHybridViewModelStringPropertySpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridViewModelStringPropertySpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridViewModelStringPropertySpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
   std::string JHybridViewModelStringPropertySpec::getValue() {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getValue");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getValue");
     auto __result = method(_javaPart);
     return __result->toStdString();
   }
   void JHybridViewModelStringPropertySpec::setValue(const std::string& value) {
-    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* value */)>("setValue");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* value */)>("setValue");
     method(_javaPart, jni::make_jstring(value));
   }
 
   // Methods
   std::function<void()> JHybridViewModelStringPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
     auto __result = method(_javaPart, JFunc_void_std__string_cxx::fromCpp(onChanged));
     return [&]() -> std::function<void()> {
       if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
@@ -76,7 +70,7 @@ namespace margelo::nitro::rive {
     }();
   }
   void JHybridViewModelStringPropertySpec::removeListeners() {
-    static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("removeListeners");
     method(_javaPart);
   }
 

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

@@ -19,34 +19,34 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridViewModelStringPropertySpec: public jni::HybridClass<JHybridViewModelStringPropertySpec, JHybridViewModelPropertySpec>,
-                                            public virtual HybridViewModelStringPropertySpec {
+  class JHybridViewModelStringPropertySpec: public virtual HybridViewModelStringPropertySpec, public virtual JHybridViewModelPropertySpec {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelStringPropertySpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridViewModelStringPropertySpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridViewModelStringPropertySpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridViewModelPropertySpec::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelStringPropertySpec;";
+      std::shared_ptr<JHybridViewModelStringPropertySpec> getJHybridViewModelStringPropertySpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridViewModelPropertySpec::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelStringPropertySpec$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 JHybridViewModelStringPropertySpec(const jni::local_ref<JHybridViewModelStringPropertySpec::JavaPart>& javaPart):
+      HybridObject(HybridViewModelStringPropertySpec::TAG),
+      JHybridObject(javaPart),
+      JHybridViewModelPropertySpec(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridViewModelStringPropertySpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridViewModelStringPropertySpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridViewModelStringPropertySpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -61,9 +61,7 @@ namespace margelo::nitro::rive {
     void removeListeners() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridViewModelStringPropertySpec::javaobject> _javaPart;
+    jni::global_ref<JHybridViewModelStringPropertySpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive

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

@@ -15,37 +15,31 @@
 
 namespace margelo::nitro::rive {
 
-  jni::local_ref<JHybridViewModelTriggerPropertySpec::jhybriddata> JHybridViewModelTriggerPropertySpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
-    return makeCxxInstance(jThis);
-  }
-
-  void JHybridViewModelTriggerPropertySpec::registerNatives() {
-    registerHybrid({
-      makeNativeMethod("initHybrid", JHybridViewModelTriggerPropertySpec::initHybrid),
-    });
+  std::shared_ptr<JHybridViewModelTriggerPropertySpec> JHybridViewModelTriggerPropertySpec::JavaPart::getJHybridViewModelTriggerPropertySpec() {
+    auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
+    auto castHybridObject = std::dynamic_pointer_cast<JHybridViewModelTriggerPropertySpec>(hybridObject);
+    if (castHybridObject == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to downcast JHybridObject to JHybridViewModelTriggerPropertySpec!");
+    }
+    return castHybridObject;
   }
 
-  size_t JHybridViewModelTriggerPropertySpec::getExternalMemorySize() noexcept {
-    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
-    return method(_javaPart);
+  jni::local_ref<JHybridViewModelTriggerPropertySpec::CxxPart::jhybriddata> JHybridViewModelTriggerPropertySpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
+    return makeCxxInstance(jThis);
   }
 
-  bool JHybridViewModelTriggerPropertySpec::equals(const std::shared_ptr<HybridObject>& other) {
-    if (auto otherCast = std::dynamic_pointer_cast<JHybridViewModelTriggerPropertySpec>(other)) {
-      return _javaPart == otherCast->_javaPart;
+  std::shared_ptr<JHybridObject> JHybridViewModelTriggerPropertySpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
+    auto castJavaPart = jni::dynamic_ref_cast<JHybridViewModelTriggerPropertySpec::JavaPart>(javaPart);
+    if (castJavaPart == nullptr) [[unlikely]] {
+      throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridViewModelTriggerPropertySpec::JavaPart!");
     }
-    return false;
-  }
-
-  void JHybridViewModelTriggerPropertySpec::dispose() noexcept {
-    static const auto method = javaClassStatic()->getMethod<void()>("dispose");
-    method(_javaPart);
+    return std::make_shared<JHybridViewModelTriggerPropertySpec>(castJavaPart);
   }
 
-  std::string JHybridViewModelTriggerPropertySpec::toString() {
-    static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
-    auto javaString = method(_javaPart);
-    return javaString->toStdString();
+  void JHybridViewModelTriggerPropertySpec::CxxPart::registerNatives() {
+    registerHybrid({
+      makeNativeMethod("initHybrid", JHybridViewModelTriggerPropertySpec::CxxPart::initHybrid),
+    });
   }
 
   // Properties
@@ -53,7 +47,7 @@ namespace margelo::nitro::rive {
 
   // Methods
   std::function<void()> JHybridViewModelTriggerPropertySpec::addListener(const std::function<void()>& onChanged) {
-    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
     auto __result = method(_javaPart, JFunc_void_cxx::fromCpp(onChanged));
     return [&]() -> std::function<void()> {
       if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
@@ -66,11 +60,11 @@ namespace margelo::nitro::rive {
     }();
   }
   void JHybridViewModelTriggerPropertySpec::trigger() {
-    static const auto method = javaClassStatic()->getMethod<void()>("trigger");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("trigger");
     method(_javaPart);
   }
   void JHybridViewModelTriggerPropertySpec::removeListeners() {
-    static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("removeListeners");
     method(_javaPart);
   }
 

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

@@ -19,34 +19,34 @@ namespace margelo::nitro::rive {
 
   using namespace facebook;
 
-  class JHybridViewModelTriggerPropertySpec: public jni::HybridClass<JHybridViewModelTriggerPropertySpec, JHybridViewModelPropertySpec>,
-                                             public virtual HybridViewModelTriggerPropertySpec {
+  class JHybridViewModelTriggerPropertySpec: public virtual HybridViewModelTriggerPropertySpec, public virtual JHybridViewModelPropertySpec {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelTriggerPropertySpec;";
-    static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
-    static void registerNatives();
-
-  protected:
-    // C++ constructor (called from Java via `initHybrid()`)
-    explicit JHybridViewModelTriggerPropertySpec(jni::alias_ref<jhybridobject> jThis) :
-      HybridObject(HybridViewModelTriggerPropertySpec::TAG),
-      HybridBase(jThis),
-      _javaPart(jni::make_global(jThis)) {}
+    struct JavaPart: public jni::JavaClass<JavaPart, JHybridViewModelPropertySpec::JavaPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelTriggerPropertySpec;";
+      std::shared_ptr<JHybridViewModelTriggerPropertySpec> getJHybridViewModelTriggerPropertySpec();
+    };
+    struct CxxPart: public jni::HybridClass<CxxPart, JHybridViewModelPropertySpec::CxxPart> {
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/HybridViewModelTriggerPropertySpec$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 JHybridViewModelTriggerPropertySpec(const jni::local_ref<JHybridViewModelTriggerPropertySpec::JavaPart>& javaPart):
+      HybridObject(HybridViewModelTriggerPropertySpec::TAG),
+      JHybridObject(javaPart),
+      JHybridViewModelPropertySpec(javaPart),
+      _javaPart(jni::make_global(javaPart)) {}
     ~JHybridViewModelTriggerPropertySpec() override {
       // Hermes GC can destroy JS objects on a non-JNI Thread.
       jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
     }
 
   public:
-    size_t getExternalMemorySize() noexcept override;
-    bool equals(const std::shared_ptr<HybridObject>& other) override;
-    void dispose() noexcept override;
-    std::string toString() override;
-
-  public:
-    inline const jni::global_ref<JHybridViewModelTriggerPropertySpec::javaobject>& getJavaPart() const noexcept {
+    inline const jni::global_ref<JHybridViewModelTriggerPropertySpec::JavaPart>& getJavaPart() const noexcept {
       return _javaPart;
     }
 
@@ -61,9 +61,7 @@ namespace margelo::nitro::rive {
     void removeListeners() override;
 
   private:
-    friend HybridBase;
-    using HybridBase::HybridBase;
-    jni::global_ref<JHybridViewModelTriggerPropertySpec::javaobject> _javaPart;
+    jni::global_ref<JHybridViewModelTriggerPropertySpec::JavaPart> _javaPart;
   };
 
 } // namespace margelo::nitro::rive

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

@@ -43,14 +43,14 @@ namespace margelo::nitro::rive {
       jni::local_ref<jni::JString> sourceAssetId = this->getFieldValue(fieldSourceAssetId);
       static const auto fieldPath = clazz->getField<jni::JString>("path");
       jni::local_ref<jni::JString> path = this->getFieldValue(fieldPath);
-      static const auto fieldImage = clazz->getField<JHybridRiveImageSpec::javaobject>("image");
-      jni::local_ref<JHybridRiveImageSpec::javaobject> image = this->getFieldValue(fieldImage);
+      static const auto fieldImage = clazz->getField<JHybridRiveImageSpec::JavaPart>("image");
+      jni::local_ref<JHybridRiveImageSpec::JavaPart> image = this->getFieldValue(fieldImage);
       return ResolvedReferencedAsset(
         sourceUrl != nullptr ? std::make_optional(sourceUrl->toStdString()) : std::nullopt,
         sourceAsset != nullptr ? std::make_optional(sourceAsset->toStdString()) : std::nullopt,
         sourceAssetId != nullptr ? std::make_optional(sourceAssetId->toStdString()) : std::nullopt,
         path != nullptr ? std::make_optional(path->toStdString()) : std::nullopt,
-        image != nullptr ? std::make_optional(image->cthis()->shared_cast<JHybridRiveImageSpec>()) : std::nullopt
+        image != nullptr ? std::make_optional(image->getJHybridRiveImageSpec()) : std::nullopt
       );
     }
 
@@ -60,7 +60,7 @@ namespace margelo::nitro::rive {
      */
     [[maybe_unused]]
     static jni::local_ref<JResolvedReferencedAsset::javaobject> fromCpp(const ResolvedReferencedAsset& value) {
-      using JSignature = JResolvedReferencedAsset(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JHybridRiveImageSpec::javaobject>);
+      using JSignature = JResolvedReferencedAsset(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JHybridRiveImageSpec::JavaPart>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(

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

@@ -15,7 +15,7 @@ namespace margelo::nitro::rive {
     if (isInstanceOf(JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName_impl::First::javaClassStatic())) {
       // It's a `std::shared_ptr<HybridViewModelInstanceSpec>`
       auto jniValue = static_cast<const JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName_impl::First*>(this)->getValue();
-      return jniValue->cthis()->shared_cast<JHybridViewModelInstanceSpec>();
+      return jniValue->getJHybridViewModelInstanceSpec();
     } else if (isInstanceOf(JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName_impl::Second::javaClassStatic())) {
       // It's a `DataBindMode`
       auto jniValue = static_cast<const JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName_impl::Second*>(this)->getValue();

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

@@ -31,8 +31,8 @@ namespace margelo::nitro::rive {
   public:
     static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName;";
 
-    static jni::local_ref<JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> create_0(jni::alias_ref<JHybridViewModelInstanceSpec::javaobject> value) {
-      static const auto method = javaClassStatic()->getStaticMethod<JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName(jni::alias_ref<JHybridViewModelInstanceSpec::javaobject>)>("create");
+    static jni::local_ref<JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> create_0(jni::alias_ref<JHybridViewModelInstanceSpec::JavaPart> value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName(jni::alias_ref<JHybridViewModelInstanceSpec::JavaPart>)>("create");
       return method(javaClassStatic(), value);
     }
     static jni::local_ref<JVariant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName> create_1(jni::alias_ref<JDataBindMode> value) {
@@ -61,8 +61,8 @@ namespace margelo::nitro::rive {
     public:
       static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/rive/Variant_HybridViewModelInstanceSpec_DataBindMode_DataBindByName$First;";
     
-      [[nodiscard]] jni::local_ref<JHybridViewModelInstanceSpec::javaobject> getValue() const {
-        static const auto field = javaClassStatic()->getField<JHybridViewModelInstanceSpec::javaobject>("value");
+      [[nodiscard]] jni::local_ref<JHybridViewModelInstanceSpec::JavaPart> getValue() const {
+        static const auto field = javaClassStatic()->getField<JHybridViewModelInstanceSpec::JavaPart>("value");
         return getFieldValue(field);
       }
     };