react-native-audio-browser 0.2.0-next.94 → 0.2.0-next.96
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/main/java/com/audiobrowser/AudioBrowser.kt +2 -0
- package/android/src/main/java/com/audiobrowser/player/Player.kt +24 -0
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +1 -0
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +7 -4
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +2 -2
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +18 -7
- package/android/src/test/java/com/audiobrowser/player/PlayerQueueVersionTest.kt +79 -0
- package/android/src/test/java/com/audiobrowser/player/SleepTimerTest.kt +48 -0
- package/android/src/test/java/com/audiobrowser/player/VolumeFaderTest.kt +43 -0
- package/ios/HybridAudioBrowser+Player.swift +4 -0
- package/ios/Player/Player.swift +2 -0
- package/ios/Player/QueueManager.swift +12 -1
- package/ios/Player/SleepTimerManager.swift +33 -7
- package/ios/Player/VolumeFader.swift +38 -29
- package/ios/Tests/PlayerTests.swift +5 -5
- package/ios/Tests/QueueManagerTests.swift +40 -0
- package/ios/Tests/SleepTimerManagerTests.swift +31 -3
- package/lib/commonjs/features/queue/queue.js +11 -0
- package/lib/commonjs/features/queue/queue.js.map +1 -1
- package/lib/commonjs/web/NativeAudioBrowser.js +5 -0
- package/lib/commonjs/web/NativeAudioBrowser.js.map +1 -1
- package/lib/module/features/queue/queue.js +10 -0
- package/lib/module/features/queue/queue.js.map +1 -1
- package/lib/module/web/NativeAudioBrowser.js +5 -0
- package/lib/module/web/NativeAudioBrowser.js.map +1 -1
- package/lib/typescript/src/features/queue/queue.d.ts +7 -0
- package/lib/typescript/src/features/queue/queue.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.cpp +5 -0
- package/nitrogen/generated/android/c++/JHybridAudioBrowserSpec.hpp +1 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/audiobrowser/HybridAudioBrowserSpec.kt +4 -0
- package/nitrogen/generated/ios/c++/HybridAudioBrowserSpecSwift.hpp +8 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec.swift +1 -0
- package/nitrogen/generated/ios/swift/HybridAudioBrowserSpec_cxx.swift +12 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.cpp +1 -0
- package/nitrogen/generated/shared/c++/HybridAudioBrowserSpec.hpp +1 -0
- package/package.json +1 -1
- package/src/features/queue/queue.ts +10 -0
- package/src/specs/audio-browser.nitro.ts +7 -0
- package/src/web/NativeAudioBrowser.playWhenReady.test.ts +33 -0
- package/src/web/NativeAudioBrowser.ts +7 -0
|
@@ -350,6 +350,7 @@ namespace margelo::nitro::audiobrowser {
|
|
|
350
350
|
virtual void toggleActiveTrackFavorited() = 0;
|
|
351
351
|
virtual void setQueue(const std::vector<Track>& tracks, std::optional<double> startIndex, std::optional<double> startPosition) = 0;
|
|
352
352
|
virtual std::vector<Track> getQueue() = 0;
|
|
353
|
+
virtual double getQueueVersion() = 0;
|
|
353
354
|
virtual std::optional<Track> getTrack(double index) = 0;
|
|
354
355
|
virtual std::optional<double> getActiveTrackIndex() = 0;
|
|
355
356
|
virtual std::optional<Track> getActiveTrack() = 0;
|
package/package.json
CHANGED
|
@@ -179,6 +179,16 @@ export function getQueue(): Track[] {
|
|
|
179
179
|
return nativeBrowser.getQueue() as unknown as Track[]
|
|
180
180
|
}
|
|
181
181
|
|
|
182
|
+
/**
|
|
183
|
+
* Gets the queue's version: it changes when the queue's tracks or their order
|
|
184
|
+
* change, whoever changed them (a `setQueue`, a pick in CarPlay or Android
|
|
185
|
+
* Auto, `add`, `remove`, `move`), and never repeats while the app runs. Equal
|
|
186
|
+
* readings mean the queue is the same, without copying it across the bridge.
|
|
187
|
+
*/
|
|
188
|
+
export function getQueueVersion(): number {
|
|
189
|
+
return nativeBrowser.getQueueVersion()
|
|
190
|
+
}
|
|
191
|
+
|
|
182
192
|
// MARK: - Event Callbacks
|
|
183
193
|
|
|
184
194
|
/**
|
|
@@ -283,6 +283,13 @@ export interface AudioBrowser extends HybridObject<{
|
|
|
283
283
|
toggleActiveTrackFavorited(): void
|
|
284
284
|
setQueue(tracks: Track[], startIndex?: number, startPosition?: number): void
|
|
285
285
|
getQueue(): Track[]
|
|
286
|
+
/**
|
|
287
|
+
* Changes when the queue's tracks or their order change, whoever changed
|
|
288
|
+
* them (`setQueue`, a pick in CarPlay or Android Auto, `add`, `remove`,
|
|
289
|
+
* `move`), and never repeats while the app runs: equal readings mean the
|
|
290
|
+
* queue is the same. -1 before the player is set up.
|
|
291
|
+
*/
|
|
292
|
+
getQueueVersion(): number
|
|
286
293
|
getTrack(index: number): Track | undefined
|
|
287
294
|
getActiveTrackIndex(): number | undefined
|
|
288
295
|
getActiveTrack(): Track | undefined
|
|
@@ -251,6 +251,39 @@ describe('NativeAudioBrowser queue reference freshness', () => {
|
|
|
251
251
|
})
|
|
252
252
|
})
|
|
253
253
|
|
|
254
|
+
describe('NativeAudioBrowser getQueueVersion', () => {
|
|
255
|
+
class QueueBrowser extends TestBrowser {
|
|
256
|
+
load(): void {}
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
it('changes with every change to the queue', () => {
|
|
260
|
+
const browser = new QueueBrowser()
|
|
261
|
+
const versions = [browser.getQueueVersion()]
|
|
262
|
+
const changes = [
|
|
263
|
+
() => browser.setQueue([track, { ...track, id: 't2' }], 0),
|
|
264
|
+
() => browser.add([{ ...track, id: 't3' }]),
|
|
265
|
+
() => browser.move(0, 1),
|
|
266
|
+
() => browser.remove([2]),
|
|
267
|
+
() => browser.removeUpcomingTracks()
|
|
268
|
+
]
|
|
269
|
+
for (const change of changes) {
|
|
270
|
+
change()
|
|
271
|
+
versions.push(browser.getQueueVersion())
|
|
272
|
+
}
|
|
273
|
+
expect(new Set(versions).size).toBe(versions.length)
|
|
274
|
+
})
|
|
275
|
+
|
|
276
|
+
it('stays while the queue does', () => {
|
|
277
|
+
const browser = new QueueBrowser()
|
|
278
|
+
browser.setQueue([track, { ...track, id: 't2' }], 0)
|
|
279
|
+
const version = browser.getQueueVersion()
|
|
280
|
+
|
|
281
|
+
browser.skip(1)
|
|
282
|
+
|
|
283
|
+
expect(browser.getQueueVersion()).toBe(version)
|
|
284
|
+
})
|
|
285
|
+
})
|
|
286
|
+
|
|
254
287
|
// Halting must precede the fade-cancel volume restore — the reverse lets
|
|
255
288
|
// full-volume audio slip out while the element is still playing.
|
|
256
289
|
describe('NativeAudioBrowser sleep-fade halt order', () => {
|
|
@@ -861,9 +861,12 @@ export class NativeAudioBrowser
|
|
|
861
861
|
* live array defeats React's reference-equality change detection.
|
|
862
862
|
*/
|
|
863
863
|
private emitQueueChanged(): void {
|
|
864
|
+
this.queueVersion++
|
|
864
865
|
this.onPlaybackQueueChanged([...this.queue.tracks])
|
|
865
866
|
}
|
|
866
867
|
|
|
868
|
+
private queueVersion = 0
|
|
869
|
+
|
|
867
870
|
// Queue mutations must reach onPlaybackQueueChanged (the contract covers
|
|
868
871
|
// added/removed/reordered; Android emits via onTimelineChanged).
|
|
869
872
|
override add(tracks: Track[], insertBeforeIndex?: number): void {
|
|
@@ -1087,6 +1090,10 @@ export class NativeAudioBrowser
|
|
|
1087
1090
|
return [...this.queue.tracks]
|
|
1088
1091
|
}
|
|
1089
1092
|
|
|
1093
|
+
getQueueVersion(): number {
|
|
1094
|
+
return this.queueVersion
|
|
1095
|
+
}
|
|
1096
|
+
|
|
1090
1097
|
getActiveTrackIndex(): number | undefined {
|
|
1091
1098
|
this.requireElement()
|
|
1092
1099
|
this.requirePlayer()
|