react-native-audio-browser 0.2.0-next.12 → 0.2.0-next.14
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 +10 -0
- package/android/build.gradle +20 -1
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +8 -1
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +52 -0
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +267 -0
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +27 -11
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +1 -1
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +11 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +11 -1
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +21 -22
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +17 -2
- package/android/src/main/java/com/audiobrowser/player/Player.kt +3 -0
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +30 -0
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +73 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +16 -6
- package/android/src/main/res/values/strings.xml +37 -2
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +50 -5
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +9 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +277 -0
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +56 -0
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +4 -4
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +77 -10
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +2 -2
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +10 -9
- package/ios/Browser/BrowserManager.swift +106 -45
- package/ios/Browser/InertStyleDiagnostic.swift +279 -0
- package/ios/Browser/JsonModels.swift +81 -15
- package/ios/Browser/SectionPresentation.swift +30 -0
- package/ios/Browser/StyleResolver.swift +11 -0
- package/ios/Browser/TabBarEntries.swift +7 -1
- package/ios/CarPlay/CarPlayController.swift +139 -35
- package/ios/CarPlay/CarPlayListItemFactory.swift +99 -27
- package/ios/Extension/Section+Copying.swift +1 -3
- package/ios/Extension/UIApplication+ActiveScene.swift +27 -0
- package/ios/Http/HttpClient.swift +8 -2
- package/ios/HybridAudioBrowser.swift +56 -12
- package/ios/Model/NitroTypeStubs.swift +60 -1
- package/ios/Player/MediaIntentCriteria.swift +13 -5
- package/ios/Player/MediaLoader.swift +33 -9
- package/ios/Player/NowPlayingUpdater.swift +53 -5
- package/ios/Player/PlaybackCoordinator.swift +11 -4
- package/ios/Player/PlaybackTimer.swift +8 -2
- package/ios/Player/QueueManager.swift +36 -10
- package/ios/Player/ShuffleOrder.swift +23 -0
- package/ios/Player/SleepTimerHandling.swift +13 -0
- package/ios/RemoteCommand/RemoteCommandController.swift +53 -18
- package/ios/Tests/InertStyleDiagnosticTests.swift +200 -0
- package/ios/Tests/JsonModelsTests.swift +76 -1
- package/ios/Tests/QueueManagerTests.swift +72 -6
- package/ios/Tests/RemoteCommandControllerTests.swift +16 -0
- package/ios/Tests/ResolvedTrackCopyingTests.swift +2 -2
- package/ios/Tests/SectionPresentationTests.swift +29 -0
- package/ios/Tests/StyleResolverTests.swift +60 -0
- package/ios/Tests/Support/TestTypes.swift +7 -0
- package/ios/TrackPlayer.swift +57 -34
- package/ios/Util/NetworkMonitor.swift +43 -26
- package/ios/Util/SFSymbolRenderer.swift +24 -2
- package/ios/Util/SVGProcessor.swift +9 -2
- package/lib/commonjs/features/browser-config.js +1 -0
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/playback/progress.js +2 -1
- package/lib/commonjs/features/playback/progress.js.map +1 -1
- package/lib/commonjs/features/playback/rate.js +8 -1
- package/lib/commonjs/features/playback/rate.js.map +1 -1
- package/lib/commonjs/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/commonjs/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/module/features/browser-config.js +1 -0
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/playback/progress.js +2 -1
- package/lib/module/features/playback/progress.js.map +1 -1
- package/lib/module/features/playback/rate.js +8 -1
- package/lib/module/features/playback/rate.js.map +1 -1
- package/lib/module/web/TrackPlayer/QueueManager.js +14 -0
- package/lib/module/web/TrackPlayer/QueueManager.js.map +1 -1
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/progress.d.ts.map +1 -1
- package/lib/typescript/src/features/playback/rate.d.ts +8 -1
- package/lib/typescript/src/features/playback/rate.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-native.d.ts +2 -1
- package/lib/typescript/src/types/browser-native.d.ts.map +1 -1
- package/lib/typescript/src/types/browser-nodes.d.ts +116 -9
- package/lib/typescript/src/types/browser-nodes.d.ts.map +1 -1
- package/lib/typescript/src/types/browser.d.ts +36 -0
- package/lib/typescript/src/types/browser.d.ts.map +1 -1
- package/nitrogen/generated/android/AudioBrowserOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JArtworkRequestConfig.hpp +4 -0
- package/nitrogen/generated/android/c++/JBrowseResult.hpp +6 -0
- package/nitrogen/generated/android/c++/JCardImage.hpp +58 -0
- package/nitrogen/generated/android/c++/JFavoriteChangedEvent.hpp +4 -0
- package/nitrogen/generated/android/c++/JFormatNowPlayingParams.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +102 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +6 -0
- package/nitrogen/generated/android/c++/JFunc_void_FavoriteChangedEvent.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_void_PlaybackActiveTrackChangedEvent.hpp +4 -0
- package/nitrogen/generated/android/c++/JFunc_void_std__optional_ResolvedTrack_.hpp +6 -0
- package/nitrogen/generated/android/c++/JFunc_void_std__vector_Track_.hpp +4 -0
- package/nitrogen/generated/android/c++/JGridTile.hpp +61 -0
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +13 -0
- package/nitrogen/generated/android/c++/JImageShape.hpp +58 -0
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +4 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -1
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +6 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +4 -0
- package/nitrogen/generated/android/c++/JPlaybackActiveTrackChangedEvent.hpp +4 -0
- package/nitrogen/generated/android/c++/JResolvedTrack.hpp +6 -0
- package/nitrogen/generated/android/c++/JSection.hpp +7 -5
- package/nitrogen/generated/android/c++/JSectionStyle.hpp +30 -3
- package/nitrogen/generated/android/c++/JTrack.hpp +4 -0
- package/nitrogen/generated/android/c++/JTrackLoadEvent.hpp +4 -0
- package/nitrogen/generated/android/c++/JTrackStyle.hpp +24 -3
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +6 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/CardImage.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__string__.kt +80 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/GridTile.kt +24 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/ImageShape.kt +23 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +7 -4
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Section.kt +2 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/SectionStyle.kt +18 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/TrackStyle.kt +15 -3
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +9 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +104 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +9 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +9 -0
- package/nitrogen/generated/ios/swift/CardImage.swift +40 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__string__.swift +54 -0
- package/nitrogen/generated/ios/swift/GridTile.swift +44 -0
- package/nitrogen/generated/ios/swift/ImageShape.swift +40 -0
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/Section.swift +1 -19
- package/nitrogen/generated/ios/swift/SectionStyle.swift +70 -1
- package/nitrogen/generated/ios/swift/TrackStyle.swift +59 -1
- package/nitrogen/generated/shared/c++/CardImage.hpp +76 -0
- package/nitrogen/generated/shared/c++/GridTile.hpp +80 -0
- package/nitrogen/generated/shared/c++/ImageShape.hpp +76 -0
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +6 -2
- package/nitrogen/generated/shared/c++/Section.hpp +1 -5
- package/nitrogen/generated/shared/c++/SectionStyle.hpp +32 -2
- package/nitrogen/generated/shared/c++/TrackStyle.hpp +25 -2
- package/package.json +7 -2
- package/src/features/browser-config.ts +1 -0
- package/src/features/playback/progress.ts +2 -1
- package/src/features/playback/rate.ts +8 -1
- package/src/style-resolution.test.ts +72 -1
- package/src/types/browser-native.ts +5 -1
- package/src/types/browser-nodes.ts +124 -9
- package/src/types/browser.ts +38 -0
- package/src/web/TrackPlayer/QueueManager.test.ts +29 -0
- package/src/web/TrackPlayer/QueueManager.ts +14 -0
- package/website/guide/android-auto.md +114 -0
- package/website/guide/android-certificates.md +409 -0
- package/website/guide/artwork.md +255 -0
- package/website/guide/audio-output.md +135 -0
- package/website/guide/automotive.md +86 -0
- package/website/guide/basic-usage.md +151 -0
- package/website/guide/battery.md +115 -0
- package/website/guide/browser.md +581 -0
- package/website/guide/carplay.md +620 -0
- package/website/guide/configuration.md +173 -0
- package/website/guide/equalizer.md +231 -0
- package/website/guide/errors.md +310 -0
- package/website/guide/favorites.md +154 -0
- package/website/guide/gate.md +143 -0
- package/website/guide/getting-started.md +46 -0
- package/website/guide/hooks.md +238 -0
- package/website/guide/live-streams.md +125 -0
- package/website/guide/metadata.md +239 -0
- package/website/guide/migrating-from-track-player.md +244 -0
- package/website/guide/native-callback-fetch.md +127 -0
- package/website/guide/network.md +86 -0
- package/website/guide/now-playing.md +175 -0
- package/website/guide/playback.md +328 -0
- package/website/guide/queue.md +300 -0
- package/website/guide/remote-controls.md +256 -0
- package/website/guide/search.md +255 -0
- package/website/guide/sleep-timer.md +268 -0
- package/website/guide/track.md +246 -0
|
@@ -12,15 +12,19 @@
|
|
|
12
12
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
14
|
#include "ArtworkVariants.hpp"
|
|
15
|
+
#include "CardImage.hpp"
|
|
15
16
|
#include "HttpMethod.hpp"
|
|
17
|
+
#include "ImageShape.hpp"
|
|
16
18
|
#include "ImageSource.hpp"
|
|
17
19
|
#include "JArtworkRendering.hpp"
|
|
18
20
|
#include "JArtworkVariants.hpp"
|
|
21
|
+
#include "JCardImage.hpp"
|
|
19
22
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp"
|
|
20
23
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp"
|
|
21
24
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp"
|
|
22
25
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp"
|
|
23
26
|
#include "JHttpMethod.hpp"
|
|
27
|
+
#include "JImageShape.hpp"
|
|
24
28
|
#include "JImageSource.hpp"
|
|
25
29
|
#include "JRequestConfig.hpp"
|
|
26
30
|
#include "JStyleDisplay.hpp"
|
|
@@ -16,11 +16,14 @@
|
|
|
16
16
|
#include "BrowseError.hpp"
|
|
17
17
|
#include "BrowserSourceCallbackParam.hpp"
|
|
18
18
|
#include "CarPlaySiriListButtonPosition.hpp"
|
|
19
|
+
#include "CardImage.hpp"
|
|
19
20
|
#include "FormatNavigationErrorParams.hpp"
|
|
20
21
|
#include "FormattedNavigationError.hpp"
|
|
22
|
+
#include "GridTile.hpp"
|
|
21
23
|
#include "HttpMethod.hpp"
|
|
22
24
|
#include "ImageContext.hpp"
|
|
23
25
|
#include "ImageQueryParams.hpp"
|
|
26
|
+
#include "ImageShape.hpp"
|
|
24
27
|
#include "ImageSource.hpp"
|
|
25
28
|
#include "JArtworkRendering.hpp"
|
|
26
29
|
#include "JArtworkRequestConfig.hpp"
|
|
@@ -29,6 +32,7 @@
|
|
|
29
32
|
#include "JBrowseResult.hpp"
|
|
30
33
|
#include "JBrowserSourceCallbackParam.hpp"
|
|
31
34
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
35
|
+
#include "JCardImage.hpp"
|
|
32
36
|
#include "JFormatNavigationErrorParams.hpp"
|
|
33
37
|
#include "JFormattedNavigationError.hpp"
|
|
34
38
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp"
|
|
@@ -42,10 +46,13 @@
|
|
|
42
46
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp"
|
|
43
47
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp"
|
|
44
48
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp"
|
|
49
|
+
#include "JFunc_std__shared_ptr_Promise_std__string__.hpp"
|
|
45
50
|
#include "JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp"
|
|
51
|
+
#include "JGridTile.hpp"
|
|
46
52
|
#include "JHttpMethod.hpp"
|
|
47
53
|
#include "JImageContext.hpp"
|
|
48
54
|
#include "JImageQueryParams.hpp"
|
|
55
|
+
#include "JImageShape.hpp"
|
|
49
56
|
#include "JImageSource.hpp"
|
|
50
57
|
#include "JMediaReference.hpp"
|
|
51
58
|
#include "JMediaRequestConfig.hpp"
|
|
@@ -139,6 +146,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
139
146
|
jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent::javaobject> handleTrackLoad = this->getFieldValue(fieldHandleTrackLoad);
|
|
140
147
|
static const auto fieldAndroidControllerOfflineError = clazz->getField<jni::JBoolean>("androidControllerOfflineError");
|
|
141
148
|
jni::local_ref<jni::JBoolean> androidControllerOfflineError = this->getFieldValue(fieldAndroidControllerOfflineError);
|
|
149
|
+
static const auto fieldViewMoreTitle = clazz->getField<JFunc_std__shared_ptr_Promise_std__string__::javaobject>("viewMoreTitle");
|
|
150
|
+
jni::local_ref<JFunc_std__shared_ptr_Promise_std__string__::javaobject> viewMoreTitle = this->getFieldValue(fieldViewMoreTitle);
|
|
142
151
|
static const auto fieldCarPlayLoadingTitle = clazz->getField<jni::JString>("carPlayLoadingTitle");
|
|
143
152
|
jni::local_ref<jni::JString> carPlayLoadingTitle = this->getFieldValue(fieldCarPlayLoadingTitle);
|
|
144
153
|
static const auto fieldResolveAlbumPath = clazz->getField<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track::javaobject>("resolveAlbumPath");
|
|
@@ -191,6 +200,15 @@ namespace margelo::nitro::audiobrowser {
|
|
|
191
200
|
}
|
|
192
201
|
}()) : std::nullopt,
|
|
193
202
|
androidControllerOfflineError != nullptr ? std::make_optional(static_cast<bool>(androidControllerOfflineError->value())) : std::nullopt,
|
|
203
|
+
viewMoreTitle != nullptr ? std::make_optional([&]() -> std::function<std::shared_ptr<Promise<std::string>>()> {
|
|
204
|
+
if (viewMoreTitle->isInstanceOf(JFunc_std__shared_ptr_Promise_std__string___cxx::javaClassStatic())) [[likely]] {
|
|
205
|
+
auto downcast = jni::static_ref_cast<JFunc_std__shared_ptr_Promise_std__string___cxx::javaobject>(viewMoreTitle);
|
|
206
|
+
return downcast->cthis()->getFunction();
|
|
207
|
+
} else {
|
|
208
|
+
auto viewMoreTitleRef = jni::make_global(viewMoreTitle);
|
|
209
|
+
return JNICallable<JFunc_std__shared_ptr_Promise_std__string__, std::shared_ptr<Promise<std::string>>()>(std::move(viewMoreTitleRef));
|
|
210
|
+
}
|
|
211
|
+
}()) : std::nullopt,
|
|
194
212
|
carPlayLoadingTitle != nullptr ? std::make_optional(carPlayLoadingTitle->toStdString()) : std::nullopt,
|
|
195
213
|
resolveAlbumPath != nullptr ? std::make_optional([&]() -> std::function<std::shared_ptr<Promise<std::optional<std::string>>>(const Track& /* track */)> {
|
|
196
214
|
if (resolveAlbumPath->isInstanceOf(JFunc_std__shared_ptr_Promise_std__optional_std__string____Track_cxx::javaClassStatic())) [[likely]] {
|
|
@@ -219,7 +237,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
219
237
|
*/
|
|
220
238
|
[[maybe_unused]]
|
|
221
239
|
static jni::local_ref<JNativeBrowserConfiguration::javaobject> fromCpp(const NativeBrowserConfiguration& value) {
|
|
222
|
-
using JSignature = JNativeBrowserConfiguration(jni::alias_ref<jni::JString>, jni::alias_ref<JTransformableRequestConfig>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____::javaobject>, jni::alias_ref<JTransformableRequestConfig>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____::javaobject>, jni::alias_ref<JMediaRequestConfig>, jni::alias_ref<JArtworkRequestConfig>, jni::alias_ref<JArtworkRequestConfig>, jni::alias_ref<jni::JArrayClass<JNativeRouteEntry>>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent::javaobject>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JString>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track::javaobject>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams::javaobject>);
|
|
240
|
+
using JSignature = JNativeBrowserConfiguration(jni::alias_ref<jni::JString>, jni::alias_ref<JTransformableRequestConfig>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____::javaobject>, jni::alias_ref<JTransformableRequestConfig>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____::javaobject>, jni::alias_ref<JMediaRequestConfig>, jni::alias_ref<JArtworkRequestConfig>, jni::alias_ref<JArtworkRequestConfig>, jni::alias_ref<jni::JArrayClass<JNativeRouteEntry>>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent::javaobject>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__string__::javaobject>, jni::alias_ref<jni::JString>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track::javaobject>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams::javaobject>);
|
|
223
241
|
static const auto clazz = javaClassStatic();
|
|
224
242
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
225
243
|
return create(
|
|
@@ -245,6 +263,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
245
263
|
value.singleTrack.has_value() ? jni::JBoolean::valueOf(value.singleTrack.value()) : nullptr,
|
|
246
264
|
value.handleTrackLoad.has_value() ? JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent_cxx::fromCpp(value.handleTrackLoad.value()) : nullptr,
|
|
247
265
|
value.androidControllerOfflineError.has_value() ? jni::JBoolean::valueOf(value.androidControllerOfflineError.value()) : nullptr,
|
|
266
|
+
value.viewMoreTitle.has_value() ? JFunc_std__shared_ptr_Promise_std__string___cxx::fromCpp(value.viewMoreTitle.value()) : nullptr,
|
|
248
267
|
value.carPlayLoadingTitle.has_value() ? jni::make_jstring(value.carPlayLoadingTitle.value()) : nullptr,
|
|
249
268
|
value.resolveAlbumPath.has_value() ? JFunc_std__shared_ptr_Promise_std__optional_std__string____Track_cxx::fromCpp(value.resolveAlbumPath.value()) : nullptr,
|
|
250
269
|
value.formatNavigationError.has_value() ? JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_cxx::fromCpp(value.formatNavigationError.value()) : nullptr
|
|
@@ -16,9 +16,12 @@
|
|
|
16
16
|
#include "BrowseError.hpp"
|
|
17
17
|
#include "BrowserSourceCallbackParam.hpp"
|
|
18
18
|
#include "CarPlaySiriListButtonPosition.hpp"
|
|
19
|
+
#include "CardImage.hpp"
|
|
20
|
+
#include "GridTile.hpp"
|
|
19
21
|
#include "HttpMethod.hpp"
|
|
20
22
|
#include "ImageContext.hpp"
|
|
21
23
|
#include "ImageQueryParams.hpp"
|
|
24
|
+
#include "ImageShape.hpp"
|
|
22
25
|
#include "ImageSource.hpp"
|
|
23
26
|
#include "JArtworkRendering.hpp"
|
|
24
27
|
#include "JArtworkRequestConfig.hpp"
|
|
@@ -27,6 +30,7 @@
|
|
|
27
30
|
#include "JBrowseResult.hpp"
|
|
28
31
|
#include "JBrowserSourceCallbackParam.hpp"
|
|
29
32
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
33
|
+
#include "JCardImage.hpp"
|
|
30
34
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp"
|
|
31
35
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp"
|
|
32
36
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp"
|
|
@@ -35,9 +39,11 @@
|
|
|
35
39
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp"
|
|
36
40
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp"
|
|
37
41
|
#include "JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp"
|
|
42
|
+
#include "JGridTile.hpp"
|
|
38
43
|
#include "JHttpMethod.hpp"
|
|
39
44
|
#include "JImageContext.hpp"
|
|
40
45
|
#include "JImageQueryParams.hpp"
|
|
46
|
+
#include "JImageShape.hpp"
|
|
41
47
|
#include "JImageSource.hpp"
|
|
42
48
|
#include "JMediaReference.hpp"
|
|
43
49
|
#include "JMediaRequestConfig.hpp"
|
|
@@ -18,12 +18,14 @@
|
|
|
18
18
|
#include "ArtworkVariants.hpp"
|
|
19
19
|
#include "CarPlayNowPlayingButton.hpp"
|
|
20
20
|
#include "CarPlayPlayingIndicatorLocation.hpp"
|
|
21
|
+
#include "CardImage.hpp"
|
|
21
22
|
#include "FormatNowPlayingParams.hpp"
|
|
22
23
|
#include "HttpMethod.hpp"
|
|
23
24
|
#include "IOSCategory.hpp"
|
|
24
25
|
#include "IOSCategoryMode.hpp"
|
|
25
26
|
#include "IOSCategoryOptions.hpp"
|
|
26
27
|
#include "IOSCategoryPolicy.hpp"
|
|
28
|
+
#include "ImageShape.hpp"
|
|
27
29
|
#include "ImageSource.hpp"
|
|
28
30
|
#include "JAndroidAudioContentType.hpp"
|
|
29
31
|
#include "JAndroidAudioOffloadSettings.hpp"
|
|
@@ -33,6 +35,7 @@
|
|
|
33
35
|
#include "JArtworkVariants.hpp"
|
|
34
36
|
#include "JCarPlayNowPlayingButton.hpp"
|
|
35
37
|
#include "JCarPlayPlayingIndicatorLocation.hpp"
|
|
38
|
+
#include "JCardImage.hpp"
|
|
36
39
|
#include "JFormatNowPlayingParams.hpp"
|
|
37
40
|
#include "JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp"
|
|
38
41
|
#include "JHttpMethod.hpp"
|
|
@@ -40,6 +43,7 @@
|
|
|
40
43
|
#include "JIOSCategoryMode.hpp"
|
|
41
44
|
#include "JIOSCategoryOptions.hpp"
|
|
42
45
|
#include "JIOSCategoryPolicy.hpp"
|
|
46
|
+
#include "JImageShape.hpp"
|
|
43
47
|
#include "JImageSource.hpp"
|
|
44
48
|
#include "JNativeAndroidSetupOptions.hpp"
|
|
45
49
|
#include "JNativeIOSSetupOptions.hpp"
|
|
@@ -12,11 +12,15 @@
|
|
|
12
12
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
14
|
#include "ArtworkVariants.hpp"
|
|
15
|
+
#include "CardImage.hpp"
|
|
15
16
|
#include "HttpMethod.hpp"
|
|
17
|
+
#include "ImageShape.hpp"
|
|
16
18
|
#include "ImageSource.hpp"
|
|
17
19
|
#include "JArtworkRendering.hpp"
|
|
18
20
|
#include "JArtworkVariants.hpp"
|
|
21
|
+
#include "JCardImage.hpp"
|
|
19
22
|
#include "JHttpMethod.hpp"
|
|
23
|
+
#include "JImageShape.hpp"
|
|
20
24
|
#include "JImageSource.hpp"
|
|
21
25
|
#include "JStyleDisplay.hpp"
|
|
22
26
|
#include "JTrack.hpp"
|
|
@@ -13,12 +13,18 @@
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
14
|
#include "ArtworkVariants.hpp"
|
|
15
15
|
#include "CarPlaySiriListButtonPosition.hpp"
|
|
16
|
+
#include "CardImage.hpp"
|
|
17
|
+
#include "GridTile.hpp"
|
|
16
18
|
#include "HttpMethod.hpp"
|
|
19
|
+
#include "ImageShape.hpp"
|
|
17
20
|
#include "ImageSource.hpp"
|
|
18
21
|
#include "JArtworkRendering.hpp"
|
|
19
22
|
#include "JArtworkVariants.hpp"
|
|
20
23
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
24
|
+
#include "JCardImage.hpp"
|
|
25
|
+
#include "JGridTile.hpp"
|
|
21
26
|
#include "JHttpMethod.hpp"
|
|
27
|
+
#include "JImageShape.hpp"
|
|
22
28
|
#include "JImageSource.hpp"
|
|
23
29
|
#include "JSection.hpp"
|
|
24
30
|
#include "JSectionStyle.hpp"
|
|
@@ -12,11 +12,17 @@
|
|
|
12
12
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
14
|
#include "ArtworkVariants.hpp"
|
|
15
|
+
#include "CardImage.hpp"
|
|
16
|
+
#include "GridTile.hpp"
|
|
15
17
|
#include "HttpMethod.hpp"
|
|
18
|
+
#include "ImageShape.hpp"
|
|
16
19
|
#include "ImageSource.hpp"
|
|
17
20
|
#include "JArtworkRendering.hpp"
|
|
18
21
|
#include "JArtworkVariants.hpp"
|
|
22
|
+
#include "JCardImage.hpp"
|
|
23
|
+
#include "JGridTile.hpp"
|
|
19
24
|
#include "JHttpMethod.hpp"
|
|
25
|
+
#include "JImageShape.hpp"
|
|
20
26
|
#include "JImageSource.hpp"
|
|
21
27
|
#include "JSectionStyle.hpp"
|
|
22
28
|
#include "JStyleDisplay.hpp"
|
|
@@ -56,8 +62,6 @@ namespace margelo::nitro::audiobrowser {
|
|
|
56
62
|
static const auto clazz = javaClassStatic();
|
|
57
63
|
static const auto fieldTitle = clazz->getField<jni::JString>("title");
|
|
58
64
|
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
65
|
static const auto fieldStyle = clazz->getField<JSectionStyle>("style");
|
|
62
66
|
jni::local_ref<JSectionStyle> style = this->getFieldValue(fieldStyle);
|
|
63
67
|
static const auto fieldPath = clazz->getField<jni::JString>("path");
|
|
@@ -66,7 +70,6 @@ namespace margelo::nitro::audiobrowser {
|
|
|
66
70
|
jni::local_ref<jni::JArrayClass<JTrack>> children = this->getFieldValue(fieldChildren);
|
|
67
71
|
return Section(
|
|
68
72
|
title != nullptr ? std::make_optional(title->toStdString()) : std::nullopt,
|
|
69
|
-
subtitle != nullptr ? std::make_optional(subtitle->toStdString()) : std::nullopt,
|
|
70
73
|
style != nullptr ? std::make_optional(style->toCpp()) : std::nullopt,
|
|
71
74
|
path != nullptr ? std::make_optional(path->toStdString()) : std::nullopt,
|
|
72
75
|
[&]() {
|
|
@@ -88,13 +91,12 @@ namespace margelo::nitro::audiobrowser {
|
|
|
88
91
|
*/
|
|
89
92
|
[[maybe_unused]]
|
|
90
93
|
static jni::local_ref<JSection::javaobject> fromCpp(const Section& value) {
|
|
91
|
-
using JSignature = JSection(jni::alias_ref<jni::JString>, jni::alias_ref<
|
|
94
|
+
using JSignature = JSection(jni::alias_ref<jni::JString>, jni::alias_ref<JSectionStyle>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JArrayClass<JTrack>>);
|
|
92
95
|
static const auto clazz = javaClassStatic();
|
|
93
96
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
94
97
|
return create(
|
|
95
98
|
clazz,
|
|
96
99
|
value.title.has_value() ? jni::make_jstring(value.title.value()) : nullptr,
|
|
97
|
-
value.subtitle.has_value() ? jni::make_jstring(value.subtitle.value()) : nullptr,
|
|
98
100
|
value.style.has_value() ? JSectionStyle::fromCpp(value.style.value()) : nullptr,
|
|
99
101
|
value.path.has_value() ? jni::make_jstring(value.path.value()) : nullptr,
|
|
100
102
|
[&]() {
|
|
@@ -11,10 +11,17 @@
|
|
|
11
11
|
#include "SectionStyle.hpp"
|
|
12
12
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
|
+
#include "CardImage.hpp"
|
|
15
|
+
#include "GridTile.hpp"
|
|
16
|
+
#include "ImageShape.hpp"
|
|
14
17
|
#include "JArtworkRendering.hpp"
|
|
18
|
+
#include "JCardImage.hpp"
|
|
19
|
+
#include "JGridTile.hpp"
|
|
20
|
+
#include "JImageShape.hpp"
|
|
15
21
|
#include "JStyleDisplay.hpp"
|
|
16
22
|
#include "StyleDisplay.hpp"
|
|
17
23
|
#include <optional>
|
|
24
|
+
#include <string>
|
|
18
25
|
|
|
19
26
|
namespace margelo::nitro::audiobrowser {
|
|
20
27
|
|
|
@@ -37,14 +44,29 @@ namespace margelo::nitro::audiobrowser {
|
|
|
37
44
|
static const auto clazz = javaClassStatic();
|
|
38
45
|
static const auto fieldGridWrap = clazz->getField<jni::JBoolean>("gridWrap");
|
|
39
46
|
jni::local_ref<jni::JBoolean> gridWrap = this->getFieldValue(fieldGridWrap);
|
|
47
|
+
static const auto fieldGridTile = clazz->getField<JGridTile>("gridTile");
|
|
48
|
+
jni::local_ref<JGridTile> gridTile = this->getFieldValue(fieldGridTile);
|
|
40
49
|
static const auto fieldDisplay = clazz->getField<JStyleDisplay>("display");
|
|
41
50
|
jni::local_ref<JStyleDisplay> display = this->getFieldValue(fieldDisplay);
|
|
42
51
|
static const auto fieldArtworkRendering = clazz->getField<JArtworkRendering>("artworkRendering");
|
|
43
52
|
jni::local_ref<JArtworkRendering> artworkRendering = this->getFieldValue(fieldArtworkRendering);
|
|
53
|
+
static const auto fieldImageShape = clazz->getField<JImageShape>("imageShape");
|
|
54
|
+
jni::local_ref<JImageShape> imageShape = this->getFieldValue(fieldImageShape);
|
|
55
|
+
static const auto fieldAccessorySymbol = clazz->getField<jni::JString>("accessorySymbol");
|
|
56
|
+
jni::local_ref<jni::JString> accessorySymbol = this->getFieldValue(fieldAccessorySymbol);
|
|
57
|
+
static const auto fieldCardTint = clazz->getField<jni::JString>("cardTint");
|
|
58
|
+
jni::local_ref<jni::JString> cardTint = this->getFieldValue(fieldCardTint);
|
|
59
|
+
static const auto fieldCardImage = clazz->getField<JCardImage>("cardImage");
|
|
60
|
+
jni::local_ref<JCardImage> cardImage = this->getFieldValue(fieldCardImage);
|
|
44
61
|
return SectionStyle(
|
|
45
62
|
gridWrap != nullptr ? std::make_optional(static_cast<bool>(gridWrap->value())) : std::nullopt,
|
|
63
|
+
gridTile != nullptr ? std::make_optional(gridTile->toCpp()) : std::nullopt,
|
|
46
64
|
display != nullptr ? std::make_optional(display->toCpp()) : std::nullopt,
|
|
47
|
-
artworkRendering != nullptr ? std::make_optional(artworkRendering->toCpp()) : std::nullopt
|
|
65
|
+
artworkRendering != nullptr ? std::make_optional(artworkRendering->toCpp()) : std::nullopt,
|
|
66
|
+
imageShape != nullptr ? std::make_optional(imageShape->toCpp()) : std::nullopt,
|
|
67
|
+
accessorySymbol != nullptr ? std::make_optional(accessorySymbol->toStdString()) : std::nullopt,
|
|
68
|
+
cardTint != nullptr ? std::make_optional(cardTint->toStdString()) : std::nullopt,
|
|
69
|
+
cardImage != nullptr ? std::make_optional(cardImage->toCpp()) : std::nullopt
|
|
48
70
|
);
|
|
49
71
|
}
|
|
50
72
|
|
|
@@ -54,14 +76,19 @@ namespace margelo::nitro::audiobrowser {
|
|
|
54
76
|
*/
|
|
55
77
|
[[maybe_unused]]
|
|
56
78
|
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>);
|
|
79
|
+
using JSignature = JSectionStyle(jni::alias_ref<jni::JBoolean>, jni::alias_ref<JGridTile>, jni::alias_ref<JStyleDisplay>, jni::alias_ref<JArtworkRendering>, jni::alias_ref<JImageShape>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JCardImage>);
|
|
58
80
|
static const auto clazz = javaClassStatic();
|
|
59
81
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
60
82
|
return create(
|
|
61
83
|
clazz,
|
|
62
84
|
value.gridWrap.has_value() ? jni::JBoolean::valueOf(value.gridWrap.value()) : nullptr,
|
|
85
|
+
value.gridTile.has_value() ? JGridTile::fromCpp(value.gridTile.value()) : nullptr,
|
|
63
86
|
value.display.has_value() ? JStyleDisplay::fromCpp(value.display.value()) : nullptr,
|
|
64
|
-
value.artworkRendering.has_value() ? JArtworkRendering::fromCpp(value.artworkRendering.value()) : nullptr
|
|
87
|
+
value.artworkRendering.has_value() ? JArtworkRendering::fromCpp(value.artworkRendering.value()) : nullptr,
|
|
88
|
+
value.imageShape.has_value() ? JImageShape::fromCpp(value.imageShape.value()) : nullptr,
|
|
89
|
+
value.accessorySymbol.has_value() ? jni::make_jstring(value.accessorySymbol.value()) : nullptr,
|
|
90
|
+
value.cardTint.has_value() ? jni::make_jstring(value.cardTint.value()) : nullptr,
|
|
91
|
+
value.cardImage.has_value() ? JCardImage::fromCpp(value.cardImage.value()) : nullptr
|
|
65
92
|
);
|
|
66
93
|
}
|
|
67
94
|
};
|
|
@@ -12,11 +12,15 @@
|
|
|
12
12
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
14
|
#include "ArtworkVariants.hpp"
|
|
15
|
+
#include "CardImage.hpp"
|
|
15
16
|
#include "HttpMethod.hpp"
|
|
17
|
+
#include "ImageShape.hpp"
|
|
16
18
|
#include "ImageSource.hpp"
|
|
17
19
|
#include "JArtworkRendering.hpp"
|
|
18
20
|
#include "JArtworkVariants.hpp"
|
|
21
|
+
#include "JCardImage.hpp"
|
|
19
22
|
#include "JHttpMethod.hpp"
|
|
23
|
+
#include "JImageShape.hpp"
|
|
20
24
|
#include "JImageSource.hpp"
|
|
21
25
|
#include "JStyleDisplay.hpp"
|
|
22
26
|
#include "JTrackRequest.hpp"
|
|
@@ -12,11 +12,15 @@
|
|
|
12
12
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
14
|
#include "ArtworkVariants.hpp"
|
|
15
|
+
#include "CardImage.hpp"
|
|
15
16
|
#include "HttpMethod.hpp"
|
|
17
|
+
#include "ImageShape.hpp"
|
|
16
18
|
#include "ImageSource.hpp"
|
|
17
19
|
#include "JArtworkRendering.hpp"
|
|
18
20
|
#include "JArtworkVariants.hpp"
|
|
21
|
+
#include "JCardImage.hpp"
|
|
19
22
|
#include "JHttpMethod.hpp"
|
|
23
|
+
#include "JImageShape.hpp"
|
|
20
24
|
#include "JImageSource.hpp"
|
|
21
25
|
#include "JStyleDisplay.hpp"
|
|
22
26
|
#include "JTrack.hpp"
|
|
@@ -11,10 +11,15 @@
|
|
|
11
11
|
#include "TrackStyle.hpp"
|
|
12
12
|
|
|
13
13
|
#include "ArtworkRendering.hpp"
|
|
14
|
+
#include "CardImage.hpp"
|
|
15
|
+
#include "ImageShape.hpp"
|
|
14
16
|
#include "JArtworkRendering.hpp"
|
|
17
|
+
#include "JCardImage.hpp"
|
|
18
|
+
#include "JImageShape.hpp"
|
|
15
19
|
#include "JStyleDisplay.hpp"
|
|
16
20
|
#include "StyleDisplay.hpp"
|
|
17
21
|
#include <optional>
|
|
22
|
+
#include <string>
|
|
18
23
|
|
|
19
24
|
namespace margelo::nitro::audiobrowser {
|
|
20
25
|
|
|
@@ -39,9 +44,21 @@ namespace margelo::nitro::audiobrowser {
|
|
|
39
44
|
jni::local_ref<JStyleDisplay> display = this->getFieldValue(fieldDisplay);
|
|
40
45
|
static const auto fieldArtworkRendering = clazz->getField<JArtworkRendering>("artworkRendering");
|
|
41
46
|
jni::local_ref<JArtworkRendering> artworkRendering = this->getFieldValue(fieldArtworkRendering);
|
|
47
|
+
static const auto fieldImageShape = clazz->getField<JImageShape>("imageShape");
|
|
48
|
+
jni::local_ref<JImageShape> imageShape = this->getFieldValue(fieldImageShape);
|
|
49
|
+
static const auto fieldAccessorySymbol = clazz->getField<jni::JString>("accessorySymbol");
|
|
50
|
+
jni::local_ref<jni::JString> accessorySymbol = this->getFieldValue(fieldAccessorySymbol);
|
|
51
|
+
static const auto fieldCardTint = clazz->getField<jni::JString>("cardTint");
|
|
52
|
+
jni::local_ref<jni::JString> cardTint = this->getFieldValue(fieldCardTint);
|
|
53
|
+
static const auto fieldCardImage = clazz->getField<JCardImage>("cardImage");
|
|
54
|
+
jni::local_ref<JCardImage> cardImage = this->getFieldValue(fieldCardImage);
|
|
42
55
|
return TrackStyle(
|
|
43
56
|
display != nullptr ? std::make_optional(display->toCpp()) : std::nullopt,
|
|
44
|
-
artworkRendering != nullptr ? std::make_optional(artworkRendering->toCpp()) : std::nullopt
|
|
57
|
+
artworkRendering != nullptr ? std::make_optional(artworkRendering->toCpp()) : std::nullopt,
|
|
58
|
+
imageShape != nullptr ? std::make_optional(imageShape->toCpp()) : std::nullopt,
|
|
59
|
+
accessorySymbol != nullptr ? std::make_optional(accessorySymbol->toStdString()) : std::nullopt,
|
|
60
|
+
cardTint != nullptr ? std::make_optional(cardTint->toStdString()) : std::nullopt,
|
|
61
|
+
cardImage != nullptr ? std::make_optional(cardImage->toCpp()) : std::nullopt
|
|
45
62
|
);
|
|
46
63
|
}
|
|
47
64
|
|
|
@@ -51,13 +68,17 @@ namespace margelo::nitro::audiobrowser {
|
|
|
51
68
|
*/
|
|
52
69
|
[[maybe_unused]]
|
|
53
70
|
static jni::local_ref<JTrackStyle::javaobject> fromCpp(const TrackStyle& value) {
|
|
54
|
-
using JSignature = JTrackStyle(jni::alias_ref<JStyleDisplay>, jni::alias_ref<JArtworkRendering>);
|
|
71
|
+
using JSignature = JTrackStyle(jni::alias_ref<JStyleDisplay>, jni::alias_ref<JArtworkRendering>, jni::alias_ref<JImageShape>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<JCardImage>);
|
|
55
72
|
static const auto clazz = javaClassStatic();
|
|
56
73
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
57
74
|
return create(
|
|
58
75
|
clazz,
|
|
59
76
|
value.display.has_value() ? JStyleDisplay::fromCpp(value.display.value()) : nullptr,
|
|
60
|
-
value.artworkRendering.has_value() ? JArtworkRendering::fromCpp(value.artworkRendering.value()) : nullptr
|
|
77
|
+
value.artworkRendering.has_value() ? JArtworkRendering::fromCpp(value.artworkRendering.value()) : nullptr,
|
|
78
|
+
value.imageShape.has_value() ? JImageShape::fromCpp(value.imageShape.value()) : nullptr,
|
|
79
|
+
value.accessorySymbol.has_value() ? jni::make_jstring(value.accessorySymbol.value()) : nullptr,
|
|
80
|
+
value.cardTint.has_value() ? jni::make_jstring(value.cardTint.value()) : nullptr,
|
|
81
|
+
value.cardImage.has_value() ? JCardImage::fromCpp(value.cardImage.value()) : nullptr
|
|
61
82
|
);
|
|
62
83
|
}
|
|
63
84
|
};
|
package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp
CHANGED
|
@@ -19,10 +19,16 @@
|
|
|
19
19
|
#include "SectionStyle.hpp"
|
|
20
20
|
#include <optional>
|
|
21
21
|
#include "JSectionStyle.hpp"
|
|
22
|
+
#include "GridTile.hpp"
|
|
23
|
+
#include "JGridTile.hpp"
|
|
22
24
|
#include "StyleDisplay.hpp"
|
|
23
25
|
#include "JStyleDisplay.hpp"
|
|
24
26
|
#include "ArtworkRendering.hpp"
|
|
25
27
|
#include "JArtworkRendering.hpp"
|
|
28
|
+
#include "ImageShape.hpp"
|
|
29
|
+
#include "JImageShape.hpp"
|
|
30
|
+
#include "CardImage.hpp"
|
|
31
|
+
#include "JCardImage.hpp"
|
|
26
32
|
#include "Section.hpp"
|
|
27
33
|
#include <vector>
|
|
28
34
|
#include "JSection.hpp"
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// CardImage.kt
|
|
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
|
+
package com.margelo.nitro.audiobrowser
|
|
9
|
+
|
|
10
|
+
import androidx.annotation.Keep
|
|
11
|
+
import com.facebook.proguard.annotations.DoNotStrip
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Represents the JavaScript enum/union "CardImage".
|
|
15
|
+
*/
|
|
16
|
+
@DoNotStrip
|
|
17
|
+
@Keep
|
|
18
|
+
enum class CardImage(@DoNotStrip @Keep val value: Int) {
|
|
19
|
+
NORMAL(0),
|
|
20
|
+
BACKGROUND(1);
|
|
21
|
+
|
|
22
|
+
companion object
|
|
23
|
+
}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// Func_std__shared_ptr_Promise_std__string__.kt
|
|
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
|
+
package com.margelo.nitro.audiobrowser
|
|
9
|
+
|
|
10
|
+
import androidx.annotation.Keep
|
|
11
|
+
import com.facebook.jni.HybridData
|
|
12
|
+
import com.facebook.proguard.annotations.DoNotStrip
|
|
13
|
+
import dalvik.annotation.optimization.FastNative
|
|
14
|
+
import com.margelo.nitro.core.Promise
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Represents the JavaScript callback `() => std::shared_ptr<Promise<std::string>>`.
|
|
18
|
+
* This can be either implemented in C++ (in which case it might be a callback coming from JS),
|
|
19
|
+
* or in Kotlin/Java (in which case it is a native callback).
|
|
20
|
+
*/
|
|
21
|
+
@DoNotStrip
|
|
22
|
+
@Keep
|
|
23
|
+
@Suppress("ClassName", "RedundantUnitReturnType")
|
|
24
|
+
fun interface Func_std__shared_ptr_Promise_std__string__: () -> Promise<String> {
|
|
25
|
+
/**
|
|
26
|
+
* Call the given JS callback.
|
|
27
|
+
* @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
|
|
28
|
+
*/
|
|
29
|
+
@DoNotStrip
|
|
30
|
+
@Keep
|
|
31
|
+
override fun invoke(): Promise<String>
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Represents the JavaScript callback `() => std::shared_ptr<Promise<std::string>>`.
|
|
36
|
+
* This is implemented in C++, via a `std::function<...>`.
|
|
37
|
+
* The callback might be coming from JS.
|
|
38
|
+
*/
|
|
39
|
+
@DoNotStrip
|
|
40
|
+
@Keep
|
|
41
|
+
@Suppress(
|
|
42
|
+
"KotlinJniMissingFunction", "unused",
|
|
43
|
+
"RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
|
|
44
|
+
"ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
|
|
45
|
+
)
|
|
46
|
+
class Func_std__shared_ptr_Promise_std__string___cxx: Func_std__shared_ptr_Promise_std__string__ {
|
|
47
|
+
@DoNotStrip
|
|
48
|
+
@Keep
|
|
49
|
+
private val mHybridData: HybridData
|
|
50
|
+
|
|
51
|
+
@DoNotStrip
|
|
52
|
+
@Keep
|
|
53
|
+
private constructor(hybridData: HybridData) {
|
|
54
|
+
mHybridData = hybridData
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
@DoNotStrip
|
|
58
|
+
@Keep
|
|
59
|
+
override fun invoke(): Promise<String>
|
|
60
|
+
= invoke_cxx()
|
|
61
|
+
|
|
62
|
+
@FastNative
|
|
63
|
+
private external fun invoke_cxx(): Promise<String>
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Represents the JavaScript callback `() => std::shared_ptr<Promise<std::string>>`.
|
|
68
|
+
* This is implemented in Java/Kotlin, via a `() -> Promise<String>`.
|
|
69
|
+
* The callback is always coming from native.
|
|
70
|
+
*/
|
|
71
|
+
@DoNotStrip
|
|
72
|
+
@Keep
|
|
73
|
+
@Suppress("ClassName", "RedundantUnitReturnType", "unused")
|
|
74
|
+
class Func_std__shared_ptr_Promise_std__string___java(private val function: () -> Promise<String>): Func_std__shared_ptr_Promise_std__string__ {
|
|
75
|
+
@DoNotStrip
|
|
76
|
+
@Keep
|
|
77
|
+
override fun invoke(): Promise<String> {
|
|
78
|
+
return this.function()
|
|
79
|
+
}
|
|
80
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// GridTile.kt
|
|
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
|
+
package com.margelo.nitro.audiobrowser
|
|
9
|
+
|
|
10
|
+
import androidx.annotation.Keep
|
|
11
|
+
import com.facebook.proguard.annotations.DoNotStrip
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Represents the JavaScript enum/union "GridTile".
|
|
15
|
+
*/
|
|
16
|
+
@DoNotStrip
|
|
17
|
+
@Keep
|
|
18
|
+
enum class GridTile(@DoNotStrip @Keep val value: Int) {
|
|
19
|
+
PLAIN(0),
|
|
20
|
+
CARD(1),
|
|
21
|
+
CONDENSED(2);
|
|
22
|
+
|
|
23
|
+
companion object
|
|
24
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// ImageShape.kt
|
|
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
|
+
package com.margelo.nitro.audiobrowser
|
|
9
|
+
|
|
10
|
+
import androidx.annotation.Keep
|
|
11
|
+
import com.facebook.proguard.annotations.DoNotStrip
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Represents the JavaScript enum/union "ImageShape".
|
|
15
|
+
*/
|
|
16
|
+
@DoNotStrip
|
|
17
|
+
@Keep
|
|
18
|
+
enum class ImageShape(@DoNotStrip @Keep val value: Int) {
|
|
19
|
+
CIRCULAR(0),
|
|
20
|
+
ROUNDED_RECTANGLE(1);
|
|
21
|
+
|
|
22
|
+
companion object
|
|
23
|
+
}
|
|
@@ -55,6 +55,9 @@ data class NativeBrowserConfiguration(
|
|
|
55
55
|
val androidControllerOfflineError: Boolean?,
|
|
56
56
|
@DoNotStrip
|
|
57
57
|
@Keep
|
|
58
|
+
val viewMoreTitle: Func_std__shared_ptr_Promise_std__string__?,
|
|
59
|
+
@DoNotStrip
|
|
60
|
+
@Keep
|
|
58
61
|
val carPlayLoadingTitle: String?,
|
|
59
62
|
@DoNotStrip
|
|
60
63
|
@Keep
|
|
@@ -66,8 +69,8 @@ data class NativeBrowserConfiguration(
|
|
|
66
69
|
/**
|
|
67
70
|
* Create a new instance of NativeBrowserConfiguration from Kotlin
|
|
68
71
|
*/
|
|
69
|
-
constructor(path: String?, request: TransformableRequestConfig?, requestResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, browse: TransformableRequestConfig?, browseResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: ((event: TrackLoadEvent) -> Promise<Promise<Unit>>)?, androidControllerOfflineError: Boolean?, carPlayLoadingTitle: String?, resolveAlbumPath: ((track: Track) -> Promise<String?>)?, formatNavigationError: ((params: FormatNavigationErrorParams) -> Promise<FormattedNavigationError?>)?):
|
|
70
|
-
this(path, request, requestResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, browse, browseResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent_java(it) }, androidControllerOfflineError, carPlayLoadingTitle, resolveAlbumPath?.let { Func_std__shared_ptr_Promise_std__optional_std__string____Track_java(it) }, formatNavigationError?.let { Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_java(it) })
|
|
72
|
+
constructor(path: String?, request: TransformableRequestConfig?, requestResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, browse: TransformableRequestConfig?, browseResolver: (() -> Promise<Promise<TransformableRequestConfig>>)?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: ((event: TrackLoadEvent) -> Promise<Promise<Unit>>)?, androidControllerOfflineError: Boolean?, viewMoreTitle: (() -> Promise<String>)?, carPlayLoadingTitle: String?, resolveAlbumPath: ((track: Track) -> Promise<String?>)?, formatNavigationError: ((params: FormatNavigationErrorParams) -> Promise<FormattedNavigationError?>)?):
|
|
73
|
+
this(path, request, requestResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, browse, browseResolver?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig_____java(it) }, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent_java(it) }, androidControllerOfflineError, viewMoreTitle?.let { Func_std__shared_ptr_Promise_std__string___java(it) }, carPlayLoadingTitle, resolveAlbumPath?.let { Func_std__shared_ptr_Promise_std__optional_std__string____Track_java(it) }, formatNavigationError?.let { Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_java(it) })
|
|
71
74
|
|
|
72
75
|
companion object {
|
|
73
76
|
/**
|
|
@@ -77,8 +80,8 @@ data class NativeBrowserConfiguration(
|
|
|
77
80
|
@Keep
|
|
78
81
|
@Suppress("unused")
|
|
79
82
|
@JvmStatic
|
|
80
|
-
private fun fromCpp(path: String?, request: TransformableRequestConfig?, requestResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, browse: TransformableRequestConfig?, browseResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent?, androidControllerOfflineError: Boolean?, carPlayLoadingTitle: String?, resolveAlbumPath: Func_std__shared_ptr_Promise_std__optional_std__string____Track?, formatNavigationError: Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams?): NativeBrowserConfiguration {
|
|
81
|
-
return NativeBrowserConfiguration(path, request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad, androidControllerOfflineError, carPlayLoadingTitle, resolveAlbumPath, formatNavigationError)
|
|
83
|
+
private fun fromCpp(path: String?, request: TransformableRequestConfig?, requestResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, browse: TransformableRequestConfig?, browseResolver: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____?, media: MediaRequestConfig?, artwork: ArtworkRequestConfig?, nowPlayingArtwork: ArtworkRequestConfig?, routes: Array<NativeRouteEntry>?, singleTrack: Boolean?, handleTrackLoad: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent?, androidControllerOfflineError: Boolean?, viewMoreTitle: Func_std__shared_ptr_Promise_std__string__?, carPlayLoadingTitle: String?, resolveAlbumPath: Func_std__shared_ptr_Promise_std__optional_std__string____Track?, formatNavigationError: Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams?): NativeBrowserConfiguration {
|
|
84
|
+
return NativeBrowserConfiguration(path, request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad, androidControllerOfflineError, viewMoreTitle, carPlayLoadingTitle, resolveAlbumPath, formatNavigationError)
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
87
|
}
|
|
@@ -22,9 +22,6 @@ data class Section(
|
|
|
22
22
|
val title: String?,
|
|
23
23
|
@DoNotStrip
|
|
24
24
|
@Keep
|
|
25
|
-
val subtitle: String?,
|
|
26
|
-
@DoNotStrip
|
|
27
|
-
@Keep
|
|
28
25
|
val style: SectionStyle?,
|
|
29
26
|
@DoNotStrip
|
|
30
27
|
@Keep
|
|
@@ -43,8 +40,8 @@ data class Section(
|
|
|
43
40
|
@Keep
|
|
44
41
|
@Suppress("unused")
|
|
45
42
|
@JvmStatic
|
|
46
|
-
private fun fromCpp(title: String?,
|
|
47
|
-
return Section(title,
|
|
43
|
+
private fun fromCpp(title: String?, style: SectionStyle?, path: String?, children: Array<Track>): Section {
|
|
44
|
+
return Section(title, style, path, children)
|
|
48
45
|
}
|
|
49
46
|
}
|
|
50
47
|
}
|