react-native-audio-browser 0.2.0-next.11 → 0.2.0-next.13

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,25 @@ 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);
       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 +135,17 @@ 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
+        live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt
       );
     }
 
@@ -149,12 +155,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>);
       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 +188,17 @@ 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.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr
       );
     }
   };

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

@@ -0,0 +1,120 @@
+///
+/// JSection.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 "Section.hpp"
+
+#include "ArtworkRendering.hpp"
+#include "ArtworkVariants.hpp"
+#include "CardImage.hpp"
+#include "GridTile.hpp"
+#include "HttpMethod.hpp"
+#include "ImageShape.hpp"
+#include "ImageSource.hpp"
+#include "JArtworkRendering.hpp"
+#include "JArtworkVariants.hpp"
+#include "JCardImage.hpp"
+#include "JGridTile.hpp"
+#include "JHttpMethod.hpp"
+#include "JImageShape.hpp"
+#include "JImageSource.hpp"
+#include "JSectionStyle.hpp"
+#include "JStyleDisplay.hpp"
+#include "JTrack.hpp"
+#include "JTrackRequest.hpp"
+#include "JTrackStyle.hpp"
+#include "JVariant_String_ArtworkVariants.hpp"
+#include "SectionStyle.hpp"
+#include "StyleDisplay.hpp"
+#include "Track.hpp"
+#include "TrackRequest.hpp"
+#include "TrackStyle.hpp"
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <variant>
+#include <vector>
+
+namespace margelo::nitro::audiobrowser {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "Section" and the the Kotlin data class "Section".
+   */
+  struct JSection final: public jni::JavaClass<JSection> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/Section;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct Section by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    Section toCpp() const {
+      static const auto clazz = javaClassStatic();
+      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 fieldStyle = clazz->getField<JSectionStyle>("style");
+      jni::local_ref<JSectionStyle> style = this->getFieldValue(fieldStyle);
+      static const auto fieldPath = clazz->getField<jni::JString>("path");
+      jni::local_ref<jni::JString> path = this->getFieldValue(fieldPath);
+      static const auto fieldChildren = clazz->getField<jni::JArrayClass<JTrack>>("children");
+      jni::local_ref<jni::JArrayClass<JTrack>> children = this->getFieldValue(fieldChildren);
+      return Section(
+        title != nullptr ? std::make_optional(title->toStdString()) : std::nullopt,
+        subtitle != nullptr ? std::make_optional(subtitle->toStdString()) : std::nullopt,
+        style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
+        path != nullptr ? std::make_optional(path->toStdString()) : std::nullopt,
+        [&]() {
+          size_t __size = children->size();
+          std::vector<Track> __vector;
+          __vector.reserve(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            auto __element = children->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<JSection::javaobject> fromCpp(const Section& value) {
+      using JSignature = JSection(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JSectionStyle>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JTrack>>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        value.title.has_value() ? jni::make_jstring(value.title.value()) : nullptr,
+        value.subtitle.has_value() ? jni::make_jstring(value.subtitle.value()) : nullptr,
+        value.style.has_value() ? JSectionStyle::fromCpp(value.style.value()) : nullptr,
+        value.path.has_value() ? jni::make_jstring(value.path.value()) : nullptr,
+        [&]() {
+          size_t __size = value.children.size();
+          jni::local_ref<jni::JArrayClass<JTrack>> __array = jni::JArrayClass<JTrack>::newArray(__size);
+          for (size_t __i = 0; __i < __size; __i++) {
+            const auto& __element = value.children[__i];
+            auto __elementJni = JTrack::fromCpp(__element);
+            __array->setElement(__i, *__elementJni);
+          }
+          return __array;
+        }()
+      );
+    }
+  };
+
+} // namespace margelo::nitro::audiobrowser

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

@@ -0,0 +1,96 @@
+///
+/// JSectionStyle.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 "SectionStyle.hpp"
+
+#include "ArtworkRendering.hpp"
+#include "CardImage.hpp"
+#include "GridTile.hpp"
+#include "ImageShape.hpp"
+#include "JArtworkRendering.hpp"
+#include "JCardImage.hpp"
+#include "JGridTile.hpp"
+#include "JImageShape.hpp"
+#include "JStyleDisplay.hpp"
+#include "StyleDisplay.hpp"
+#include <optional>
+#include <string>
+
+namespace margelo::nitro::audiobrowser {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ struct "SectionStyle" and the the Kotlin data class "SectionStyle".
+   */
+  struct JSectionStyle final: public jni::JavaClass<JSectionStyle> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/SectionStyle;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based struct to the C++ struct SectionStyle by copying all values to C++.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    SectionStyle toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldGridWrap = clazz->getField<jni::JBoolean>("gridWrap");
+      jni::local_ref<jni::JBoolean> gridWrap = this->getFieldValue(fieldGridWrap);
+      static const auto fieldGridTile = clazz->getField<JGridTile>("gridTile");
+      jni::local_ref<JGridTile> gridTile = this->getFieldValue(fieldGridTile);
+      static const auto fieldDisplay = clazz->getField<JStyleDisplay>("display");
+      jni::local_ref<JStyleDisplay> display = this->getFieldValue(fieldDisplay);
+      static const auto fieldArtworkRendering = clazz->getField<JArtworkRendering>("artworkRendering");
+      jni::local_ref<JArtworkRendering> artworkRendering = this->getFieldValue(fieldArtworkRendering);
+      static const auto fieldImageShape = clazz->getField<JImageShape>("imageShape");
+      jni::local_ref<JImageShape> imageShape = this->getFieldValue(fieldImageShape);
+      static const auto fieldAccessorySymbol = clazz->getField<jni::JString>("accessorySymbol");
+      jni::local_ref<jni::JString> accessorySymbol = this->getFieldValue(fieldAccessorySymbol);
+      static const auto fieldCardTint = clazz->getField<jni::JString>("cardTint");
+      jni::local_ref<jni::JString> cardTint = this->getFieldValue(fieldCardTint);
+      static const auto fieldCardImage = clazz->getField<JCardImage>("cardImage");
+      jni::local_ref<JCardImage> cardImage = this->getFieldValue(fieldCardImage);
+      return SectionStyle(
+        gridWrap != nullptr ? std::make_optional(static_cast<bool>(gridWrap->value())) : std::nullopt,
+        gridTile != nullptr ? std::make_optional(gridTile->toCpp()) : std::nullopt,
+        display != nullptr ? std::make_optional(display->toCpp()) : std::nullopt,
+        artworkRendering != nullptr ? std::make_optional(artworkRendering->toCpp()) : std::nullopt,
+        imageShape != nullptr ? std::make_optional(imageShape->toCpp()) : std::nullopt,
+        accessorySymbol != nullptr ? std::make_optional(accessorySymbol->toStdString()) : std::nullopt,
+        cardTint != nullptr ? std::make_optional(cardTint->toStdString()) : std::nullopt,
+        cardImage != nullptr ? std::make_optional(cardImage->toCpp()) : std::nullopt
+      );
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
+     */
+    [[maybe_unused]]
+    static jni::local_ref<JSectionStyle::javaobject> fromCpp(const SectionStyle& value) {
+      using JSignature = JSectionStyle(jni::alias_ref<jni::JBoolean>, jni::alias_ref<JGridTile>, jni::alias_ref<JStyleDisplay>, jni::alias_ref<JArtworkRendering>, jni::alias_ref<JImageShape>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JCardImage>);
+      static const auto clazz = javaClassStatic();
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        value.gridWrap.has_value() ? jni::JBoolean::valueOf(value.gridWrap.value()) : nullptr,
+        value.gridTile.has_value() ? JGridTile::fromCpp(value.gridTile.value()) : nullptr,
+        value.display.has_value() ? JStyleDisplay::fromCpp(value.display.value()) : nullptr,
+        value.artworkRendering.has_value() ? JArtworkRendering::fromCpp(value.artworkRendering.value()) : nullptr,
+        value.imageShape.has_value() ? JImageShape::fromCpp(value.imageShape.value()) : nullptr,
+        value.accessorySymbol.has_value() ? jni::make_jstring(value.accessorySymbol.value()) : nullptr,
+        value.cardTint.has_value() ? jni::make_jstring(value.cardTint.value()) : nullptr,
+        value.cardImage.has_value() ? JCardImage::fromCpp(value.cardImage.value()) : nullptr
+      );
+    }
+  };
+
+} // namespace margelo::nitro::audiobrowser

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

@@ -0,0 +1,58 @@
+///
+/// JStyleDisplay.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 "StyleDisplay.hpp"
+
+namespace margelo::nitro::audiobrowser {
+
+  using namespace facebook;
+
+  /**
+   * The C++ JNI bridge between the C++ enum "StyleDisplay" and the the Kotlin enum "StyleDisplay".
+   */
+  struct JStyleDisplay final: public jni::JavaClass<JStyleDisplay> {
+  public:
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/StyleDisplay;";
+
+  public:
+    /**
+     * Convert this Java/Kotlin-based enum to the C++ enum StyleDisplay.
+     */
+    [[maybe_unused]]
+    [[nodiscard]]
+    StyleDisplay toCpp() const {
+      static const auto clazz = javaClassStatic();
+      static const auto fieldOrdinal = clazz->getField<int>("value");
+      int ordinal = this->getFieldValue(fieldOrdinal);
+      return static_cast<StyleDisplay>(ordinal);
+    }
+
+  public:
+    /**
+     * Create a Java/Kotlin-based enum with the given C++ enum's value.
+     */
+    [[maybe_unused]]
+    static jni::alias_ref<JStyleDisplay> fromCpp(StyleDisplay value) {
+      static const auto clazz = javaClassStatic();
+      switch (value) {
+        case StyleDisplay::LIST:
+          static const auto fieldLIST = clazz->getStaticField<JStyleDisplay>("LIST");
+          return clazz->getStaticFieldValue(fieldLIST);
+        case StyleDisplay::GRID:
+          static const auto fieldGRID = clazz->getStaticField<JStyleDisplay>("GRID");
+          return clazz->getStaticFieldValue(fieldGRID);
+        default:
+          std::string stringValue = std::to_string(static_cast<int>(value));
+          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
+      }
+    }
+  };
+
+} // namespace margelo::nitro::audiobrowser

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

@@ -10,24 +10,29 @@
 #include <fbjni/fbjni.h>
 #include "Track.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 "JTrackRequest.hpp"
 #include "JTrackStyle.hpp"
 #include "JVariant_String_ArtworkVariants.hpp"
+#include "StyleDisplay.hpp"
 #include "TrackRequest.hpp"
 #include "TrackStyle.hpp"
 #include <optional>
 #include <string>
 #include <unordered_map>
 #include <variant>
-#include <vector>
 
 namespace margelo::nitro::audiobrowser {
 
@@ -50,8 +55,8 @@ namespace margelo::nitro::audiobrowser {
       static const auto clazz = javaClassStatic();
       static const auto fieldId = clazz->getField<jni::JString>("id");
       jni::local_ref<jni::JString> id = this->getFieldValue(fieldId);
-      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 fieldSrc = clazz->getField<jni::JString>("src");
       jni::local_ref<jni::JString> src = this->getFieldValue(fieldSrc);
       static const auto fieldArtwork = clazz->getField<JVariant_String_ArtworkVariants>("artwork");
@@ -60,16 +65,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");
@@ -80,47 +83,31 @@ namespace margelo::nitro::audiobrowser {
       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);
       return Track(
         id != nullptr ? std::make_optional(id->toStdString()) : std::nullopt,
-        url != nullptr ? std::make_optional(url->toStdString()) : std::nullopt,
+        path != nullptr ? std::make_optional(path->toStdString()) : std::nullopt,
         src != nullptr ? std::make_optional(src->toStdString()) : std::nullopt,
         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
+        live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt
       );
     }
 
@@ -130,41 +117,29 @@ namespace margelo::nitro::audiobrowser {
      */
     [[maybe_unused]]
     static jni::local_ref<JTrack::javaobject> fromCpp(const Track& value) {
-      using JSignature = JTrack(jni::alias_ref<jni::JString>, 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 = JTrack(jni::alias_ref<jni::JString>, 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<JTrackStyle>, 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(
         clazz,
         value.id.has_value() ? jni::make_jstring(value.id.value()) : nullptr,
-        value.url.has_value() ? jni::make_jstring(value.url.value()) : nullptr,
+        value.path.has_value() ? jni::make_jstring(value.path.value()) : nullptr,
         value.src.has_value() ? jni::make_jstring(value.src.value()) : nullptr,
         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.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr
       );
     }
   };