react-native-audio-browser 0.2.0-next.10 → 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.
- package/README.md +4 -4
- package/android/build.gradle +6 -5
- package/android/gradle.properties +1 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +110 -25
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +254 -188
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +23 -3
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +77 -58
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +68 -26
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +49 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +9 -7
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +20 -0
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +15 -0
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +120 -67
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +21 -24
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +93 -73
- package/android/src/main/java/com/audiobrowser/player/Player.kt +48 -30
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +2 -15
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +46 -5
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +86 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +58 -14
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +20 -6
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +249 -86
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +44 -40
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +28 -23
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +35 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +45 -53
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +69 -30
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +153 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +6 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +345 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +91 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +128 -53
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +87 -0
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +43 -0
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +41 -0
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +42 -2
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +55 -0
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +152 -8
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +218 -10
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +322 -0
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +41 -16
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +161 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +7 -7
- package/ios/Browser/BrowserConfig.swift +102 -5
- package/ios/Browser/BrowserManager+URLResolution.swift +18 -14
- package/ios/Browser/BrowserManager.swift +131 -143
- package/ios/Browser/BrowserPathHelper.swift +44 -44
- package/ios/Browser/JsonModels.swift +187 -106
- package/ios/Browser/SearchDrillIn.swift +6 -6
- package/ios/Browser/SectionPresentation.swift +34 -0
- package/ios/Browser/SectionScope.swift +58 -24
- package/ios/Browser/StyleResolver.swift +47 -0
- package/ios/Browser/TabBarEntries.swift +2 -2
- package/ios/Browser/TrackIdTemplate.swift +37 -0
- package/ios/CarPlay/CarPlayArtworkResolver.swift +8 -7
- package/ios/CarPlay/CarPlayController.swift +105 -67
- package/ios/CarPlay/CarPlayImageLoader.swift +38 -18
- package/ios/CarPlay/CarPlayListItemFactory.swift +217 -84
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +15 -12
- package/ios/Extension/Capability+RemoteCommand.swift +1 -1
- package/ios/Extension/PlayerCapabilities+Favorite.swift +1 -15
- package/ios/Extension/ResolvedTrack+Copying.swift +11 -15
- package/ios/Extension/Section+Copying.swift +31 -0
- package/ios/Extension/Track+Copying.swift +6 -12
- package/ios/Extension/Track+Identity.swift +18 -0
- package/ios/HybridAudioBrowser.swift +113 -35
- package/ios/Model/NitroTypeStubs.swift +64 -23
- package/ios/Model/PlayerUpdateOptions.swift +7 -0
- package/ios/Player/NowPlayingUpdater.swift +1 -1
- package/ios/Player/PlaybackCoordinator.swift +2 -2
- package/ios/Player/RetryManager.swift +4 -3
- package/ios/Tests/BrowserPathHelperTests.swift +50 -20
- package/ios/Tests/CarPlayArtworkResolverTests.swift +24 -41
- package/ios/Tests/JsonModelsTests.swift +75 -1
- package/ios/Tests/PlaybackStateStoreTests.swift +4 -3
- package/ios/Tests/QueueManagerTests.swift +4 -4
- package/ios/Tests/ResolvedTrackCopyingTests.swift +37 -35
- package/ios/Tests/SearchDrillInTests.swift +16 -16
- package/ios/Tests/SectionPresentationTests.swift +61 -0
- package/ios/Tests/SectionScopeTests.swift +87 -55
- package/ios/Tests/StyleResolverTests.swift +67 -0
- package/ios/Tests/TabBarEntriesTests.swift +18 -18
- package/ios/Tests/TrackIdTemplateTests.swift +67 -0
- package/ios/Tests/TrackIdentityTests.swift +20 -0
- package/ios/Tests/TrackSelectorTests.swift +168 -33
- package/ios/TrackSelector.swift +45 -30
- package/ios/Util/ArtworkImageFetcher.swift +16 -1
- package/lib/commonjs/AudioBrowser.js +11 -0
- package/lib/commonjs/AudioBrowser.js.map +1 -1
- package/lib/commonjs/features/browser-config.js +11 -8
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +2 -2
- package/lib/commonjs/features/favorites.js +13 -10
- package/lib/commonjs/features/favorites.js.map +1 -1
- package/lib/commonjs/features/playback/controls.js +4 -2
- package/lib/commonjs/features/playback/controls.js.map +1 -1
- package/lib/commonjs/features/playback/state.js +2 -3
- package/lib/commonjs/features/playback/state.js.map +1 -1
- package/lib/commonjs/features/player/options.js.map +1 -1
- package/lib/commonjs/features/player/setup.js +3 -1
- package/lib/commonjs/features/player/setup.js.map +1 -1
- package/lib/commonjs/features/player/validateOptions.js +2 -0
- package/lib/commonjs/features/player/validateOptions.js.map +1 -1
- package/lib/commonjs/features/queue/activeTrack.js +14 -3
- package/lib/commonjs/features/queue/activeTrack.js.map +1 -1
- package/lib/commonjs/features/queue/queue.js +11 -4
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/utils/LazyNativeEmitter.js +21 -10
- package/lib/commonjs/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/commonjs/utils/NativeUpdatedValue.js +31 -13
- package/lib/commonjs/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/commonjs/utils/getTrackIdentity.js +24 -0
- package/lib/commonjs/utils/getTrackIdentity.js.map +1 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js +33 -0
- package/lib/commonjs/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/commonjs/web/NativeAudioBrowser.js +32 -24
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +144 -87
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/FavoriteManager.js +30 -21
- package/lib/commonjs/web/browser/FavoriteManager.js.map +1 -1
- package/lib/commonjs/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/commonjs/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/commonjs/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/commonjs/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/commonjs/web/browser/sections.js +89 -0
- package/lib/commonjs/web/browser/sections.js.map +1 -0
- package/lib/commonjs/web/player/NowPlayingManager.js +4 -3
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +56 -11
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/AudioBrowser.js +1 -0
- package/lib/module/AudioBrowser.js.map +1 -1
- package/lib/module/features/browser-config.js +11 -8
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +2 -2
- package/lib/module/features/favorites.js +13 -10
- package/lib/module/features/favorites.js.map +1 -1
- package/lib/module/features/playback/controls.js +4 -2
- package/lib/module/features/playback/controls.js.map +1 -1
- package/lib/module/features/playback/state.js +2 -3
- package/lib/module/features/playback/state.js.map +1 -1
- package/lib/module/features/player/options.js.map +1 -1
- package/lib/module/features/player/setup.js +3 -1
- package/lib/module/features/player/setup.js.map +1 -1
- package/lib/module/features/player/validateOptions.js +2 -0
- package/lib/module/features/player/validateOptions.js.map +1 -1
- package/lib/module/features/queue/activeTrack.js +14 -3
- package/lib/module/features/queue/activeTrack.js.map +1 -1
- package/lib/module/features/queue/queue.js +11 -4
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/utils/LazyNativeEmitter.js +21 -10
- package/lib/module/utils/LazyNativeEmitter.js.map +1 -1
- package/lib/module/utils/NativeUpdatedValue.js +31 -13
- package/lib/module/utils/NativeUpdatedValue.js.map +1 -1
- package/lib/module/utils/getTrackIdentity.js +20 -0
- package/lib/module/utils/getTrackIdentity.js.map +1 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js +29 -0
- package/lib/module/utils/useNativeValueRefreshedBy.js.map +1 -0
- package/lib/module/web/NativeAudioBrowser.js +32 -24
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +144 -87
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/FavoriteManager.js +31 -21
- package/lib/module/web/browser/FavoriteManager.js.map +1 -1
- package/lib/module/web/browser/assertBrowsePageShape.js +2 -2
- package/lib/module/web/browser/assertBrowsePageShape.js.map +1 -1
- package/lib/module/web/browser/classifyTrackNavigation.js +9 -9
- package/lib/module/web/browser/classifyTrackNavigation.js.map +1 -1
- package/lib/module/web/browser/sections.js +83 -0
- package/lib/module/web/browser/sections.js.map +1 -0
- package/lib/module/web/player/NowPlayingManager.js +4 -3
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +56 -11
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/typescript/src/AudioBrowser.d.ts +1 -0
- package/lib/typescript/src/AudioBrowser.d.ts.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +2 -2
- package/lib/typescript/src/features/favorites.d.ts +13 -10
- package/lib/typescript/src/features/favorites.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/controls.d.ts +4 -2
- package/lib/typescript/src/features/playback/controls.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/state.d.ts +2 -3
- package/lib/typescript/src/features/playback/state.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts +1 -1
- package/lib/typescript/src/features/playback/trackPlaybackTime.d.ts.map +1 -1
- package/lib/typescript/src/features/player/options.d.ts +21 -19
- package/lib/typescript/src/features/player/options.d.ts.map +1 -1
- package/lib/typescript/src/features/player/setup.d.ts.map +1 -1
- package/lib/typescript/src/features/player/validateOptions.d.ts +1 -8
- package/lib/typescript/src/features/player/validateOptions.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts +8 -1
- package/lib/typescript/src/features/queue/activeTrack.d.ts.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +5 -2
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -2
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +260 -127
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +33 -53
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts +16 -17
- package/lib/typescript/src/utils/LazyNativeEmitter.d.ts.map +1 -1
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts +24 -19
- package/lib/typescript/src/utils/NativeUpdatedValue.d.ts.map +1 -1
- package/lib/typescript/src/utils/getTrackIdentity.d.ts +18 -0
- package/lib/typescript/src/utils/getTrackIdentity.d.ts.map +1 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts +21 -0
- package/lib/typescript/src/utils/useNativeValueRefreshedBy.d.ts.map +1 -0
- package/nitrogen/generated/android/AudioBrowser+autolinking.cmake +0 -1
- package/nitrogen/generated/android/c++/{JFavoritesMatchMode.hpp → JArtworkRendering.hpp} +15 -15
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +4 -3
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +10 -4
- package/nitrogen/generated/android/c++/JCarPlayPlayingIndicatorLocation.hpp +58 -0
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +4 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +4 -2
- 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
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_void_Options.hpp +2 -5
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +9 -3
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +4 -2
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +21 -14
- package/nitrogen/generated/android/c++/JIOSOptions.hpp +9 -3
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +4 -3
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +16 -10
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +8 -2
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +6 -7
- package/nitrogen/generated/android/c++/JNativeUpdateOptions.hpp +2 -5
- package/nitrogen/generated/android/c++/JNitroIOSUpdateOptions.hpp +9 -3
- package/nitrogen/generated/android/c++/JOptions.hpp +2 -5
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +4 -3
- package/nitrogen/generated/android/c++/JPlayerCapabilities.hpp +5 -11
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +49 -51
- package/nitrogen/generated/android/c++/JSection.hpp +114 -0
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +69 -0
- package/nitrogen/generated/android/c++/JStyleDisplay.hpp +58 -0
- package/nitrogen/generated/android/c++/JTrack.hpp +19 -48
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +4 -2
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +25 -18
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +10 -4
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoritesMatchMode.kt → ArtworkRendering.kt} +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CarPlayPlayingIndicatorLocation.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/IOSOptions.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +5 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NitroIOSUpdateOptions.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/PlayerCapabilities.kt +2 -2
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ResolvedTrack.kt +12 -18
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +50 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/{FavoriteConfig.kt → SectionStyle.kt} +12 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/StyleDisplay.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Track.kt +6 -15
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +23 -5
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +104 -82
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +16 -10
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +16 -10
- package/nitrogen/generated/ios/swift/ArtworkRendering.swift +40 -0
- package/nitrogen/generated/ios/swift/CarPlayPlayingIndicatorLocation.swift +40 -0
- package/nitrogen/generated/ios/swift/IOSOptions.swift +7 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +5 -5
- package/nitrogen/generated/ios/swift/NitroIOSUpdateOptions.swift +12 -1
- package/nitrogen/generated/ios/swift/PlayerCapabilities.swift +8 -27
- package/nitrogen/generated/ios/swift/ResolvedTrack.swift +54 -83
- package/nitrogen/generated/ios/swift/Section.swift +100 -0
- package/nitrogen/generated/ios/swift/SectionStyle.swift +64 -0
- package/nitrogen/generated/ios/swift/StyleDisplay.swift +40 -0
- package/nitrogen/generated/ios/swift/Track.swift +20 -73
- package/nitrogen/generated/ios/swift/TrackStyle.swift +28 -22
- package/nitrogen/generated/shared/c++/{FavoritesMatchMode.hpp → ArtworkRendering.hpp} +17 -17
- package/nitrogen/generated/shared/c++/CarPlayPlayingIndicatorLocation.hpp +76 -0
- package/nitrogen/generated/shared/c++/IOSOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +6 -6
- package/nitrogen/generated/shared/c++/NitroIOSUpdateOptions.hpp +9 -2
- package/nitrogen/generated/shared/c++/PlayerCapabilities.hpp +6 -9
- package/nitrogen/generated/shared/c++/ResolvedTrack.hpp +30 -38
- package/nitrogen/generated/shared/c++/Section.hpp +106 -0
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +96 -0
- package/nitrogen/generated/shared/c++/StyleDisplay.hpp +76 -0
- package/nitrogen/generated/shared/c++/Track.hpp +15 -31
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +50 -34
- package/package.json +3 -2
- package/src/AudioBrowser.ts +1 -0
- package/src/features/browser-config.test.ts +21 -6
- package/src/features/browser-config.ts +11 -8
- package/src/features/browser.test.ts +1 -1
- package/src/features/browser.ts +2 -2
- package/src/features/favorites.ts +13 -10
- package/src/features/hook-wiring.test.ts +63 -15
- package/src/features/playback/controls.ts +4 -2
- package/src/features/playback/state.ts +2 -3
- package/src/features/playback/trackPlaybackTime.ts +1 -1
- package/src/features/player/options.ts +27 -19
- package/src/features/player/setup.test.ts +12 -3
- package/src/features/player/setup.ts +3 -1
- package/src/features/player/validateOptions.ts +2 -0
- package/src/features/queue/activeTrack.ts +14 -3
- package/src/features/queue/queue.ts +11 -4
- package/src/nitro-stub-drift.test.ts +277 -0
- package/src/public-surface.test.ts +40 -0
- package/src/specs/audio-browser.nitro.ts +4 -3
- package/src/style-resolution.test.ts +139 -0
- package/src/types/browser-native.ts +2 -2
- package/src/types/browser-nodes.ts +268 -136
- package/src/types/browser.ts +34 -55
- package/src/utils/LazyNativeEmitter.ts +20 -10
- package/src/utils/NativeUpdatedValue.ts +29 -13
- package/src/utils/getTrackIdentity.ts +20 -0
- package/src/utils/useNativeValueRefreshedBy.ts +38 -0
- package/src/web/NativeAudioBrowser.ts +37 -22
- package/src/web/browser/BrowserManager.ts +176 -95
- package/src/web/browser/FavoriteManager.test.ts +84 -0
- package/src/web/browser/FavoriteManager.ts +28 -23
- package/src/web/browser/assertBrowsePageShape.test.ts +1 -1
- package/src/web/browser/assertBrowsePageShape.ts +5 -3
- package/src/web/browser/classifyTrackNavigation.test.ts +10 -8
- package/src/web/browser/classifyTrackNavigation.ts +9 -9
- package/src/web/browser/parseSearchResponse.test.ts +8 -2
- package/src/web/browser/sections.test.ts +91 -0
- package/src/web/browser/sections.ts +72 -0
- package/src/web/player/NowPlayingManager.ts +4 -3
- package/src/web/util/BrowserPathHelper.test.ts +52 -0
- package/src/web/util/BrowserPathHelper.ts +61 -13
- package/ios/CarPlay/ImageRowItem+CarPlay.swift +0 -19
- package/nitrogen/generated/android/c++/JFavoriteConfig.hpp +0 -58
- package/nitrogen/generated/android/c++/JImageRowItem.hpp +0 -105
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.cpp +0 -26
- package/nitrogen/generated/android/c++/JVariant_Boolean_FavoriteConfig.hpp +0 -71
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageRowItem.kt +0 -68
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Variant_Boolean_FavoriteConfig.kt +0 -53
- package/nitrogen/generated/ios/swift/FavoriteConfig.swift +0 -29
- package/nitrogen/generated/ios/swift/FavoritesMatchMode.swift +0 -40
- package/nitrogen/generated/ios/swift/ImageRowItem.swift +0 -195
- package/nitrogen/generated/ios/swift/Variant_Bool_FavoriteConfig.swift +0 -18
- package/nitrogen/generated/shared/c++/FavoriteConfig.hpp +0 -84
- package/nitrogen/generated/shared/c++/ImageRowItem.hpp +0 -129
|
@@ -10,17 +10,18 @@
|
|
|
10
10
|
#include <fbjni/fbjni.h>
|
|
11
11
|
#include "FormatNowPlayingParams.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
21
|
#include "JPlaybackError.hpp"
|
|
22
22
|
#include "JPlaybackErrorKind.hpp"
|
|
23
23
|
#include "JStallReason.hpp"
|
|
24
|
+
#include "JStyleDisplay.hpp"
|
|
24
25
|
#include "JTimedMetadata.hpp"
|
|
25
26
|
#include "JTrack.hpp"
|
|
26
27
|
#include "JTrackRequest.hpp"
|
|
@@ -29,6 +30,7 @@
|
|
|
29
30
|
#include "PlaybackError.hpp"
|
|
30
31
|
#include "PlaybackErrorKind.hpp"
|
|
31
32
|
#include "StallReason.hpp"
|
|
33
|
+
#include "StyleDisplay.hpp"
|
|
32
34
|
#include "TimedMetadata.hpp"
|
|
33
35
|
#include "Track.hpp"
|
|
34
36
|
#include "TrackRequest.hpp"
|
|
@@ -37,7 +39,6 @@
|
|
|
37
39
|
#include <string>
|
|
38
40
|
#include <unordered_map>
|
|
39
41
|
#include <variant>
|
|
40
|
-
#include <vector>
|
|
41
42
|
|
|
42
43
|
namespace margelo::nitro::audiobrowser {
|
|
43
44
|
|
package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp
CHANGED
|
@@ -33,9 +33,10 @@
|
|
|
33
33
|
#include "JTrackRequest.hpp"
|
|
34
34
|
#include "TrackStyle.hpp"
|
|
35
35
|
#include "JTrackStyle.hpp"
|
|
36
|
-
#include "
|
|
37
|
-
#include
|
|
38
|
-
#include "
|
|
36
|
+
#include "StyleDisplay.hpp"
|
|
37
|
+
#include "JStyleDisplay.hpp"
|
|
38
|
+
#include "ArtworkRendering.hpp"
|
|
39
|
+
#include "JArtworkRendering.hpp"
|
|
39
40
|
|
|
40
41
|
namespace margelo::nitro::audiobrowser {
|
|
41
42
|
|
|
@@ -35,9 +35,10 @@
|
|
|
35
35
|
#include "JTrackRequest.hpp"
|
|
36
36
|
#include "TrackStyle.hpp"
|
|
37
37
|
#include "JTrackStyle.hpp"
|
|
38
|
-
#include "
|
|
39
|
-
#include
|
|
40
|
-
#include "
|
|
38
|
+
#include "StyleDisplay.hpp"
|
|
39
|
+
#include "JStyleDisplay.hpp"
|
|
40
|
+
#include "ArtworkRendering.hpp"
|
|
41
|
+
#include "JArtworkRendering.hpp"
|
|
41
42
|
#include "TimedMetadata.hpp"
|
|
42
43
|
#include "JTimedMetadata.hpp"
|
|
43
44
|
#include "StallReason.hpp"
|
|
@@ -31,9 +31,10 @@
|
|
|
31
31
|
#include "JTrackRequest.hpp"
|
|
32
32
|
#include "TrackStyle.hpp"
|
|
33
33
|
#include "JTrackStyle.hpp"
|
|
34
|
-
#include "
|
|
35
|
-
#include
|
|
36
|
-
#include "
|
|
34
|
+
#include "StyleDisplay.hpp"
|
|
35
|
+
#include "JStyleDisplay.hpp"
|
|
36
|
+
#include "ArtworkRendering.hpp"
|
|
37
|
+
#include "JArtworkRendering.hpp"
|
|
37
38
|
|
|
38
39
|
namespace margelo::nitro::audiobrowser {
|
|
39
40
|
|
|
@@ -33,9 +33,10 @@
|
|
|
33
33
|
#include "JTrackRequest.hpp"
|
|
34
34
|
#include "TrackStyle.hpp"
|
|
35
35
|
#include "JTrackStyle.hpp"
|
|
36
|
-
#include "
|
|
37
|
-
#include
|
|
38
|
-
#include "
|
|
36
|
+
#include "StyleDisplay.hpp"
|
|
37
|
+
#include "JStyleDisplay.hpp"
|
|
38
|
+
#include "ArtworkRendering.hpp"
|
|
39
|
+
#include "JArtworkRendering.hpp"
|
|
39
40
|
|
|
40
41
|
namespace margelo::nitro::audiobrowser {
|
|
41
42
|
|
|
@@ -33,8 +33,10 @@
|
|
|
33
33
|
#include "JTrackRequest.hpp"
|
|
34
34
|
#include "TrackStyle.hpp"
|
|
35
35
|
#include "JTrackStyle.hpp"
|
|
36
|
-
#include "
|
|
37
|
-
#include "
|
|
36
|
+
#include "StyleDisplay.hpp"
|
|
37
|
+
#include "JStyleDisplay.hpp"
|
|
38
|
+
#include "ArtworkRendering.hpp"
|
|
39
|
+
#include "JArtworkRendering.hpp"
|
|
38
40
|
#include "JSearchParams.hpp"
|
|
39
41
|
#include "SearchMode.hpp"
|
|
40
42
|
#include "JSearchMode.hpp"
|
|
@@ -34,9 +34,11 @@
|
|
|
34
34
|
#include "JTrackRequest.hpp"
|
|
35
35
|
#include "TrackStyle.hpp"
|
|
36
36
|
#include "JTrackStyle.hpp"
|
|
37
|
-
#include "
|
|
37
|
+
#include "StyleDisplay.hpp"
|
|
38
|
+
#include "JStyleDisplay.hpp"
|
|
39
|
+
#include "ArtworkRendering.hpp"
|
|
40
|
+
#include "JArtworkRendering.hpp"
|
|
38
41
|
#include <vector>
|
|
39
|
-
#include "JImageRowItem.hpp"
|
|
40
42
|
|
|
41
43
|
namespace margelo::nitro::audiobrowser {
|
|
42
44
|
|
|
@@ -21,9 +21,17 @@
|
|
|
21
21
|
#include "JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp"
|
|
22
22
|
#include "JResolvedTrack.hpp"
|
|
23
23
|
#include <string>
|
|
24
|
-
#include "
|
|
25
|
-
#include <vector>
|
|
24
|
+
#include "SectionStyle.hpp"
|
|
26
25
|
#include <optional>
|
|
26
|
+
#include "JSectionStyle.hpp"
|
|
27
|
+
#include "StyleDisplay.hpp"
|
|
28
|
+
#include "JStyleDisplay.hpp"
|
|
29
|
+
#include "ArtworkRendering.hpp"
|
|
30
|
+
#include "JArtworkRendering.hpp"
|
|
31
|
+
#include "Section.hpp"
|
|
32
|
+
#include <vector>
|
|
33
|
+
#include "JSection.hpp"
|
|
34
|
+
#include "Track.hpp"
|
|
27
35
|
#include "JTrack.hpp"
|
|
28
36
|
#include "ArtworkVariants.hpp"
|
|
29
37
|
#include "JVariant_String_ArtworkVariants.hpp"
|
|
@@ -37,8 +45,6 @@
|
|
|
37
45
|
#include "JTrackRequest.hpp"
|
|
38
46
|
#include "TrackStyle.hpp"
|
|
39
47
|
#include "JTrackStyle.hpp"
|
|
40
|
-
#include "ImageRowItem.hpp"
|
|
41
|
-
#include "JImageRowItem.hpp"
|
|
42
48
|
#include "CarPlaySiriListButtonPosition.hpp"
|
|
43
49
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
44
50
|
#include "JBrowseError.hpp"
|
|
@@ -31,9 +31,10 @@
|
|
|
31
31
|
#include "JTrackRequest.hpp"
|
|
32
32
|
#include "TrackStyle.hpp"
|
|
33
33
|
#include "JTrackStyle.hpp"
|
|
34
|
-
#include "
|
|
35
|
-
#include
|
|
36
|
-
#include "
|
|
34
|
+
#include "StyleDisplay.hpp"
|
|
35
|
+
#include "JStyleDisplay.hpp"
|
|
36
|
+
#include "ArtworkRendering.hpp"
|
|
37
|
+
#include "JArtworkRendering.hpp"
|
|
37
38
|
|
|
38
39
|
namespace margelo::nitro::audiobrowser {
|
|
39
40
|
|
|
@@ -31,15 +31,12 @@
|
|
|
31
31
|
#include "JVariant_NullType_Double.hpp"
|
|
32
32
|
#include "PlayerCapabilities.hpp"
|
|
33
33
|
#include "JPlayerCapabilities.hpp"
|
|
34
|
-
#include "FavoriteConfig.hpp"
|
|
35
|
-
#include "JVariant_Boolean_FavoriteConfig.hpp"
|
|
36
|
-
#include "JFavoriteConfig.hpp"
|
|
37
|
-
#include "FavoritesMatchMode.hpp"
|
|
38
|
-
#include "JFavoritesMatchMode.hpp"
|
|
39
34
|
#include "IOSOptions.hpp"
|
|
40
35
|
#include "JIOSOptions.hpp"
|
|
41
36
|
#include "CarPlayNowPlayingButton.hpp"
|
|
42
37
|
#include "JCarPlayNowPlayingButton.hpp"
|
|
38
|
+
#include "CarPlayPlayingIndicatorLocation.hpp"
|
|
39
|
+
#include "JCarPlayPlayingIndicatorLocation.hpp"
|
|
43
40
|
|
|
44
41
|
namespace margelo::nitro::audiobrowser {
|
|
45
42
|
|
|
@@ -31,9 +31,10 @@
|
|
|
31
31
|
#include "JTrackRequest.hpp"
|
|
32
32
|
#include "TrackStyle.hpp"
|
|
33
33
|
#include "JTrackStyle.hpp"
|
|
34
|
-
#include "
|
|
35
|
-
#include
|
|
36
|
-
#include "
|
|
34
|
+
#include "StyleDisplay.hpp"
|
|
35
|
+
#include "JStyleDisplay.hpp"
|
|
36
|
+
#include "ArtworkRendering.hpp"
|
|
37
|
+
#include "JArtworkRendering.hpp"
|
|
37
38
|
|
|
38
39
|
namespace margelo::nitro::audiobrowser {
|
|
39
40
|
|
|
@@ -16,8 +16,16 @@
|
|
|
16
16
|
#include <NitroModules/JNICallable.hpp>
|
|
17
17
|
#include "JResolvedTrack.hpp"
|
|
18
18
|
#include <string>
|
|
19
|
-
#include "
|
|
19
|
+
#include "SectionStyle.hpp"
|
|
20
|
+
#include "JSectionStyle.hpp"
|
|
21
|
+
#include "StyleDisplay.hpp"
|
|
22
|
+
#include "JStyleDisplay.hpp"
|
|
23
|
+
#include "ArtworkRendering.hpp"
|
|
24
|
+
#include "JArtworkRendering.hpp"
|
|
25
|
+
#include "Section.hpp"
|
|
20
26
|
#include <vector>
|
|
27
|
+
#include "JSection.hpp"
|
|
28
|
+
#include "Track.hpp"
|
|
21
29
|
#include "JTrack.hpp"
|
|
22
30
|
#include "ArtworkVariants.hpp"
|
|
23
31
|
#include <variant>
|
|
@@ -32,8 +40,6 @@
|
|
|
32
40
|
#include "JTrackRequest.hpp"
|
|
33
41
|
#include "TrackStyle.hpp"
|
|
34
42
|
#include "JTrackStyle.hpp"
|
|
35
|
-
#include "ImageRowItem.hpp"
|
|
36
|
-
#include "JImageRowItem.hpp"
|
|
37
43
|
#include "CarPlaySiriListButtonPosition.hpp"
|
|
38
44
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
39
45
|
|
|
@@ -30,8 +30,10 @@
|
|
|
30
30
|
#include "JTrackRequest.hpp"
|
|
31
31
|
#include "TrackStyle.hpp"
|
|
32
32
|
#include "JTrackStyle.hpp"
|
|
33
|
-
#include "
|
|
34
|
-
#include "
|
|
33
|
+
#include "StyleDisplay.hpp"
|
|
34
|
+
#include "JStyleDisplay.hpp"
|
|
35
|
+
#include "ArtworkRendering.hpp"
|
|
36
|
+
#include "JArtworkRendering.hpp"
|
|
35
37
|
|
|
36
38
|
namespace margelo::nitro::audiobrowser {
|
|
37
39
|
|
|
@@ -18,11 +18,17 @@ namespace margelo::nitro::audiobrowser { enum class HttpMethod; }
|
|
|
18
18
|
// Forward declaration of `TrackRequest` to properly resolve imports.
|
|
19
19
|
namespace margelo::nitro::audiobrowser { struct TrackRequest; }
|
|
20
20
|
// Forward declaration of `TrackStyle` to properly resolve imports.
|
|
21
|
-
namespace margelo::nitro::audiobrowser {
|
|
22
|
-
// Forward declaration of `
|
|
23
|
-
namespace margelo::nitro::audiobrowser {
|
|
21
|
+
namespace margelo::nitro::audiobrowser { struct TrackStyle; }
|
|
22
|
+
// Forward declaration of `StyleDisplay` to properly resolve imports.
|
|
23
|
+
namespace margelo::nitro::audiobrowser { enum class StyleDisplay; }
|
|
24
|
+
// Forward declaration of `ArtworkRendering` to properly resolve imports.
|
|
25
|
+
namespace margelo::nitro::audiobrowser { enum class ArtworkRendering; }
|
|
24
26
|
// Forward declaration of `ResolvedTrack` to properly resolve imports.
|
|
25
27
|
namespace margelo::nitro::audiobrowser { struct ResolvedTrack; }
|
|
28
|
+
// Forward declaration of `SectionStyle` to properly resolve imports.
|
|
29
|
+
namespace margelo::nitro::audiobrowser { struct SectionStyle; }
|
|
30
|
+
// Forward declaration of `Section` to properly resolve imports.
|
|
31
|
+
namespace margelo::nitro::audiobrowser { struct Section; }
|
|
26
32
|
// Forward declaration of `CarPlaySiriListButtonPosition` to properly resolve imports.
|
|
27
33
|
namespace margelo::nitro::audiobrowser { enum class CarPlaySiriListButtonPosition; }
|
|
28
34
|
// Forward declaration of `NavigationErrorEvent` to properly resolve imports.
|
|
@@ -133,14 +139,12 @@ namespace margelo::nitro::audiobrowser { struct RemoteButtonLayout; }
|
|
|
133
139
|
namespace margelo::nitro::audiobrowser { enum class RemoteButton; }
|
|
134
140
|
// Forward declaration of `PlayerCapabilities` to properly resolve imports.
|
|
135
141
|
namespace margelo::nitro::audiobrowser { struct PlayerCapabilities; }
|
|
136
|
-
// Forward declaration of `FavoriteConfig` to properly resolve imports.
|
|
137
|
-
namespace margelo::nitro::audiobrowser { struct FavoriteConfig; }
|
|
138
|
-
// Forward declaration of `FavoritesMatchMode` to properly resolve imports.
|
|
139
|
-
namespace margelo::nitro::audiobrowser { enum class FavoritesMatchMode; }
|
|
140
142
|
// Forward declaration of `IOSOptions` to properly resolve imports.
|
|
141
143
|
namespace margelo::nitro::audiobrowser { struct IOSOptions; }
|
|
142
144
|
// Forward declaration of `CarPlayNowPlayingButton` to properly resolve imports.
|
|
143
145
|
namespace margelo::nitro::audiobrowser { enum class CarPlayNowPlayingButton; }
|
|
146
|
+
// Forward declaration of `CarPlayPlayingIndicatorLocation` to properly resolve imports.
|
|
147
|
+
namespace margelo::nitro::audiobrowser { enum class CarPlayPlayingIndicatorLocation; }
|
|
144
148
|
// Forward declaration of `FavoriteChangedEvent` to properly resolve imports.
|
|
145
149
|
namespace margelo::nitro::audiobrowser { struct FavoriteChangedEvent; }
|
|
146
150
|
// Forward declaration of `NowPlayingMetadata` to properly resolve imports.
|
|
@@ -212,14 +216,20 @@ namespace margelo::nitro::audiobrowser { struct RetryConfig; }
|
|
|
212
216
|
#include "JTrackRequest.hpp"
|
|
213
217
|
#include "TrackStyle.hpp"
|
|
214
218
|
#include "JTrackStyle.hpp"
|
|
215
|
-
#include "
|
|
216
|
-
#include "
|
|
219
|
+
#include "StyleDisplay.hpp"
|
|
220
|
+
#include "JStyleDisplay.hpp"
|
|
221
|
+
#include "ArtworkRendering.hpp"
|
|
222
|
+
#include "JArtworkRendering.hpp"
|
|
217
223
|
#include <functional>
|
|
218
224
|
#include "JFunc_void_std__string.hpp"
|
|
219
225
|
#include <NitroModules/JNICallable.hpp>
|
|
220
226
|
#include "ResolvedTrack.hpp"
|
|
221
227
|
#include "JFunc_void_std__optional_ResolvedTrack_.hpp"
|
|
222
228
|
#include "JResolvedTrack.hpp"
|
|
229
|
+
#include "SectionStyle.hpp"
|
|
230
|
+
#include "JSectionStyle.hpp"
|
|
231
|
+
#include "Section.hpp"
|
|
232
|
+
#include "JSection.hpp"
|
|
223
233
|
#include "CarPlaySiriListButtonPosition.hpp"
|
|
224
234
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
225
235
|
#include "JFunc_void_std__vector_Track_.hpp"
|
|
@@ -378,15 +388,12 @@ namespace margelo::nitro::audiobrowser { struct RetryConfig; }
|
|
|
378
388
|
#include "JVariant_NullType_Double.hpp"
|
|
379
389
|
#include "PlayerCapabilities.hpp"
|
|
380
390
|
#include "JPlayerCapabilities.hpp"
|
|
381
|
-
#include "FavoriteConfig.hpp"
|
|
382
|
-
#include "JVariant_Boolean_FavoriteConfig.hpp"
|
|
383
|
-
#include "JFavoriteConfig.hpp"
|
|
384
|
-
#include "FavoritesMatchMode.hpp"
|
|
385
|
-
#include "JFavoritesMatchMode.hpp"
|
|
386
391
|
#include "IOSOptions.hpp"
|
|
387
392
|
#include "JIOSOptions.hpp"
|
|
388
393
|
#include "CarPlayNowPlayingButton.hpp"
|
|
389
394
|
#include "JCarPlayNowPlayingButton.hpp"
|
|
395
|
+
#include "CarPlayPlayingIndicatorLocation.hpp"
|
|
396
|
+
#include "JCarPlayPlayingIndicatorLocation.hpp"
|
|
390
397
|
#include "FavoriteChangedEvent.hpp"
|
|
391
398
|
#include "JFunc_void_FavoriteChangedEvent.hpp"
|
|
392
399
|
#include "JFavoriteChangedEvent.hpp"
|
|
@@ -11,7 +11,9 @@
|
|
|
11
11
|
#include "IOSOptions.hpp"
|
|
12
12
|
|
|
13
13
|
#include "CarPlayNowPlayingButton.hpp"
|
|
14
|
+
#include "CarPlayPlayingIndicatorLocation.hpp"
|
|
14
15
|
#include "JCarPlayNowPlayingButton.hpp"
|
|
16
|
+
#include "JCarPlayPlayingIndicatorLocation.hpp"
|
|
15
17
|
#include <vector>
|
|
16
18
|
|
|
17
19
|
namespace margelo::nitro::audiobrowser {
|
|
@@ -39,6 +41,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
39
41
|
jboolean carPlayUpNextButton = this->getFieldValue(fieldCarPlayUpNextButton);
|
|
40
42
|
static const auto fieldCarPlayNowPlayingButtons = clazz->getField<jni::JArrayClass<JCarPlayNowPlayingButton>>("carPlayNowPlayingButtons");
|
|
41
43
|
jni::local_ref<jni::JArrayClass<JCarPlayNowPlayingButton>> carPlayNowPlayingButtons = this->getFieldValue(fieldCarPlayNowPlayingButtons);
|
|
44
|
+
static const auto fieldCarPlayPlayingIndicatorLocation = clazz->getField<JCarPlayPlayingIndicatorLocation>("carPlayPlayingIndicatorLocation");
|
|
45
|
+
jni::local_ref<JCarPlayPlayingIndicatorLocation> carPlayPlayingIndicatorLocation = this->getFieldValue(fieldCarPlayPlayingIndicatorLocation);
|
|
42
46
|
return IOSOptions(
|
|
43
47
|
[&]() {
|
|
44
48
|
size_t __size = playbackRates->size();
|
|
@@ -56,7 +60,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
56
60
|
__vector.push_back(__element->toCpp());
|
|
57
61
|
}
|
|
58
62
|
return __vector;
|
|
59
|
-
}()
|
|
63
|
+
}(),
|
|
64
|
+
carPlayPlayingIndicatorLocation->toCpp()
|
|
60
65
|
);
|
|
61
66
|
}
|
|
62
67
|
|
|
@@ -66,7 +71,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
66
71
|
*/
|
|
67
72
|
[[maybe_unused]]
|
|
68
73
|
static jni::local_ref<JIOSOptions::javaobject> fromCpp(const IOSOptions& value) {
|
|
69
|
-
using JSignature = JIOSOptions(jni::alias_ref<jni::JArrayDouble>, jboolean, jni::alias_ref<jni::JArrayClass<JCarPlayNowPlayingButton
|
|
74
|
+
using JSignature = JIOSOptions(jni::alias_ref<jni::JArrayDouble>, jboolean, jni::alias_ref<jni::JArrayClass<JCarPlayNowPlayingButton>>, jni::alias_ref<JCarPlayPlayingIndicatorLocation>);
|
|
70
75
|
static const auto clazz = javaClassStatic();
|
|
71
76
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
72
77
|
return create(
|
|
@@ -87,7 +92,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
87
92
|
__array->setElement(__i, *__elementJni);
|
|
88
93
|
}
|
|
89
94
|
return __array;
|
|
90
|
-
}()
|
|
95
|
+
}(),
|
|
96
|
+
JCarPlayPlayingIndicatorLocation::fromCpp(value.carPlayPlayingIndicatorLocation)
|
|
91
97
|
);
|
|
92
98
|
}
|
|
93
99
|
};
|
|
@@ -10,24 +10,26 @@
|
|
|
10
10
|
#include <fbjni/fbjni.h>
|
|
11
11
|
#include "MediaRequestConfig.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 "JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp"
|
|
19
20
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp"
|
|
20
21
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp"
|
|
21
22
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp"
|
|
22
23
|
#include "JHttpMethod.hpp"
|
|
23
|
-
#include "JImageRowItem.hpp"
|
|
24
24
|
#include "JImageSource.hpp"
|
|
25
25
|
#include "JRequestConfig.hpp"
|
|
26
|
+
#include "JStyleDisplay.hpp"
|
|
26
27
|
#include "JTrack.hpp"
|
|
27
28
|
#include "JTrackRequest.hpp"
|
|
28
29
|
#include "JTrackStyle.hpp"
|
|
29
30
|
#include "JVariant_String_ArtworkVariants.hpp"
|
|
30
31
|
#include "RequestConfig.hpp"
|
|
32
|
+
#include "StyleDisplay.hpp"
|
|
31
33
|
#include "Track.hpp"
|
|
32
34
|
#include "TrackRequest.hpp"
|
|
33
35
|
#include "TrackStyle.hpp"
|
|
@@ -39,7 +41,6 @@
|
|
|
39
41
|
#include <string>
|
|
40
42
|
#include <unordered_map>
|
|
41
43
|
#include <variant>
|
|
42
|
-
#include <vector>
|
|
43
44
|
|
|
44
45
|
namespace margelo::nitro::audiobrowser {
|
|
45
46
|
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
#include <fbjni/fbjni.h>
|
|
11
11
|
#include "NativeBrowserConfiguration.hpp"
|
|
12
12
|
|
|
13
|
+
#include "ArtworkRendering.hpp"
|
|
13
14
|
#include "ArtworkRequestConfig.hpp"
|
|
14
15
|
#include "ArtworkVariants.hpp"
|
|
15
16
|
#include "BrowseError.hpp"
|
|
@@ -20,8 +21,8 @@
|
|
|
20
21
|
#include "HttpMethod.hpp"
|
|
21
22
|
#include "ImageContext.hpp"
|
|
22
23
|
#include "ImageQueryParams.hpp"
|
|
23
|
-
#include "ImageRowItem.hpp"
|
|
24
24
|
#include "ImageSource.hpp"
|
|
25
|
+
#include "JArtworkRendering.hpp"
|
|
25
26
|
#include "JArtworkRequestConfig.hpp"
|
|
26
27
|
#include "JArtworkVariants.hpp"
|
|
27
28
|
#include "JBrowseError.hpp"
|
|
@@ -45,7 +46,6 @@
|
|
|
45
46
|
#include "JHttpMethod.hpp"
|
|
46
47
|
#include "JImageContext.hpp"
|
|
47
48
|
#include "JImageQueryParams.hpp"
|
|
48
|
-
#include "JImageRowItem.hpp"
|
|
49
49
|
#include "JImageSource.hpp"
|
|
50
50
|
#include "JMediaReference.hpp"
|
|
51
51
|
#include "JMediaRequestConfig.hpp"
|
|
@@ -57,6 +57,9 @@
|
|
|
57
57
|
#include "JResolvedTrack.hpp"
|
|
58
58
|
#include "JSearchMode.hpp"
|
|
59
59
|
#include "JSearchParams.hpp"
|
|
60
|
+
#include "JSection.hpp"
|
|
61
|
+
#include "JSectionStyle.hpp"
|
|
62
|
+
#include "JStyleDisplay.hpp"
|
|
60
63
|
#include "JTrack.hpp"
|
|
61
64
|
#include "JTrackLoadEvent.hpp"
|
|
62
65
|
#include "JTrackRequest.hpp"
|
|
@@ -74,6 +77,9 @@
|
|
|
74
77
|
#include "ResolvedTrack.hpp"
|
|
75
78
|
#include "SearchMode.hpp"
|
|
76
79
|
#include "SearchParams.hpp"
|
|
80
|
+
#include "Section.hpp"
|
|
81
|
+
#include "SectionStyle.hpp"
|
|
82
|
+
#include "StyleDisplay.hpp"
|
|
77
83
|
#include "Track.hpp"
|
|
78
84
|
#include "TrackLoadEvent.hpp"
|
|
79
85
|
#include "TrackRequest.hpp"
|
|
@@ -135,8 +141,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
135
141
|
jni::local_ref<jni::JBoolean> androidControllerOfflineError = this->getFieldValue(fieldAndroidControllerOfflineError);
|
|
136
142
|
static const auto fieldCarPlayLoadingTitle = clazz->getField<jni::JString>("carPlayLoadingTitle");
|
|
137
143
|
jni::local_ref<jni::JString> carPlayLoadingTitle = this->getFieldValue(fieldCarPlayLoadingTitle);
|
|
138
|
-
static const auto
|
|
139
|
-
jni::local_ref<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track::javaobject>
|
|
144
|
+
static const auto fieldResolveAlbumPath = clazz->getField<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track::javaobject>("resolveAlbumPath");
|
|
145
|
+
jni::local_ref<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track::javaobject> resolveAlbumPath = this->getFieldValue(fieldResolveAlbumPath);
|
|
140
146
|
static const auto fieldFormatNavigationError = clazz->getField<JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams::javaobject>("formatNavigationError");
|
|
141
147
|
jni::local_ref<JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams::javaobject> formatNavigationError = this->getFieldValue(fieldFormatNavigationError);
|
|
142
148
|
return NativeBrowserConfiguration(
|
|
@@ -186,13 +192,13 @@ namespace margelo::nitro::audiobrowser {
|
|
|
186
192
|
}()) : std::nullopt,
|
|
187
193
|
androidControllerOfflineError != nullptr ? std::make_optional(static_cast<bool>(androidControllerOfflineError->value())) : std::nullopt,
|
|
188
194
|
carPlayLoadingTitle != nullptr ? std::make_optional(carPlayLoadingTitle->toStdString()) : std::nullopt,
|
|
189
|
-
|
|
190
|
-
if (
|
|
191
|
-
auto downcast = jni::static_ref_cast<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track_cxx::javaobject>(
|
|
195
|
+
resolveAlbumPath != nullptr ? std::make_optional([&]() -> std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const Track& /* track */)> {
|
|
196
|
+
if (resolveAlbumPath->isInstanceOf(JFunc_std__shared_ptr_Promise_std__optional_std__string____Track_cxx::javaClassStatic())) [[likely]] {
|
|
197
|
+
auto downcast = jni::static_ref_cast<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track_cxx::javaobject>(resolveAlbumPath);
|
|
192
198
|
return downcast->cthis()->getFunction();
|
|
193
199
|
} else {
|
|
194
|
-
auto
|
|
195
|
-
return JNICallable<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track, std::shared_ptr<Promise<std::optional<std::string>>>(Track)>(std::move(
|
|
200
|
+
auto resolveAlbumPathRef = jni::make_global(resolveAlbumPath);
|
|
201
|
+
return JNICallable<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track, std::shared_ptr<Promise<std::optional<std::string>>>(Track)>(std::move(resolveAlbumPathRef));
|
|
196
202
|
}
|
|
197
203
|
}()) : std::nullopt,
|
|
198
204
|
formatNavigationError != nullptr ? std::make_optional([&]() -> std::function<std::shared_ptr<Promise<std::optional<FormattedNavigationError>>>(const FormatNavigationErrorParams& /* params */)> {
|
|
@@ -240,7 +246,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
240
246
|
value.handleTrackLoad.has_value() ? JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent_cxx::fromCpp(value.handleTrackLoad.value()) : nullptr,
|
|
241
247
|
value.androidControllerOfflineError.has_value() ? jni::JBoolean::valueOf(value.androidControllerOfflineError.value()) : nullptr,
|
|
242
248
|
value.carPlayLoadingTitle.has_value() ? jni::make_jstring(value.carPlayLoadingTitle.value()) : nullptr,
|
|
243
|
-
value.
|
|
249
|
+
value.resolveAlbumPath.has_value() ? JFunc_std__shared_ptr_Promise_std__optional_std__string____Track_cxx::fromCpp(value.resolveAlbumPath.value()) : nullptr,
|
|
244
250
|
value.formatNavigationError.has_value() ? JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_cxx::fromCpp(value.formatNavigationError.value()) : nullptr
|
|
245
251
|
);
|
|
246
252
|
}
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
#include <fbjni/fbjni.h>
|
|
11
11
|
#include "NativeRouteEntry.hpp"
|
|
12
12
|
|
|
13
|
+
#include "ArtworkRendering.hpp"
|
|
13
14
|
#include "ArtworkRequestConfig.hpp"
|
|
14
15
|
#include "ArtworkVariants.hpp"
|
|
15
16
|
#include "BrowseError.hpp"
|
|
@@ -18,8 +19,8 @@
|
|
|
18
19
|
#include "HttpMethod.hpp"
|
|
19
20
|
#include "ImageContext.hpp"
|
|
20
21
|
#include "ImageQueryParams.hpp"
|
|
21
|
-
#include "ImageRowItem.hpp"
|
|
22
22
|
#include "ImageSource.hpp"
|
|
23
|
+
#include "JArtworkRendering.hpp"
|
|
23
24
|
#include "JArtworkRequestConfig.hpp"
|
|
24
25
|
#include "JArtworkVariants.hpp"
|
|
25
26
|
#include "JBrowseError.hpp"
|
|
@@ -37,7 +38,6 @@
|
|
|
37
38
|
#include "JHttpMethod.hpp"
|
|
38
39
|
#include "JImageContext.hpp"
|
|
39
40
|
#include "JImageQueryParams.hpp"
|
|
40
|
-
#include "JImageRowItem.hpp"
|
|
41
41
|
#include "JImageSource.hpp"
|
|
42
42
|
#include "JMediaReference.hpp"
|
|
43
43
|
#include "JMediaRequestConfig.hpp"
|
|
@@ -46,6 +46,9 @@
|
|
|
46
46
|
#include "JResolvedTrack.hpp"
|
|
47
47
|
#include "JSearchMode.hpp"
|
|
48
48
|
#include "JSearchParams.hpp"
|
|
49
|
+
#include "JSection.hpp"
|
|
50
|
+
#include "JSectionStyle.hpp"
|
|
51
|
+
#include "JStyleDisplay.hpp"
|
|
49
52
|
#include "JTrack.hpp"
|
|
50
53
|
#include "JTrackRequest.hpp"
|
|
51
54
|
#include "JTrackStyle.hpp"
|
|
@@ -59,6 +62,9 @@
|
|
|
59
62
|
#include "ResolvedTrack.hpp"
|
|
60
63
|
#include "SearchMode.hpp"
|
|
61
64
|
#include "SearchParams.hpp"
|
|
65
|
+
#include "Section.hpp"
|
|
66
|
+
#include "SectionStyle.hpp"
|
|
67
|
+
#include "StyleDisplay.hpp"
|
|
62
68
|
#include "Track.hpp"
|
|
63
69
|
#include "TrackRequest.hpp"
|
|
64
70
|
#include "TrackStyle.hpp"
|
|
@@ -14,26 +14,25 @@
|
|
|
14
14
|
#include "AndroidAudioOffloadSettings.hpp"
|
|
15
15
|
#include "AndroidPlayerWakeMode.hpp"
|
|
16
16
|
#include "AppKilledPlaybackBehavior.hpp"
|
|
17
|
+
#include "ArtworkRendering.hpp"
|
|
17
18
|
#include "ArtworkVariants.hpp"
|
|
18
19
|
#include "CarPlayNowPlayingButton.hpp"
|
|
19
|
-
#include "
|
|
20
|
-
#include "FavoritesMatchMode.hpp"
|
|
20
|
+
#include "CarPlayPlayingIndicatorLocation.hpp"
|
|
21
21
|
#include "FormatNowPlayingParams.hpp"
|
|
22
22
|
#include "HttpMethod.hpp"
|
|
23
23
|
#include "IOSCategory.hpp"
|
|
24
24
|
#include "IOSCategoryMode.hpp"
|
|
25
25
|
#include "IOSCategoryOptions.hpp"
|
|
26
26
|
#include "IOSCategoryPolicy.hpp"
|
|
27
|
-
#include "ImageRowItem.hpp"
|
|
28
27
|
#include "ImageSource.hpp"
|
|
29
28
|
#include "JAndroidAudioContentType.hpp"
|
|
30
29
|
#include "JAndroidAudioOffloadSettings.hpp"
|
|
31
30
|
#include "JAndroidPlayerWakeMode.hpp"
|
|
32
31
|
#include "JAppKilledPlaybackBehavior.hpp"
|
|
32
|
+
#include "JArtworkRendering.hpp"
|
|
33
33
|
#include "JArtworkVariants.hpp"
|
|
34
34
|
#include "JCarPlayNowPlayingButton.hpp"
|
|
35
|
-
#include "
|
|
36
|
-
#include "JFavoritesMatchMode.hpp"
|
|
35
|
+
#include "JCarPlayPlayingIndicatorLocation.hpp"
|
|
37
36
|
#include "JFormatNowPlayingParams.hpp"
|
|
38
37
|
#include "JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp"
|
|
39
38
|
#include "JHttpMethod.hpp"
|
|
@@ -41,7 +40,6 @@
|
|
|
41
40
|
#include "JIOSCategoryMode.hpp"
|
|
42
41
|
#include "JIOSCategoryOptions.hpp"
|
|
43
42
|
#include "JIOSCategoryPolicy.hpp"
|
|
44
|
-
#include "JImageRowItem.hpp"
|
|
45
43
|
#include "JImageSource.hpp"
|
|
46
44
|
#include "JNativeAndroidSetupOptions.hpp"
|
|
47
45
|
#include "JNativeIOSSetupOptions.hpp"
|
|
@@ -57,12 +55,12 @@
|
|
|
57
55
|
#include "JRepeatMode.hpp"
|
|
58
56
|
#include "JRetryConfig.hpp"
|
|
59
57
|
#include "JStallReason.hpp"
|
|
58
|
+
#include "JStyleDisplay.hpp"
|
|
60
59
|
#include "JTimedMetadata.hpp"
|
|
61
60
|
#include "JTrack.hpp"
|
|
62
61
|
#include "JTrackRequest.hpp"
|
|
63
62
|
#include "JTrackStyle.hpp"
|
|
64
63
|
#include "JVariant_Boolean_AndroidAudioOffloadSettings.hpp"
|
|
65
|
-
#include "JVariant_Boolean_FavoriteConfig.hpp"
|
|
66
64
|
#include "JVariant_Boolean_RetryConfig.hpp"
|
|
67
65
|
#include "JVariant_NullType_Double.hpp"
|
|
68
66
|
#include "JVariant_NullType_RemoteButtonLayout.hpp"
|
|
@@ -81,6 +79,7 @@
|
|
|
81
79
|
#include "RepeatMode.hpp"
|
|
82
80
|
#include "RetryConfig.hpp"
|
|
83
81
|
#include "StallReason.hpp"
|
|
82
|
+
#include "StyleDisplay.hpp"
|
|
84
83
|
#include "TimedMetadata.hpp"
|
|
85
84
|
#include "Track.hpp"
|
|
86
85
|
#include "TrackRequest.hpp"
|
|
@@ -12,18 +12,15 @@
|
|
|
12
12
|
|
|
13
13
|
#include "AppKilledPlaybackBehavior.hpp"
|
|
14
14
|
#include "CarPlayNowPlayingButton.hpp"
|
|
15
|
-
#include "
|
|
16
|
-
#include "FavoritesMatchMode.hpp"
|
|
15
|
+
#include "CarPlayPlayingIndicatorLocation.hpp"
|
|
17
16
|
#include "JAppKilledPlaybackBehavior.hpp"
|
|
18
17
|
#include "JCarPlayNowPlayingButton.hpp"
|
|
19
|
-
#include "
|
|
20
|
-
#include "JFavoritesMatchMode.hpp"
|
|
18
|
+
#include "JCarPlayPlayingIndicatorLocation.hpp"
|
|
21
19
|
#include "JNitroAndroidUpdateOptions.hpp"
|
|
22
20
|
#include "JNitroIOSUpdateOptions.hpp"
|
|
23
21
|
#include "JPlayerCapabilities.hpp"
|
|
24
22
|
#include "JRemoteButton.hpp"
|
|
25
23
|
#include "JRemoteButtonLayout.hpp"
|
|
26
|
-
#include "JVariant_Boolean_FavoriteConfig.hpp"
|
|
27
24
|
#include "JVariant_NullType_Double.hpp"
|
|
28
25
|
#include "JVariant_NullType_RemoteButtonLayout.hpp"
|
|
29
26
|
#include "NitroAndroidUpdateOptions.hpp"
|