@rive-app/react-native 0.1.1-beta.0 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (78) hide show
  1. package/android/src/main/java/com/margelo/nitro/rive/BaseHybridViewModelProperty.kt +9 -7
  2. package/android/src/main/java/com/margelo/nitro/rive/BaseHybridViewModelPropertyImpl.kt +43 -24
  3. package/android/src/main/java/com/margelo/nitro/rive/HybridViewModelBooleanProperty.kt +3 -2
  4. package/android/src/main/java/com/margelo/nitro/rive/HybridViewModelColorProperty.kt +3 -2
  5. package/android/src/main/java/com/margelo/nitro/rive/HybridViewModelEnumProperty.kt +3 -2
  6. package/android/src/main/java/com/margelo/nitro/rive/HybridViewModelImageProperty.kt +3 -2
  7. package/android/src/main/java/com/margelo/nitro/rive/HybridViewModelNumberProperty.kt +3 -2
  8. package/android/src/main/java/com/margelo/nitro/rive/HybridViewModelStringProperty.kt +3 -2
  9. package/android/src/main/java/com/margelo/nitro/rive/HybridViewModelTriggerProperty.kt +3 -2
  10. package/ios/BaseHybridViewModelProperty.swift +13 -6
  11. package/ios/HybridViewModel.swift +1 -6
  12. package/ios/HybridViewModelBooleanProperty.swift +1 -9
  13. package/ios/HybridViewModelColorProperty.swift +3 -12
  14. package/ios/HybridViewModelEnumProperty.swift +1 -9
  15. package/ios/HybridViewModelImageProperty.swift +4 -4
  16. package/ios/HybridViewModelInstance.swift +1 -6
  17. package/ios/HybridViewModelNumberProperty.swift +2 -13
  18. package/ios/HybridViewModelStringProperty.swift +1 -9
  19. package/ios/HybridViewModelTriggerProperty.swift +5 -14
  20. package/ios/RiveReactNativeView.swift +36 -0
  21. package/lib/typescript/src/specs/ViewModel.nitro.d.ts +15 -15
  22. package/lib/typescript/src/specs/ViewModel.nitro.d.ts.map +1 -1
  23. package/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.cpp +14 -4
  24. package/nitrogen/generated/android/c++/JHybridViewModelBooleanPropertySpec.hpp +1 -1
  25. package/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.cpp +14 -4
  26. package/nitrogen/generated/android/c++/JHybridViewModelColorPropertySpec.hpp +1 -1
  27. package/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.cpp +14 -4
  28. package/nitrogen/generated/android/c++/JHybridViewModelEnumPropertySpec.hpp +1 -1
  29. package/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp +15 -6
  30. package/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.hpp +1 -1
  31. package/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.cpp +14 -4
  32. package/nitrogen/generated/android/c++/JHybridViewModelNumberPropertySpec.hpp +1 -1
  33. package/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.cpp +14 -4
  34. package/nitrogen/generated/android/c++/JHybridViewModelStringPropertySpec.hpp +1 -1
  35. package/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.cpp +12 -3
  36. package/nitrogen/generated/android/c++/JHybridViewModelTriggerPropertySpec.hpp +1 -1
  37. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelBooleanPropertySpec.kt +3 -3
  38. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelColorPropertySpec.kt +3 -3
  39. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelEnumPropertySpec.kt +3 -3
  40. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelImagePropertySpec.kt +3 -3
  41. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelNumberPropertySpec.kt +3 -3
  42. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelStringPropertySpec.kt +3 -3
  43. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rive/HybridViewModelTriggerPropertySpec.kt +3 -3
  44. package/nitrogen/generated/android/riveOnLoad.cpp +2 -74
  45. package/nitrogen/generated/ios/RNRive-Swift-Cxx-Bridge.hpp +9 -0
  46. package/nitrogen/generated/ios/RNRiveAutolinking.mm +0 -72
  47. package/nitrogen/generated/ios/RNRiveAutolinking.swift +0 -135
  48. package/nitrogen/generated/ios/c++/HybridViewModelBooleanPropertySpecSwift.hpp +3 -1
  49. package/nitrogen/generated/ios/c++/HybridViewModelColorPropertySpecSwift.hpp +3 -1
  50. package/nitrogen/generated/ios/c++/HybridViewModelEnumPropertySpecSwift.hpp +3 -1
  51. package/nitrogen/generated/ios/c++/HybridViewModelImagePropertySpecSwift.hpp +3 -1
  52. package/nitrogen/generated/ios/c++/HybridViewModelNumberPropertySpecSwift.hpp +3 -1
  53. package/nitrogen/generated/ios/c++/HybridViewModelStringPropertySpecSwift.hpp +3 -1
  54. package/nitrogen/generated/ios/c++/HybridViewModelTriggerPropertySpecSwift.hpp +3 -1
  55. package/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec.swift +1 -1
  56. package/nitrogen/generated/ios/swift/HybridViewModelBooleanPropertySpec_cxx.swift +8 -4
  57. package/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec.swift +1 -1
  58. package/nitrogen/generated/ios/swift/HybridViewModelColorPropertySpec_cxx.swift +8 -4
  59. package/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec.swift +1 -1
  60. package/nitrogen/generated/ios/swift/HybridViewModelEnumPropertySpec_cxx.swift +8 -4
  61. package/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec.swift +1 -1
  62. package/nitrogen/generated/ios/swift/HybridViewModelImagePropertySpec_cxx.swift +8 -4
  63. package/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec.swift +1 -1
  64. package/nitrogen/generated/ios/swift/HybridViewModelNumberPropertySpec_cxx.swift +8 -4
  65. package/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec.swift +1 -1
  66. package/nitrogen/generated/ios/swift/HybridViewModelStringPropertySpec_cxx.swift +8 -4
  67. package/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec.swift +1 -1
  68. package/nitrogen/generated/ios/swift/HybridViewModelTriggerPropertySpec_cxx.swift +8 -4
  69. package/nitrogen/generated/shared/c++/HybridViewModelBooleanPropertySpec.hpp +1 -1
  70. package/nitrogen/generated/shared/c++/HybridViewModelColorPropertySpec.hpp +1 -1
  71. package/nitrogen/generated/shared/c++/HybridViewModelEnumPropertySpec.hpp +1 -1
  72. package/nitrogen/generated/shared/c++/HybridViewModelImagePropertySpec.hpp +1 -1
  73. package/nitrogen/generated/shared/c++/HybridViewModelNumberPropertySpec.hpp +1 -1
  74. package/nitrogen/generated/shared/c++/HybridViewModelStringPropertySpec.hpp +1 -1
  75. package/nitrogen/generated/shared/c++/HybridViewModelTriggerPropertySpec.hpp +1 -1
  76. package/package.json +1 -1
  77. package/src/hooks/useRiveProperty.ts +1 -1
  78. package/src/specs/ViewModel.nitro.ts +15 -15
@@ -56,7 +56,7 @@ namespace margelo::nitro::rive {
56
56
 
57
57
  public:
58
58
  // Methods
59
- void addListener(const std::function<void(double /* value */)>& onChanged) override;
59
+ std::function<void()> addListener(const std::function<void(double /* value */)>& onChanged) override;
60
60
  void removeListeners() override;
61
61
 
62
62
  private:
@@ -11,8 +11,9 @@
11
11
 
12
12
  #include <string>
13
13
  #include <functional>
14
- #include "JFunc_void_std__string.hpp"
14
+ #include "JFunc_void.hpp"
15
15
  #include <NitroModules/JNICallable.hpp>
16
+ #include "JFunc_void_std__string.hpp"
16
17
 
17
18
  namespace margelo::nitro::rive {
18
19
 
@@ -54,9 +55,18 @@ namespace margelo::nitro::rive {
54
55
  }
55
56
 
56
57
  // Methods
57
- void JHybridViewModelEnumPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
58
- static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
59
- method(_javaPart, JFunc_void_std__string_cxx::fromCpp(onChanged));
58
+ std::function<void()> JHybridViewModelEnumPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
59
+ static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
60
+ auto __result = method(_javaPart, JFunc_void_std__string_cxx::fromCpp(onChanged));
61
+ return [&]() -> std::function<void()> {
62
+ if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
63
+ auto downcast = jni::static_ref_cast<JFunc_void_cxx::javaobject>(__result);
64
+ return downcast->cthis()->getFunction();
65
+ } else {
66
+ auto __resultRef = jni::make_global(__result);
67
+ return JNICallable<JFunc_void, void()>(std::move(__resultRef));
68
+ }
69
+ }();
60
70
  }
61
71
  void JHybridViewModelEnumPropertySpec::removeListeners() {
62
72
  static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");
@@ -56,7 +56,7 @@ namespace margelo::nitro::rive {
56
56
 
57
57
  public:
58
58
  // Methods
59
- void addListener(const std::function<void(const std::string& /* value */)>& onChanged) override;
59
+ std::function<void()> addListener(const std::function<void(const std::string& /* value */)>& onChanged) override;
60
60
  void removeListeners() override;
61
61
 
62
62
  private:
@@ -10,13 +10,13 @@
10
10
  // Forward declaration of `HybridRiveImageSpec` to properly resolve imports.
11
11
  namespace margelo::nitro::rive { class HybridRiveImageSpec; }
12
12
 
13
+ #include <functional>
14
+ #include "JFunc_void.hpp"
15
+ #include <NitroModules/JNICallable.hpp>
13
16
  #include <memory>
14
17
  #include "HybridRiveImageSpec.hpp"
15
18
  #include <optional>
16
19
  #include "JHybridRiveImageSpec.hpp"
17
- #include <functional>
18
- #include "JFunc_void.hpp"
19
- #include <NitroModules/JNICallable.hpp>
20
20
 
21
21
  namespace margelo::nitro::rive {
22
22
 
@@ -54,9 +54,18 @@ namespace margelo::nitro::rive {
54
54
  static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JHybridRiveImageSpec::javaobject> /* image */)>("set");
55
55
  method(_javaPart, image.has_value() ? std::dynamic_pointer_cast<JHybridRiveImageSpec>(image.value())->getJavaPart() : nullptr);
56
56
  }
57
- void JHybridViewModelImagePropertySpec::addListener(const std::function<void()>& onChanged) {
58
- static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
59
- method(_javaPart, JFunc_void_cxx::fromCpp(onChanged));
57
+ std::function<void()> JHybridViewModelImagePropertySpec::addListener(const std::function<void()>& onChanged) {
58
+ static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
59
+ auto __result = method(_javaPart, JFunc_void_cxx::fromCpp(onChanged));
60
+ return [&]() -> std::function<void()> {
61
+ if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
62
+ auto downcast = jni::static_ref_cast<JFunc_void_cxx::javaobject>(__result);
63
+ return downcast->cthis()->getFunction();
64
+ } else {
65
+ auto __resultRef = jni::make_global(__result);
66
+ return JNICallable<JFunc_void, void()>(std::move(__resultRef));
67
+ }
68
+ }();
60
69
  }
61
70
  void JHybridViewModelImagePropertySpec::removeListeners() {
62
71
  static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");
@@ -56,7 +56,7 @@ namespace margelo::nitro::rive {
56
56
  public:
57
57
  // Methods
58
58
  void set(const std::optional<std::shared_ptr<HybridRiveImageSpec>>& image) override;
59
- void addListener(const std::function<void()>& onChanged) override;
59
+ std::function<void()> addListener(const std::function<void()>& onChanged) override;
60
60
  void removeListeners() override;
61
61
 
62
62
  private:
@@ -10,8 +10,9 @@
10
10
 
11
11
 
12
12
  #include <functional>
13
- #include "JFunc_void_double.hpp"
13
+ #include "JFunc_void.hpp"
14
14
  #include <NitroModules/JNICallable.hpp>
15
+ #include "JFunc_void_double.hpp"
15
16
 
16
17
  namespace margelo::nitro::rive {
17
18
 
@@ -53,9 +54,18 @@ namespace margelo::nitro::rive {
53
54
  }
54
55
 
55
56
  // Methods
56
- void JHybridViewModelNumberPropertySpec::addListener(const std::function<void(double /* value */)>& onChanged) {
57
- static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_double::javaobject> /* onChanged */)>("addListener_cxx");
58
- method(_javaPart, JFunc_void_double_cxx::fromCpp(onChanged));
57
+ std::function<void()> JHybridViewModelNumberPropertySpec::addListener(const std::function<void(double /* value */)>& onChanged) {
58
+ static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_double::javaobject> /* onChanged */)>("addListener_cxx");
59
+ auto __result = method(_javaPart, JFunc_void_double_cxx::fromCpp(onChanged));
60
+ return [&]() -> std::function<void()> {
61
+ if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
62
+ auto downcast = jni::static_ref_cast<JFunc_void_cxx::javaobject>(__result);
63
+ return downcast->cthis()->getFunction();
64
+ } else {
65
+ auto __resultRef = jni::make_global(__result);
66
+ return JNICallable<JFunc_void, void()>(std::move(__resultRef));
67
+ }
68
+ }();
59
69
  }
60
70
  void JHybridViewModelNumberPropertySpec::removeListeners() {
61
71
  static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");
@@ -56,7 +56,7 @@ namespace margelo::nitro::rive {
56
56
 
57
57
  public:
58
58
  // Methods
59
- void addListener(const std::function<void(double /* value */)>& onChanged) override;
59
+ std::function<void()> addListener(const std::function<void(double /* value */)>& onChanged) override;
60
60
  void removeListeners() override;
61
61
 
62
62
  private:
@@ -11,8 +11,9 @@
11
11
 
12
12
  #include <string>
13
13
  #include <functional>
14
- #include "JFunc_void_std__string.hpp"
14
+ #include "JFunc_void.hpp"
15
15
  #include <NitroModules/JNICallable.hpp>
16
+ #include "JFunc_void_std__string.hpp"
16
17
 
17
18
  namespace margelo::nitro::rive {
18
19
 
@@ -54,9 +55,18 @@ namespace margelo::nitro::rive {
54
55
  }
55
56
 
56
57
  // Methods
57
- void JHybridViewModelStringPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
58
- static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
59
- method(_javaPart, JFunc_void_std__string_cxx::fromCpp(onChanged));
58
+ std::function<void()> JHybridViewModelStringPropertySpec::addListener(const std::function<void(const std::string& /* value */)>& onChanged) {
59
+ static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void_std__string::javaobject> /* onChanged */)>("addListener_cxx");
60
+ auto __result = method(_javaPart, JFunc_void_std__string_cxx::fromCpp(onChanged));
61
+ return [&]() -> std::function<void()> {
62
+ if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
63
+ auto downcast = jni::static_ref_cast<JFunc_void_cxx::javaobject>(__result);
64
+ return downcast->cthis()->getFunction();
65
+ } else {
66
+ auto __resultRef = jni::make_global(__result);
67
+ return JNICallable<JFunc_void, void()>(std::move(__resultRef));
68
+ }
69
+ }();
60
70
  }
61
71
  void JHybridViewModelStringPropertySpec::removeListeners() {
62
72
  static const auto method = javaClassStatic()->getMethod<void()>("removeListeners");
@@ -56,7 +56,7 @@ namespace margelo::nitro::rive {
56
56
 
57
57
  public:
58
58
  // Methods
59
- void addListener(const std::function<void(const std::string& /* value */)>& onChanged) override;
59
+ std::function<void()> addListener(const std::function<void(const std::string& /* value */)>& onChanged) override;
60
60
  void removeListeners() override;
61
61
 
62
62
  private:
@@ -45,9 +45,18 @@ namespace margelo::nitro::rive {
45
45
 
46
46
 
47
47
  // Methods
48
- void JHybridViewModelTriggerPropertySpec::addListener(const std::function<void()>& onChanged) {
49
- static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
50
- method(_javaPart, JFunc_void_cxx::fromCpp(onChanged));
48
+ std::function<void()> JHybridViewModelTriggerPropertySpec::addListener(const std::function<void()>& onChanged) {
49
+ static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void::javaobject>(jni::alias_ref<JFunc_void::javaobject> /* onChanged */)>("addListener_cxx");
50
+ auto __result = method(_javaPart, JFunc_void_cxx::fromCpp(onChanged));
51
+ return [&]() -> std::function<void()> {
52
+ if (__result->isInstanceOf(JFunc_void_cxx::javaClassStatic())) [[likely]] {
53
+ auto downcast = jni::static_ref_cast<JFunc_void_cxx::javaobject>(__result);
54
+ return downcast->cthis()->getFunction();
55
+ } else {
56
+ auto __resultRef = jni::make_global(__result);
57
+ return JNICallable<JFunc_void, void()>(std::move(__resultRef));
58
+ }
59
+ }();
51
60
  }
52
61
  void JHybridViewModelTriggerPropertySpec::trigger() {
53
62
  static const auto method = javaClassStatic()->getMethod<void()>("trigger");
@@ -55,7 +55,7 @@ namespace margelo::nitro::rive {
55
55
 
56
56
  public:
57
57
  // Methods
58
- void addListener(const std::function<void()>& onChanged) override;
58
+ std::function<void()> addListener(const std::function<void()>& onChanged) override;
59
59
  void trigger() override;
60
60
  void removeListeners() override;
61
61
 
@@ -49,13 +49,13 @@ abstract class HybridViewModelBooleanPropertySpec: HybridViewModelPropertySpec()
49
49
  abstract var value: Boolean
50
50
 
51
51
  // Methods
52
- abstract fun addListener(onChanged: (value: Boolean) -> Unit): Unit
52
+ abstract fun addListener(onChanged: (value: Boolean) -> Unit): () -> Unit
53
53
 
54
54
  @DoNotStrip
55
55
  @Keep
56
- private fun addListener_cxx(onChanged: Func_void_bool): Unit {
56
+ private fun addListener_cxx(onChanged: Func_void_bool): Func_void {
57
57
  val __result = addListener(onChanged)
58
- return __result
58
+ return Func_void_java(__result)
59
59
  }
60
60
 
61
61
  @DoNotStrip
@@ -49,13 +49,13 @@ abstract class HybridViewModelColorPropertySpec: HybridViewModelPropertySpec() {
49
49
  abstract var value: Double
50
50
 
51
51
  // Methods
52
- abstract fun addListener(onChanged: (value: Double) -> Unit): Unit
52
+ abstract fun addListener(onChanged: (value: Double) -> Unit): () -> Unit
53
53
 
54
54
  @DoNotStrip
55
55
  @Keep
56
- private fun addListener_cxx(onChanged: Func_void_double): Unit {
56
+ private fun addListener_cxx(onChanged: Func_void_double): Func_void {
57
57
  val __result = addListener(onChanged)
58
- return __result
58
+ return Func_void_java(__result)
59
59
  }
60
60
 
61
61
  @DoNotStrip
@@ -49,13 +49,13 @@ abstract class HybridViewModelEnumPropertySpec: HybridViewModelPropertySpec() {
49
49
  abstract var value: String
50
50
 
51
51
  // Methods
52
- abstract fun addListener(onChanged: (value: String) -> Unit): Unit
52
+ abstract fun addListener(onChanged: (value: String) -> Unit): () -> Unit
53
53
 
54
54
  @DoNotStrip
55
55
  @Keep
56
- private fun addListener_cxx(onChanged: Func_void_std__string): Unit {
56
+ private fun addListener_cxx(onChanged: Func_void_std__string): Func_void {
57
57
  val __result = addListener(onChanged)
58
- return __result
58
+ return Func_void_java(__result)
59
59
  }
60
60
 
61
61
  @DoNotStrip
@@ -49,13 +49,13 @@ abstract class HybridViewModelImagePropertySpec: HybridViewModelPropertySpec() {
49
49
  @Keep
50
50
  abstract fun set(image: HybridRiveImageSpec?): Unit
51
51
 
52
- abstract fun addListener(onChanged: () -> Unit): Unit
52
+ abstract fun addListener(onChanged: () -> Unit): () -> Unit
53
53
 
54
54
  @DoNotStrip
55
55
  @Keep
56
- private fun addListener_cxx(onChanged: Func_void): Unit {
56
+ private fun addListener_cxx(onChanged: Func_void): Func_void {
57
57
  val __result = addListener(onChanged)
58
- return __result
58
+ return Func_void_java(__result)
59
59
  }
60
60
 
61
61
  @DoNotStrip
@@ -49,13 +49,13 @@ abstract class HybridViewModelNumberPropertySpec: HybridViewModelPropertySpec()
49
49
  abstract var value: Double
50
50
 
51
51
  // Methods
52
- abstract fun addListener(onChanged: (value: Double) -> Unit): Unit
52
+ abstract fun addListener(onChanged: (value: Double) -> Unit): () -> Unit
53
53
 
54
54
  @DoNotStrip
55
55
  @Keep
56
- private fun addListener_cxx(onChanged: Func_void_double): Unit {
56
+ private fun addListener_cxx(onChanged: Func_void_double): Func_void {
57
57
  val __result = addListener(onChanged)
58
- return __result
58
+ return Func_void_java(__result)
59
59
  }
60
60
 
61
61
  @DoNotStrip
@@ -49,13 +49,13 @@ abstract class HybridViewModelStringPropertySpec: HybridViewModelPropertySpec()
49
49
  abstract var value: String
50
50
 
51
51
  // Methods
52
- abstract fun addListener(onChanged: (value: String) -> Unit): Unit
52
+ abstract fun addListener(onChanged: (value: String) -> Unit): () -> Unit
53
53
 
54
54
  @DoNotStrip
55
55
  @Keep
56
- private fun addListener_cxx(onChanged: Func_void_std__string): Unit {
56
+ private fun addListener_cxx(onChanged: Func_void_std__string): Func_void {
57
57
  val __result = addListener(onChanged)
58
- return __result
58
+ return Func_void_java(__result)
59
59
  }
60
60
 
61
61
  @DoNotStrip
@@ -45,13 +45,13 @@ abstract class HybridViewModelTriggerPropertySpec: HybridViewModelPropertySpec()
45
45
 
46
46
 
47
47
  // Methods
48
- abstract fun addListener(onChanged: () -> Unit): Unit
48
+ abstract fun addListener(onChanged: () -> Unit): () -> Unit
49
49
 
50
50
  @DoNotStrip
51
51
  @Keep
52
- private fun addListener_cxx(onChanged: Func_void): Unit {
52
+ private fun addListener_cxx(onChanged: Func_void): Func_void {
53
53
  val __result = addListener(onChanged)
54
- return __result
54
+ return Func_void_java(__result)
55
55
  }
56
56
 
57
57
  @DoNotStrip
@@ -28,6 +28,7 @@
28
28
  #include "JHybridViewModelInstanceSpec.hpp"
29
29
  #include "JHybridViewModelPropertySpec.hpp"
30
30
  #include "JHybridViewModelNumberPropertySpec.hpp"
31
+ #include "JFunc_void.hpp"
31
32
  #include "JFunc_void_double.hpp"
32
33
  #include "JHybridViewModelStringPropertySpec.hpp"
33
34
  #include "JFunc_void_std__string.hpp"
@@ -36,7 +37,6 @@
36
37
  #include "JHybridViewModelColorPropertySpec.hpp"
37
38
  #include "JHybridViewModelEnumPropertySpec.hpp"
38
39
  #include "JHybridViewModelTriggerPropertySpec.hpp"
39
- #include "JFunc_void.hpp"
40
40
  #include "JHybridViewModelImagePropertySpec.hpp"
41
41
  #include <NitroModules/DefaultConstructableObject.hpp>
42
42
 
@@ -62,6 +62,7 @@ int initialize(JavaVM* vm) {
62
62
  margelo::nitro::rive::JHybridViewModelInstanceSpec::registerNatives();
63
63
  margelo::nitro::rive::JHybridViewModelPropertySpec::registerNatives();
64
64
  margelo::nitro::rive::JHybridViewModelNumberPropertySpec::registerNatives();
65
+ margelo::nitro::rive::JFunc_void_cxx::registerNatives();
65
66
  margelo::nitro::rive::JFunc_void_double_cxx::registerNatives();
66
67
  margelo::nitro::rive::JHybridViewModelStringPropertySpec::registerNatives();
67
68
  margelo::nitro::rive::JFunc_void_std__string_cxx::registerNatives();
@@ -70,7 +71,6 @@ int initialize(JavaVM* vm) {
70
71
  margelo::nitro::rive::JHybridViewModelColorPropertySpec::registerNatives();
71
72
  margelo::nitro::rive::JHybridViewModelEnumPropertySpec::registerNatives();
72
73
  margelo::nitro::rive::JHybridViewModelTriggerPropertySpec::registerNatives();
73
- margelo::nitro::rive::JFunc_void_cxx::registerNatives();
74
74
  margelo::nitro::rive::JHybridViewModelImagePropertySpec::registerNatives();
75
75
 
76
76
  // Register Nitro Hybrid Objects
@@ -98,78 +98,6 @@ int initialize(JavaVM* vm) {
98
98
  return instance->cthis()->shared();
99
99
  }
100
100
  );
101
- HybridObjectRegistry::registerHybridObjectConstructor(
102
- "ViewModel",
103
- []() -> std::shared_ptr<HybridObject> {
104
- static DefaultConstructableObject<JHybridViewModelSpec::javaobject> object("com/margelo/nitro/rive/HybridViewModel");
105
- auto instance = object.create();
106
- return instance->cthis()->shared();
107
- }
108
- );
109
- HybridObjectRegistry::registerHybridObjectConstructor(
110
- "ViewModelInstance",
111
- []() -> std::shared_ptr<HybridObject> {
112
- static DefaultConstructableObject<JHybridViewModelInstanceSpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelInstance");
113
- auto instance = object.create();
114
- return instance->cthis()->shared();
115
- }
116
- );
117
- HybridObjectRegistry::registerHybridObjectConstructor(
118
- "ViewModelNumberProperty",
119
- []() -> std::shared_ptr<HybridObject> {
120
- static DefaultConstructableObject<JHybridViewModelNumberPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelNumberProperty");
121
- auto instance = object.create();
122
- return instance->cthis()->shared();
123
- }
124
- );
125
- HybridObjectRegistry::registerHybridObjectConstructor(
126
- "ViewModelStringProperty",
127
- []() -> std::shared_ptr<HybridObject> {
128
- static DefaultConstructableObject<JHybridViewModelStringPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelStringProperty");
129
- auto instance = object.create();
130
- return instance->cthis()->shared();
131
- }
132
- );
133
- HybridObjectRegistry::registerHybridObjectConstructor(
134
- "ViewModelBooleanProperty",
135
- []() -> std::shared_ptr<HybridObject> {
136
- static DefaultConstructableObject<JHybridViewModelBooleanPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelBooleanProperty");
137
- auto instance = object.create();
138
- return instance->cthis()->shared();
139
- }
140
- );
141
- HybridObjectRegistry::registerHybridObjectConstructor(
142
- "ViewModelColorProperty",
143
- []() -> std::shared_ptr<HybridObject> {
144
- static DefaultConstructableObject<JHybridViewModelColorPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelColorProperty");
145
- auto instance = object.create();
146
- return instance->cthis()->shared();
147
- }
148
- );
149
- HybridObjectRegistry::registerHybridObjectConstructor(
150
- "ViewModelEnumProperty",
151
- []() -> std::shared_ptr<HybridObject> {
152
- static DefaultConstructableObject<JHybridViewModelEnumPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelEnumProperty");
153
- auto instance = object.create();
154
- return instance->cthis()->shared();
155
- }
156
- );
157
- HybridObjectRegistry::registerHybridObjectConstructor(
158
- "ViewModelTriggerProperty",
159
- []() -> std::shared_ptr<HybridObject> {
160
- static DefaultConstructableObject<JHybridViewModelTriggerPropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelTriggerProperty");
161
- auto instance = object.create();
162
- return instance->cthis()->shared();
163
- }
164
- );
165
- HybridObjectRegistry::registerHybridObjectConstructor(
166
- "ViewModelImageProperty",
167
- []() -> std::shared_ptr<HybridObject> {
168
- static DefaultConstructableObject<JHybridViewModelImagePropertySpec::javaobject> object("com/margelo/nitro/rive/HybridViewModelImageProperty");
169
- auto instance = object.create();
170
- return instance->cthis()->shared();
171
- }
172
- );
173
101
  HybridObjectRegistry::registerHybridObjectConstructor(
174
102
  "RiveView",
175
103
  []() -> std::shared_ptr<HybridObject> {
@@ -1155,6 +1155,15 @@ namespace margelo::nitro::rive::bridge::swift {
1155
1155
  return Func_void_double_Wrapper(std::move(value));
1156
1156
  }
1157
1157
 
1158
+ // pragma MARK: Result<std::function<void()>>
1159
+ using Result_std__function_void____ = Result<std::function<void()>>;
1160
+ inline Result_std__function_void____ create_Result_std__function_void____(const std::function<void()>& value) noexcept {
1161
+ return Result<std::function<void()>>::withValue(value);
1162
+ }
1163
+ inline Result_std__function_void____ create_Result_std__function_void____(const std::exception_ptr& error) noexcept {
1164
+ return Result<std::function<void()>>::withError(error);
1165
+ }
1166
+
1158
1167
  // pragma MARK: std::function<void(const std::string& /* value */)>
1159
1168
  /**
1160
1169
  * Specialized version of `std::function<void(const std::string&)>`.
@@ -13,15 +13,6 @@
13
13
  #include "HybridRiveSpecSwift.hpp"
14
14
  #include "HybridRiveFileFactorySpecSwift.hpp"
15
15
  #include "HybridRiveFileSpecSwift.hpp"
16
- #include "HybridViewModelSpecSwift.hpp"
17
- #include "HybridViewModelInstanceSpecSwift.hpp"
18
- #include "HybridViewModelNumberPropertySpecSwift.hpp"
19
- #include "HybridViewModelStringPropertySpecSwift.hpp"
20
- #include "HybridViewModelBooleanPropertySpecSwift.hpp"
21
- #include "HybridViewModelColorPropertySpecSwift.hpp"
22
- #include "HybridViewModelEnumPropertySpecSwift.hpp"
23
- #include "HybridViewModelTriggerPropertySpecSwift.hpp"
24
- #include "HybridViewModelImagePropertySpecSwift.hpp"
25
16
  #include "HybridRiveViewSpecSwift.hpp"
26
17
  #include "HybridRiveImageFactorySpecSwift.hpp"
27
18
 
@@ -55,69 +46,6 @@
55
46
  return hybridObject;
56
47
  }
57
48
  );
58
- HybridObjectRegistry::registerHybridObjectConstructor(
59
- "ViewModel",
60
- []() -> std::shared_ptr<HybridObject> {
61
- std::shared_ptr<HybridViewModelSpec> hybridObject = RNRive::RNRiveAutolinking::createViewModel();
62
- return hybridObject;
63
- }
64
- );
65
- HybridObjectRegistry::registerHybridObjectConstructor(
66
- "ViewModelInstance",
67
- []() -> std::shared_ptr<HybridObject> {
68
- std::shared_ptr<HybridViewModelInstanceSpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelInstance();
69
- return hybridObject;
70
- }
71
- );
72
- HybridObjectRegistry::registerHybridObjectConstructor(
73
- "ViewModelNumberProperty",
74
- []() -> std::shared_ptr<HybridObject> {
75
- std::shared_ptr<HybridViewModelNumberPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelNumberProperty();
76
- return hybridObject;
77
- }
78
- );
79
- HybridObjectRegistry::registerHybridObjectConstructor(
80
- "ViewModelStringProperty",
81
- []() -> std::shared_ptr<HybridObject> {
82
- std::shared_ptr<HybridViewModelStringPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelStringProperty();
83
- return hybridObject;
84
- }
85
- );
86
- HybridObjectRegistry::registerHybridObjectConstructor(
87
- "ViewModelBooleanProperty",
88
- []() -> std::shared_ptr<HybridObject> {
89
- std::shared_ptr<HybridViewModelBooleanPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelBooleanProperty();
90
- return hybridObject;
91
- }
92
- );
93
- HybridObjectRegistry::registerHybridObjectConstructor(
94
- "ViewModelColorProperty",
95
- []() -> std::shared_ptr<HybridObject> {
96
- std::shared_ptr<HybridViewModelColorPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelColorProperty();
97
- return hybridObject;
98
- }
99
- );
100
- HybridObjectRegistry::registerHybridObjectConstructor(
101
- "ViewModelEnumProperty",
102
- []() -> std::shared_ptr<HybridObject> {
103
- std::shared_ptr<HybridViewModelEnumPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelEnumProperty();
104
- return hybridObject;
105
- }
106
- );
107
- HybridObjectRegistry::registerHybridObjectConstructor(
108
- "ViewModelTriggerProperty",
109
- []() -> std::shared_ptr<HybridObject> {
110
- std::shared_ptr<HybridViewModelTriggerPropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelTriggerProperty();
111
- return hybridObject;
112
- }
113
- );
114
- HybridObjectRegistry::registerHybridObjectConstructor(
115
- "ViewModelImageProperty",
116
- []() -> std::shared_ptr<HybridObject> {
117
- std::shared_ptr<HybridViewModelImagePropertySpec> hybridObject = RNRive::RNRiveAutolinking::createViewModelImageProperty();
118
- return hybridObject;
119
- }
120
- );
121
49
  HybridObjectRegistry::registerHybridObjectConstructor(
122
50
  "RiveView",
123
51
  []() -> std::shared_ptr<HybridObject> {