react-native-audio-browser 0.2.0-next.4 → 0.2.0-next.6

package/nitrogen/generated/android/c++/{JNotificationButton.hpp → JRemoteButton.hpp}

@@ -1,5 +1,5 @@
 ///
-/// JNotificationButton.hpp
+/// JRemoteButton.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © Marc Rousavy @ Margelo
@@ -8,30 +8,30 @@
 #pragma once
 
 #include <fbjni/fbjni.h>
-#include "NotificationButton.hpp"
+#include "RemoteButton.hpp"
 
 namespace margelo::nitro::audiobrowser {
 
   using namespace facebook;
 
   /**
-   * The C++ JNI bridge between the C++ enum "NotificationButton" and the the Kotlin enum "NotificationButton".
+   * The C++ JNI bridge between the C++ enum "RemoteButton" and the the Kotlin enum "RemoteButton".
    */
-  struct JNotificationButton final: public jni::JavaClass<JNotificationButton> {
+  struct JRemoteButton final: public jni::JavaClass<JRemoteButton> {
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/NotificationButton;";
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/RemoteButton;";
 
   public:
     /**
-     * Convert this Java/Kotlin-based enum to the C++ enum NotificationButton.
+     * Convert this Java/Kotlin-based enum to the C++ enum RemoteButton.
      */
     [[maybe_unused]]
     [[nodiscard]]
-    NotificationButton toCpp() const {
+    RemoteButton toCpp() const {
       static const auto clazz = javaClassStatic();
       static const auto fieldOrdinal = clazz->getField<int>("value");
       int ordinal = this->getFieldValue(fieldOrdinal);
-      return static_cast<NotificationButton>(ordinal);
+      return static_cast<RemoteButton>(ordinal);
     }
 
   public:
@@ -39,23 +39,23 @@ namespace margelo::nitro::audiobrowser {
      * Create a Java/Kotlin-based enum with the given C++ enum's value.
      */
     [[maybe_unused]]
-    static jni::alias_ref<JNotificationButton> fromCpp(NotificationButton value) {
+    static jni::alias_ref<JRemoteButton> fromCpp(RemoteButton value) {
       static const auto clazz = javaClassStatic();
       switch (value) {
-        case NotificationButton::SKIP_TO_PREVIOUS:
-          static const auto fieldSKIP_TO_PREVIOUS = clazz->getStaticField<JNotificationButton>("SKIP_TO_PREVIOUS");
+        case RemoteButton::SKIP_TO_PREVIOUS:
+          static const auto fieldSKIP_TO_PREVIOUS = clazz->getStaticField<JRemoteButton>("SKIP_TO_PREVIOUS");
           return clazz->getStaticFieldValue(fieldSKIP_TO_PREVIOUS);
-        case NotificationButton::SKIP_TO_NEXT:
-          static const auto fieldSKIP_TO_NEXT = clazz->getStaticField<JNotificationButton>("SKIP_TO_NEXT");
+        case RemoteButton::SKIP_TO_NEXT:
+          static const auto fieldSKIP_TO_NEXT = clazz->getStaticField<JRemoteButton>("SKIP_TO_NEXT");
           return clazz->getStaticFieldValue(fieldSKIP_TO_NEXT);
-        case NotificationButton::JUMP_BACKWARD:
-          static const auto fieldJUMP_BACKWARD = clazz->getStaticField<JNotificationButton>("JUMP_BACKWARD");
+        case RemoteButton::JUMP_BACKWARD:
+          static const auto fieldJUMP_BACKWARD = clazz->getStaticField<JRemoteButton>("JUMP_BACKWARD");
           return clazz->getStaticFieldValue(fieldJUMP_BACKWARD);
-        case NotificationButton::JUMP_FORWARD:
-          static const auto fieldJUMP_FORWARD = clazz->getStaticField<JNotificationButton>("JUMP_FORWARD");
+        case RemoteButton::JUMP_FORWARD:
+          static const auto fieldJUMP_FORWARD = clazz->getStaticField<JRemoteButton>("JUMP_FORWARD");
           return clazz->getStaticFieldValue(fieldJUMP_FORWARD);
-        case NotificationButton::FAVORITE:
-          static const auto fieldFAVORITE = clazz->getStaticField<JNotificationButton>("FAVORITE");
+        case RemoteButton::FAVORITE:
+          static const auto fieldFAVORITE = clazz->getStaticField<JRemoteButton>("FAVORITE");
           return clazz->getStaticFieldValue(fieldFAVORITE);
         default:
           std::string stringValue = std::to_string(static_cast<int>(value));

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

@@ -0,0 +1,86 @@
+///
+/// JRemoteButtonLayout.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 "RemoteButtonLayout.hpp"
+
+#include "JRemoteButton.hpp"
+#include "RemoteButton.hpp"
+#include <optional>
+#include <vector>
+
+namespace margelo::nitro::audiobrowser {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "RemoteButtonLayout" and the the Kotlin data class "RemoteButtonLayout".
+   */
+  struct JRemoteButtonLayout final: public jni::JavaClass<JRemoteButtonLayout> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/RemoteButtonLayout;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct RemoteButtonLayout by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    RemoteButtonLayout toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldBack = clazz->getField<JRemoteButton>("back");
+      jni::local_ref<JRemoteButton> back = this->getFieldValue(fieldBack);
+      static const auto fieldForward = clazz->getField<JRemoteButton>("forward");
+      jni::local_ref<JRemoteButton> forward = this->getFieldValue(fieldForward);
+      static const auto fieldOverflow = clazz->getField<jni::JArrayClass<JRemoteButton>>("overflow");
+      jni::local_ref<jni::JArrayClass<JRemoteButton>> overflow = this->getFieldValue(fieldOverflow);
+      return RemoteButtonLayout(
+        back != nullptr ? std::make_optional(back->toCpp()) : std::nullopt,
+        forward != nullptr ? std::make_optional(forward->toCpp()) : std::nullopt,
+        [&]() {
+          size_t __size = overflow->size();
+          std::vector<RemoteButton> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = overflow->getElement(__i);
+            __vector.push_back(__element->toCpp());
+          }
+          return __vector;
+        }()
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JRemoteButtonLayout::javaobject> fromCpp(const RemoteButtonLayout& value) {
+      using JSignature = JRemoteButtonLayout(jni::alias_ref<JRemoteButton>, jni::alias_ref<JRemoteButton>, jni::alias_ref<jni::JArrayClass<JRemoteButton>>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        value.back.has_value() ? JRemoteButton::fromCpp(value.back.value()) : nullptr,
+        value.forward.has_value() ? JRemoteButton::fromCpp(value.forward.value()) : nullptr,
+        [&]() {
+          size_t __size = value.overflow.size();
+          jni::local_ref<jni::JArrayClass<JRemoteButton>> __array = jni::JArrayClass<JRemoteButton>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = value.overflow[__i];
+            auto __elementJni = JRemoteButton::fromCpp(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }()
+      );
+    }
+  };
+
+} // namespace margelo::nitro::audiobrowser

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

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

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

@@ -0,0 +1,75 @@
+///
+/// JVariant_NullType_RemoteButtonLayout.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 <NitroModules/Null.hpp>
+#include "RemoteButtonLayout.hpp"
+#include <variant>
+#include <NitroModules/JNull.hpp>
+#include "JRemoteButtonLayout.hpp"
+#include "RemoteButton.hpp"
+#include <optional>
+#include "JRemoteButton.hpp"
+#include <vector>
+
+namespace margelo::nitro::audiobrowser {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ std::variant and the Java class "Variant_NullType_RemoteButtonLayout".
+   */
+  class JVariant_NullType_RemoteButtonLayout: public jni::JavaClass<JVariant_NullType_RemoteButtonLayout> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout;";
+
+    static jni::local_ref<JVariant_NullType_RemoteButtonLayout> create_0(jni::alias_ref<JNull> value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_RemoteButtonLayout(jni::alias_ref<JNull>)>("create");
+      return method(javaClassStatic(), value);
+    }
+    static jni::local_ref<JVariant_NullType_RemoteButtonLayout> create_1(jni::alias_ref<JRemoteButtonLayout> value) {
+      static const auto method = javaClassStatic()->getStaticMethod<JVariant_NullType_RemoteButtonLayout(jni::alias_ref<JRemoteButtonLayout>)>("create");
+      return method(javaClassStatic(), value);
+    }
+
+    static jni::local_ref<JVariant_NullType_RemoteButtonLayout> fromCpp(const std::variant<nitro::NullType, RemoteButtonLayout>& variant) {
+      switch (variant.index()) {
+        case 0: return create_0(JNull::null());
+        case 1: return create_1(JRemoteButtonLayout::fromCpp(std::get<1>(variant)));
+        default: throw std::invalid_argument("Variant holds unknown index! (" + std::to_string(variant.index()) + ")");
+      }
+    }
+
+    [[nodiscard]] std::variant<nitro::NullType, RemoteButtonLayout> toCpp() const;
+  };
+
+  namespace JVariant_NullType_RemoteButtonLayout_impl {
+    class First final: public jni::JavaClass<First, JVariant_NullType_RemoteButtonLayout> {
+    public:
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout$First;";
+    
+      [[nodiscard]] jni::local_ref<JNull> getValue() const {
+        static const auto field = javaClassStatic()->getField<JNull>("value");
+        return getFieldValue(field);
+      }
+    };
+    
+    class Second final: public jni::JavaClass<Second, JVariant_NullType_RemoteButtonLayout> {
+    public:
+      static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/Variant_NullType_RemoteButtonLayout$Second;";
+    
+      [[nodiscard]] jni::local_ref<JRemoteButtonLayout> getValue() const {
+        static const auto field = javaClassStatic()->getField<JRemoteButtonLayout>("value");
+        return getFieldValue(field);
+      }
+    };
+  } // namespace JVariant_NullType_RemoteButtonLayout_impl
+} // namespace margelo::nitro::audiobrowser

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/AndroidOptions.kt

@@ -25,7 +25,7 @@ data class AndroidOptions(
   val skipSilence: Boolean,
   @DoNotStrip
   @Keep
-  val notificationButtons: Variant_NullType_NotificationButtonLayout?
+  val remoteButtonLayout: Variant_NullType_RemoteButtonLayout?
 ) {
   /* primary constructor */
 
@@ -37,8 +37,8 @@ data class AndroidOptions(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(appKilledPlaybackBehavior: AppKilledPlaybackBehavior, skipSilence: Boolean, notificationButtons: Variant_NullType_NotificationButtonLayout?): AndroidOptions {
-      return AndroidOptions(appKilledPlaybackBehavior, skipSilence, notificationButtons)
+    private fun fromCpp(appKilledPlaybackBehavior: AppKilledPlaybackBehavior, skipSilence: Boolean, remoteButtonLayout: Variant_NullType_RemoteButtonLayout?): AndroidOptions {
+      return AndroidOptions(appKilledPlaybackBehavior, skipSilence, remoteButtonLayout)
     }
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroAndroidUpdateOptions.kt

@@ -25,7 +25,7 @@ data class NitroAndroidUpdateOptions(
   val skipSilence: Boolean?,
   @DoNotStrip
   @Keep
-  val notificationButtons: Variant_NullType_NotificationButtonLayout?
+  val remoteButtonLayout: Variant_NullType_RemoteButtonLayout?
 ) {
   /* primary constructor */
 
@@ -37,8 +37,8 @@ data class NitroAndroidUpdateOptions(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(appKilledPlaybackBehavior: AppKilledPlaybackBehavior?, skipSilence: Boolean?, notificationButtons: Variant_NullType_NotificationButtonLayout?): NitroAndroidUpdateOptions {
-      return NitroAndroidUpdateOptions(appKilledPlaybackBehavior, skipSilence, notificationButtons)
+    private fun fromCpp(appKilledPlaybackBehavior: AppKilledPlaybackBehavior?, skipSilence: Boolean?, remoteButtonLayout: Variant_NullType_RemoteButtonLayout?): NitroAndroidUpdateOptions {
+      return NitroAndroidUpdateOptions(appKilledPlaybackBehavior, skipSilence, remoteButtonLayout)
     }
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{NotificationButton.kt → RemoteButton.kt}

@@ -1,5 +1,5 @@
 ///
-/// NotificationButton.kt
+/// RemoteButton.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © Marc Rousavy @ Margelo
@@ -11,11 +11,11 @@ import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
 
 /**
- * Represents the JavaScript enum/union "NotificationButton".
+ * Represents the JavaScript enum/union "RemoteButton".
  */
 @DoNotStrip
 @Keep
-enum class NotificationButton(@DoNotStrip @Keep val value: Int) {
+enum class RemoteButton(@DoNotStrip @Keep val value: Int) {
   SKIP_TO_PREVIOUS(0),
   SKIP_TO_NEXT(1),
   JUMP_BACKWARD(2),

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/RemoteButtonLayout.kt

@@ -0,0 +1,44 @@
+///
+/// RemoteButtonLayout.kt
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+package com.margelo.nitro.audiobrowser
+
+import androidx.annotation.Keep
+import com.facebook.proguard.annotations.DoNotStrip
+
+
+/**
+ * Represents the JavaScript object/struct "RemoteButtonLayout".
+ */
+@DoNotStrip
+@Keep
+data class RemoteButtonLayout(
+  @DoNotStrip
+  @Keep
+  val back: RemoteButton?,
+  @DoNotStrip
+  @Keep
+  val forward: RemoteButton?,
+  @DoNotStrip
+  @Keep
+  val overflow: Array<RemoteButton>
+) {
+  /* primary constructor */
+
+  companion object {
+    /**
+     * Constructor called from C++
+     */
+    @DoNotStrip
+    @Keep
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(back: RemoteButton?, forward: RemoteButton?, overflow: Array<RemoteButton>): RemoteButtonLayout {
+      return RemoteButtonLayout(back, forward, overflow)
+    }
+  }
+}

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{Variant_NullType_NotificationButtonLayout.kt → Variant_NullType_RemoteButtonLayout.kt}

@@ -1,5 +1,5 @@
 ///
-/// Variant_NullType_NotificationButtonLayout.kt
+/// Variant_NullType_RemoteButtonLayout.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © Marc Rousavy @ Margelo
@@ -11,15 +11,15 @@ import com.facebook.proguard.annotations.DoNotStrip
 import com.margelo.nitro.core.NullType
 
 /**
- * Represents the TypeScript variant "NullType | NotificationButtonLayout".
+ * Represents the TypeScript variant "NullType | RemoteButtonLayout".
  */
 @Suppress("ClassName")
 @DoNotStrip
-sealed class Variant_NullType_NotificationButtonLayout {
+sealed class Variant_NullType_RemoteButtonLayout {
   @DoNotStrip
-  data class First(@DoNotStrip val value: NullType): Variant_NullType_NotificationButtonLayout()
+  data class First(@DoNotStrip val value: NullType): Variant_NullType_RemoteButtonLayout()
   @DoNotStrip
-  data class Second(@DoNotStrip val value: NotificationButtonLayout): Variant_NullType_NotificationButtonLayout()
+  data class Second(@DoNotStrip val value: RemoteButtonLayout): Variant_NullType_RemoteButtonLayout()
 
   val isFirst: Boolean
     get() = this is First
@@ -30,12 +30,12 @@ sealed class Variant_NullType_NotificationButtonLayout {
     val value = (this as? First)?.value ?: return null
     return value
   }
-  fun asSecondOrNull(): NotificationButtonLayout? {
+  fun asSecondOrNull(): RemoteButtonLayout? {
     val value = (this as? Second)?.value ?: return null
     return value
   }
 
-  inline fun <R> match(first: (NullType) -> R, second: (NotificationButtonLayout) -> R): R {
+  inline fun <R> match(first: (NullType) -> R, second: (RemoteButtonLayout) -> R): R {
     return when (this) {
       is First -> first(value)
       is Second -> second(value)
@@ -45,9 +45,9 @@ sealed class Variant_NullType_NotificationButtonLayout {
   companion object {
     @JvmStatic
     @DoNotStrip
-    fun create(value: NullType): Variant_NullType_NotificationButtonLayout = First(value)
+    fun create(value: NullType): Variant_NullType_RemoteButtonLayout = First(value)
     @JvmStatic
     @DoNotStrip
-    fun create(value: NotificationButtonLayout): Variant_NullType_NotificationButtonLayout = Second(value)
+    fun create(value: RemoteButtonLayout): Variant_NullType_RemoteButtonLayout = Second(value)
   }
 }

package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp

@@ -108,10 +108,6 @@ namespace margelo::nitro::audiobrowser { struct NavigationError; }
 namespace margelo::nitro::audiobrowser { struct NitroAndroidUpdateOptions; }
 // Forward declaration of `NitroIOSUpdateOptions` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct NitroIOSUpdateOptions; }
-// Forward declaration of `NotificationButtonLayout` to properly resolve imports.
-namespace margelo::nitro::audiobrowser { struct NotificationButtonLayout; }
-// Forward declaration of `NotificationButton` to properly resolve imports.
-namespace margelo::nitro::audiobrowser { enum class NotificationButton; }
 // Forward declaration of `NowPlayingMetadata` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct NowPlayingMetadata; }
 // Forward declaration of `NowPlayingUpdate` to properly resolve imports.
@@ -146,6 +142,10 @@ namespace margelo::nitro::audiobrowser { struct PlayerCapabilities; }
 namespace margelo::nitro::audiobrowser { struct PlayingState; }
 // Forward declaration of `Progress` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct Progress; }
+// Forward declaration of `RemoteButtonLayout` to properly resolve imports.
+namespace margelo::nitro::audiobrowser { struct RemoteButtonLayout; }
+// Forward declaration of `RemoteButton` to properly resolve imports.
+namespace margelo::nitro::audiobrowser { enum class RemoteButton; }
 // Forward declaration of `RemoteJumpBackwardEvent` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct RemoteJumpBackwardEvent; }
 // Forward declaration of `RemoteJumpForwardEvent` to properly resolve imports.
@@ -248,8 +248,6 @@ namespace AudioBrowser { class HybridAudioBrowserSpec_cxx; }
 #include "NavigationErrorType.hpp"
 #include "NitroAndroidUpdateOptions.hpp"
 #include "NitroIOSUpdateOptions.hpp"
-#include "NotificationButton.hpp"
-#include "NotificationButtonLayout.hpp"
 #include "NowPlayingMetadata.hpp"
 #include "NowPlayingUpdate.hpp"
 #include "Options.hpp"
@@ -267,6 +265,8 @@ namespace AudioBrowser { class HybridAudioBrowserSpec_cxx; }
 #include "PlayerCapabilities.hpp"
 #include "PlayingState.hpp"
 #include "Progress.hpp"
+#include "RemoteButton.hpp"
+#include "RemoteButtonLayout.hpp"
 #include "RemoteJumpBackwardEvent.hpp"
 #include "RemoteJumpForwardEvent.hpp"
 #include "RemotePlayIdEvent.hpp"
@@ -2182,31 +2182,31 @@ namespace margelo::nitro::audiobrowser::bridge::swift {
     return optional.value();
   }
   
-  // pragma MARK: std::optional<std::variant<nitro::NullType, NotificationButtonLayout>>
+  // pragma MARK: std::optional<std::variant<nitro::NullType, RemoteButtonLayout>>
   /**
-   * Specialized version of `std::optional<std::variant<nitro::NullType, NotificationButtonLayout>>`.
+   * Specialized version of `std::optional<std::variant<nitro::NullType, RemoteButtonLayout>>`.
    */
-  using std__optional_std__variant_nitro__NullType__NotificationButtonLayout__ = std::optional<std::variant<nitro::NullType, NotificationButtonLayout>>;
-  inline std::optional<std::variant<nitro::NullType, NotificationButtonLayout>> create_std__optional_std__variant_nitro__NullType__NotificationButtonLayout__(const std::variant<nitro::NullType, NotificationButtonLayout>& value) noexcept {
-    return std::optional<std::variant<nitro::NullType, NotificationButtonLayout>>(value);
+  using std__optional_std__variant_nitro__NullType__RemoteButtonLayout__ = std::optional<std::variant<nitro::NullType, RemoteButtonLayout>>;
+  inline std::optional<std::variant<nitro::NullType, RemoteButtonLayout>> create_std__optional_std__variant_nitro__NullType__RemoteButtonLayout__(const std::variant<nitro::NullType, RemoteButtonLayout>& value) noexcept {
+    return std::optional<std::variant<nitro::NullType, RemoteButtonLayout>>(value);
   }
-  inline bool has_value_std__optional_std__variant_nitro__NullType__NotificationButtonLayout__(const std::optional<std::variant<nitro::NullType, NotificationButtonLayout>>& optional) noexcept {
+  inline bool has_value_std__optional_std__variant_nitro__NullType__RemoteButtonLayout__(const std::optional<std::variant<nitro::NullType, RemoteButtonLayout>>& optional) noexcept {
     return optional.has_value();
   }
-  inline std::variant<nitro::NullType, NotificationButtonLayout> get_std__optional_std__variant_nitro__NullType__NotificationButtonLayout__(const std::optional<std::variant<nitro::NullType, NotificationButtonLayout>>& optional) noexcept {
+  inline std::variant<nitro::NullType, RemoteButtonLayout> get_std__optional_std__variant_nitro__NullType__RemoteButtonLayout__(const std::optional<std::variant<nitro::NullType, RemoteButtonLayout>>& optional) noexcept {
     return optional.value();
   }
   
-  // pragma MARK: std::variant<nitro::NullType, NotificationButtonLayout>
+  // pragma MARK: std::variant<nitro::NullType, RemoteButtonLayout>
   /**
-   * Wrapper struct for `std::variant<nitro::NullType, NotificationButtonLayout>`.
+   * Wrapper struct for `std::variant<nitro::NullType, RemoteButtonLayout>`.
    * std::variant cannot be used in Swift because of a Swift bug.
    * Not even specializing it works. So we create a wrapper struct.
    */
-  struct std__variant_nitro__NullType__NotificationButtonLayout_ final {
-    std::variant<nitro::NullType, NotificationButtonLayout> variant;
-    std__variant_nitro__NullType__NotificationButtonLayout_(std::variant<nitro::NullType, NotificationButtonLayout> variant): variant(variant) { }
-    operator std::variant<nitro::NullType, NotificationButtonLayout>() const noexcept {
+  struct std__variant_nitro__NullType__RemoteButtonLayout_ final {
+    std::variant<nitro::NullType, RemoteButtonLayout> variant;
+    std__variant_nitro__NullType__RemoteButtonLayout_(std::variant<nitro::NullType, RemoteButtonLayout> variant): variant(variant) { }
+    operator std::variant<nitro::NullType, RemoteButtonLayout>() const noexcept {
       return variant;
     }
     inline size_t index() const noexcept {
@@ -2215,54 +2215,39 @@ namespace margelo::nitro::audiobrowser::bridge::swift {
     inline nitro::NullType get_0() const noexcept {
       return std::get<0>(variant);
     }
-    inline NotificationButtonLayout get_1() const noexcept {
+    inline RemoteButtonLayout get_1() const noexcept {
       return std::get<1>(variant);
     }
   };
-  inline std__variant_nitro__NullType__NotificationButtonLayout_ create_std__variant_nitro__NullType__NotificationButtonLayout_(nitro::NullType value) noexcept {
-    return std__variant_nitro__NullType__NotificationButtonLayout_(value);
+  inline std__variant_nitro__NullType__RemoteButtonLayout_ create_std__variant_nitro__NullType__RemoteButtonLayout_(nitro::NullType value) noexcept {
+    return std__variant_nitro__NullType__RemoteButtonLayout_(value);
   }
-  inline std__variant_nitro__NullType__NotificationButtonLayout_ create_std__variant_nitro__NullType__NotificationButtonLayout_(const NotificationButtonLayout& value) noexcept {
-    return std__variant_nitro__NullType__NotificationButtonLayout_(value);
+  inline std__variant_nitro__NullType__RemoteButtonLayout_ create_std__variant_nitro__NullType__RemoteButtonLayout_(const RemoteButtonLayout& value) noexcept {
+    return std__variant_nitro__NullType__RemoteButtonLayout_(value);
   }
   
-  // pragma MARK: std::optional<NotificationButton>
+  // pragma MARK: std::optional<RemoteButton>
   /**
-   * Specialized version of `std::optional<NotificationButton>`.
+   * Specialized version of `std::optional<RemoteButton>`.
    */
-  using std__optional_NotificationButton_ = std::optional<NotificationButton>;
-  inline std::optional<NotificationButton> create_std__optional_NotificationButton_(const NotificationButton& value) noexcept {
-    return std::optional<NotificationButton>(value);
+  using std__optional_RemoteButton_ = std::optional<RemoteButton>;
+  inline std::optional<RemoteButton> create_std__optional_RemoteButton_(const RemoteButton& value) noexcept {
+    return std::optional<RemoteButton>(value);
   }
-  inline bool has_value_std__optional_NotificationButton_(const std::optional<NotificationButton>& optional) noexcept {
+  inline bool has_value_std__optional_RemoteButton_(const std::optional<RemoteButton>& optional) noexcept {
     return optional.has_value();
   }
-  inline NotificationButton get_std__optional_NotificationButton_(const std::optional<NotificationButton>& optional) noexcept {
+  inline RemoteButton get_std__optional_RemoteButton_(const std::optional<RemoteButton>& optional) noexcept {
     return optional.value();
   }
   
-  // pragma MARK: std::optional<std::vector<NotificationButton>>
+  // pragma MARK: std::vector<RemoteButton>
   /**
-   * Specialized version of `std::optional<std::vector<NotificationButton>>`.
+   * Specialized version of `std::vector<RemoteButton>`.
    */
-  using std__optional_std__vector_NotificationButton__ = std::optional<std::vector<NotificationButton>>;
-  inline std::optional<std::vector<NotificationButton>> create_std__optional_std__vector_NotificationButton__(const std::vector<NotificationButton>& value) noexcept {
-    return std::optional<std::vector<NotificationButton>>(value);
-  }
-  inline bool has_value_std__optional_std__vector_NotificationButton__(const std::optional<std::vector<NotificationButton>>& optional) noexcept {
-    return optional.has_value();
-  }
-  inline std::vector<NotificationButton> get_std__optional_std__vector_NotificationButton__(const std::optional<std::vector<NotificationButton>>& optional) noexcept {
-    return optional.value();
-  }
-  
-  // pragma MARK: std::vector<NotificationButton>
-  /**
-   * Specialized version of `std::vector<NotificationButton>`.
-   */
-  using std__vector_NotificationButton_ = std::vector<NotificationButton>;
-  inline std::vector<NotificationButton> create_std__vector_NotificationButton_(size_t size) noexcept {
-    std::vector<NotificationButton> vector;
+  using std__vector_RemoteButton_ = std::vector<RemoteButton>;
+  inline std::vector<RemoteButton> create_std__vector_RemoteButton_(size_t size) noexcept {
+    std::vector<RemoteButton> vector;
     vector.reserve(size);
     return vector;
   }

package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp

@@ -112,10 +112,6 @@ namespace margelo::nitro::audiobrowser { struct NavigationError; }
 namespace margelo::nitro::audiobrowser { struct NitroAndroidUpdateOptions; }
 // Forward declaration of `NitroIOSUpdateOptions` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct NitroIOSUpdateOptions; }
-// Forward declaration of `NotificationButtonLayout` to properly resolve imports.
-namespace margelo::nitro::audiobrowser { struct NotificationButtonLayout; }
-// Forward declaration of `NotificationButton` to properly resolve imports.
-namespace margelo::nitro::audiobrowser { enum class NotificationButton; }
 // Forward declaration of `NowPlayingMetadata` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct NowPlayingMetadata; }
 // Forward declaration of `NowPlayingUpdate` to properly resolve imports.
@@ -150,6 +146,10 @@ namespace margelo::nitro::audiobrowser { struct PlayerCapabilities; }
 namespace margelo::nitro::audiobrowser { struct PlayingState; }
 // Forward declaration of `Progress` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct Progress; }
+// Forward declaration of `RemoteButtonLayout` to properly resolve imports.
+namespace margelo::nitro::audiobrowser { struct RemoteButtonLayout; }
+// Forward declaration of `RemoteButton` to properly resolve imports.
+namespace margelo::nitro::audiobrowser { enum class RemoteButton; }
 // Forward declaration of `RemoteJumpBackwardEvent` to properly resolve imports.
 namespace margelo::nitro::audiobrowser { struct RemoteJumpBackwardEvent; }
 // Forward declaration of `RemoteJumpForwardEvent` to properly resolve imports.
@@ -250,8 +250,6 @@ namespace margelo::nitro::audiobrowser { struct TransformableRequestConfig; }
 #include "NavigationErrorType.hpp"
 #include "NitroAndroidUpdateOptions.hpp"
 #include "NitroIOSUpdateOptions.hpp"
-#include "NotificationButton.hpp"
-#include "NotificationButtonLayout.hpp"
 #include "NowPlayingMetadata.hpp"
 #include "NowPlayingUpdate.hpp"
 #include "Options.hpp"
@@ -269,6 +267,8 @@ namespace margelo::nitro::audiobrowser { struct TransformableRequestConfig; }
 #include "PlayerCapabilities.hpp"
 #include "PlayingState.hpp"
 #include "Progress.hpp"
+#include "RemoteButton.hpp"
+#include "RemoteButtonLayout.hpp"
 #include "RemoteJumpBackwardEvent.hpp"
 #include "RemoteJumpForwardEvent.hpp"
 #include "RemotePlayIdEvent.hpp"