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

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

@@ -10,18 +10,24 @@
 #include <fbjni/fbjni.h>
 #include "TrackLoadEvent.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"

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

@@ -10,12 +10,23 @@
 #include <fbjni/fbjni.h>
 #include "TrackStyle.hpp"
 
+#include "ArtworkRendering.hpp"
+#include "CardImage.hpp"
+#include "ImageShape.hpp"
+#include "JArtworkRendering.hpp"
+#include "JCardImage.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++ enum "TrackStyle" and the the Kotlin enum "TrackStyle".
+   * The C++ JNI bridge between the C++ struct "TrackStyle" and the the Kotlin data class "TrackStyle".
    */
   struct JTrackStyle final: public jni::JavaClass<JTrackStyle> {
   public:
@@ -23,35 +34,52 @@ namespace margelo::nitro::audiobrowser {
 
   public:
     /**
-     * Convert this Java/Kotlin-based enum to the C++ enum TrackStyle.
+     * Convert this Java/Kotlin-based struct to the C++ struct TrackStyle by copying all values to C++.
      */
     [[maybe_unused]]
     [[nodiscard]]
     TrackStyle toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("value");
-      int ordinal = this->getFieldValue(fieldOrdinal);
-      return static_cast<TrackStyle>(ordinal);
+      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 TrackStyle(
+        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 enum with the given C++ enum's value.
+     * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
      */
     [[maybe_unused]]
-    static jni::alias_ref<JTrackStyle> fromCpp(TrackStyle value) {
+    static jni::local_ref<JTrackStyle::javaobject> fromCpp(const TrackStyle& value) {
+      using JSignature = JTrackStyle(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();
-      switch (value) {
-        case TrackStyle::LIST:
-          static const auto fieldLIST = clazz->getStaticField<JTrackStyle>("LIST");
-          return clazz->getStaticFieldValue(fieldLIST);
-        case TrackStyle::GRID:
-          static const auto fieldGRID = clazz->getStaticField<JTrackStyle>("GRID");
-          return clazz->getStaticFieldValue(fieldGRID);
-        default:
-          std::string stringValue = std::to_string(static_cast<int>(value));
-          throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
-      }
+      static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
+      return create(
+        clazz,
+        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
+      );
     }
   };
 

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

@@ -16,9 +16,23 @@
 #include <NitroModules/Promise.hpp>
 #include "JResolvedTrack.hpp"
 #include <string>
-#include "Track.hpp"
-#include <vector>
+#include "SectionStyle.hpp"
 #include <optional>
+#include "JSectionStyle.hpp"
+#include "GridTile.hpp"
+#include "JGridTile.hpp"
+#include "StyleDisplay.hpp"
+#include "JStyleDisplay.hpp"
+#include "ArtworkRendering.hpp"
+#include "JArtworkRendering.hpp"
+#include "ImageShape.hpp"
+#include "JImageShape.hpp"
+#include "CardImage.hpp"
+#include "JCardImage.hpp"
+#include "Section.hpp"
+#include <vector>
+#include "JSection.hpp"
+#include "Track.hpp"
 #include "JTrack.hpp"
 #include "ArtworkVariants.hpp"
 #include "JVariant_String_ArtworkVariants.hpp"
@@ -32,8 +46,6 @@
 #include "JTrackRequest.hpp"
 #include "TrackStyle.hpp"
 #include "JTrackStyle.hpp"
-#include "ImageRowItem.hpp"
-#include "JImageRowItem.hpp"
 #include "CarPlaySiriListButtonPosition.hpp"
 #include "JCarPlaySiriListButtonPosition.hpp"
 #include "JBrowseError.hpp"

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt}

@@ -1,5 +1,5 @@
 ///
-/// FavoritesMatchMode.kt
+/// ArtworkRendering.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © Marc Rousavy @ Margelo
@@ -11,13 +11,13 @@ import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
 
 /**
- * Represents the JavaScript enum/union "FavoritesMatchMode".
+ * Represents the JavaScript enum/union "ArtworkRendering".
  */
 @DoNotStrip
 @Keep
-enum class FavoritesMatchMode(@DoNotStrip @Keep val value: Int) {
-  EXACT(0),
-  PARTIAL(1);
+enum class ArtworkRendering(@DoNotStrip @Keep val value: Int) {
+  ORIGINAL(0),
+  STENCIL(1);
 
   companion object
 }

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

@@ -0,0 +1,23 @@
+///
+/// CarPlayPlayingIndicatorLocation.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 enum/union "CarPlayPlayingIndicatorLocation".
+ */
+@DoNotStrip
+@Keep
+enum class CarPlayPlayingIndicatorLocation(@DoNotStrip @Keep val value: Int) {
+  LEADING(0),
+  TRAILING(1);
+
+  companion object
+}

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

@@ -0,0 +1,23 @@
+///
+/// CardImage.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 enum/union "CardImage".
+ */
+@DoNotStrip
+@Keep
+enum class CardImage(@DoNotStrip @Keep val value: Int) {
+  NORMAL(0),
+  BACKGROUND(1);
+
+  companion object
+}

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

@@ -0,0 +1,24 @@
+///
+/// GridTile.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 enum/union "GridTile".
+ */
+@DoNotStrip
+@Keep
+enum class GridTile(@DoNotStrip @Keep val value: Int) {
+  PLAIN(0),
+  CARD(1),
+  CONDENSED(2);
+
+  companion object
+}

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

@@ -25,7 +25,10 @@ data class IOSOptions(
   val carPlayUpNextButton: Boolean,
   @DoNotStrip
   @Keep
-  val carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>
+  val carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>,
+  @DoNotStrip
+  @Keep
+  val carPlayPlayingIndicatorLocation: CarPlayPlayingIndicatorLocation
 ) {
   /* primary constructor */
 
@@ -37,8 +40,8 @@ data class IOSOptions(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(playbackRates: DoubleArray, carPlayUpNextButton: Boolean, carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>): IOSOptions {
-      return IOSOptions(playbackRates, carPlayUpNextButton, carPlayNowPlayingButtons)
+    private fun fromCpp(playbackRates: DoubleArray, carPlayUpNextButton: Boolean, carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>, carPlayPlayingIndicatorLocation: CarPlayPlayingIndicatorLocation): IOSOptions {
+      return IOSOptions(playbackRates, carPlayUpNextButton, carPlayNowPlayingButtons, carPlayPlayingIndicatorLocation)
     }
   }
 }

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

@@ -0,0 +1,23 @@
+///
+/// ImageShape.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 enum/union "ImageShape".
+ */
+@DoNotStrip
+@Keep
+enum class ImageShape(@DoNotStrip @Keep val value: Int) {
+  CIRCULAR(0),
+  ROUNDED_RECTANGLE(1);
+
+  companion object
+}

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

@@ -58,7 +58,7 @@ data class NativeBrowserConfiguration(
   val carPlayLoadingTitle: String?,
   @DoNotStrip
   @Keep
-  val resolveAlbumUrl: Func_std__shared_ptr_Promise_std__optional_std__string____Track?,
+  val resolveAlbumPath: Func_std__shared_ptr_Promise_std__optional_std__string____Track?,
   @DoNotStrip
   @Keep
   val formatNavigationError: Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams?
@@ -66,8 +66,8 @@ data class NativeBrowserConfiguration(
   /**
    * Create a new instance of NativeBrowserConfiguration from Kotlin
    */
-  constructor(path: String?, request: TransformableRequestConfig?, requestResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, browse: TransformableRequestConfig?, browseResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: ((event: TrackLoadEvent) -> Promise<Promise<Unit>>)?, androidControllerOfflineError: Boolean?, carPlayLoadingTitle: String?, resolveAlbumUrl: ((track: Track) -> Promise<String?>)?, formatNavigationError: ((params: FormatNavigationErrorParams) -> Promise<FormattedNavigationError?>)?):
-         this(path, request, requestResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, browse, browseResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent_java(it) }, androidControllerOfflineError, carPlayLoadingTitle, resolveAlbumUrl?.let { Func_std__shared_ptr_Promise_std__optional_std__string____Track_java(it) }, formatNavigationError?.let { Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_java(it) })
+  constructor(path: String?, request: TransformableRequestConfig?, requestResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, browse: TransformableRequestConfig?, browseResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: ((event: TrackLoadEvent) -> Promise<Promise<Unit>>)?, androidControllerOfflineError: Boolean?, carPlayLoadingTitle: String?, resolveAlbumPath: ((track: Track) -> Promise<String?>)?, formatNavigationError: ((params: FormatNavigationErrorParams) -> Promise<FormattedNavigationError?>)?):
+         this(path, request, requestResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, browse, browseResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent_java(it) }, androidControllerOfflineError, carPlayLoadingTitle, resolveAlbumPath?.let { Func_std__shared_ptr_Promise_std__optional_std__string____Track_java(it) }, formatNavigationError?.let { Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_java(it) })
 
   companion object {
     /**
@@ -77,8 +77,8 @@ data class NativeBrowserConfiguration(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(path: String?, request: TransformableRequestConfig?, requestResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, browse: TransformableRequestConfig?, browseResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent?, androidControllerOfflineError: Boolean?, carPlayLoadingTitle: String?, resolveAlbumUrl: Func_std__shared_ptr_Promise_std__optional_std__string____Track?, formatNavigationError: Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams?): NativeBrowserConfiguration {
-      return NativeBrowserConfiguration(path, request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad, androidControllerOfflineError, carPlayLoadingTitle, resolveAlbumUrl, formatNavigationError)
+    private fun fromCpp(path: String?, request: TransformableRequestConfig?, requestResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, browse: TransformableRequestConfig?, browseResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent?, androidControllerOfflineError: Boolean?, carPlayLoadingTitle: String?, resolveAlbumPath: Func_std__shared_ptr_Promise_std__optional_std__string____Track?, formatNavigationError: Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams?): NativeBrowserConfiguration {
+      return NativeBrowserConfiguration(path, request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad, androidControllerOfflineError, carPlayLoadingTitle, resolveAlbumPath, formatNavigationError)
     }
   }
 }

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

@@ -25,7 +25,10 @@ data class NitroIOSUpdateOptions(
   val carPlayUpNextButton: Boolean?,
   @DoNotStrip
   @Keep
-  val carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>?
+  val carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>?,
+  @DoNotStrip
+  @Keep
+  val carPlayPlayingIndicatorLocation: CarPlayPlayingIndicatorLocation?
 ) {
   /* primary constructor */
 
@@ -37,8 +40,8 @@ data class NitroIOSUpdateOptions(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(playbackRates: DoubleArray?, carPlayUpNextButton: Boolean?, carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>?): NitroIOSUpdateOptions {
-      return NitroIOSUpdateOptions(playbackRates, carPlayUpNextButton, carPlayNowPlayingButtons)
+    private fun fromCpp(playbackRates: DoubleArray?, carPlayUpNextButton: Boolean?, carPlayNowPlayingButtons: Array<CarPlayNowPlayingButton>?, carPlayPlayingIndicatorLocation: CarPlayPlayingIndicatorLocation?): NitroIOSUpdateOptions {
+      return NitroIOSUpdateOptions(playbackRates, carPlayUpNextButton, carPlayNowPlayingButtons, carPlayPlayingIndicatorLocation)
     }
   }
 }

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

@@ -43,7 +43,7 @@ data class PlayerCapabilities(
   val jumpBackward: Boolean?,
   @DoNotStrip
   @Keep
-  val favorite: Variant_Boolean_FavoriteConfig?,
+  val favorite: Boolean?,
   @DoNotStrip
   @Keep
   val shuffleMode: Boolean?,
@@ -64,7 +64,7 @@ data class PlayerCapabilities(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(play: Boolean?, pause: Boolean?, stop: Boolean?, seekTo: Boolean?, skipToNext: Boolean?, skipToPrevious: Boolean?, jumpForward: Boolean?, jumpBackward: Boolean?, favorite: Variant_Boolean_FavoriteConfig?, shuffleMode: Boolean?, repeatMode: Boolean?, playbackRate: Boolean?): PlayerCapabilities {
+    private fun fromCpp(play: Boolean?, pause: Boolean?, stop: Boolean?, seekTo: Boolean?, skipToNext: Boolean?, skipToPrevious: Boolean?, jumpForward: Boolean?, jumpBackward: Boolean?, favorite: Boolean?, shuffleMode: Boolean?, repeatMode: Boolean?, playbackRate: Boolean?): PlayerCapabilities {
       return PlayerCapabilities(play, pause, stop, seekTo, skipToNext, skipToPrevious, jumpForward, jumpBackward, favorite, shuffleMode, repeatMode, playbackRate)
     }
   }

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

@@ -19,7 +19,13 @@ import com.facebook.proguard.annotations.DoNotStrip
 data class ResolvedTrack(
   @DoNotStrip
   @Keep
-  val url: String,
+  val path: String,
+  @DoNotStrip
+  @Keep
+  val style: SectionStyle?,
+  @DoNotStrip
+  @Keep
+  val sections: Array<Section>?,
   @DoNotStrip
   @Keep
   val children: Array<Track>?,
@@ -43,9 +49,6 @@ data class ResolvedTrack(
   val request: TrackRequest?,
   @DoNotStrip
   @Keep
-  val artworkCarPlayTinted: Boolean?,
-  @DoNotStrip
-  @Keep
   val title: String,
   @DoNotStrip
   @Keep
@@ -55,7 +58,7 @@ data class ResolvedTrack(
   val artist: String?,
   @DoNotStrip
   @Keep
-  val albumUrl: String?,
+  val albumPath: String?,
   @DoNotStrip
   @Keep
   val album: String?,
@@ -70,22 +73,13 @@ data class ResolvedTrack(
   val duration: Double?,
   @DoNotStrip
   @Keep
-  val style: TrackStyle?,
-  @DoNotStrip
-  @Keep
-  val childrenStyle: TrackStyle?,
+  val disabled: Boolean?,
   @DoNotStrip
   @Keep
   val favorited: Boolean?,
   @DoNotStrip
   @Keep
-  val groupTitle: String?,
-  @DoNotStrip
-  @Keep
-  val live: Boolean?,
-  @DoNotStrip
-  @Keep
-  val imageRow: Array<ImageRowItem>?
+  val live: Boolean?
 ) {
   /* primary constructor */
 
@@ -97,8 +91,8 @@ data class ResolvedTrack(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(url: String, children: Array<Track>?, carPlaySiriListButton: CarPlaySiriListButtonPosition?, id: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, artworkCarPlayTinted: Boolean?, title: String, subtitle: String?, artist: String?, albumUrl: String?, album: String?, description: String?, genre: String?, duration: Double?, style: TrackStyle?, childrenStyle: TrackStyle?, favorited: Boolean?, groupTitle: String?, live: Boolean?, imageRow: Array<ImageRowItem>?): ResolvedTrack {
-      return ResolvedTrack(url, children, carPlaySiriListButton, id, src, artwork, artworkSource, request, artworkCarPlayTinted, title, subtitle, artist, albumUrl, album, description, genre, duration, style, childrenStyle, favorited, groupTitle, live, imageRow)
+    private fun fromCpp(path: String, style: SectionStyle?, sections: Array<Section>?, children: Array<Track>?, carPlaySiriListButton: CarPlaySiriListButtonPosition?, id: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, disabled: Boolean?, favorited: Boolean?, live: Boolean?): ResolvedTrack {
+      return ResolvedTrack(path, style, sections, children, carPlaySiriListButton, id, src, artwork, artworkSource, request, title, subtitle, artist, albumPath, album, description, genre, duration, disabled, favorited, live)
     }
   }
 }

package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoriteConfig.kt → Section.kt}

@@ -1,5 +1,5 @@
 ///
-/// FavoriteConfig.kt
+/// Section.kt
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © Marc Rousavy @ Margelo
@@ -12,14 +12,26 @@ import com.facebook.proguard.annotations.DoNotStrip
 
 
 /**
- * Represents the JavaScript object/struct "FavoriteConfig".
+ * Represents the JavaScript object/struct "Section".
  */
 @DoNotStrip
 @Keep
-data class FavoriteConfig(
+data class Section(
   @DoNotStrip
   @Keep
-  val match: FavoritesMatchMode
+  val title: String?,
+  @DoNotStrip
+  @Keep
+  val subtitle: String?,
+  @DoNotStrip
+  @Keep
+  val style: SectionStyle?,
+  @DoNotStrip
+  @Keep
+  val path: String?,
+  @DoNotStrip
+  @Keep
+  val children: Array<Track>
 ) {
   /* primary constructor */
 
@@ -31,8 +43,8 @@ data class FavoriteConfig(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(match: FavoritesMatchMode): FavoriteConfig {
-      return FavoriteConfig(match)
+    private fun fromCpp(title: String?, subtitle: String?, style: SectionStyle?, path: String?, children: Array<Track>): Section {
+      return Section(title, subtitle, style, path, children)
     }
   }
 }

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

@@ -0,0 +1,59 @@
+///
+/// SectionStyle.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 "SectionStyle".
+ */
+@DoNotStrip
+@Keep
+data class SectionStyle(
+  @DoNotStrip
+  @Keep
+  val gridWrap: Boolean?,
+  @DoNotStrip
+  @Keep
+  val gridTile: GridTile?,
+  @DoNotStrip
+  @Keep
+  val display: StyleDisplay?,
+  @DoNotStrip
+  @Keep
+  val artworkRendering: ArtworkRendering?,
+  @DoNotStrip
+  @Keep
+  val imageShape: ImageShape?,
+  @DoNotStrip
+  @Keep
+  val accessorySymbol: String?,
+  @DoNotStrip
+  @Keep
+  val cardTint: String?,
+  @DoNotStrip
+  @Keep
+  val cardImage: CardImage?
+) {
+  /* primary constructor */
+
+  companion object {
+    /**
+     * Constructor called from C++
+     */
+    @DoNotStrip
+    @Keep
+    @Suppress("unused")
+    @JvmStatic
+    private fun fromCpp(gridWrap: Boolean?, gridTile: GridTile?, display: StyleDisplay?, artworkRendering: ArtworkRendering?, imageShape: ImageShape?, accessorySymbol: String?, cardTint: String?, cardImage: CardImage?): SectionStyle {
+      return SectionStyle(gridWrap, gridTile, display, artworkRendering, imageShape, accessorySymbol, cardTint, cardImage)
+    }
+  }
+}

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

@@ -0,0 +1,23 @@
+///
+/// StyleDisplay.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 enum/union "StyleDisplay".
+ */
+@DoNotStrip
+@Keep
+enum class StyleDisplay(@DoNotStrip @Keep val value: Int) {
+  LIST(0),
+  GRID(1);
+
+  companion object
+}

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

@@ -22,7 +22,7 @@ data class Track(
   val id: String?,
   @DoNotStrip
   @Keep
-  val url: String?,
+  val path: String?,
   @DoNotStrip
   @Keep
   val src: String?,
@@ -37,9 +37,6 @@ data class Track(
   val request: TrackRequest?,
   @DoNotStrip
   @Keep
-  val artworkCarPlayTinted: Boolean?,
-  @DoNotStrip
-  @Keep
   val title: String,
   @DoNotStrip
   @Keep
@@ -49,7 +46,7 @@ data class Track(
   val artist: String?,
   @DoNotStrip
   @Keep
-  val albumUrl: String?,
+  val albumPath: String?,
   @DoNotStrip
   @Keep
   val album: String?,
@@ -67,19 +64,13 @@ data class Track(
   val style: TrackStyle?,
   @DoNotStrip
   @Keep
-  val childrenStyle: TrackStyle?,
+  val disabled: Boolean?,
   @DoNotStrip
   @Keep
   val favorited: Boolean?,
   @DoNotStrip
   @Keep
-  val groupTitle: String?,
-  @DoNotStrip
-  @Keep
-  val live: Boolean?,
-  @DoNotStrip
-  @Keep
-  val imageRow: Array<ImageRowItem>?
+  val live: Boolean?
 ) {
   /* primary constructor */
 
@@ -91,8 +82,8 @@ data class Track(
     @Keep
     @Suppress("unused")
     @JvmStatic
-    private fun fromCpp(id: String?, url: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, artworkCarPlayTinted: Boolean?, title: String, subtitle: String?, artist: String?, albumUrl: String?, album: String?, description: String?, genre: String?, duration: Double?, style: TrackStyle?, childrenStyle: TrackStyle?, favorited: Boolean?, groupTitle: String?, live: Boolean?, imageRow: Array<ImageRowItem>?): Track {
-      return Track(id, url, src, artwork, artworkSource, request, artworkCarPlayTinted, title, subtitle, artist, albumUrl, album, description, genre, duration, style, childrenStyle, favorited, groupTitle, live, imageRow)
+    private fun fromCpp(id: String?, path: String?, src: String?, artwork: Variant_String_ArtworkVariants?, artworkSource: ImageSource?, request: TrackRequest?, title: String, subtitle: String?, artist: String?, albumPath: String?, album: String?, description: String?, genre: String?, duration: Double?, style: TrackStyle?, disabled: Boolean?, favorited: Boolean?, live: Boolean?): Track {
+      return Track(id, path, src, artwork, artworkSource, request, title, subtitle, artist, albumPath, album, description, genre, duration, style, disabled, favorited, live)
     }
   }
 }