react-native-audio-browser 1.0.0-next.5 → 1.0.0-next.6
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/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +75 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +14 -2
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +25 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +183 -122
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +2 -59
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +3 -3
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +201 -107
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -20
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +14 -1
- package/android/src/main/java/com/audiobrowser/player/RetryLoop.kt +1 -1
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +52 -7
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +2 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +5 -0
- package/android/src/main/java/com/audiobrowser/util/AwaitCancellable.kt +35 -11
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +11 -0
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +10 -7
- package/android/src/main/res/values/strings.xml +5 -2
- package/android/src/test/java/androidx/media3/session/SessionViews.kt +15 -0
- package/android/src/test/java/com/audiobrowser/ContentRefreshNavigationErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/NavigateTrackTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/ResolveFormattedErrorTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +9 -6
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +19 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerSearchFailureTest.kt +168 -0
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +32 -0
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +43 -18
- package/android/src/test/java/com/audiobrowser/player/HandleTrackLoadSeekTest.kt +1 -0
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +40 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerRetryTest.kt +115 -2
- package/android/src/test/java/com/audiobrowser/player/SessionBrowserNeverConfiguredTest.kt +98 -0
- package/android/src/test/java/com/audiobrowser/player/SessionUncachedIdTest.kt +396 -0
- package/android/src/test/java/com/audiobrowser/player/SessionViewTest.kt +6 -2
- package/android/src/test/java/com/audiobrowser/player/SessionVoiceSearchTest.kt +116 -14
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +12 -1
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +241 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +11 -0
- package/android/src/test/java/com/audiobrowser/util/ArtworkRoutesTest.kt +25 -0
- package/android/src/test/java/com/audiobrowser/util/AwaitCancellableTest.kt +43 -2
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +38 -0
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryRatingTest.kt +11 -0
- package/android/src/testCast/java/com/audiobrowser/cast/SdkCastRemoteTest.kt +187 -2
- package/ios/AVPlayerEngine.swift +2 -2
- package/ios/Browser/BrowserPathHelper.swift +3 -2
- package/ios/Browser/PageResolver.swift +1 -1
- package/ios/Extension/Promise+AwaitCallback.swift +13 -4
- package/ios/HybridAudioBrowser+Player.swift +3 -2
- package/ios/HybridAudioBrowser.swift +1 -1
- package/ios/Player/Player.swift +4 -2
- package/ios/Tests/AwaitCallbackTests.swift +8 -0
- package/ios/Tests/DataURLDecodingTests.swift +25 -0
- package/ios/Tests/GenerationMemoTests.swift +136 -0
- package/ios/Tests/JSCallbackErrorTests.swift +33 -0
- package/ios/Tests/PlayerPolicyTests.swift +19 -28
- package/ios/Tests/PlayerProgressTests.swift +0 -2
- package/ios/Tests/RequestLayerTests.swift +5 -0
- package/ios/Tests/RoutePickerSourceFrameTests.swift +30 -0
- package/ios/Tests/RoutePickerSourceLifetimeTests.swift +79 -0
- package/ios/Tests/Support/TestTypes.swift +14 -0
- package/ios/Util/ArtworkImageFetcher.swift +40 -16
- package/ios/Util/AwaitCallback.swift +16 -10
- package/ios/Util/GenerationMemo.swift +81 -17
- package/ios/Util/JSCallbackError.swift +23 -0
- package/ios/Util/OutputPicker.swift +25 -5
- package/ios/Util/RoutePickerSourceFrame.swift +17 -0
- package/ios/Util/RoutePickerSourceLifetime.swift +34 -0
- package/lib/commonjs/features/browser-config.js +3 -2
- package/lib/commonjs/features/browser-config.js.map +1 -1
- package/lib/commonjs/features/browser.js +7 -8
- package/lib/commonjs/features/browser.js.map +1 -1
- package/lib/commonjs/features/output.js +7 -3
- package/lib/commonjs/features/output.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +43 -2
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/commonjs/web/browser/BrowserManager.js +37 -65
- package/lib/commonjs/web/browser/BrowserManager.js.map +1 -1
- package/lib/commonjs/web/browser/SearchManager.js +1 -4
- package/lib/commonjs/web/browser/SearchManager.js.map +1 -1
- package/lib/commonjs/web/http/RequestConfigBuilder.js +53 -55
- package/lib/commonjs/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/commonjs/web/player/NowPlayingManager.js +3 -22
- package/lib/commonjs/web/player/NowPlayingManager.js.map +1 -1
- package/lib/commonjs/web/util/BrowserPathHelper.js +5 -7
- package/lib/commonjs/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/commonjs/web/util/GenerationMemo.js +92 -0
- package/lib/commonjs/web/util/GenerationMemo.js.map +1 -0
- package/lib/module/features/browser-config.js +3 -2
- package/lib/module/features/browser-config.js.map +1 -1
- package/lib/module/features/browser.js +7 -8
- package/lib/module/features/browser.js.map +1 -1
- package/lib/module/features/output.js +7 -3
- package/lib/module/features/output.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +43 -2
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/web/browser/BrowserManager.js +37 -66
- package/lib/module/web/browser/BrowserManager.js.map +1 -1
- package/lib/module/web/browser/SearchManager.js +1 -5
- package/lib/module/web/browser/SearchManager.js.map +1 -1
- package/lib/module/web/http/RequestConfigBuilder.js +53 -55
- package/lib/module/web/http/RequestConfigBuilder.js.map +1 -1
- package/lib/module/web/player/NowPlayingManager.js +3 -22
- package/lib/module/web/player/NowPlayingManager.js.map +1 -1
- package/lib/module/web/util/BrowserPathHelper.js +5 -7
- package/lib/module/web/util/BrowserPathHelper.js.map +1 -1
- package/lib/module/web/util/GenerationMemo.js +87 -0
- package/lib/module/web/util/GenerationMemo.js.map +1 -0
- package/lib/typescript/src/features/browser-config.d.ts.map +1 -1
- package/lib/typescript/src/features/browser.d.ts +7 -8
- package/lib/typescript/src/features/browser.d.ts.map +1 -1
- package/lib/typescript/src/features/output.d.ts +8 -4
- package/lib/typescript/src/features/output.d.ts.map +1 -1
- package/lib/typescript/src/specs/audio-browser.nitro.d.ts +11 -0
- package/lib/typescript/src/specs/audio-browser.nitro.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.d.ts +55 -8
- 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 +3 -0
- package/nitrogen/generated/android/c++/JFindTrackParams.hpp +57 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_RequestConfig___Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_NowPlayingUpdate____FormatNowPlayingParams.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__optional_std__string____Track.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_GateDecision_____NativeGateRequest.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____MediaTransformParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp +171 -0
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp +23 -2
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__string__.hpp +13 -1
- package/nitrogen/generated/android/c++/JFunc_std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError__std__shared_ptr_Promise_std__variant_ResolvedTrack__BrowseError_______BrowserSourceCallbackParam.hpp +13 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +15 -3
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -1
- package/nitrogen/generated/android/c++/JMediaRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeBrowserConfiguration.hpp +20 -2
- package/nitrogen/generated/android/c++/JNativeRouteEntry.hpp +3 -0
- package/nitrogen/generated/android/c++/JNativeSetupPlayerOptions.hpp +3 -0
- package/nitrogen/generated/android/c++/JOutputPickerAnchor.hpp +69 -0
- package/nitrogen/generated/android/c++/JTransformableRequestConfig.hpp +3 -0
- package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp +13 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/FindTrackParams.kt +51 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.kt +78 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/NativeBrowserConfiguration.kt +11 -6
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt +66 -0
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.cpp +35 -1
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Bridge.hpp +144 -15
- package/nitrogen/generated/ios/AudioBrowser-Swift-Cxx-Umbrella.hpp +8 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -2
- package/nitrogen/generated/ios/swift/FindTrackParams.swift +29 -0
- package/nitrogen/generated/ios/swift/Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.swift +67 -0
- package/nitrogen/generated/ios/swift/Func_void_std__optional_Track_.swift +46 -0
- package/nitrogen/generated/ios/swift/Func_void_std__shared_ptr_Promise_std__optional_Track___.swift +66 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -1
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +2 -2
- package/nitrogen/generated/ios/swift/NativeBrowserConfiguration.swift +48 -1
- package/nitrogen/generated/ios/swift/OutputPickerAnchor.swift +44 -0
- package/nitrogen/generated/shared/c++/FindTrackParams.hpp +83 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +4 -1
- package/nitrogen/generated/shared/c++/NativeBrowserConfiguration.hpp +10 -3
- package/nitrogen/generated/shared/c++/OutputPickerAnchor.hpp +95 -0
- package/package.json +1 -1
- package/src/codegen-js-error-message.test.ts +78 -0
- package/src/features/browser-config.test.ts +7 -0
- package/src/features/browser-config.ts +3 -2
- package/src/features/browser.ts +7 -8
- package/src/features/output.ts +13 -5
- package/src/specs/audio-browser.nitro.ts +16 -3
- package/src/types/browser-native.ts +4 -1
- package/src/types/browser.ts +60 -8
- package/src/web/NativeAudioBrowser.ts +43 -3
- package/src/web/__tests__/nowPlayingArtwork.test.ts +191 -0
- package/src/web/browser/BrowserManager.ts +50 -79
- package/src/web/browser/SearchManager.ts +1 -8
- package/src/web/browser/__tests__/artwork-resolution.test.ts +33 -0
- package/src/web/browser/__tests__/layer-resolver.test.ts +47 -1
- package/src/web/http/RequestConfigBuilder.test.ts +151 -1
- package/src/web/http/RequestConfigBuilder.ts +72 -57
- package/src/web/player/NowPlayingManager.test.ts +29 -0
- package/src/web/player/NowPlayingManager.ts +4 -27
- package/src/web/util/BrowserPathHelper.test.ts +23 -0
- package/src/web/util/BrowserPathHelper.ts +6 -7
- package/src/web/util/GenerationMemo.test.ts +148 -0
- package/src/web/util/GenerationMemo.ts +103 -0
- package/website/guide/audio-output.md +34 -7
- package/website/guide/browser.md +21 -0
- package/website/guide/gate.md +1 -1
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
#include "BrowserSourceCallbackParam.hpp"
|
|
18
18
|
#include "CarPlaySiriListButtonPosition.hpp"
|
|
19
19
|
#include "CardImage.hpp"
|
|
20
|
+
#include "FindTrackParams.hpp"
|
|
20
21
|
#include "FormatNavigationErrorParams.hpp"
|
|
21
22
|
#include "FormattedNavigationError.hpp"
|
|
22
23
|
#include "GridTile.hpp"
|
|
@@ -33,6 +34,7 @@
|
|
|
33
34
|
#include "JBrowserSourceCallbackParam.hpp"
|
|
34
35
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
35
36
|
#include "JCardImage.hpp"
|
|
37
|
+
#include "JFindTrackParams.hpp"
|
|
36
38
|
#include "JFormatNavigationErrorParams.hpp"
|
|
37
39
|
#include "JFormattedNavigationError.hpp"
|
|
38
40
|
#include "JFunc_std__shared_ptr_Promise_RequestConfig___MediaTransformParams.hpp"
|
|
@@ -44,6 +46,7 @@
|
|
|
44
46
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____RequestConfig_std__optional_std__unordered_map_std__string__std__string__.hpp"
|
|
45
47
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_RequestConfig_____Track.hpp"
|
|
46
48
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_TransformableRequestConfig____.hpp"
|
|
49
|
+
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.hpp"
|
|
47
50
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__vector_Track______SearchParams.hpp"
|
|
48
51
|
#include "JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_void_____TrackLoadEvent.hpp"
|
|
49
52
|
#include "JFunc_std__shared_ptr_Promise_std__string__.hpp"
|
|
@@ -98,8 +101,11 @@
|
|
|
98
101
|
#include <NitroModules/JPromise.hpp>
|
|
99
102
|
#include <NitroModules/JUnit.hpp>
|
|
100
103
|
#include <NitroModules/Promise.hpp>
|
|
104
|
+
#include <exception>
|
|
101
105
|
#include <functional>
|
|
106
|
+
#include <jsi/jsi.h>
|
|
102
107
|
#include <optional>
|
|
108
|
+
#include <stdexcept>
|
|
103
109
|
#include <string>
|
|
104
110
|
#include <unordered_map>
|
|
105
111
|
#include <variant>
|
|
@@ -156,6 +162,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
156
162
|
jni::local_ref<JFunc_std__shared_ptr_Promise_std__optional_std__string____Track::javaobject> resolveAlbumPath = this->getFieldValue(fieldResolveAlbumPath);
|
|
157
163
|
static const auto fieldFormatNavigationError = clazz->getField<JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams::javaobject>("formatNavigationError");
|
|
158
164
|
jni::local_ref<JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams::javaobject> formatNavigationError = this->getFieldValue(fieldFormatNavigationError);
|
|
165
|
+
static const auto fieldFindTrack = clazz->getField<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams::javaobject>("findTrack");
|
|
166
|
+
jni::local_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams::javaobject> findTrack = this->getFieldValue(fieldFindTrack);
|
|
159
167
|
return NativeBrowserConfiguration(
|
|
160
168
|
path != nullptr ? std::make_optional(path->toStdString()) : std::nullopt,
|
|
161
169
|
request != nullptr ? std::make_optional(request->toCpp()) : std::nullopt,
|
|
@@ -229,6 +237,15 @@ namespace margelo::nitro::audiobrowser {
|
|
|
229
237
|
auto formatNavigationErrorRef = jni::make_global(formatNavigationError);
|
|
230
238
|
return JNICallable<JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams, std::shared_ptr<Promise<std::optional<FormattedNavigationError>>>(FormatNavigationErrorParams)>(std::move(formatNavigationErrorRef));
|
|
231
239
|
}
|
|
240
|
+
}()) : std::nullopt,
|
|
241
|
+
findTrack != nullptr ? std::make_optional([&]() -> std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>(const FindTrackParams& /* params */)> {
|
|
242
|
+
if (findTrack->isInstanceOf(JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams_cxx::javaClassStatic())) [[likely]] {
|
|
243
|
+
auto downcast = jni::static_ref_cast<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams_cxx::javaobject>(findTrack);
|
|
244
|
+
return downcast->cthis()->getFunction();
|
|
245
|
+
} else {
|
|
246
|
+
auto findTrackRef = jni::make_global(findTrack);
|
|
247
|
+
return JNICallable<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams, std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>(FindTrackParams)>(std::move(findTrackRef));
|
|
248
|
+
}
|
|
232
249
|
}()) : std::nullopt
|
|
233
250
|
);
|
|
234
251
|
}
|
|
@@ -239,7 +256,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
239
256
|
*/
|
|
240
257
|
[[maybe_unused]]
|
|
241
258
|
static jni::local_ref<JNativeBrowserConfiguration::javaobject> fromCpp(const NativeBrowserConfiguration& value) {
|
|
242
|
-
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>);
|
|
259
|
+
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>, jni::alias_ref<JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams::javaobject>);
|
|
243
260
|
static const auto clazz = javaClassStatic();
|
|
244
261
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
245
262
|
return create(
|
|
@@ -268,7 +285,8 @@ namespace margelo::nitro::audiobrowser {
|
|
|
268
285
|
value.viewMoreTitle.has_value() ? JFunc_std__shared_ptr_Promise_std__string___cxx::fromCpp(value.viewMoreTitle.value()) : nullptr,
|
|
269
286
|
value.carPlayLoadingTitle.has_value() ? jni::make_jstring(value.carPlayLoadingTitle.value()) : nullptr,
|
|
270
287
|
value.resolveAlbumPath.has_value() ? JFunc_std__shared_ptr_Promise_std__optional_std__string____Track_cxx::fromCpp(value.resolveAlbumPath.value()) : nullptr,
|
|
271
|
-
value.formatNavigationError.has_value() ? JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_cxx::fromCpp(value.formatNavigationError.value()) : nullptr
|
|
288
|
+
value.formatNavigationError.has_value() ? JFunc_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams_cxx::fromCpp(value.formatNavigationError.value()) : nullptr,
|
|
289
|
+
value.findTrack.has_value() ? JFunc_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams_cxx::fromCpp(value.findTrack.value()) : nullptr
|
|
272
290
|
);
|
|
273
291
|
}
|
|
274
292
|
};
|
|
@@ -78,8 +78,11 @@
|
|
|
78
78
|
#include <NitroModules/JNICallable.hpp>
|
|
79
79
|
#include <NitroModules/JPromise.hpp>
|
|
80
80
|
#include <NitroModules/Promise.hpp>
|
|
81
|
+
#include <exception>
|
|
81
82
|
#include <functional>
|
|
83
|
+
#include <jsi/jsi.h>
|
|
82
84
|
#include <optional>
|
|
85
|
+
#include <stdexcept>
|
|
83
86
|
#include <string>
|
|
84
87
|
#include <unordered_map>
|
|
85
88
|
#include <variant>
|
|
@@ -95,8 +95,11 @@
|
|
|
95
95
|
#include <NitroModules/JPromise.hpp>
|
|
96
96
|
#include <NitroModules/Null.hpp>
|
|
97
97
|
#include <NitroModules/Promise.hpp>
|
|
98
|
+
#include <exception>
|
|
98
99
|
#include <functional>
|
|
100
|
+
#include <jsi/jsi.h>
|
|
99
101
|
#include <optional>
|
|
102
|
+
#include <stdexcept>
|
|
100
103
|
#include <string>
|
|
101
104
|
#include <unordered_map>
|
|
102
105
|
#include <variant>
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// JOutputPickerAnchor.hpp
|
|
3
|
+
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
|
+
/// https://github.com/mrousavy/nitro
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
|
+
///
|
|
7
|
+
|
|
8
|
+
#pragma once
|
|
9
|
+
|
|
10
|
+
#include <fbjni/fbjni.h>
|
|
11
|
+
#include "OutputPickerAnchor.hpp"
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
namespace margelo::nitro::audiobrowser {
|
|
16
|
+
|
|
17
|
+
using namespace facebook;
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* The C++ JNI bridge between the C++ struct "OutputPickerAnchor" and the Kotlin data class "OutputPickerAnchor".
|
|
21
|
+
*/
|
|
22
|
+
struct JOutputPickerAnchor final: public jni::JavaClass<JOutputPickerAnchor> {
|
|
23
|
+
public:
|
|
24
|
+
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/audiobrowser/OutputPickerAnchor;";
|
|
25
|
+
|
|
26
|
+
public:
|
|
27
|
+
/**
|
|
28
|
+
* Convert this Java/Kotlin-based struct to the C++ struct OutputPickerAnchor by copying all values to C++.
|
|
29
|
+
*/
|
|
30
|
+
[[maybe_unused]]
|
|
31
|
+
[[nodiscard]]
|
|
32
|
+
OutputPickerAnchor toCpp() const {
|
|
33
|
+
static const auto clazz = javaClassStatic();
|
|
34
|
+
static const auto fieldX = clazz->getField<double>("x");
|
|
35
|
+
double x = this->getFieldValue(fieldX);
|
|
36
|
+
static const auto fieldY = clazz->getField<double>("y");
|
|
37
|
+
double y = this->getFieldValue(fieldY);
|
|
38
|
+
static const auto fieldWidth = clazz->getField<double>("width");
|
|
39
|
+
double width = this->getFieldValue(fieldWidth);
|
|
40
|
+
static const auto fieldHeight = clazz->getField<double>("height");
|
|
41
|
+
double height = this->getFieldValue(fieldHeight);
|
|
42
|
+
return OutputPickerAnchor(
|
|
43
|
+
x,
|
|
44
|
+
y,
|
|
45
|
+
width,
|
|
46
|
+
height
|
|
47
|
+
);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
public:
|
|
51
|
+
/**
|
|
52
|
+
* Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
|
|
53
|
+
*/
|
|
54
|
+
[[maybe_unused]]
|
|
55
|
+
static jni::local_ref<JOutputPickerAnchor::javaobject> fromCpp(const OutputPickerAnchor& value) {
|
|
56
|
+
using JSignature = JOutputPickerAnchor(double, double, double, double);
|
|
57
|
+
static const auto clazz = javaClassStatic();
|
|
58
|
+
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
59
|
+
return create(
|
|
60
|
+
clazz,
|
|
61
|
+
value.x,
|
|
62
|
+
value.y,
|
|
63
|
+
value.width,
|
|
64
|
+
value.height
|
|
65
|
+
);
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
} // namespace margelo::nitro::audiobrowser
|
|
@@ -19,8 +19,11 @@
|
|
|
19
19
|
#include <NitroModules/JNICallable.hpp>
|
|
20
20
|
#include <NitroModules/JPromise.hpp>
|
|
21
21
|
#include <NitroModules/Promise.hpp>
|
|
22
|
+
#include <exception>
|
|
22
23
|
#include <functional>
|
|
24
|
+
#include <jsi/jsi.h>
|
|
23
25
|
#include <optional>
|
|
26
|
+
#include <stdexcept>
|
|
24
27
|
#include <string>
|
|
25
28
|
#include <unordered_map>
|
|
26
29
|
|
package/nitrogen/generated/android/c++/JVariant_ResolvedTrack_BrowseError_Promise_BrowseResult_.hpp
CHANGED
|
@@ -50,6 +50,9 @@
|
|
|
50
50
|
#include "JCarPlaySiriListButtonPosition.hpp"
|
|
51
51
|
#include "JBrowseError.hpp"
|
|
52
52
|
#include <NitroModules/JPromise.hpp>
|
|
53
|
+
#include <exception>
|
|
54
|
+
#include <stdexcept>
|
|
55
|
+
#include <jsi/jsi.h>
|
|
53
56
|
#include "JBrowseResult.hpp"
|
|
54
57
|
|
|
55
58
|
namespace margelo::nitro::audiobrowser {
|
|
@@ -87,7 +90,16 @@ namespace margelo::nitro::audiobrowser {
|
|
|
87
90
|
__promise->cthis()->resolve(JBrowseResult::fromCpp(__result));
|
|
88
91
|
});
|
|
89
92
|
std::get<2>(variant)->addOnRejectedListener([=](const std::exception_ptr& __error) {
|
|
90
|
-
auto __jniError = jni::getJavaExceptionForCppException(__error)
|
|
93
|
+
auto __jniError = jni::getJavaExceptionForCppException([](const std::exception_ptr& __error) -> std::exception_ptr {
|
|
94
|
+
if (__error == nullptr) return __error;
|
|
95
|
+
try {
|
|
96
|
+
std::rethrow_exception(__error);
|
|
97
|
+
} catch (const facebook::jsi::JSError& __jsError) {
|
|
98
|
+
return std::make_exception_ptr(std::runtime_error(__jsError.getMessage()));
|
|
99
|
+
} catch (...) {
|
|
100
|
+
return __error;
|
|
101
|
+
}
|
|
102
|
+
}(__error));
|
|
91
103
|
__promise->cthis()->reject(__jniError);
|
|
92
104
|
});
|
|
93
105
|
return __localPromise;
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// FindTrackParams.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
|
+
import java.util.Objects
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Represents the JavaScript object/struct "FindTrackParams".
|
|
17
|
+
*/
|
|
18
|
+
@DoNotStrip
|
|
19
|
+
@Keep
|
|
20
|
+
data class FindTrackParams(
|
|
21
|
+
@DoNotStrip
|
|
22
|
+
@Keep
|
|
23
|
+
val id: String
|
|
24
|
+
) {
|
|
25
|
+
/* primary constructor */
|
|
26
|
+
|
|
27
|
+
override fun equals(other: Any?): Boolean {
|
|
28
|
+
if (this === other) return true
|
|
29
|
+
if (other !is FindTrackParams) return false
|
|
30
|
+
return Objects.deepEquals(this.id, other.id)
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
override fun hashCode(): Int {
|
|
34
|
+
return arrayOf<Any?>(
|
|
35
|
+
id
|
|
36
|
+
).contentDeepHashCode()
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
companion object {
|
|
40
|
+
/**
|
|
41
|
+
* Constructor called from C++
|
|
42
|
+
*/
|
|
43
|
+
@DoNotStrip
|
|
44
|
+
@Keep
|
|
45
|
+
@Suppress("unused")
|
|
46
|
+
@JvmStatic
|
|
47
|
+
private fun fromCpp(id: String): FindTrackParams {
|
|
48
|
+
return FindTrackParams(id)
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams.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 com.margelo.nitro.core.Promise
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Represents the JavaScript callback `(params: struct) => std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>`.
|
|
17
|
+
* This can be either implemented in C++ (in which case it might be a callback coming from JS),
|
|
18
|
+
* or in Kotlin/Java (in which case it is a native callback).
|
|
19
|
+
*/
|
|
20
|
+
@DoNotStrip
|
|
21
|
+
@Keep
|
|
22
|
+
@Suppress("ClassName", "RedundantUnitReturnType")
|
|
23
|
+
fun interface Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams: (FindTrackParams) -> Promise<Promise<Track?>> {
|
|
24
|
+
/**
|
|
25
|
+
* Call the given JS callback.
|
|
26
|
+
* @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
|
|
27
|
+
*/
|
|
28
|
+
@DoNotStrip
|
|
29
|
+
@Keep
|
|
30
|
+
override fun invoke(params: FindTrackParams): Promise<Promise<Track?>>
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Represents the JavaScript callback `(params: struct) => std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>`.
|
|
35
|
+
* This is implemented in C++, via a `std::function<...>`.
|
|
36
|
+
* The callback might be coming from JS.
|
|
37
|
+
*/
|
|
38
|
+
@DoNotStrip
|
|
39
|
+
@Keep
|
|
40
|
+
@Suppress(
|
|
41
|
+
"KotlinJniMissingFunction", "unused",
|
|
42
|
+
"RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
|
|
43
|
+
"ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
|
|
44
|
+
)
|
|
45
|
+
class Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams_cxx: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams {
|
|
46
|
+
@DoNotStrip
|
|
47
|
+
@Keep
|
|
48
|
+
private val mHybridData: HybridData
|
|
49
|
+
|
|
50
|
+
@DoNotStrip
|
|
51
|
+
@Keep
|
|
52
|
+
private constructor(hybridData: HybridData) {
|
|
53
|
+
mHybridData = hybridData
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
@DoNotStrip
|
|
57
|
+
@Keep
|
|
58
|
+
override fun invoke(params: FindTrackParams): Promise<Promise<Track?>>
|
|
59
|
+
= invoke_cxx(params)
|
|
60
|
+
|
|
61
|
+
private external fun invoke_cxx(params: FindTrackParams): Promise<Promise<Track?>>
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Represents the JavaScript callback `(params: struct) => std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>`.
|
|
66
|
+
* This is implemented in Java/Kotlin, via a `(FindTrackParams) -> Promise<Promise<Track?>>`.
|
|
67
|
+
* The callback is always coming from native.
|
|
68
|
+
*/
|
|
69
|
+
@DoNotStrip
|
|
70
|
+
@Keep
|
|
71
|
+
@Suppress("ClassName", "RedundantUnitReturnType", "unused")
|
|
72
|
+
class Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams_java(private val function: (FindTrackParams) -> Promise<Promise<Track?>>): Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams {
|
|
73
|
+
@DoNotStrip
|
|
74
|
+
@Keep
|
|
75
|
+
override fun invoke(params: FindTrackParams): Promise<Promise<Track?>> {
|
|
76
|
+
return this.function(params)
|
|
77
|
+
}
|
|
78
|
+
}
|
|
@@ -65,13 +65,16 @@ data class NativeBrowserConfiguration(
|
|
|
65
65
|
val resolveAlbumPath: Func_std__shared_ptr_Promise_std__optional_std__string____Track?,
|
|
66
66
|
@DoNotStrip
|
|
67
67
|
@Keep
|
|
68
|
-
val formatNavigationError: Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams
|
|
68
|
+
val formatNavigationError: Func_std__shared_ptr_Promise_std__optional_FormattedNavigationError____FormatNavigationErrorParams?,
|
|
69
|
+
@DoNotStrip
|
|
70
|
+
@Keep
|
|
71
|
+
val findTrack: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams?
|
|
69
72
|
) {
|
|
70
73
|
/**
|
|
71
74
|
* Create a new instance of NativeBrowserConfiguration from Kotlin
|
|
72
75
|
*/
|
|
73
|
-
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?>)?):
|
|
74
|
-
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) })
|
|
76
|
+
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?>)?, findTrack: ((params: FindTrackParams) -> Promise<Promise<Track?>>)?):
|
|
77
|
+
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) }, findTrack?.let { Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams_java(it) })
|
|
75
78
|
|
|
76
79
|
override fun equals(other: Any?): Boolean {
|
|
77
80
|
if (this === other) return true
|
|
@@ -92,6 +95,7 @@ data class NativeBrowserConfiguration(
|
|
|
92
95
|
&& Objects.deepEquals(this.carPlayLoadingTitle, other.carPlayLoadingTitle)
|
|
93
96
|
&& Objects.deepEquals(this.resolveAlbumPath, other.resolveAlbumPath)
|
|
94
97
|
&& Objects.deepEquals(this.formatNavigationError, other.formatNavigationError)
|
|
98
|
+
&& Objects.deepEquals(this.findTrack, other.findTrack)
|
|
95
99
|
}
|
|
96
100
|
|
|
97
101
|
override fun hashCode(): Int {
|
|
@@ -111,7 +115,8 @@ data class NativeBrowserConfiguration(
|
|
|
111
115
|
viewMoreTitle,
|
|
112
116
|
carPlayLoadingTitle,
|
|
113
117
|
resolveAlbumPath,
|
|
114
|
-
formatNavigationError
|
|
118
|
+
formatNavigationError,
|
|
119
|
+
findTrack
|
|
115
120
|
).contentDeepHashCode()
|
|
116
121
|
}
|
|
117
122
|
|
|
@@ -123,8 +128,8 @@ data class NativeBrowserConfiguration(
|
|
|
123
128
|
@Keep
|
|
124
129
|
@Suppress("unused")
|
|
125
130
|
@JvmStatic
|
|
126
|
-
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 {
|
|
127
|
-
return NativeBrowserConfiguration(path, request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad, androidControllerOfflineError, viewMoreTitle, carPlayLoadingTitle, resolveAlbumPath, formatNavigationError)
|
|
131
|
+
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?, findTrack: Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams?): NativeBrowserConfiguration {
|
|
132
|
+
return NativeBrowserConfiguration(path, request, requestResolver, browse, browseResolver, media, artwork, nowPlayingArtwork, routes, singleTrack, handleTrackLoad, androidControllerOfflineError, viewMoreTitle, carPlayLoadingTitle, resolveAlbumPath, formatNavigationError, findTrack)
|
|
128
133
|
}
|
|
129
134
|
}
|
|
130
135
|
}
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/OutputPickerAnchor.kt
ADDED
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// OutputPickerAnchor.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
|
+
import java.util.Objects
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Represents the JavaScript object/struct "OutputPickerAnchor".
|
|
17
|
+
*/
|
|
18
|
+
@DoNotStrip
|
|
19
|
+
@Keep
|
|
20
|
+
data class OutputPickerAnchor(
|
|
21
|
+
@DoNotStrip
|
|
22
|
+
@Keep
|
|
23
|
+
val x: Double,
|
|
24
|
+
@DoNotStrip
|
|
25
|
+
@Keep
|
|
26
|
+
val y: Double,
|
|
27
|
+
@DoNotStrip
|
|
28
|
+
@Keep
|
|
29
|
+
val width: Double,
|
|
30
|
+
@DoNotStrip
|
|
31
|
+
@Keep
|
|
32
|
+
val height: Double
|
|
33
|
+
) {
|
|
34
|
+
/* primary constructor */
|
|
35
|
+
|
|
36
|
+
override fun equals(other: Any?): Boolean {
|
|
37
|
+
if (this === other) return true
|
|
38
|
+
if (other !is OutputPickerAnchor) return false
|
|
39
|
+
return Objects.deepEquals(this.x, other.x)
|
|
40
|
+
&& Objects.deepEquals(this.y, other.y)
|
|
41
|
+
&& Objects.deepEquals(this.width, other.width)
|
|
42
|
+
&& Objects.deepEquals(this.height, other.height)
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
override fun hashCode(): Int {
|
|
46
|
+
return arrayOf<Any?>(
|
|
47
|
+
x,
|
|
48
|
+
y,
|
|
49
|
+
width,
|
|
50
|
+
height
|
|
51
|
+
).contentDeepHashCode()
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
companion object {
|
|
55
|
+
/**
|
|
56
|
+
* Constructor called from C++
|
|
57
|
+
*/
|
|
58
|
+
@DoNotStrip
|
|
59
|
+
@Keep
|
|
60
|
+
@Suppress("unused")
|
|
61
|
+
@JvmStatic
|
|
62
|
+
private fun fromCpp(x: Double, y: Double, width: Double, height: Double): OutputPickerAnchor {
|
|
63
|
+
return OutputPickerAnchor(x, y, width, height)
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
@@ -26,7 +26,16 @@ namespace margelo::nitro::audiobrowser::bridge::swift {
|
|
|
26
26
|
Func_void_std__exception_ptr create_Func_void_std__exception_ptr(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
27
27
|
auto swiftClosure = AudioBrowser::Func_void_std__exception_ptr::fromUnsafe(swiftClosureWrapper);
|
|
28
28
|
return [swiftClosure = std::move(swiftClosure)](const std::exception_ptr& error) mutable -> void {
|
|
29
|
-
swiftClosure.call(
|
|
29
|
+
swiftClosure.call([](const std::exception_ptr& __error) -> std::exception_ptr {
|
|
30
|
+
if (__error == nullptr) return __error;
|
|
31
|
+
try {
|
|
32
|
+
std::rethrow_exception(__error);
|
|
33
|
+
} catch (const facebook::jsi::JSError& __jsError) {
|
|
34
|
+
return std::make_exception_ptr(std::runtime_error(__jsError.getMessage()));
|
|
35
|
+
} catch (...) {
|
|
36
|
+
return __error;
|
|
37
|
+
}
|
|
38
|
+
}(error));
|
|
30
39
|
};
|
|
31
40
|
}
|
|
32
41
|
|
|
@@ -259,6 +268,31 @@ namespace margelo::nitro::audiobrowser::bridge::swift {
|
|
|
259
268
|
};
|
|
260
269
|
}
|
|
261
270
|
|
|
271
|
+
// pragma MARK: std::function<void(const std::optional<Track>& /* result */)>
|
|
272
|
+
Func_void_std__optional_Track_ create_Func_void_std__optional_Track_(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
273
|
+
auto swiftClosure = AudioBrowser::Func_void_std__optional_Track_::fromUnsafe(swiftClosureWrapper);
|
|
274
|
+
return [swiftClosure = std::move(swiftClosure)](const std::optional<Track>& result) mutable -> void {
|
|
275
|
+
swiftClosure.call(result);
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
// pragma MARK: std::function<std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>>(const FindTrackParams& /* params */)>
|
|
280
|
+
Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams create_Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
281
|
+
auto swiftClosure = AudioBrowser::Func_std__shared_ptr_Promise_std__shared_ptr_Promise_std__optional_Track______FindTrackParams::fromUnsafe(swiftClosureWrapper);
|
|
282
|
+
return [swiftClosure = std::move(swiftClosure)](const FindTrackParams& params) mutable -> std::shared_ptr<Promise<std::shared_ptr<Promise<std::optional<Track>>>>> {
|
|
283
|
+
auto __result = swiftClosure.call(params);
|
|
284
|
+
return __result;
|
|
285
|
+
};
|
|
286
|
+
}
|
|
287
|
+
|
|
288
|
+
// pragma MARK: std::function<void(const std::shared_ptr<Promise<std::optional<Track>>>& /* result */)>
|
|
289
|
+
Func_void_std__shared_ptr_Promise_std__optional_Track___ create_Func_void_std__shared_ptr_Promise_std__optional_Track___(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
290
|
+
auto swiftClosure = AudioBrowser::Func_void_std__shared_ptr_Promise_std__optional_Track___::fromUnsafe(swiftClosureWrapper);
|
|
291
|
+
return [swiftClosure = std::move(swiftClosure)](const std::shared_ptr<Promise<std::optional<Track>>>& result) mutable -> void {
|
|
292
|
+
swiftClosure.call(result);
|
|
293
|
+
};
|
|
294
|
+
}
|
|
295
|
+
|
|
262
296
|
// pragma MARK: std::function<void(const GateDecision& /* result */)>
|
|
263
297
|
Func_void_GateDecision create_Func_void_GateDecision(void* NON_NULL swiftClosureWrapper) noexcept {
|
|
264
298
|
auto swiftClosure = AudioBrowser::Func_void_GateDecision::fromUnsafe(swiftClosureWrapper);
|