fix(web): make source a listenable state, fixes the view

nitrogen/generated/android/c++/JFunc_void_std__optional_Source_.hpp

@@ -0,0 +1,89 @@
+///
+/// JFunc_void_std__optional_Source_.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 <functional>
+
+#include "Source.hpp"
+#include <optional>
+#include <functional>
+#include <NitroModules/JNICallable.hpp>
+#include "JSource.hpp"
+#include "VideoSrc.hpp"
+#include "JVideoSrc.hpp"
+#include <string>
+#include <unordered_map>
+#include "Subtitle.hpp"
+#include <vector>
+#include "JSubtitle.hpp"
+#include "Metadata.hpp"
+#include "JMetadata.hpp"
+#include "MixAudioMode.hpp"
+#include "JMixAudioMode.hpp"
+
+namespace margelo::nitro::omni {
+
+  using namespace facebook;
+
+  /**
+   * Represents the Java/Kotlin callback `(value: Source?) -> Unit`.
+   * This can be passed around between C++ and Java/Kotlin.
+   */
+  struct JFunc_void_std__optional_Source_: public jni::JavaClass<JFunc_void_std__optional_Source_> {
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/omni/Func_void_std__optional_Source_;";
+
+  public:
+    /**
+     * Invokes the function this `JFunc_void_std__optional_Source_` instance holds through JNI.
+     */
+    void invoke(const std::optional<Source>& value) const {
+      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JSource> /* value */)>("invoke");
+      method(self(), value.has_value() ? JSource::fromCpp(value.value()) : nullptr);
+    }
+  };
+
+  /**
+   * An implementation of Func_void_std__optional_Source_ that is backed by a C++ implementation (using `std::function<...>`)
+   */
+  class JFunc_void_std__optional_Source__cxx final: public jni::HybridClass<JFunc_void_std__optional_Source__cxx, JFunc_void_std__optional_Source_> {
+  public:
+    static jni::local_ref<JFunc_void_std__optional_Source_::javaobject> fromCpp(const std::function<void(const std::optional<Source>& /* value */)>& func) {
+      return JFunc_void_std__optional_Source__cxx::newObjectCxxArgs(func);
+    }
+
+  public:
+    /**
+     * Invokes the C++ `std::function<...>` this `JFunc_void_std__optional_Source__cxx` instance holds.
+     */
+    void invoke_cxx(jni::alias_ref<JSource> value) {
+      _func(value != nullptr ? std::make_optional(value->toCpp()) : std::nullopt);
+    }
+
+  public:
+    [[nodiscard]]
+    inline const std::function<void(const std::optional<Source>& /* value */)>& getFunction() const {
+      return _func;
+    }
+
+  public:
+    static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/omni/Func_void_std__optional_Source__cxx;";
+    static void registerNatives() {
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__optional_Source__cxx::invoke_cxx)});
+    }
+
+  private:
+    explicit JFunc_void_std__optional_Source__cxx(const std::function<void(const std::optional<Source>& /* value */)>& func): _func(func) { }
+
+  private:
+    friend HybridBase;
+    std::function<void(const std::optional<Source>& /* value */)> _func;
+  };
+
+} // namespace margelo::nitro::omni

nitrogen/generated/android/c++/JHybridOmniEventMapSpec.cpp

@@ -15,6 +15,16 @@ namespace margelo::nitro::omni { enum class BoolProperty; }
 namespace margelo::nitro::omni { enum class PlayerStatus; }
 // Forward declaration of `CastStatus` to properly resolve imports.
 namespace margelo::nitro::omni { enum class CastStatus; }
+// Forward declaration of `Source` to properly resolve imports.
+namespace margelo::nitro::omni { struct Source; }
+// Forward declaration of `VideoSrc` to properly resolve imports.
+namespace margelo::nitro::omni { struct VideoSrc; }
+// Forward declaration of `Subtitle` to properly resolve imports.
+namespace margelo::nitro::omni { struct Subtitle; }
+// Forward declaration of `Metadata` to properly resolve imports.
+namespace margelo::nitro::omni { struct Metadata; }
+// Forward declaration of `MixAudioMode` to properly resolve imports.
+namespace margelo::nitro::omni { enum class MixAudioMode; }
 // Forward declaration of `Track` to properly resolve imports.
 namespace margelo::nitro::omni { struct Track; }
 // Forward declaration of `Rendition` to properly resolve imports.
@@ -34,14 +44,27 @@ namespace margelo::nitro::omni { struct Rendition; }
 #include "CastStatus.hpp"
 #include "JFunc_void_CastStatus.hpp"
 #include "JCastStatus.hpp"
-#include "JFunc_void.hpp"
+#include "Source.hpp"
+#include <optional>
+#include "JFunc_void_std__optional_Source_.hpp"
+#include "JSource.hpp"
+#include "VideoSrc.hpp"
+#include "JVideoSrc.hpp"
 #include <string>
+#include <unordered_map>
+#include "Subtitle.hpp"
+#include <vector>
+#include "JSubtitle.hpp"
+#include "Metadata.hpp"
+#include "JMetadata.hpp"
+#include "MixAudioMode.hpp"
+#include "JMixAudioMode.hpp"
+#include "JFunc_void.hpp"
 #include "JFunc_void_std__string_std__string.hpp"
 #include "JFunc_void_std__string.hpp"
 #include "Track.hpp"
 #include "JFunc_void_Track.hpp"
 #include "JTrack.hpp"
-#include <optional>
 #include "JFunc_void_std__optional_Track_.hpp"
 #include "Rendition.hpp"
 #include "JFunc_void_Rendition.hpp"
@@ -112,6 +135,14 @@ namespace margelo::nitro::omni {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_CastStatus::javaobject> /* cb */)>("removeCastStatusListener_cxx");
     method(_javaPart, JFunc_void_CastStatus_cxx::fromCpp(cb));
   }
+  void JHybridOmniEventMapSpec::addSourceListener(const std::function<void(const std::optional<Source>& /* value */)>& cb) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_Source_::javaobject> /* cb */)>("addSourceListener_cxx");
+    method(_javaPart, JFunc_void_std__optional_Source__cxx::fromCpp(cb));
+  }
+  void JHybridOmniEventMapSpec::removeSourceListener(const std::function<void(const std::optional<Source>& /* value */)>& cb) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__optional_Source_::javaobject> /* cb */)>("removeSourceListener_cxx");
+    method(_javaPart, JFunc_void_std__optional_Source__cxx::fromCpp(cb));
+  }
   void JHybridOmniEventMapSpec::addOnEndListener(const std::function<void()>& cb) {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void::javaobject> /* cb */)>("addOnEndListener_cxx");
     method(_javaPart, JFunc_void_cxx::fromCpp(cb));

nitrogen/generated/android/c++/JHybridOmniEventMapSpec.hpp

@@ -62,6 +62,8 @@ namespace margelo::nitro::omni {
     void removePlayerStatusListener(const std::function<void(PlayerStatus /* value */)>& cb) override;
     void addCastStatusListener(const std::function<void(CastStatus /* value */)>& cb) override;
     void removeCastStatusListener(const std::function<void(CastStatus /* value */)>& cb) override;
+    void addSourceListener(const std::function<void(const std::optional<Source>& /* value */)>& cb) override;
+    void removeSourceListener(const std::function<void(const std::optional<Source>& /* value */)>& cb) override;
     void addOnEndListener(const std::function<void()>& cb) override;
     void removeOnEndListener(const std::function<void()>& cb) override;
     void addOnPrevListener(const std::function<void()>& cb) override;

nitrogen/generated/android/c++/JHybridOmniPlayerSpec.cpp

@@ -9,6 +9,10 @@
 
 // Forward declaration of `HybridOmniEventMapSpec` to properly resolve imports.
 namespace margelo::nitro::omni { class HybridOmniEventMapSpec; }
+// Forward declaration of `Track` to properly resolve imports.
+namespace margelo::nitro::omni { struct Track; }
+// Forward declaration of `Rendition` to properly resolve imports.
+namespace margelo::nitro::omni { struct Rendition; }
 // Forward declaration of `Source` to properly resolve imports.
 namespace margelo::nitro::omni { struct Source; }
 // Forward declaration of `VideoSrc` to properly resolve imports.
@@ -19,10 +23,6 @@ namespace margelo::nitro::omni { struct Subtitle; }
 namespace margelo::nitro::omni { struct Metadata; }
 // Forward declaration of `MixAudioMode` to properly resolve imports.
 namespace margelo::nitro::omni { enum class MixAudioMode; }
-// Forward declaration of `Track` to properly resolve imports.
-namespace margelo::nitro::omni { struct Track; }
-// Forward declaration of `Rendition` to properly resolve imports.
-namespace margelo::nitro::omni { struct Rendition; }
 // Forward declaration of `PlayerStatus` to properly resolve imports.
 namespace margelo::nitro::omni { enum class PlayerStatus; }
 // Forward declaration of `CastStatus` to properly resolve imports.
@@ -32,23 +32,23 @@ namespace margelo::nitro::omni { enum class CastStatus; }
 #include "HybridOmniEventMapSpec.hpp"
 #include "JHybridOmniEventMapSpec.hpp"
 #include <optional>
+#include "Track.hpp"
+#include <vector>
+#include "JTrack.hpp"
+#include <string>
+#include "Rendition.hpp"
+#include "JRendition.hpp"
 #include "Source.hpp"
 #include "JSource.hpp"
 #include "VideoSrc.hpp"
 #include "JVideoSrc.hpp"
-#include <string>
 #include <unordered_map>
 #include "Subtitle.hpp"
-#include <vector>
 #include "JSubtitle.hpp"
 #include "Metadata.hpp"
 #include "JMetadata.hpp"
 #include "MixAudioMode.hpp"
 #include "JMixAudioMode.hpp"
-#include "Track.hpp"
-#include "JTrack.hpp"
-#include "Rendition.hpp"
-#include "JRendition.hpp"
 #include "PlayerStatus.hpp"
 #include "JPlayerStatus.hpp"
 #include "CastStatus.hpp"
@@ -98,15 +98,6 @@ namespace margelo::nitro::omni {
     static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* showNotification */)>("setShowNotification");
     method(_javaPart, showNotification.has_value() ? jni::JBoolean::valueOf(showNotification.value()) : nullptr);
   }
-  std::optional<Source> JHybridOmniPlayerSpec::getSource() {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JSource>()>("getSource");
-    auto __result = method(_javaPart);
-    return __result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt;
-  }
-  void JHybridOmniPlayerSpec::setSource(const std::optional<Source>& source) {
-    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JSource> /* source */)>("setSource");
-    method(_javaPart, source.has_value() ? JSource::fromCpp(source.value()) : nullptr);
-  }
   bool JHybridOmniPlayerSpec::getHasPrev() {
     static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean()>("getHasPrev");
     auto __result = method(_javaPart);
@@ -173,6 +164,15 @@ namespace margelo::nitro::omni {
       return __vector;
     }(__result);
   }
+  std::optional<Source> JHybridOmniPlayerSpec::getSource() {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JSource>()>("getSource");
+    auto __result = method(_javaPart);
+    return __result != nullptr ? std::make_optional(__result->toCpp()) : std::nullopt;
+  }
+  void JHybridOmniPlayerSpec::setSource(const std::optional<Source>& source) {
+    static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<JSource> /* source */)>("setSource");
+    method(_javaPart, source.has_value() ? JSource::fromCpp(source.value()) : nullptr);
+  }
   PlayerStatus JHybridOmniPlayerSpec::getStatus() {
     static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPlayerStatus>()>("getStatus");
     auto __result = method(_javaPart);

nitrogen/generated/android/c++/JHybridOmniPlayerSpec.hpp

@@ -53,14 +53,14 @@ namespace margelo::nitro::omni {
     std::shared_ptr<HybridOmniEventMapSpec> getEventMap() override;
     std::optional<bool> getShowNotification() override;
     void setShowNotification(std::optional<bool> showNotification) override;
-    std::optional<Source> getSource() override;
-    void setSource(const std::optional<Source>& source) override;
     bool getHasPrev() override;
     bool getHasNext() override;
     std::vector<Track> getVideos() override;
     std::vector<Track> getAudios() override;
     std::vector<Track> getSubtitles() override;
     std::vector<Rendition> getRendition() override;
+    std::optional<Source> getSource() override;
+    void setSource(const std::optional<Source>& source) override;
     PlayerStatus getStatus() override;
     bool getIsPlaying() override;
     double getCurrentTime() override;