react-native-audio-browser 0.2.0-next.2 → 0.2.0-next.21

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

@@ -12,25 +12,22 @@
 
 #include "AppKilledPlaybackBehavior.hpp"
 #include "CarPlayNowPlayingButton.hpp"
-#include "FavoriteConfig.hpp"
-#include "FavoritesMatchMode.hpp"
+#include "CarPlayPlayingIndicatorLocation.hpp"
 #include "JAppKilledPlaybackBehavior.hpp"
 #include "JCarPlayNowPlayingButton.hpp"
-#include "JFavoriteConfig.hpp"
-#include "JFavoritesMatchMode.hpp"
+#include "JCarPlayPlayingIndicatorLocation.hpp"
 #include "JNitroAndroidUpdateOptions.hpp"
 #include "JNitroIOSUpdateOptions.hpp"
-#include "JNotificationButton.hpp"
-#include "JNotificationButtonLayout.hpp"
 #include "JPlayerCapabilities.hpp"
-#include "JVariant_Boolean_FavoriteConfig.hpp"
+#include "JRemoteButton.hpp"
+#include "JRemoteButtonLayout.hpp"
 #include "JVariant_NullType_Double.hpp"
-#include "JVariant_NullType_NotificationButtonLayout.hpp"
+#include "JVariant_NullType_RemoteButtonLayout.hpp"
 #include "NitroAndroidUpdateOptions.hpp"
 #include "NitroIOSUpdateOptions.hpp"
-#include "NotificationButton.hpp"
-#include "NotificationButtonLayout.hpp"
 #include "PlayerCapabilities.hpp"
+#include "RemoteButton.hpp"
+#include "RemoteButtonLayout.hpp"
 #include <NitroModules/JNull.hpp>
 #include <NitroModules/Null.hpp>
 #include <optional>

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

@@ -12,11 +12,11 @@
 
 #include "AppKilledPlaybackBehavior.hpp"
 #include "JAppKilledPlaybackBehavior.hpp"
-#include "JNotificationButton.hpp"
-#include "JNotificationButtonLayout.hpp"
-#include "JVariant_NullType_NotificationButtonLayout.hpp"
-#include "NotificationButton.hpp"
-#include "NotificationButtonLayout.hpp"
+#include "JRemoteButton.hpp"
+#include "JRemoteButtonLayout.hpp"
+#include "JVariant_NullType_RemoteButtonLayout.hpp"
+#include "RemoteButton.hpp"
+#include "RemoteButtonLayout.hpp"
 #include <NitroModules/JNull.hpp>
 #include <NitroModules/Null.hpp>
 #include <optional>
@@ -46,12 +46,12 @@ namespace margelo::nitro::audiobrowser {
       jni::local_ref<JAppKilledPlaybackBehavior> appKilledPlaybackBehavior = this->getFieldValue(fieldAppKilledPlaybackBehavior);
       static const auto fieldSkipSilence = clazz->getField<jni::JBoolean>("skipSilence");
       jni::local_ref<jni::JBoolean> skipSilence = this->getFieldValue(fieldSkipSilence);
-      static const auto fieldNotificationButtons = clazz->getField<JVariant_NullType_NotificationButtonLayout>("notificationButtons");
-      jni::local_ref<JVariant_NullType_NotificationButtonLayout> notificationButtons = this->getFieldValue(fieldNotificationButtons);
+      static const auto fieldRemoteButtonLayout = clazz->getField<JVariant_NullType_RemoteButtonLayout>("remoteButtonLayout");
+      jni::local_ref<JVariant_NullType_RemoteButtonLayout> remoteButtonLayout = this->getFieldValue(fieldRemoteButtonLayout);
       return NitroAndroidUpdateOptions(
         appKilledPlaybackBehavior != nullptr ? std::make_optional(appKilledPlaybackBehavior->toCpp()) : std::nullopt,
         skipSilence != nullptr ? std::make_optional(static_cast<bool>(skipSilence->value())) : std::nullopt,
-        notificationButtons != nullptr ? std::make_optional(notificationButtons->toCpp()) : std::nullopt
+        remoteButtonLayout != nullptr ? std::make_optional(remoteButtonLayout->toCpp()) : std::nullopt
       );
     }
 
@@ -61,14 +61,14 @@ namespace margelo::nitro::audiobrowser {
      */
     [[maybe_unused]]
     static jni::local_ref<JNitroAndroidUpdateOptions::javaobject> fromCpp(const NitroAndroidUpdateOptions& value) {
-      using JSignature = JNitroAndroidUpdateOptions(jni::alias_ref<JAppKilledPlaybackBehavior>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JVariant_NullType_NotificationButtonLayout>);
+      using JSignature = JNitroAndroidUpdateOptions(jni::alias_ref<JAppKilledPlaybackBehavior>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JVariant_NullType_RemoteButtonLayout>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
         value.appKilledPlaybackBehavior.has_value() ? JAppKilledPlaybackBehavior::fromCpp(value.appKilledPlaybackBehavior.value()) : nullptr,
         value.skipSilence.has_value() ? jni::JBoolean::valueOf(value.skipSilence.value()) : nullptr,
-        value.notificationButtons.has_value() ? JVariant_NullType_NotificationButtonLayout::fromCpp(value.notificationButtons.value()) : nullptr
+        value.remoteButtonLayout.has_value() ? JVariant_NullType_RemoteButtonLayout::fromCpp(value.remoteButtonLayout.value()) : nullptr
       );
     }
   };

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

@@ -11,7 +11,9 @@
 #include "NitroIOSUpdateOptions.hpp"
 
 #include "CarPlayNowPlayingButton.hpp"
+#include "CarPlayPlayingIndicatorLocation.hpp"
 #include "JCarPlayNowPlayingButton.hpp"
+#include "JCarPlayPlayingIndicatorLocation.hpp"
 #include <optional>
 #include <vector>
 
@@ -40,6 +42,8 @@ namespace margelo::nitro::audiobrowser {
       jni::local_ref<jni::JBoolean> carPlayUpNextButton = this->getFieldValue(fieldCarPlayUpNextButton);
       static const auto fieldCarPlayNowPlayingButtons = clazz->getField<jni::JArrayClass<JCarPlayNowPlayingButton>>("carPlayNowPlayingButtons");
       jni::local_ref<jni::JArrayClass<JCarPlayNowPlayingButton>> carPlayNowPlayingButtons = this->getFieldValue(fieldCarPlayNowPlayingButtons);
+      static const auto fieldCarPlayPlayingIndicatorLocation = clazz->getField<JCarPlayPlayingIndicatorLocation>("carPlayPlayingIndicatorLocation");
+      jni::local_ref<JCarPlayPlayingIndicatorLocation> carPlayPlayingIndicatorLocation = this->getFieldValue(fieldCarPlayPlayingIndicatorLocation);
       return NitroIOSUpdateOptions(
         playbackRates != nullptr ? std::make_optional([&]() {
           size_t __size = playbackRates->size();
@@ -57,7 +61,8 @@ namespace margelo::nitro::audiobrowser {
             __vector.push_back(__element->toCpp());
           }
           return __vector;
-        }()) : std::nullopt
+        }()) : std::nullopt,
+        carPlayPlayingIndicatorLocation != nullptr ? std::make_optional(carPlayPlayingIndicatorLocation->toCpp()) : std::nullopt
       );
     }
 
@@ -67,7 +72,7 @@ namespace margelo::nitro::audiobrowser {
      */
     [[maybe_unused]]
     static jni::local_ref<JNitroIOSUpdateOptions::javaobject> fromCpp(const NitroIOSUpdateOptions& value) {
-      using JSignature = JNitroIOSUpdateOptions(jni::alias_ref<jni::JArrayDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JArrayClass<JCarPlayNowPlayingButton>>);
+      using JSignature = JNitroIOSUpdateOptions(jni::alias_ref<jni::JArrayDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JArrayClass<JCarPlayNowPlayingButton>>, jni::alias_ref<JCarPlayPlayingIndicatorLocation>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -88,7 +93,8 @@ namespace margelo::nitro::audiobrowser {
             __array->setElement(__i, *__elementJni);
           }
           return __array;
-        }() : nullptr
+        }() : nullptr,
+        value.carPlayPlayingIndicatorLocation.has_value() ? JCarPlayPlayingIndicatorLocation::fromCpp(value.carPlayPlayingIndicatorLocation.value()) : nullptr
       );
     }
   };

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

@@ -13,24 +13,21 @@
 #include "AndroidOptions.hpp"
 #include "AppKilledPlaybackBehavior.hpp"
 #include "CarPlayNowPlayingButton.hpp"
-#include "FavoriteConfig.hpp"
-#include "FavoritesMatchMode.hpp"
+#include "CarPlayPlayingIndicatorLocation.hpp"
 #include "IOSOptions.hpp"
 #include "JAndroidOptions.hpp"
 #include "JAppKilledPlaybackBehavior.hpp"
 #include "JCarPlayNowPlayingButton.hpp"
-#include "JFavoriteConfig.hpp"
-#include "JFavoritesMatchMode.hpp"
+#include "JCarPlayPlayingIndicatorLocation.hpp"
 #include "JIOSOptions.hpp"
-#include "JNotificationButton.hpp"
-#include "JNotificationButtonLayout.hpp"
 #include "JPlayerCapabilities.hpp"
-#include "JVariant_Boolean_FavoriteConfig.hpp"
+#include "JRemoteButton.hpp"
+#include "JRemoteButtonLayout.hpp"
 #include "JVariant_NullType_Double.hpp"
-#include "JVariant_NullType_NotificationButtonLayout.hpp"
-#include "NotificationButton.hpp"
-#include "NotificationButtonLayout.hpp"
+#include "JVariant_NullType_RemoteButtonLayout.hpp"
 #include "PlayerCapabilities.hpp"
+#include "RemoteButton.hpp"
+#include "RemoteButtonLayout.hpp"
 #include <NitroModules/JNull.hpp>
 #include <NitroModules/Null.hpp>
 #include <optional>

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

@@ -10,18 +10,24 @@
 #include <fbjni/fbjni.h>
 #include "PlaybackActiveTrackChangedEvent.hpp"
 
+#include "ArtworkRendering.hpp"
 #include "ArtworkVariants.hpp"
+#include "CardImage.hpp"
 #include "HttpMethod.hpp"
-#include "ImageRowItem.hpp"
+#include "ImageShape.hpp"
 #include "ImageSource.hpp"
+#include "JArtworkRendering.hpp"
 #include "JArtworkVariants.hpp"
+#include "JCardImage.hpp"
 #include "JHttpMethod.hpp"
-#include "JImageRowItem.hpp"
+#include "JImageShape.hpp"
 #include "JImageSource.hpp"
+#include "JStyleDisplay.hpp"
 #include "JTrack.hpp"
 #include "JTrackRequest.hpp"
 #include "JTrackStyle.hpp"
 #include "JVariant_String_ArtworkVariants.hpp"
+#include "StyleDisplay.hpp"
 #include "Track.hpp"
 #include "TrackRequest.hpp"
 #include "TrackStyle.hpp"
@@ -29,7 +35,6 @@
 #include <string>
 #include <unordered_map>
 #include <variant>
-#include <vector>
 
 namespace margelo::nitro::audiobrowser {
 

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

@@ -10,13 +10,7 @@
 #include <fbjni/fbjni.h>
 #include "PlayerCapabilities.hpp"
 
-#include "FavoriteConfig.hpp"
-#include "FavoritesMatchMode.hpp"
-#include "JFavoriteConfig.hpp"
-#include "JFavoritesMatchMode.hpp"
-#include "JVariant_Boolean_FavoriteConfig.hpp"
 #include <optional>
-#include <variant>
 
 namespace margelo::nitro::audiobrowser {
 
@@ -53,8 +47,8 @@ namespace margelo::nitro::audiobrowser {
       jni::local_ref<jni::JBoolean> jumpForward = this->getFieldValue(fieldJumpForward);
       static const auto fieldJumpBackward = clazz->getField<jni::JBoolean>("jumpBackward");
       jni::local_ref<jni::JBoolean> jumpBackward = this->getFieldValue(fieldJumpBackward);
-      static const auto fieldFavorite = clazz->getField<JVariant_Boolean_FavoriteConfig>("favorite");
-      jni::local_ref<JVariant_Boolean_FavoriteConfig> favorite = this->getFieldValue(fieldFavorite);
+      static const auto fieldFavorite = clazz->getField<jni::JBoolean>("favorite");
+      jni::local_ref<jni::JBoolean> favorite = this->getFieldValue(fieldFavorite);
       static const auto fieldShuffleMode = clazz->getField<jni::JBoolean>("shuffleMode");
       jni::local_ref<jni::JBoolean> shuffleMode = this->getFieldValue(fieldShuffleMode);
       static const auto fieldRepeatMode = clazz->getField<jni::JBoolean>("repeatMode");
@@ -70,7 +64,7 @@ namespace margelo::nitro::audiobrowser {
         skipToPrevious != nullptr ? std::make_optional(static_cast<bool>(skipToPrevious->value())) : std::nullopt,
         jumpForward != nullptr ? std::make_optional(static_cast<bool>(jumpForward->value())) : std::nullopt,
         jumpBackward != nullptr ? std::make_optional(static_cast<bool>(jumpBackward->value())) : std::nullopt,
-        favorite != nullptr ? std::make_optional(favorite->toCpp()) : std::nullopt,
+        favorite != nullptr ? std::make_optional(static_cast<bool>(favorite->value())) : std::nullopt,
         shuffleMode != nullptr ? std::make_optional(static_cast<bool>(shuffleMode->value())) : std::nullopt,
         repeatMode != nullptr ? std::make_optional(static_cast<bool>(repeatMode->value())) : std::nullopt,
         playbackRate != nullptr ? std::make_optional(static_cast<bool>(playbackRate->value())) : std::nullopt
@@ -83,7 +77,7 @@ namespace margelo::nitro::audiobrowser {
      */
     [[maybe_unused]]
     static jni::local_ref<JPlayerCapabilities::javaobject> fromCpp(const PlayerCapabilities& value) {
-      using JSignature = JPlayerCapabilities(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JVariant_Boolean_FavoriteConfig>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>);
+      using JSignature = JPlayerCapabilities(jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
@@ -96,7 +90,7 @@ namespace margelo::nitro::audiobrowser {
         value.skipToPrevious.has_value() ? jni::JBoolean::valueOf(value.skipToPrevious.value()) : nullptr,
         value.jumpForward.has_value() ? jni::JBoolean::valueOf(value.jumpForward.value()) : nullptr,
         value.jumpBackward.has_value() ? jni::JBoolean::valueOf(value.jumpBackward.value()) : nullptr,
-        value.favorite.has_value() ? JVariant_Boolean_FavoriteConfig::fromCpp(value.favorite.value()) : nullptr,
+        value.favorite.has_value() ? jni::JBoolean::valueOf(value.favorite.value()) : nullptr,
         value.shuffleMode.has_value() ? jni::JBoolean::valueOf(value.shuffleMode.value()) : nullptr,
         value.repeatMode.has_value() ? jni::JBoolean::valueOf(value.repeatMode.value()) : nullptr,
         value.playbackRate.has_value() ? jni::JBoolean::valueOf(value.playbackRate.value()) : nullptr

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++/JResolvedTrack.hpp

@@ -10,20 +10,32 @@
 #include <fbjni/fbjni.h>
 #include "ResolvedTrack.hpp"
 
+#include "ArtworkRendering.hpp"
 #include "ArtworkVariants.hpp"
 #include "CarPlaySiriListButtonPosition.hpp"
+#include "CardImage.hpp"
+#include "GridTile.hpp"
 #include "HttpMethod.hpp"
-#include "ImageRowItem.hpp"
+#include "ImageShape.hpp"
 #include "ImageSource.hpp"
+#include "JArtworkRendering.hpp"
 #include "JArtworkVariants.hpp"
 #include "JCarPlaySiriListButtonPosition.hpp"
+#include "JCardImage.hpp"
+#include "JGridTile.hpp"
 #include "JHttpMethod.hpp"
-#include "JImageRowItem.hpp"
+#include "JImageShape.hpp"
 #include "JImageSource.hpp"
+#include "JSection.hpp"
+#include "JSectionStyle.hpp"
+#include "JStyleDisplay.hpp"
 #include "JTrack.hpp"
 #include "JTrackRequest.hpp"
 #include "JTrackStyle.hpp"
 #include "JVariant_String_ArtworkVariants.hpp"
+#include "Section.hpp"
+#include "SectionStyle.hpp"
+#include "StyleDisplay.hpp"
 #include "Track.hpp"
 #include "TrackRequest.hpp"
 #include "TrackStyle.hpp"
@@ -52,8 +64,12 @@ namespace margelo::nitro::audiobrowser {
     [[nodiscard]]
     ResolvedTrack toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldUrl = clazz->getField<jni::JString>("url");
-      jni::local_ref<jni::JString> url = this->getFieldValue(fieldUrl);
+      static const auto fieldPath = clazz->getField<jni::JString>("path");
+      jni::local_ref<jni::JString> path = this->getFieldValue(fieldPath);
+      static const auto fieldStyle = clazz->getField<JSectionStyle>("style");
+      jni::local_ref<JSectionStyle> style = this->getFieldValue(fieldStyle);
+      static const auto fieldSections = clazz->getField<jni::JArrayClass<JSection>>("sections");
+      jni::local_ref<jni::JArrayClass<JSection>> sections = this->getFieldValue(fieldSections);
       static const auto fieldChildren = clazz->getField<jni::JArrayClass<JTrack>>("children");
       jni::local_ref<jni::JArrayClass<JTrack>> children = this->getFieldValue(fieldChildren);
       static const auto fieldCarPlaySiriListButton = clazz->getField<JCarPlaySiriListButtonPosition>("carPlaySiriListButton");
@@ -68,16 +84,14 @@ namespace margelo::nitro::audiobrowser {
       jni::local_ref<JImageSource> artworkSource = this->getFieldValue(fieldArtworkSource);
       static const auto fieldRequest = clazz->getField<JTrackRequest>("request");
       jni::local_ref<JTrackRequest> request = this->getFieldValue(fieldRequest);
-      static const auto fieldArtworkCarPlayTinted = clazz->getField<jni::JBoolean>("artworkCarPlayTinted");
-      jni::local_ref<jni::JBoolean> artworkCarPlayTinted = this->getFieldValue(fieldArtworkCarPlayTinted);
       static const auto fieldTitle = clazz->getField<jni::JString>("title");
       jni::local_ref<jni::JString> title = this->getFieldValue(fieldTitle);
       static const auto fieldSubtitle = clazz->getField<jni::JString>("subtitle");
       jni::local_ref<jni::JString> subtitle = this->getFieldValue(fieldSubtitle);
       static const auto fieldArtist = clazz->getField<jni::JString>("artist");
       jni::local_ref<jni::JString> artist = this->getFieldValue(fieldArtist);
-      static const auto fieldAlbumUrl = clazz->getField<jni::JString>("albumUrl");
-      jni::local_ref<jni::JString> albumUrl = this->getFieldValue(fieldAlbumUrl);
+      static const auto fieldAlbumPath = clazz->getField<jni::JString>("albumPath");
+      jni::local_ref<jni::JString> albumPath = this->getFieldValue(fieldAlbumPath);
       static const auto fieldAlbum = clazz->getField<jni::JString>("album");
       jni::local_ref<jni::JString> album = this->getFieldValue(fieldAlbum);
       static const auto fieldDescription = clazz->getField<jni::JString>("description");
@@ -86,20 +100,27 @@ namespace margelo::nitro::audiobrowser {
       jni::local_ref<jni::JString> genre = this->getFieldValue(fieldGenre);
       static const auto fieldDuration = clazz->getField<jni::JDouble>("duration");
       jni::local_ref<jni::JDouble> duration = this->getFieldValue(fieldDuration);
-      static const auto fieldStyle = clazz->getField<JTrackStyle>("style");
-      jni::local_ref<JTrackStyle> style = this->getFieldValue(fieldStyle);
-      static const auto fieldChildrenStyle = clazz->getField<JTrackStyle>("childrenStyle");
-      jni::local_ref<JTrackStyle> childrenStyle = this->getFieldValue(fieldChildrenStyle);
+      static const auto fieldDisabled = clazz->getField<jni::JBoolean>("disabled");
+      jni::local_ref<jni::JBoolean> disabled = this->getFieldValue(fieldDisabled);
       static const auto fieldFavorited = clazz->getField<jni::JBoolean>("favorited");
       jni::local_ref<jni::JBoolean> favorited = this->getFieldValue(fieldFavorited);
-      static const auto fieldGroupTitle = clazz->getField<jni::JString>("groupTitle");
-      jni::local_ref<jni::JString> groupTitle = this->getFieldValue(fieldGroupTitle);
       static const auto fieldLive = clazz->getField<jni::JBoolean>("live");
       jni::local_ref<jni::JBoolean> live = this->getFieldValue(fieldLive);
-      static const auto fieldImageRow = clazz->getField<jni::JArrayClass<JImageRowItem>>("imageRow");
-      jni::local_ref<jni::JArrayClass<JImageRowItem>> imageRow = this->getFieldValue(fieldImageRow);
+      static const auto fieldIcyCharset = clazz->getField<jni::JString>("icyCharset");
+      jni::local_ref<jni::JString> icyCharset = this->getFieldValue(fieldIcyCharset);
       return ResolvedTrack(
-        url->toStdString(),
+        path->toStdString(),
+        style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
+        sections != nullptr ? std::make_optional([&]() {
+          size_t __size = sections->size();
+          std::vector<Section> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = sections->getElement(__i);
+            __vector.push_back(__element->toCpp());
+          }
+          return __vector;
+        }()) : std::nullopt,
         children != nullptr ? std::make_optional([&]() {
           size_t __size = children->size();
           std::vector<Track> __vector;
@@ -116,30 +137,18 @@ namespace margelo::nitro::audiobrowser {
         artwork != nullptr ? std::make_optional(artwork->toCpp()) : std::nullopt,
         artworkSource != nullptr ? std::make_optional(artworkSource->toCpp()) : std::nullopt,
         request != nullptr ? std::make_optional(request->toCpp()) : std::nullopt,
-        artworkCarPlayTinted != nullptr ? std::make_optional(static_cast<bool>(artworkCarPlayTinted->value())) : std::nullopt,
         title->toStdString(),
         subtitle != nullptr ? std::make_optional(subtitle->toStdString()) : std::nullopt,
         artist != nullptr ? std::make_optional(artist->toStdString()) : std::nullopt,
-        albumUrl != nullptr ? std::make_optional(albumUrl->toStdString()) : std::nullopt,
+        albumPath != nullptr ? std::make_optional(albumPath->toStdString()) : std::nullopt,
         album != nullptr ? std::make_optional(album->toStdString()) : std::nullopt,
         description != nullptr ? std::make_optional(description->toStdString()) : std::nullopt,
         genre != nullptr ? std::make_optional(genre->toStdString()) : std::nullopt,
         duration != nullptr ? std::make_optional(duration->value()) : std::nullopt,
-        style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
-        childrenStyle != nullptr ? std::make_optional(childrenStyle->toCpp()) : std::nullopt,
+        disabled != nullptr ? std::make_optional(static_cast<bool>(disabled->value())) : std::nullopt,
         favorited != nullptr ? std::make_optional(static_cast<bool>(favorited->value())) : std::nullopt,
-        groupTitle != nullptr ? std::make_optional(groupTitle->toStdString()) : std::nullopt,
         live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt,
-        imageRow != nullptr ? std::make_optional([&]() {
-          size_t __size = imageRow->size();
-          std::vector<ImageRowItem> __vector;
-          __vector.reserve(__size);
-          for (size_t __i = 0; __i < __size; __i++) {
-            auto __element = imageRow->getElement(__i);
-            __vector.push_back(__element->toCpp());
-          }
-          return __vector;
-        }()) : std::nullopt
+        icyCharset != nullptr ? std::make_optional(icyCharset->toStdString()) : std::nullopt
       );
     }
 
@@ -149,12 +158,23 @@ namespace margelo::nitro::audiobrowser {
      */
     [[maybe_unused]]
     static jni::local_ref<JResolvedTrack::javaobject> fromCpp(const ResolvedTrack& value) {
-      using JSignature = JResolvedTrack(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JTrack>>, jni::alias_ref<JCarPlaySiriListButtonPosition>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JVariant_String_ArtworkVariants>, jni::alias_ref<JImageSource>, jni::alias_ref<JTrackRequest>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JTrackStyle>, jni::alias_ref<JTrackStyle>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JArrayClass<JImageRowItem>>);
+      using JSignature = JResolvedTrack(jni::alias_ref<jni::JString>, jni::alias_ref<JSectionStyle>, jni::alias_ref<jni::JArrayClass<JSection>>, jni::alias_ref<jni::JArrayClass<JTrack>>, jni::alias_ref<JCarPlaySiriListButtonPosition>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JVariant_String_ArtworkVariants>, jni::alias_ref<JImageSource>, jni::alias_ref<JTrackRequest>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>);
       static const auto clazz = javaClassStatic();
       static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
       return create(
         clazz,
-        jni::make_jstring(value.url),
+        jni::make_jstring(value.path),
+        value.style.has_value() ? JSectionStyle::fromCpp(value.style.value()) : nullptr,
+        value.sections.has_value() ? [&]() {
+          size_t __size = value.sections.value().size();
+          jni::local_ref<jni::JArrayClass<JSection>> __array = jni::JArrayClass<JSection>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = value.sections.value()[__i];
+            auto __elementJni = JSection::fromCpp(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }() : nullptr,
         value.children.has_value() ? [&]() {
           size_t __size = value.children.value().size();
           jni::local_ref<jni::JArrayClass<JTrack>> __array = jni::JArrayClass<JTrack>::newArray(__size);
@@ -171,30 +191,18 @@ namespace margelo::nitro::audiobrowser {
         value.artwork.has_value() ? JVariant_String_ArtworkVariants::fromCpp(value.artwork.value()) : nullptr,
         value.artworkSource.has_value() ? JImageSource::fromCpp(value.artworkSource.value()) : nullptr,
         value.request.has_value() ? JTrackRequest::fromCpp(value.request.value()) : nullptr,
-        value.artworkCarPlayTinted.has_value() ? jni::JBoolean::valueOf(value.artworkCarPlayTinted.value()) : nullptr,
         jni::make_jstring(value.title),
         value.subtitle.has_value() ? jni::make_jstring(value.subtitle.value()) : nullptr,
         value.artist.has_value() ? jni::make_jstring(value.artist.value()) : nullptr,
-        value.albumUrl.has_value() ? jni::make_jstring(value.albumUrl.value()) : nullptr,
+        value.albumPath.has_value() ? jni::make_jstring(value.albumPath.value()) : nullptr,
         value.album.has_value() ? jni::make_jstring(value.album.value()) : nullptr,
         value.description.has_value() ? jni::make_jstring(value.description.value()) : nullptr,
         value.genre.has_value() ? jni::make_jstring(value.genre.value()) : nullptr,
         value.duration.has_value() ? jni::JDouble::valueOf(value.duration.value()) : nullptr,
-        value.style.has_value() ? JTrackStyle::fromCpp(value.style.value()) : nullptr,
-        value.childrenStyle.has_value() ? JTrackStyle::fromCpp(value.childrenStyle.value()) : nullptr,
+        value.disabled.has_value() ? jni::JBoolean::valueOf(value.disabled.value()) : nullptr,
         value.favorited.has_value() ? jni::JBoolean::valueOf(value.favorited.value()) : nullptr,
-        value.groupTitle.has_value() ? jni::make_jstring(value.groupTitle.value()) : nullptr,
         value.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr,
-        value.imageRow.has_value() ? [&]() {
-          size_t __size = value.imageRow.value().size();
-          jni::local_ref<jni::JArrayClass<JImageRowItem>> __array = jni::JArrayClass<JImageRowItem>::newArray(__size);
-          for (size_t __i = 0; __i < __size; __i++) {
-            const auto& __element = value.imageRow.value()[__i];
-            auto __elementJni = JImageRowItem::fromCpp(__element);
-            __array->setElement(__i, *__elementJni);
-          }
-          return __array;
-        }() : nullptr
+        value.icyCharset.has_value() ? jni::make_jstring(value.icyCharset.value()) : nullptr
       );
     }
   };