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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (333) hide show
  1. package/README.md +4 -4
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +110 -25
  3. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +254 -188
  4. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +23 -3
  5. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +77 -58
  6. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +68 -26
  7. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
  8. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +9 -7
  9. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
  10. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
  11. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +120 -67
  12. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +21 -24
  13. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +93 -73
  14. package/android/src/main/java/com/audiobrowser/player/Player.kt +48 -30
  15. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
  16. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +44 -40
  17. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
  18. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +35 -0
  19. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +45 -53
  20. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +26 -39
  21. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
  22. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +228 -50
  23. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +38 -0
  24. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -1
  25. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +91 -0
  26. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -53
  27. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +87 -0
  28. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
  29. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
  30. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
  31. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
  32. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
  33. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +41 -16
  34. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +161 -0
  35. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
  36. package/ios/Browser/BrowserConfig.swift +102 -5
  37. package/ios/Browser/BrowserManager+URLResolution.swift +18 -14
  38. package/ios/Browser/BrowserManager.swift +131 -143
  39. package/ios/Browser/BrowserPathHelper.swift +44 -44
  40. package/ios/Browser/JsonModels.swift +187 -106
  41. package/ios/Browser/SearchDrillIn.swift +6 -6
  42. package/ios/Browser/SectionPresentation.swift +34 -0
  43. package/ios/Browser/SectionScope.swift +58 -24
  44. package/ios/Browser/StyleResolver.swift +47 -0
  45. package/ios/Browser/TabBarEntries.swift +2 -2
  46. package/ios/Browser/TrackIdTemplate.swift +37 -0
  47. package/ios/CarPlay/CarPlayArtworkResolver.swift +8 -7
  48. package/ios/CarPlay/CarPlayController.swift +105 -67
  49. package/ios/CarPlay/CarPlayImageLoader.swift +38 -18
  50. package/ios/CarPlay/CarPlayListItemFactory.swift +217 -84
  51. package/ios/CarPlay/CarPlayNowPlayingManager.swift +15 -12
  52. package/ios/Extension/Capability+RemoteCommand.swift +1 -1
  53. package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
  54. package/ios/Extension/ResolvedTrack+Copying.swift +11 -15
  55. package/ios/Extension/Section+Copying.swift +31 -0
  56. package/ios/Extension/Track+Copying.swift +6 -12
  57. package/ios/Extension/Track+Identity.swift +18 -0
  58. package/ios/HybridAudioBrowser.swift +113 -35
  59. package/ios/Model/NitroTypeStubs.swift +46 -21
  60. package/ios/Model/PlayerUpdateOptions.swift +7 -0
  61. package/ios/Player/NowPlayingUpdater.swift +1 -1
  62. package/ios/Player/PlaybackCoordinator.swift +2 -2
  63. package/ios/Player/RetryManager.swift +4 -3
  64. package/ios/Tests/BrowserPathHelperTests.swift +50 -20
  65. package/ios/Tests/CarPlayArtworkResolverTests.swift +24 -41
  66. package/ios/Tests/JsonModelsTests.swift +75 -1
  67. package/ios/Tests/PlaybackStateStoreTests.swift +4 -3
  68. package/ios/Tests/ResolvedTrackCopyingTests.swift +37 -35
  69. package/ios/Tests/SearchDrillInTests.swift +16 -16
  70. package/ios/Tests/SectionPresentationTests.swift +61 -0
  71. package/ios/Tests/SectionScopeTests.swift +87 -55
  72. package/ios/Tests/StyleResolverTests.swift +67 -0
  73. package/ios/Tests/TabBarEntriesTests.swift +18 -18
  74. package/ios/Tests/TrackIdTemplateTests.swift +67 -0
  75. package/ios/Tests/TrackIdentityTests.swift +20 -0
  76. package/ios/Tests/TrackSelectorTests.swift +168 -33
  77. package/ios/TrackSelector.swift +45 -30
  78. package/ios/Util/ArtworkImageFetcher.swift +16 -1
  79. package/lib/commonjs/AudioBrowser.js +11 -0
  80. package/lib/commonjs/AudioBrowser.js.map +1 -1
  81. package/lib/commonjs/features/browser-config.js +11 -8
  82. package/lib/commonjs/features/browser-config.js.map +1 -1
  83. package/lib/commonjs/features/browser.js +2 -2
  84. package/lib/commonjs/features/favorites.js +13 -10
  85. package/lib/commonjs/features/favorites.js.map +1 -1
  86. package/lib/commonjs/features/playback/controls.js +4 -2
  87. package/lib/commonjs/features/playback/controls.js.map +1 -1
  88. package/lib/commonjs/features/playback/state.js +2 -3
  89. package/lib/commonjs/features/playback/state.js.map +1 -1
  90. package/lib/commonjs/features/player/options.js.map +1 -1
  91. package/lib/commonjs/features/player/setup.js +3 -1
  92. package/lib/commonjs/features/player/setup.js.map +1 -1
  93. package/lib/commonjs/features/player/validateOptions.js +2 -0
  94. package/lib/commonjs/features/player/validateOptions.js.map +1 -1
  95. package/lib/commonjs/features/queue/activeTrack.js +14 -3
  96. package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
  97. package/lib/commonjs/features/queue/queue.js +11 -4
  98. package/lib/commonjs/features/queue/queue.js.map +1 -1
  99. package/lib/commonjs/utils/LazyNativeEmitter.js +21 -10
  100. package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
  101. package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
  102. package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
  103. package/lib/commonjs/utils/getTrackIdentity.js +24 -0
  104. package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
  105. package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
  106. package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
  107. package/lib/commonjs/web/NativeAudioBrowser.js +32 -24
  108. package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
  109. package/lib/commonjs/web/browser/BrowserManager.js +144 -87
  110. package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
  111. package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
  112. package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
  113. package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
  114. package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
  115. package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
  116. package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
  117. package/lib/commonjs/web/browser/sections.js +89 -0
  118. package/lib/commonjs/web/browser/sections.js.map +1 -0
  119. package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
  120. package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
  121. package/lib/commonjs/web/util/BrowserPathHelper.js +56 -11
  122. package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
  123. package/lib/module/AudioBrowser.js +1 -0
  124. package/lib/module/AudioBrowser.js.map +1 -1
  125. package/lib/module/features/browser-config.js +11 -8
  126. package/lib/module/features/browser-config.js.map +1 -1
  127. package/lib/module/features/browser.js +2 -2
  128. package/lib/module/features/favorites.js +13 -10
  129. package/lib/module/features/favorites.js.map +1 -1
  130. package/lib/module/features/playback/controls.js +4 -2
  131. package/lib/module/features/playback/controls.js.map +1 -1
  132. package/lib/module/features/playback/state.js +2 -3
  133. package/lib/module/features/playback/state.js.map +1 -1
  134. package/lib/module/features/player/options.js.map +1 -1
  135. package/lib/module/features/player/setup.js +3 -1
  136. package/lib/module/features/player/setup.js.map +1 -1
  137. package/lib/module/features/player/validateOptions.js +2 -0
  138. package/lib/module/features/player/validateOptions.js.map +1 -1
  139. package/lib/module/features/queue/activeTrack.js +14 -3
  140. package/lib/module/features/queue/activeTrack.js.map +1 -1
  141. package/lib/module/features/queue/queue.js +11 -4
  142. package/lib/module/features/queue/queue.js.map +1 -1
  143. package/lib/module/utils/LazyNativeEmitter.js +21 -10
  144. package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
  145. package/lib/module/utils/NativeUpdatedValue.js +31 -13
  146. package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
  147. package/lib/module/utils/getTrackIdentity.js +20 -0
  148. package/lib/module/utils/getTrackIdentity.js.map +1 -0
  149. package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
  150. package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
  151. package/lib/module/web/NativeAudioBrowser.js +32 -24
  152. package/lib/module/web/NativeAudioBrowser.js.map +1 -1
  153. package/lib/module/web/browser/BrowserManager.js +144 -87
  154. package/lib/module/web/browser/BrowserManager.js.map +1 -1
  155. package/lib/module/web/browser/FavoriteManager.js +31 -21
  156. package/lib/module/web/browser/FavoriteManager.js.map +1 -1
  157. package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
  158. package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
  159. package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
  160. package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
  161. package/lib/module/web/browser/sections.js +83 -0
  162. package/lib/module/web/browser/sections.js.map +1 -0
  163. package/lib/module/web/player/NowPlayingManager.js +4 -3
  164. package/lib/module/web/player/NowPlayingManager.js.map +1 -1
  165. package/lib/module/web/util/BrowserPathHelper.js +56 -11
  166. package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
  167. package/lib/typescript/src/AudioBrowser.d.ts +1 -0
  168. package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
  169. package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
  170. package/lib/typescript/src/features/browser.d.ts +2 -2
  171. package/lib/typescript/src/features/favorites.d.ts +13 -10
  172. package/lib/typescript/src/features/favorites.d.ts.map +1 -1
  173. package/lib/typescript/src/features/playback/controls.d.ts +4 -2
  174. package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
  175. package/lib/typescript/src/features/playback/state.d.ts +2 -3
  176. package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
  177. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
  178. package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
  179. package/lib/typescript/src/features/player/options.d.ts +21 -19
  180. package/lib/typescript/src/features/player/options.d.ts.map +1 -1
  181. package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
  182. package/lib/typescript/src/features/player/validateOptions.d.ts +1 -8
  183. package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -1
  184. package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -1
  185. package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
  186. package/lib/typescript/src/features/queue/queue.d.ts +5 -2
  187. package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
  188. package/lib/typescript/src/types/browser-native.d.ts +2 -2
  189. package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
  190. package/lib/typescript/src/types/browser-nodes.d.ts +260 -127
  191. package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
  192. package/lib/typescript/src/types/browser.d.ts +33 -53
  193. package/lib/typescript/src/types/browser.d.ts.map +1 -1
  194. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +16 -17
  195. package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
  196. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
  197. package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
  198. package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
  199. package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
  200. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
  201. package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
  202. package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
  203. package/nitrogen/generated/android/c++/{JFavoritesMatchMode.hpp → JArtworkRendering.hpp} +15 -15
  204. package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +4 -3
  205. package/nitrogen/generated/android/c++/JBrowseResult.hpp +10 -4
  206. package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
  207. package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +4 -3
  208. package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +4 -3
  209. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +4 -3
  210. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +4 -3
  211. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +4 -3
  212. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +4 -3
  213. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +4 -2
  214. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +4 -2
  215. package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +10 -4
  216. package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +4 -3
  217. package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +2 -5
  218. package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +4 -3
  219. package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +9 -3
  220. package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +4 -2
  221. package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +21 -14
  222. package/nitrogen/generated/android/c++/JIOSOptions.hpp +9 -3
  223. package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +4 -3
  224. package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +16 -10
  225. package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +8 -2
  226. package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +6 -7
  227. package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +2 -5
  228. package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +9 -3
  229. package/nitrogen/generated/android/c++/JOptions.hpp +2 -5
  230. package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +4 -3
  231. package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -11
  232. package/nitrogen/generated/android/c++/JResolvedTrack.hpp +49 -51
  233. package/nitrogen/generated/android/c++/JSection.hpp +114 -0
  234. package/nitrogen/generated/android/c++/JSectionStyle.hpp +69 -0
  235. package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
  236. package/nitrogen/generated/android/c++/JTrack.hpp +19 -48
  237. package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +4 -2
  238. package/nitrogen/generated/android/c++/JTrackStyle.hpp +25 -18
  239. package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +10 -4
  240. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
  241. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
  242. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +6 -3
  243. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +5 -5
  244. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +6 -3
  245. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +2 -2
  246. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +12 -18
  247. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +50 -0
  248. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoriteConfig.kt → SectionStyle.kt} +12 -6
  249. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
  250. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +6 -15
  251. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +23 -5
  252. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +104 -82
  253. package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +16 -10
  254. package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +16 -10
  255. package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
  256. package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
  257. package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
  258. package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +5 -5
  259. package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
  260. package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
  261. package/nitrogen/generated/ios/swift/ResolvedTrack.swift +54 -83
  262. package/nitrogen/generated/ios/swift/Section.swift +100 -0
  263. package/nitrogen/generated/ios/swift/SectionStyle.swift +64 -0
  264. package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
  265. package/nitrogen/generated/ios/swift/Track.swift +20 -73
  266. package/nitrogen/generated/ios/swift/TrackStyle.swift +28 -22
  267. package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
  268. package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
  269. package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
  270. package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +6 -6
  271. package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
  272. package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
  273. package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +30 -38
  274. package/nitrogen/generated/shared/c++/Section.hpp +106 -0
  275. package/nitrogen/generated/shared/c++/SectionStyle.hpp +96 -0
  276. package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
  277. package/nitrogen/generated/shared/c++/Track.hpp +15 -31
  278. package/nitrogen/generated/shared/c++/TrackStyle.hpp +50 -34
  279. package/package.json +1 -1
  280. package/src/AudioBrowser.ts +1 -0
  281. package/src/features/browser-config.test.ts +21 -6
  282. package/src/features/browser-config.ts +11 -8
  283. package/src/features/browser.test.ts +1 -1
  284. package/src/features/browser.ts +2 -2
  285. package/src/features/favorites.ts +13 -10
  286. package/src/features/hook-wiring.test.ts +63 -15
  287. package/src/features/playback/controls.ts +4 -2
  288. package/src/features/playback/state.ts +2 -3
  289. package/src/features/playback/trackPlaybackTime.ts +1 -1
  290. package/src/features/player/options.ts +27 -19
  291. package/src/features/player/setup.test.ts +12 -3
  292. package/src/features/player/setup.ts +3 -1
  293. package/src/features/player/validateOptions.ts +2 -0
  294. package/src/features/queue/activeTrack.ts +14 -3
  295. package/src/features/queue/queue.ts +11 -4
  296. package/src/nitro-stub-drift.test.ts +40 -0
  297. package/src/public-surface.test.ts +40 -0
  298. package/src/specs/audio-browser.nitro.ts +4 -3
  299. package/src/style-resolution.test.ts +139 -0
  300. package/src/types/browser-native.ts +2 -2
  301. package/src/types/browser-nodes.ts +268 -136
  302. package/src/types/browser.ts +34 -55
  303. package/src/utils/LazyNativeEmitter.ts +20 -10
  304. package/src/utils/NativeUpdatedValue.ts +29 -13
  305. package/src/utils/getTrackIdentity.ts +20 -0
  306. package/src/utils/useNativeValueRefreshedBy.ts +38 -0
  307. package/src/web/NativeAudioBrowser.ts +37 -22
  308. package/src/web/browser/BrowserManager.ts +176 -95
  309. package/src/web/browser/FavoriteManager.test.ts +84 -0
  310. package/src/web/browser/FavoriteManager.ts +28 -23
  311. package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
  312. package/src/web/browser/assertBrowsePageShape.ts +5 -3
  313. package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
  314. package/src/web/browser/classifyTrackNavigation.ts +9 -9
  315. package/src/web/browser/parseSearchResponse.test.ts +8 -2
  316. package/src/web/browser/sections.test.ts +91 -0
  317. package/src/web/browser/sections.ts +72 -0
  318. package/src/web/player/NowPlayingManager.ts +4 -3
  319. package/src/web/util/BrowserPathHelper.test.ts +52 -0
  320. package/src/web/util/BrowserPathHelper.ts +61 -13
  321. package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
  322. package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
  323. package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
  324. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
  325. package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
  326. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
  327. package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
  328. package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
  329. package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
  330. package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
  331. package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
  332. package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
  333. package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
@@ -11,7 +11,9 @@
11
11
  #include "NitroIOSUpdateOptions.hpp"
12
12
 
13
13
  #include "CarPlayNowPlayingButton.hpp"
14
+ #include "CarPlayPlayingIndicatorLocation.hpp"
14
15
  #include "JCarPlayNowPlayingButton.hpp"
16
+ #include "JCarPlayPlayingIndicatorLocation.hpp"
15
17
  #include <optional>
16
18
  #include <vector>
17
19
 
@@ -40,6 +42,8 @@ namespace margelo::nitro::audiobrowser {
40
42
  jni::local_ref<jni::JBoolean> carPlayUpNextButton = this->getFieldValue(fieldCarPlayUpNextButton);
41
43
  static const auto fieldCarPlayNowPlayingButtons = clazz->getField<jni::JArrayClass<JCarPlayNowPlayingButton>>("carPlayNowPlayingButtons");
42
44
  jni::local_ref<jni::JArrayClass<JCarPlayNowPlayingButton>> carPlayNowPlayingButtons = this->getFieldValue(fieldCarPlayNowPlayingButtons);
45
+ static const auto fieldCarPlayPlayingIndicatorLocation = clazz->getField<JCarPlayPlayingIndicatorLocation>("carPlayPlayingIndicatorLocation");
46
+ jni::local_ref<JCarPlayPlayingIndicatorLocation> carPlayPlayingIndicatorLocation = this->getFieldValue(fieldCarPlayPlayingIndicatorLocation);
43
47
  return NitroIOSUpdateOptions(
44
48
  playbackRates != nullptr ? std::make_optional([&]() {
45
49
  size_t __size = playbackRates->size();
@@ -57,7 +61,8 @@ namespace margelo::nitro::audiobrowser {
57
61
  __vector.push_back(__element->toCpp());
58
62
  }
59
63
  return __vector;
60
- }()) : std::nullopt
64
+ }()) : std::nullopt,
65
+ carPlayPlayingIndicatorLocation != nullptr ? std::make_optional(carPlayPlayingIndicatorLocation->toCpp()) : std::nullopt
61
66
  );
62
67
  }
63
68
 
@@ -67,7 +72,7 @@ namespace margelo::nitro::audiobrowser {
67
72
  */
68
73
  [[maybe_unused]]
69
74
  static jni::local_ref<JNitroIOSUpdateOptions::javaobject> fromCpp(const NitroIOSUpdateOptions& value) {
70
- using JSignature = JNitroIOSUpdateOptions(jni::alias_ref<jni::JArrayDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JArrayClass<JCarPlayNowPlayingButton>>);
75
+ using JSignature = JNitroIOSUpdateOptions(jni::alias_ref<jni::JArrayDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JArrayClass<JCarPlayNowPlayingButton>>, jni::alias_ref<JCarPlayPlayingIndicatorLocation>);
71
76
  static const auto clazz = javaClassStatic();
72
77
  static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
73
78
  return create(
@@ -88,7 +93,8 @@ namespace margelo::nitro::audiobrowser {
88
93
  __array->setElement(__i, *__elementJni);
89
94
  }
90
95
  return __array;
91
- }() : nullptr
96
+ }() : nullptr,
97
+ value.carPlayPlayingIndicatorLocation.has_value() ? JCarPlayPlayingIndicatorLocation::fromCpp(value.carPlayPlayingIndicatorLocation.value()) : nullptr
92
98
  );
93
99
  }
94
100
  };
@@ -13,19 +13,16 @@
13
13
  #include "AndroidOptions.hpp"
14
14
  #include "AppKilledPlaybackBehavior.hpp"
15
15
  #include "CarPlayNowPlayingButton.hpp"
16
- #include "FavoriteConfig.hpp"
17
- #include "FavoritesMatchMode.hpp"
16
+ #include "CarPlayPlayingIndicatorLocation.hpp"
18
17
  #include "IOSOptions.hpp"
19
18
  #include "JAndroidOptions.hpp"
20
19
  #include "JAppKilledPlaybackBehavior.hpp"
21
20
  #include "JCarPlayNowPlayingButton.hpp"
22
- #include "JFavoriteConfig.hpp"
23
- #include "JFavoritesMatchMode.hpp"
21
+ #include "JCarPlayPlayingIndicatorLocation.hpp"
24
22
  #include "JIOSOptions.hpp"
25
23
  #include "JPlayerCapabilities.hpp"
26
24
  #include "JRemoteButton.hpp"
27
25
  #include "JRemoteButtonLayout.hpp"
28
- #include "JVariant_Boolean_FavoriteConfig.hpp"
29
26
  #include "JVariant_NullType_Double.hpp"
30
27
  #include "JVariant_NullType_RemoteButtonLayout.hpp"
31
28
  #include "PlayerCapabilities.hpp"
@@ -10,18 +10,20 @@
10
10
  #include <fbjni/fbjni.h>
11
11
  #include "PlaybackActiveTrackChangedEvent.hpp"
12
12
 
13
+ #include "ArtworkRendering.hpp"
13
14
  #include "ArtworkVariants.hpp"
14
15
  #include "HttpMethod.hpp"
15
- #include "ImageRowItem.hpp"
16
16
  #include "ImageSource.hpp"
17
+ #include "JArtworkRendering.hpp"
17
18
  #include "JArtworkVariants.hpp"
18
19
  #include "JHttpMethod.hpp"
19
- #include "JImageRowItem.hpp"
20
20
  #include "JImageSource.hpp"
21
+ #include "JStyleDisplay.hpp"
21
22
  #include "JTrack.hpp"
22
23
  #include "JTrackRequest.hpp"
23
24
  #include "JTrackStyle.hpp"
24
25
  #include "JVariant_String_ArtworkVariants.hpp"
26
+ #include "StyleDisplay.hpp"
25
27
  #include "Track.hpp"
26
28
  #include "TrackRequest.hpp"
27
29
  #include "TrackStyle.hpp"
@@ -29,7 +31,6 @@
29
31
  #include <string>
30
32
  #include <unordered_map>
31
33
  #include <variant>
32
- #include <vector>
33
34
 
34
35
  namespace margelo::nitro::audiobrowser {
35
36
 
@@ -10,13 +10,7 @@
10
10
  #include <fbjni/fbjni.h>
11
11
  #include "PlayerCapabilities.hpp"
12
12
 
13
- #include "FavoriteConfig.hpp"
14
- #include "FavoritesMatchMode.hpp"
15
- #include "JFavoriteConfig.hpp"
16
- #include "JFavoritesMatchMode.hpp"
17
- #include "JVariant_Boolean_FavoriteConfig.hpp"
18
13
  #include <optional>
19
- #include <variant>
20
14
 
21
15
  namespace margelo::nitro::audiobrowser {
22
16
 
@@ -53,8 +47,8 @@ namespace margelo::nitro::audiobrowser {
53
47
  jni::local_ref<jni::JBoolean> jumpForward = this->getFieldValue(fieldJumpForward);
54
48
  static const auto fieldJumpBackward = clazz->getField<jni::JBoolean>("jumpBackward");
55
49
  jni::local_ref<jni::JBoolean> jumpBackward = this->getFieldValue(fieldJumpBackward);
56
- static const auto fieldFavorite = clazz->getField<JVariant_Boolean_FavoriteConfig>("favorite");
57
- jni::local_ref<JVariant_Boolean_FavoriteConfig> favorite = this->getFieldValue(fieldFavorite);
50
+ static const auto fieldFavorite = clazz->getField<jni::JBoolean>("favorite");
51
+ jni::local_ref<jni::JBoolean> favorite = this->getFieldValue(fieldFavorite);
58
52
  static const auto fieldShuffleMode = clazz->getField<jni::JBoolean>("shuffleMode");
59
53
  jni::local_ref<jni::JBoolean> shuffleMode = this->getFieldValue(fieldShuffleMode);
60
54
  static const auto fieldRepeatMode = clazz->getField<jni::JBoolean>("repeatMode");
@@ -70,7 +64,7 @@ namespace margelo::nitro::audiobrowser {
70
64
  skipToPrevious != nullptr ? std::make_optional(static_cast<bool>(skipToPrevious->value())) : std::nullopt,
71
65
  jumpForward != nullptr ? std::make_optional(static_cast<bool>(jumpForward->value())) : std::nullopt,
72
66
  jumpBackward != nullptr ? std::make_optional(static_cast<bool>(jumpBackward->value())) : std::nullopt,
73
- favorite != nullptr ? std::make_optional(favorite->toCpp()) : std::nullopt,
67
+ favorite != nullptr ? std::make_optional(static_cast<bool>(favorite->value())) : std::nullopt,
74
68
  shuffleMode != nullptr ? std::make_optional(static_cast<bool>(shuffleMode->value())) : std::nullopt,
75
69
  repeatMode != nullptr ? std::make_optional(static_cast<bool>(repeatMode->value())) : std::nullopt,
76
70
  playbackRate != nullptr ? std::make_optional(static_cast<bool>(playbackRate->value())) : std::nullopt
@@ -83,7 +77,7 @@ namespace margelo::nitro::audiobrowser {
83
77
  */
84
78
  [[maybe_unused]]
85
79
  static jni::local_ref<JPlayerCapabilities::javaobject> fromCpp(const PlayerCapabilities& value) {
86
- 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>);
80
+ 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>);
87
81
  static const auto clazz = javaClassStatic();
88
82
  static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
89
83
  return create(
@@ -96,7 +90,7 @@ namespace margelo::nitro::audiobrowser {
96
90
  value.skipToPrevious.has_value() ? jni::JBoolean::valueOf(value.skipToPrevious.value()) : nullptr,
97
91
  value.jumpForward.has_value() ? jni::JBoolean::valueOf(value.jumpForward.value()) : nullptr,
98
92
  value.jumpBackward.has_value() ? jni::JBoolean::valueOf(value.jumpBackward.value()) : nullptr,
99
- value.favorite.has_value() ? JVariant_Boolean_FavoriteConfig::fromCpp(value.favorite.value()) : nullptr,
93
+ value.favorite.has_value() ? jni::JBoolean::valueOf(value.favorite.value()) : nullptr,
100
94
  value.shuffleMode.has_value() ? jni::JBoolean::valueOf(value.shuffleMode.value()) : nullptr,
101
95
  value.repeatMode.has_value() ? jni::JBoolean::valueOf(value.repeatMode.value()) : nullptr,
102
96
  value.playbackRate.has_value() ? jni::JBoolean::valueOf(value.playbackRate.value()) : nullptr
@@ -10,20 +10,26 @@
10
10
  #include <fbjni/fbjni.h>
11
11
  #include "ResolvedTrack.hpp"
12
12
 
13
+ #include "ArtworkRendering.hpp"
13
14
  #include "ArtworkVariants.hpp"
14
15
  #include "CarPlaySiriListButtonPosition.hpp"
15
16
  #include "HttpMethod.hpp"
16
- #include "ImageRowItem.hpp"
17
17
  #include "ImageSource.hpp"
18
+ #include "JArtworkRendering.hpp"
18
19
  #include "JArtworkVariants.hpp"
19
20
  #include "JCarPlaySiriListButtonPosition.hpp"
20
21
  #include "JHttpMethod.hpp"
21
- #include "JImageRowItem.hpp"
22
22
  #include "JImageSource.hpp"
23
+ #include "JSection.hpp"
24
+ #include "JSectionStyle.hpp"
25
+ #include "JStyleDisplay.hpp"
23
26
  #include "JTrack.hpp"
24
27
  #include "JTrackRequest.hpp"
25
28
  #include "JTrackStyle.hpp"
26
29
  #include "JVariant_String_ArtworkVariants.hpp"
30
+ #include "Section.hpp"
31
+ #include "SectionStyle.hpp"
32
+ #include "StyleDisplay.hpp"
27
33
  #include "Track.hpp"
28
34
  #include "TrackRequest.hpp"
29
35
  #include "TrackStyle.hpp"
@@ -52,8 +58,12 @@ namespace margelo::nitro::audiobrowser {
52
58
  [[nodiscard]]
53
59
  ResolvedTrack toCpp() const {
54
60
  static const auto clazz = javaClassStatic();
55
- static const auto fieldUrl = clazz->getField<jni::JString>("url");
56
- jni::local_ref<jni::JString> url = this->getFieldValue(fieldUrl);
61
+ static const auto fieldPath = clazz->getField<jni::JString>("path");
62
+ jni::local_ref<jni::JString> path = this->getFieldValue(fieldPath);
63
+ static const auto fieldStyle = clazz->getField<JSectionStyle>("style");
64
+ jni::local_ref<JSectionStyle> style = this->getFieldValue(fieldStyle);
65
+ static const auto fieldSections = clazz->getField<jni::JArrayClass<JSection>>("sections");
66
+ jni::local_ref<jni::JArrayClass<JSection>> sections = this->getFieldValue(fieldSections);
57
67
  static const auto fieldChildren = clazz->getField<jni::JArrayClass<JTrack>>("children");
58
68
  jni::local_ref<jni::JArrayClass<JTrack>> children = this->getFieldValue(fieldChildren);
59
69
  static const auto fieldCarPlaySiriListButton = clazz->getField<JCarPlaySiriListButtonPosition>("carPlaySiriListButton");
@@ -68,16 +78,14 @@ namespace margelo::nitro::audiobrowser {
68
78
  jni::local_ref<JImageSource> artworkSource = this->getFieldValue(fieldArtworkSource);
69
79
  static const auto fieldRequest = clazz->getField<JTrackRequest>("request");
70
80
  jni::local_ref<JTrackRequest> request = this->getFieldValue(fieldRequest);
71
- static const auto fieldArtworkCarPlayTinted = clazz->getField<jni::JBoolean>("artworkCarPlayTinted");
72
- jni::local_ref<jni::JBoolean> artworkCarPlayTinted = this->getFieldValue(fieldArtworkCarPlayTinted);
73
81
  static const auto fieldTitle = clazz->getField<jni::JString>("title");
74
82
  jni::local_ref<jni::JString> title = this->getFieldValue(fieldTitle);
75
83
  static const auto fieldSubtitle = clazz->getField<jni::JString>("subtitle");
76
84
  jni::local_ref<jni::JString> subtitle = this->getFieldValue(fieldSubtitle);
77
85
  static const auto fieldArtist = clazz->getField<jni::JString>("artist");
78
86
  jni::local_ref<jni::JString> artist = this->getFieldValue(fieldArtist);
79
- static const auto fieldAlbumUrl = clazz->getField<jni::JString>("albumUrl");
80
- jni::local_ref<jni::JString> albumUrl = this->getFieldValue(fieldAlbumUrl);
87
+ static const auto fieldAlbumPath = clazz->getField<jni::JString>("albumPath");
88
+ jni::local_ref<jni::JString> albumPath = this->getFieldValue(fieldAlbumPath);
81
89
  static const auto fieldAlbum = clazz->getField<jni::JString>("album");
82
90
  jni::local_ref<jni::JString> album = this->getFieldValue(fieldAlbum);
83
91
  static const auto fieldDescription = clazz->getField<jni::JString>("description");
@@ -86,20 +94,25 @@ namespace margelo::nitro::audiobrowser {
86
94
  jni::local_ref<jni::JString> genre = this->getFieldValue(fieldGenre);
87
95
  static const auto fieldDuration = clazz->getField<jni::JDouble>("duration");
88
96
  jni::local_ref<jni::JDouble> duration = this->getFieldValue(fieldDuration);
89
- static const auto fieldStyle = clazz->getField<JTrackStyle>("style");
90
- jni::local_ref<JTrackStyle> style = this->getFieldValue(fieldStyle);
91
- static const auto fieldChildrenStyle = clazz->getField<JTrackStyle>("childrenStyle");
92
- jni::local_ref<JTrackStyle> childrenStyle = this->getFieldValue(fieldChildrenStyle);
97
+ static const auto fieldDisabled = clazz->getField<jni::JBoolean>("disabled");
98
+ jni::local_ref<jni::JBoolean> disabled = this->getFieldValue(fieldDisabled);
93
99
  static const auto fieldFavorited = clazz->getField<jni::JBoolean>("favorited");
94
100
  jni::local_ref<jni::JBoolean> favorited = this->getFieldValue(fieldFavorited);
95
- static const auto fieldGroupTitle = clazz->getField<jni::JString>("groupTitle");
96
- jni::local_ref<jni::JString> groupTitle = this->getFieldValue(fieldGroupTitle);
97
101
  static const auto fieldLive = clazz->getField<jni::JBoolean>("live");
98
102
  jni::local_ref<jni::JBoolean> live = this->getFieldValue(fieldLive);
99
- static const auto fieldImageRow = clazz->getField<jni::JArrayClass<JImageRowItem>>("imageRow");
100
- jni::local_ref<jni::JArrayClass<JImageRowItem>> imageRow = this->getFieldValue(fieldImageRow);
101
103
  return ResolvedTrack(
102
- url->toStdString(),
104
+ path->toStdString(),
105
+ style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
106
+ sections != nullptr ? std::make_optional([&]() {
107
+ size_t __size = sections->size();
108
+ std::vector<Section> __vector;
109
+ __vector.reserve(__size);
110
+ for (size_t __i = 0; __i < __size; __i++) {
111
+ auto __element = sections->getElement(__i);
112
+ __vector.push_back(__element->toCpp());
113
+ }
114
+ return __vector;
115
+ }()) : std::nullopt,
103
116
  children != nullptr ? std::make_optional([&]() {
104
117
  size_t __size = children->size();
105
118
  std::vector<Track> __vector;
@@ -116,30 +129,17 @@ namespace margelo::nitro::audiobrowser {
116
129
  artwork != nullptr ? std::make_optional(artwork->toCpp()) : std::nullopt,
117
130
  artworkSource != nullptr ? std::make_optional(artworkSource->toCpp()) : std::nullopt,
118
131
  request != nullptr ? std::make_optional(request->toCpp()) : std::nullopt,
119
- artworkCarPlayTinted != nullptr ? std::make_optional(static_cast<bool>(artworkCarPlayTinted->value())) : std::nullopt,
120
132
  title->toStdString(),
121
133
  subtitle != nullptr ? std::make_optional(subtitle->toStdString()) : std::nullopt,
122
134
  artist != nullptr ? std::make_optional(artist->toStdString()) : std::nullopt,
123
- albumUrl != nullptr ? std::make_optional(albumUrl->toStdString()) : std::nullopt,
135
+ albumPath != nullptr ? std::make_optional(albumPath->toStdString()) : std::nullopt,
124
136
  album != nullptr ? std::make_optional(album->toStdString()) : std::nullopt,
125
137
  description != nullptr ? std::make_optional(description->toStdString()) : std::nullopt,
126
138
  genre != nullptr ? std::make_optional(genre->toStdString()) : std::nullopt,
127
139
  duration != nullptr ? std::make_optional(duration->value()) : std::nullopt,
128
- style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
129
- childrenStyle != nullptr ? std::make_optional(childrenStyle->toCpp()) : std::nullopt,
140
+ disabled != nullptr ? std::make_optional(static_cast<bool>(disabled->value())) : std::nullopt,
130
141
  favorited != nullptr ? std::make_optional(static_cast<bool>(favorited->value())) : std::nullopt,
131
- groupTitle != nullptr ? std::make_optional(groupTitle->toStdString()) : std::nullopt,
132
- live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt,
133
- imageRow != nullptr ? std::make_optional([&]() {
134
- size_t __size = imageRow->size();
135
- std::vector<ImageRowItem> __vector;
136
- __vector.reserve(__size);
137
- for (size_t __i = 0; __i < __size; __i++) {
138
- auto __element = imageRow->getElement(__i);
139
- __vector.push_back(__element->toCpp());
140
- }
141
- return __vector;
142
- }()) : std::nullopt
142
+ live != nullptr ? std::make_optional(static_cast<bool>(live->value())) : std::nullopt
143
143
  );
144
144
  }
145
145
 
@@ -149,12 +149,23 @@ namespace margelo::nitro::audiobrowser {
149
149
  */
150
150
  [[maybe_unused]]
151
151
  static jni::local_ref<JResolvedTrack::javaobject> fromCpp(const ResolvedTrack& value) {
152
- 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>>);
152
+ 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>);
153
153
  static const auto clazz = javaClassStatic();
154
154
  static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
155
155
  return create(
156
156
  clazz,
157
- jni::make_jstring(value.url),
157
+ jni::make_jstring(value.path),
158
+ value.style.has_value() ? JSectionStyle::fromCpp(value.style.value()) : nullptr,
159
+ value.sections.has_value() ? [&]() {
160
+ size_t __size = value.sections.value().size();
161
+ jni::local_ref<jni::JArrayClass<JSection>> __array = jni::JArrayClass<JSection>::newArray(__size);
162
+ for (size_t __i = 0; __i < __size; __i++) {
163
+ const auto& __element = value.sections.value()[__i];
164
+ auto __elementJni = JSection::fromCpp(__element);
165
+ __array->setElement(__i, *__elementJni);
166
+ }
167
+ return __array;
168
+ }() : nullptr,
158
169
  value.children.has_value() ? [&]() {
159
170
  size_t __size = value.children.value().size();
160
171
  jni::local_ref<jni::JArrayClass<JTrack>> __array = jni::JArrayClass<JTrack>::newArray(__size);
@@ -171,30 +182,17 @@ namespace margelo::nitro::audiobrowser {
171
182
  value.artwork.has_value() ? JVariant_String_ArtworkVariants::fromCpp(value.artwork.value()) : nullptr,
172
183
  value.artworkSource.has_value() ? JImageSource::fromCpp(value.artworkSource.value()) : nullptr,
173
184
  value.request.has_value() ? JTrackRequest::fromCpp(value.request.value()) : nullptr,
174
- value.artworkCarPlayTinted.has_value() ? jni::JBoolean::valueOf(value.artworkCarPlayTinted.value()) : nullptr,
175
185
  jni::make_jstring(value.title),
176
186
  value.subtitle.has_value() ? jni::make_jstring(value.subtitle.value()) : nullptr,
177
187
  value.artist.has_value() ? jni::make_jstring(value.artist.value()) : nullptr,
178
- value.albumUrl.has_value() ? jni::make_jstring(value.albumUrl.value()) : nullptr,
188
+ value.albumPath.has_value() ? jni::make_jstring(value.albumPath.value()) : nullptr,
179
189
  value.album.has_value() ? jni::make_jstring(value.album.value()) : nullptr,
180
190
  value.description.has_value() ? jni::make_jstring(value.description.value()) : nullptr,
181
191
  value.genre.has_value() ? jni::make_jstring(value.genre.value()) : nullptr,
182
192
  value.duration.has_value() ? jni::JDouble::valueOf(value.duration.value()) : nullptr,
183
- value.style.has_value() ? JTrackStyle::fromCpp(value.style.value()) : nullptr,
184
- value.childrenStyle.has_value() ? JTrackStyle::fromCpp(value.childrenStyle.value()) : nullptr,
193
+ value.disabled.has_value() ? jni::JBoolean::valueOf(value.disabled.value()) : nullptr,
185
194
  value.favorited.has_value() ? jni::JBoolean::valueOf(value.favorited.value()) : nullptr,
186
- value.groupTitle.has_value() ? jni::make_jstring(value.groupTitle.value()) : nullptr,
187
- value.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr,
188
- value.imageRow.has_value() ? [&]() {
189
- size_t __size = value.imageRow.value().size();
190
- jni::local_ref<jni::JArrayClass<JImageRowItem>> __array = jni::JArrayClass<JImageRowItem>::newArray(__size);
191
- for (size_t __i = 0; __i < __size; __i++) {
192
- const auto& __element = value.imageRow.value()[__i];
193
- auto __elementJni = JImageRowItem::fromCpp(__element);
194
- __array->setElement(__i, *__elementJni);
195
- }
196
- return __array;
197
- }() : nullptr
195
+ value.live.has_value() ? jni::JBoolean::valueOf(value.live.value()) : nullptr
198
196
  );
199
197
  }
200
198
  };
@@ -0,0 +1,114 @@
1
+ ///
2
+ /// JSection.hpp
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ #pragma once
9
+
10
+ #include <fbjni/fbjni.h>
11
+ #include "Section.hpp"
12
+
13
+ #include "ArtworkRendering.hpp"
14
+ #include "ArtworkVariants.hpp"
15
+ #include "HttpMethod.hpp"
16
+ #include "ImageSource.hpp"
17
+ #include "JArtworkRendering.hpp"
18
+ #include "JArtworkVariants.hpp"
19
+ #include "JHttpMethod.hpp"
20
+ #include "JImageSource.hpp"
21
+ #include "JSectionStyle.hpp"
22
+ #include "JStyleDisplay.hpp"
23
+ #include "JTrack.hpp"
24
+ #include "JTrackRequest.hpp"
25
+ #include "JTrackStyle.hpp"
26
+ #include "JVariant_String_ArtworkVariants.hpp"
27
+ #include "SectionStyle.hpp"
28
+ #include "StyleDisplay.hpp"
29
+ #include "Track.hpp"
30
+ #include "TrackRequest.hpp"
31
+ #include "TrackStyle.hpp"
32
+ #include <optional>
33
+ #include <string>
34
+ #include <unordered_map>
35
+ #include <variant>
36
+ #include <vector>
37
+
38
+ namespace margelo::nitro::audiobrowser {
39
+
40
+ using namespace facebook;
41
+
42
+ /**
43
+ * The C++ JNI bridge between the C++ struct "Section" and the the Kotlin data class "Section".
44
+ */
45
+ struct JSection final: public jni::JavaClass<JSection> {
46
+ public:
47
+ static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/Section;";
48
+
49
+ public:
50
+ /**
51
+ * Convert this Java/Kotlin-based struct to the C++ struct Section by copying all values to C++.
52
+ */
53
+ [[maybe_unused]]
54
+ [[nodiscard]]
55
+ Section toCpp() const {
56
+ static const auto clazz = javaClassStatic();
57
+ static const auto fieldTitle = clazz->getField<jni::JString>("title");
58
+ jni::local_ref<jni::JString> title = this->getFieldValue(fieldTitle);
59
+ static const auto fieldSubtitle = clazz->getField<jni::JString>("subtitle");
60
+ jni::local_ref<jni::JString> subtitle = this->getFieldValue(fieldSubtitle);
61
+ static const auto fieldStyle = clazz->getField<JSectionStyle>("style");
62
+ jni::local_ref<JSectionStyle> style = this->getFieldValue(fieldStyle);
63
+ static const auto fieldPath = clazz->getField<jni::JString>("path");
64
+ jni::local_ref<jni::JString> path = this->getFieldValue(fieldPath);
65
+ static const auto fieldChildren = clazz->getField<jni::JArrayClass<JTrack>>("children");
66
+ jni::local_ref<jni::JArrayClass<JTrack>> children = this->getFieldValue(fieldChildren);
67
+ return Section(
68
+ title != nullptr ? std::make_optional(title->toStdString()) : std::nullopt,
69
+ subtitle != nullptr ? std::make_optional(subtitle->toStdString()) : std::nullopt,
70
+ style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
71
+ path != nullptr ? std::make_optional(path->toStdString()) : std::nullopt,
72
+ [&]() {
73
+ size_t __size = children->size();
74
+ std::vector<Track> __vector;
75
+ __vector.reserve(__size);
76
+ for (size_t __i = 0; __i < __size; __i++) {
77
+ auto __element = children->getElement(__i);
78
+ __vector.push_back(__element->toCpp());
79
+ }
80
+ return __vector;
81
+ }()
82
+ );
83
+ }
84
+
85
+ public:
86
+ /**
87
+ * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
88
+ */
89
+ [[maybe_unused]]
90
+ static jni::local_ref<JSection::javaobject> fromCpp(const Section& value) {
91
+ 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>>);
92
+ static const auto clazz = javaClassStatic();
93
+ static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
94
+ return create(
95
+ clazz,
96
+ value.title.has_value() ? jni::make_jstring(value.title.value()) : nullptr,
97
+ value.subtitle.has_value() ? jni::make_jstring(value.subtitle.value()) : nullptr,
98
+ value.style.has_value() ? JSectionStyle::fromCpp(value.style.value()) : nullptr,
99
+ value.path.has_value() ? jni::make_jstring(value.path.value()) : nullptr,
100
+ [&]() {
101
+ size_t __size = value.children.size();
102
+ jni::local_ref<jni::JArrayClass<JTrack>> __array = jni::JArrayClass<JTrack>::newArray(__size);
103
+ for (size_t __i = 0; __i < __size; __i++) {
104
+ const auto& __element = value.children[__i];
105
+ auto __elementJni = JTrack::fromCpp(__element);
106
+ __array->setElement(__i, *__elementJni);
107
+ }
108
+ return __array;
109
+ }()
110
+ );
111
+ }
112
+ };
113
+
114
+ } // namespace margelo::nitro::audiobrowser
@@ -0,0 +1,69 @@
1
+ ///
2
+ /// JSectionStyle.hpp
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ #pragma once
9
+
10
+ #include <fbjni/fbjni.h>
11
+ #include "SectionStyle.hpp"
12
+
13
+ #include "ArtworkRendering.hpp"
14
+ #include "JArtworkRendering.hpp"
15
+ #include "JStyleDisplay.hpp"
16
+ #include "StyleDisplay.hpp"
17
+ #include <optional>
18
+
19
+ namespace margelo::nitro::audiobrowser {
20
+
21
+ using namespace facebook;
22
+
23
+ /**
24
+ * The C++ JNI bridge between the C++ struct "SectionStyle" and the the Kotlin data class "SectionStyle".
25
+ */
26
+ struct JSectionStyle final: public jni::JavaClass<JSectionStyle> {
27
+ public:
28
+ static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/SectionStyle;";
29
+
30
+ public:
31
+ /**
32
+ * Convert this Java/Kotlin-based struct to the C++ struct SectionStyle by copying all values to C++.
33
+ */
34
+ [[maybe_unused]]
35
+ [[nodiscard]]
36
+ SectionStyle toCpp() const {
37
+ static const auto clazz = javaClassStatic();
38
+ static const auto fieldGridWrap = clazz->getField<jni::JBoolean>("gridWrap");
39
+ jni::local_ref<jni::JBoolean> gridWrap = this->getFieldValue(fieldGridWrap);
40
+ static const auto fieldDisplay = clazz->getField<JStyleDisplay>("display");
41
+ jni::local_ref<JStyleDisplay> display = this->getFieldValue(fieldDisplay);
42
+ static const auto fieldArtworkRendering = clazz->getField<JArtworkRendering>("artworkRendering");
43
+ jni::local_ref<JArtworkRendering> artworkRendering = this->getFieldValue(fieldArtworkRendering);
44
+ return SectionStyle(
45
+ gridWrap != nullptr ? std::make_optional(static_cast<bool>(gridWrap->value())) : std::nullopt,
46
+ display != nullptr ? std::make_optional(display->toCpp()) : std::nullopt,
47
+ artworkRendering != nullptr ? std::make_optional(artworkRendering->toCpp()) : std::nullopt
48
+ );
49
+ }
50
+
51
+ public:
52
+ /**
53
+ * Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
54
+ */
55
+ [[maybe_unused]]
56
+ static jni::local_ref<JSectionStyle::javaobject> fromCpp(const SectionStyle& value) {
57
+ using JSignature = JSectionStyle(jni::alias_ref<jni::JBoolean>, jni::alias_ref<JStyleDisplay>, jni::alias_ref<JArtworkRendering>);
58
+ static const auto clazz = javaClassStatic();
59
+ static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
60
+ return create(
61
+ clazz,
62
+ value.gridWrap.has_value() ? jni::JBoolean::valueOf(value.gridWrap.value()) : nullptr,
63
+ value.display.has_value() ? JStyleDisplay::fromCpp(value.display.value()) : nullptr,
64
+ value.artworkRendering.has_value() ? JArtworkRendering::fromCpp(value.artworkRendering.value()) : nullptr
65
+ );
66
+ }
67
+ };
68
+
69
+ } // namespace margelo::nitro::audiobrowser
@@ -0,0 +1,58 @@
1
+ ///
2
+ /// JStyleDisplay.hpp
3
+ /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
4
+ /// https://github.com/mrousavy/nitro
5
+ /// Copyright © Marc Rousavy @ Margelo
6
+ ///
7
+
8
+ #pragma once
9
+
10
+ #include <fbjni/fbjni.h>
11
+ #include "StyleDisplay.hpp"
12
+
13
+ namespace margelo::nitro::audiobrowser {
14
+
15
+ using namespace facebook;
16
+
17
+ /**
18
+ * The C++ JNI bridge between the C++ enum "StyleDisplay" and the the Kotlin enum "StyleDisplay".
19
+ */
20
+ struct JStyleDisplay final: public jni::JavaClass<JStyleDisplay> {
21
+ public:
22
+ static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/StyleDisplay;";
23
+
24
+ public:
25
+ /**
26
+ * Convert this Java/Kotlin-based enum to the C++ enum StyleDisplay.
27
+ */
28
+ [[maybe_unused]]
29
+ [[nodiscard]]
30
+ StyleDisplay toCpp() const {
31
+ static const auto clazz = javaClassStatic();
32
+ static const auto fieldOrdinal = clazz->getField<int>("value");
33
+ int ordinal = this->getFieldValue(fieldOrdinal);
34
+ return static_cast<StyleDisplay>(ordinal);
35
+ }
36
+
37
+ public:
38
+ /**
39
+ * Create a Java/Kotlin-based enum with the given C++ enum's value.
40
+ */
41
+ [[maybe_unused]]
42
+ static jni::alias_ref<JStyleDisplay> fromCpp(StyleDisplay value) {
43
+ static const auto clazz = javaClassStatic();
44
+ switch (value) {
45
+ case StyleDisplay::LIST:
46
+ static const auto fieldLIST = clazz->getStaticField<JStyleDisplay>("LIST");
47
+ return clazz->getStaticFieldValue(fieldLIST);
48
+ case StyleDisplay::GRID:
49
+ static const auto fieldGRID = clazz->getStaticField<JStyleDisplay>("GRID");
50
+ return clazz->getStaticFieldValue(fieldGRID);
51
+ default:
52
+ std::string stringValue = std::to_string(static_cast<int>(value));
53
+ throw std::invalid_argument("Invalid enum value (" + stringValue + "!");
54
+ }
55
+ }
56
+ };
57
+
58
+ } // namespace margelo::nitro::audiobrowser