react-native-audio-browser 0.2.0-next.53 → 0.2.0-next.54
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 +8 -10
- package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
- package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
- package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
- package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
- package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
- package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
- package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
- package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
- package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
- package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
- package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
- package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
- package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
- package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
- package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
- package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
- package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
- package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
- package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
- package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
- package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
- package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
- package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
- package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
- package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
- package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
- package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
- package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
- package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
- package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
- package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
- package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
- package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
- package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
- package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
- package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
- package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
- package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
- package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
- package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
- package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
- package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
- package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
- package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
- package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
- package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
- package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
- package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
- package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
- package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
- package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
- package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
- package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
- package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
- package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
- package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
- package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
- package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
- package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
- package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
- package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
- package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
- package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
- package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
- package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
- package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
- package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
- package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
- package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
- package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
- package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
- package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
- package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
- package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
- package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
- package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
- package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
- package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
- package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
- package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
- package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
- package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
- package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
- package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
- package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
- package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
- package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
- package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
- package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
- package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
- package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
- package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
- package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
- package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
- package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
- package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
- package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
- package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
- package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
- package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
- package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
- package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
- package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
- package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
- package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
- package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
- package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
- package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
- package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
- package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
- package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
- package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
- package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
- package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
- package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
- package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
- package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
- package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
- package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
- package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
- package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
- package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
- package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
- package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
- package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
- package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
- package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
- package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
- package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
- package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
- package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
- package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
- package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
- package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
- package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
- package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
- package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
- package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
- package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
- package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
- package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
- package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
- package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
- package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
- package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
- package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
- package/ios/AVPlayerEngine.swift +13 -21
- package/ios/AVPlayerEngineCallbacks.swift +2 -4
- package/ios/Browser/BrowseGate.swift +7 -8
- package/ios/Browser/BrowserConfig.swift +19 -34
- package/ios/Browser/BrowserError.swift +0 -1
- package/ios/Browser/BrowserManager.swift +29 -75
- package/ios/Browser/BrowserPathHelper.swift +13 -93
- package/ios/Browser/FavoriteSet.swift +7 -10
- package/ios/Browser/InertStyleDiagnostic.swift +17 -82
- package/ios/Browser/JsonModels.swift +11 -51
- package/ios/Browser/NavigationErrorState.swift +3 -2
- package/ios/Browser/PageResolver.swift +13 -23
- package/ios/Browser/RequestLayer.swift +16 -20
- package/ios/Browser/RequestPipeline.swift +33 -43
- package/ios/Browser/SearchDrillIn.swift +7 -13
- package/ios/Browser/SectionScope.swift +14 -26
- package/ios/Browser/SimpleRouter.swift +8 -15
- package/ios/Browser/StyleResolver.swift +12 -29
- package/ios/Browser/TabBarEntries.swift +6 -11
- package/ios/Browser/TrackIdTemplate.swift +6 -14
- package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
- package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
- package/ios/CarPlay/CarPlayController.swift +4 -4
- package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
- package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
- package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
- package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
- package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
- package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
- package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
- package/ios/CarPlay/CarPlaySession.swift +13 -17
- package/ios/CarPlay/CarPlayTemplates.swift +6 -7
- package/ios/CarPlay/IntentHandlers.swift +3 -5
- package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
- package/ios/CarPlay/MediaIntentHandler.swift +4 -7
- package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
- package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
- package/ios/CarPlay/SectionPresentation.swift +18 -28
- package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
- package/ios/Extension/Capability+RemoteCommand.swift +3 -3
- package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
- package/ios/Extension/CxxVectorConformances.swift +4 -16
- package/ios/Extension/NavigationError+Conversion.swift +4 -7
- package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
- package/ios/Extension/RequestConfig+Copying.swift +2 -6
- package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
- package/ios/Extension/SearchParams+Query.swift +4 -4
- package/ios/Extension/Section+Copying.swift +3 -6
- package/ios/Extension/String+IcyCharset.swift +5 -5
- package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
- package/ios/Extension/Track+AVPlayer.swift +1 -2
- package/ios/Extension/Track+Copying.swift +2 -8
- package/ios/Extension/Track+Identity.swift +4 -9
- package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
- package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
- package/ios/Extension/Variant+Artwork.swift +8 -22
- package/ios/Http/HttpClient.swift +3 -3
- package/ios/HybridAudioBrowser+Browser.swift +10 -16
- package/ios/HybridAudioBrowser+Options.swift +6 -9
- package/ios/HybridAudioBrowser+Player.swift +8 -16
- package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
- package/ios/HybridAudioBrowser+Stubs.swift +5 -7
- package/ios/HybridAudioBrowser.swift +54 -79
- package/ios/Model/NitroTypeStubs.swift +15 -22
- package/ios/Model/PlayerUpdateOptions.swift +6 -21
- package/ios/Model/RemoteCommand.swift +2 -2
- package/ios/Model/TrackPlayerError.swift +9 -22
- package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
- package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
- package/ios/Observer/ItemObserver.swift +7 -5
- package/ios/Observer/PlayerObserver.swift +5 -5
- package/ios/PlaybackEvent.swift +2 -2
- package/ios/Player/AirPlayStallJudgement.swift +7 -9
- package/ios/Player/AudioSessionController.swift +14 -15
- package/ios/Player/DeferredSeek.swift +2 -2
- package/ios/Player/EndOfTrackJudgement.swift +6 -13
- package/ios/Player/ErrorStatus.swift +8 -7
- package/ios/Player/MediaLoader.swift +20 -24
- package/ios/Player/NowPlayingLines.swift +1 -4
- package/ios/Player/NowPlayingUpdater.swift +35 -61
- package/ios/Player/PersistedPlaybackState.swift +1 -2
- package/ios/Player/PlaybackFailure.swift +20 -24
- package/ios/Player/PlaybackPersistence.swift +5 -6
- package/ios/Player/PlaybackStateMachine.swift +8 -11
- package/ios/Player/PlaybackTimer.swift +8 -11
- package/ios/Player/Player.swift +6 -13
- package/ios/Player/PlayerEngine.swift +20 -20
- package/ios/Player/PlayerStatusTypes.swift +1 -2
- package/ios/Player/QueueManager.swift +23 -67
- package/ios/Player/RetryLoop.swift +39 -50
- package/ios/Player/ShuffleOrder.swift +17 -57
- package/ios/Player/SleepTimerManager.swift +13 -28
- package/ios/Player/VolumeFader.swift +16 -16
- package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
- package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
- package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
- package/ios/Tests/BrowserPathHelperTests.swift +3 -6
- package/ios/Tests/DeferredSeekTests.swift +1 -3
- package/ios/Tests/EmitterTests.swift +0 -1
- package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
- package/ios/Tests/FavoriteSetTests.swift +1 -0
- package/ios/Tests/GenerationMemoTests.swift +2 -2
- package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
- package/ios/Tests/JsonModelsTests.swift +5 -12
- package/ios/Tests/LRUCacheTests.swift +1 -5
- package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
- package/ios/Tests/MediaLoaderTests.swift +3 -12
- package/ios/Tests/ObserverTests.swift +3 -3
- package/ios/Tests/PlaybackErrorTests.swift +7 -9
- package/ios/Tests/PlaybackFailureTests.swift +9 -17
- package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
- package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
- package/ios/Tests/PlaybackTimerTests.swift +2 -3
- package/ios/Tests/PlayerPolicyTests.swift +10 -26
- package/ios/Tests/PlayerTests.swift +53 -88
- package/ios/Tests/PlayingStateTests.swift +0 -1
- package/ios/Tests/QueueManagerTests.swift +30 -80
- package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
- package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
- package/ios/Tests/RetryLoopTests.swift +12 -35
- package/ios/Tests/SearchDrillInTests.swift +4 -5
- package/ios/Tests/SectionPresentationTests.swift +3 -16
- package/ios/Tests/SectionScopeTests.swift +3 -6
- package/ios/Tests/SimpleRouterTests.swift +1 -5
- package/ios/Tests/SleepTimerManagerTests.swift +8 -11
- package/ios/Tests/StyleResolverTests.swift +4 -13
- package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
- package/ios/Tests/Support/TestTypes.swift +5 -15
- package/ios/Tests/TabBarEntriesTests.swift +0 -2
- package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
- package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
- package/ios/Tests/TrackIdTemplateTests.swift +2 -6
- package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
- package/ios/Tests/TrackSelectorTests.swift +3 -15
- package/ios/TrackSelector.swift +13 -25
- package/ios/Util/ArtworkFreshness.swift +6 -6
- package/ios/Util/ArtworkImageFetcher.swift +19 -20
- package/ios/Util/ConcurrentMap.swift +2 -2
- package/ios/Util/Emitter.swift +8 -13
- package/ios/Util/NetworkMonitor.swift +4 -6
- package/ios/Util/OutputPicker.swift +1 -1
- package/ios/Util/ReadyValue.swift +3 -2
- package/ios/Util/SFSymbolRenderer.swift +17 -30
- package/ios/Util/SVGProcessor.swift +5 -9
- package/package.json +1 -1
|
@@ -2,22 +2,19 @@
|
|
|
2
2
|
import NitroModules
|
|
3
3
|
#endif
|
|
4
4
|
|
|
5
|
-
///
|
|
6
|
-
///
|
|
7
|
-
///
|
|
8
|
-
///
|
|
9
|
-
///
|
|
10
|
-
///
|
|
11
|
-
/// single-line grid (`gridWrap: false`) renders everywhere — the legacy image
|
|
12
|
-
/// row IS the single-line presentation.
|
|
5
|
+
/// How CarPlay draws a section, from its resolved style and what the platform supports
|
|
6
|
+
/// (ADR 0011: decorations drop before layout). A wrapping grid needs a wrapping tile container
|
|
7
|
+
/// (iOS 26+'s element API) and becomes a list without one, so every item stays reachable
|
|
8
|
+
/// instead of truncating at an unknown width; a single-line grid is the legacy image row and
|
|
9
|
+
/// renders everywhere. These rules live here, not in the CarPlay factory, so they are testable
|
|
10
|
+
/// off-device.
|
|
13
11
|
enum SectionPresentation: Equatable {
|
|
14
12
|
case list
|
|
15
13
|
case singleLineRow
|
|
16
14
|
case wrappingGrid
|
|
17
15
|
|
|
18
|
-
/// - Parameter supportsWrappingGrid: whether the platform has a wrapping
|
|
19
|
-
///
|
|
20
|
-
/// the mapping is testable off-device.
|
|
16
|
+
/// - Parameter supportsWrappingGrid: whether the platform has a wrapping tile container; passed
|
|
17
|
+
/// in rather than read with `#available` so the mapping is testable off-device.
|
|
21
18
|
init(for style: SectionStyle?, supportsWrappingGrid: Bool) {
|
|
22
19
|
guard style?.display == .grid else {
|
|
23
20
|
self = .list
|
|
@@ -32,33 +29,23 @@ enum SectionPresentation: Equatable {
|
|
|
32
29
|
}
|
|
33
30
|
}
|
|
34
31
|
|
|
35
|
-
/// The accessory symbol a
|
|
36
|
-
///
|
|
37
|
-
/// that restores the derived accessory (a browsable row's chevron). Here,
|
|
38
|
-
/// not in the CarPlay factory, so the sentinel rule is testable off-device.
|
|
32
|
+
/// The accessory symbol a block draws: nil when undeclared, and nil for the `"none"` sentinel,
|
|
33
|
+
/// which restores the derived accessory (a browsable row's chevron).
|
|
39
34
|
static func effectiveAccessorySymbol(_ style: TrackStyle?) -> String? {
|
|
40
35
|
guard let symbol = style?.accessorySymbol, symbol != "none" else { return nil }
|
|
41
36
|
return symbol
|
|
42
37
|
}
|
|
43
38
|
|
|
44
|
-
/// The title a tile shelf draws as the list section's header; nil when
|
|
45
|
-
///
|
|
46
|
-
/// so
|
|
47
|
-
/// image row's text whether or not the row has a handler, so only a shelf
|
|
48
|
-
/// with a "view all" `path` keeps its title there.
|
|
39
|
+
/// The title a tile shelf draws as the list section's header; nil when the image row's own text
|
|
40
|
+
/// carries it. CarPlay draws a chevron beside an image row's text whether or not the row has a
|
|
41
|
+
/// handler, so only a shelf with a "view all" `path` keeps its title there.
|
|
49
42
|
///
|
|
50
|
-
/// - Parameter supportsElements: whether the platform has the iOS 26
|
|
51
|
-
///
|
|
43
|
+
/// - Parameter supportsElements: whether the platform has the iOS 26 element API; without it the
|
|
44
|
+
/// legacy image row's text always carries the title.
|
|
52
45
|
static func tileSectionHeader(_ section: Section, supportsElements: Bool) -> String? {
|
|
53
46
|
supportsElements && section.path == nil ? section.title : nil
|
|
54
47
|
}
|
|
55
48
|
|
|
56
|
-
/// The element family a tile presentation renders on iOS 26+ — here, not
|
|
57
|
-
/// in the CarPlay factory, so the style→family mapping is testable
|
|
58
|
-
/// off-device. `gridTile` picks the family (plain by default), in either
|
|
59
|
-
/// wrap mode: a plain tile is a row element (title + subtitle), an image
|
|
60
|
-
/// tile an image-grid element (title, shape, accessory). Pre-26 has no element API at all: the treatment drops
|
|
61
|
-
/// with the legacy image row (decorations drop before layout).
|
|
62
49
|
enum TileElementFamily: Equatable {
|
|
63
50
|
case rowElements
|
|
64
51
|
case imageGridElements
|
|
@@ -66,6 +53,9 @@ enum SectionPresentation: Equatable {
|
|
|
66
53
|
case condensedElements
|
|
67
54
|
}
|
|
68
55
|
|
|
56
|
+
/// The iOS 26+ element family for a tile presentation, picked by `gridTile` (plain by default)
|
|
57
|
+
/// in either wrap mode. Before iOS 26 there are no elements and the legacy image row drops the
|
|
58
|
+
/// treatment.
|
|
69
59
|
static func tileFamily(for style: SectionStyle?) -> TileElementFamily {
|
|
70
60
|
switch style?.gridTile {
|
|
71
61
|
case .image: .imageGridElements
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
import os.log
|
|
3
3
|
|
|
4
|
-
/// The stack
|
|
4
|
+
/// The stack operations a top-template replacement needs:
|
|
5
5
|
/// `CPInterfaceController` in the app, a fake in tests.
|
|
6
6
|
@MainActor
|
|
7
7
|
protocol TemplateStack {
|
|
@@ -15,8 +15,8 @@ protocol TemplateStack {
|
|
|
15
15
|
func push(_ template: Template, animated: Bool, completion: @escaping (Bool, Error?) -> Void)
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
-
/// Pushes onto a full template stack by replacing its top template
|
|
19
|
-
/// unanimated pop, then the push
|
|
18
|
+
/// Pushes onto a full template stack by replacing its top template (an
|
|
19
|
+
/// unanimated pop, then the push) and holds back every other stack mutation
|
|
20
20
|
/// until both have completed. See "Template Depth" in
|
|
21
21
|
/// `website/guide/carplay.md`.
|
|
22
22
|
@MainActor
|
|
@@ -24,10 +24,9 @@ final class TopTemplateReplacer {
|
|
|
24
24
|
private let logger = Logger(subsystem: "com.audiobrowser", category: "TemplateStack")
|
|
25
25
|
private var deferred: [() -> Void] = []
|
|
26
26
|
|
|
27
|
-
/// True from the pop until the push completes.
|
|
28
27
|
private(set) var isReplacing = false
|
|
29
28
|
|
|
30
|
-
/// Runs `mutation` now
|
|
29
|
+
/// Runs `mutation` now or, while a replacement is in flight, once it has
|
|
31
30
|
/// settled, after the mutations that arrived before it.
|
|
32
31
|
func whenSettled(_ mutation: @escaping () -> Void) {
|
|
33
32
|
guard isReplacing else {
|
|
@@ -38,11 +37,11 @@ final class TopTemplateReplacer {
|
|
|
38
37
|
}
|
|
39
38
|
|
|
40
39
|
/// Pushes `template` onto `stack` in place of its top template. When the
|
|
41
|
-
/// push fails, the popped template is pushed back
|
|
42
|
-
///
|
|
40
|
+
/// push fails, the popped template is pushed back. `completion` reports the
|
|
41
|
+
/// push of `template` itself.
|
|
43
42
|
///
|
|
44
|
-
/// Refuses a stack with nothing above the root
|
|
45
|
-
///
|
|
43
|
+
/// Refuses a stack with nothing above the root, and a call made while a
|
|
44
|
+
/// replacement is in flight: route it through `whenSettled`.
|
|
46
45
|
func push<Stack: TemplateStack>(
|
|
47
46
|
_ template: Stack.Template,
|
|
48
47
|
replacingTopOf stack: Stack,
|
|
@@ -5,9 +5,9 @@ import Foundation
|
|
|
5
5
|
#endif
|
|
6
6
|
|
|
7
7
|
extension PlayerCapabilities {
|
|
8
|
-
/// The remote commands
|
|
9
|
-
/// enables none: no iOS 16+ surface invokes
|
|
10
|
-
/// Siri its affinity intent.
|
|
8
|
+
/// The remote commands to enable: each capability's command unless it is set to false, so an
|
|
9
|
+
/// unset one counts as enabled. `favorite` enables none: no iOS 16+ surface invokes
|
|
10
|
+
/// `likeCommand`; CarPlay has its own heart button and Siri its affinity intent.
|
|
11
11
|
var remoteCommands: Set<RemoteCommand> {
|
|
12
12
|
let enabled: [(Bool?, RemoteCommand)] = [
|
|
13
13
|
(play, .play),
|
|
@@ -5,17 +5,14 @@ import AVFoundation
|
|
|
5
5
|
#endif
|
|
6
6
|
|
|
7
7
|
extension ChapterMetadata {
|
|
8
|
-
/// Creates an array of ChapterMetadata from AVTimedMetadataGroup array.
|
|
9
8
|
static func from(groups: [AVTimedMetadataGroup]) -> [ChapterMetadata] {
|
|
10
9
|
groups.map { group in
|
|
11
10
|
let startTime = CMTimeGetSeconds(group.timeRange.start)
|
|
12
11
|
let endTime = CMTimeGetSeconds(group.timeRange.start) + CMTimeGetSeconds(group.timeRange.duration)
|
|
13
12
|
|
|
14
|
-
// Extract metadata from chapter items
|
|
15
|
-
// TODO: Artwork extraction missing. Requires converting binary data
|
|
16
|
-
// to a URL (base64 data URL or temp file).
|
|
17
|
-
// See also: Android implementation in MetadataAdapter.kt
|
|
18
13
|
var title: String?
|
|
14
|
+
// TODO: chapter artwork is not extracted; it needs its binary data turned into a URL (a
|
|
15
|
+
// base64 data URL or a temp file). Android has the same gap: MetadataAdapter.kt
|
|
19
16
|
let url: String? = nil
|
|
20
17
|
|
|
21
18
|
for item in group.items {
|
|
@@ -1,20 +1,8 @@
|
|
|
1
1
|
import NitroModules
|
|
2
2
|
|
|
3
|
-
//
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
// Swift's C++ interop synthesizes this conformance lazily, but in incremental
|
|
8
|
-
// builds the conformance may not be available in the compilation batch that needs
|
|
9
|
-
// it, causing: "Value of type 'std::vector<T>' has no member 'map'"
|
|
10
|
-
//
|
|
11
|
-
// This should be fixed upstream in Nitro Modules. Until then, explicitly
|
|
12
|
-
// declaring the conformance here guarantees it's available regardless of
|
|
13
|
-
// compilation order.
|
|
14
|
-
//
|
|
15
|
-
// To identify which types need conformance, search the generated Swift files for
|
|
16
|
-
// .map() calls on bridge.std__vector_<T>_ types:
|
|
17
|
-
//
|
|
3
|
+
// Works around a Nitro Modules issue: nitrogen-generated Swift calls .map() on std::vector<T>,
|
|
4
|
+
// which needs CxxRandomAccessCollection. Swift's C++ interop synthesizes that conformance lazily,
|
|
5
|
+
// so an incremental build can fail with "Value of type 'std::vector<T>' has no member 'map'".
|
|
6
|
+
// Declare it here for each vector the generated code maps; find them with
|
|
18
7
|
// grep -r '\.map(' nitrogen/generated/ios/swift/ | grep std__vector
|
|
19
|
-
|
|
20
8
|
extension margelo.nitro.audiobrowser.bridge.swift.std__vector_Track_: @retroactive CxxRandomAccessCollection {}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
|
|
3
3
|
extension NavigationError {
|
|
4
|
-
///
|
|
5
|
-
///
|
|
4
|
+
/// Maps any thrown error to a NavigationError. `BrowserError.invalidConfiguration`,
|
|
5
|
+
/// and any error that is not a BrowserError, HttpException or URLError, becomes `.unknownError`.
|
|
6
6
|
static func from(_ error: Error) -> NavigationError {
|
|
7
7
|
if let browserError = error as? BrowserError {
|
|
8
8
|
switch browserError {
|
|
@@ -22,7 +22,7 @@ extension NavigationError {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
///
|
|
25
|
+
/// The English copy passed to the app's `formatNavigationError`, and used when it has none.
|
|
26
26
|
func defaultFormatted() -> FormattedNavigationError {
|
|
27
27
|
let title: String = switch code {
|
|
28
28
|
case .contentNotFound:
|
|
@@ -40,13 +40,11 @@ extension NavigationError {
|
|
|
40
40
|
case .unknownError:
|
|
41
41
|
"Error"
|
|
42
42
|
case .emptyContent:
|
|
43
|
-
// Not a failure
|
|
44
|
-
// the message (carried on the NavigationError) is typically empty. See ADR 0001.
|
|
43
|
+
// Not a failure: a container with no children (ADR 0001).
|
|
45
44
|
"Nothing here"
|
|
46
45
|
case .timeout:
|
|
47
46
|
"Couldn't load"
|
|
48
47
|
}
|
|
49
|
-
// Omit an empty message so it renders as title-only (e.g. the empty-content case).
|
|
50
48
|
return FormattedNavigationError(title: title, message: message.isEmpty ? nil : message)
|
|
51
49
|
}
|
|
52
50
|
}
|
|
@@ -59,7 +57,6 @@ extension NavigationError {
|
|
|
59
57
|
}
|
|
60
58
|
|
|
61
59
|
extension NavigationErrorKind {
|
|
62
|
-
/// The kind of request a navigation error on `path` came from.
|
|
63
60
|
init(path: String) {
|
|
64
61
|
self = BrowserPathHelper.isSearchPath(path) ? .search : .browse
|
|
65
62
|
}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
import NitroModules
|
|
2
2
|
|
|
3
3
|
extension RequestConfig {
|
|
4
|
-
/// Returns a copy
|
|
5
|
-
///
|
|
6
|
-
/// `RequestConfig` is a C++-backed Nitro struct whose fields are get-only, so
|
|
7
|
-
/// "mutation" means rebuilding via the initializer. Uses double-optional
|
|
8
|
-
/// (`T??`) so callers can distinguish omitted (keep), `.some(nil)` (clear),
|
|
9
|
-
/// and `.some(value)` (set).
|
|
4
|
+
/// Returns a copy with only the given fields changed: an omitted argument keeps the field,
|
|
5
|
+
/// `.some(nil)` clears it. The Nitro struct's fields are get-only, hence the rebuild.
|
|
10
6
|
func copying(
|
|
11
7
|
method: HttpMethod?? = nil,
|
|
12
8
|
path: String?? = nil,
|
|
@@ -3,14 +3,8 @@
|
|
|
3
3
|
#endif
|
|
4
4
|
|
|
5
5
|
extension ResolvedTrack {
|
|
6
|
-
/// Returns a copy
|
|
7
|
-
///
|
|
8
|
-
/// Uses double-optional (`T??`) so callers can distinguish between:
|
|
9
|
-
/// - Omitted argument → keep existing value
|
|
10
|
-
/// - `.some(nil)` → set field to nil
|
|
11
|
-
/// - `.some(value)` → set field to value
|
|
12
|
-
///
|
|
13
|
-
/// `path` and `title` use single-optional since they are non-optional on ResolvedTrack.
|
|
6
|
+
/// Returns a copy with the given fields replaced. An omitted argument keeps the field;
|
|
7
|
+
/// `.some(nil)` clears it. `path` and `title` are required, so they can only be replaced.
|
|
14
8
|
func copying(
|
|
15
9
|
path: String? = nil,
|
|
16
10
|
style: SectionStyle?? = nil,
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
#endif
|
|
4
4
|
|
|
5
5
|
extension SearchParams {
|
|
6
|
-
///
|
|
7
|
-
///
|
|
6
|
+
/// `q` plus whichever filters are set, matching Android and web. Also the search's cache
|
|
7
|
+
/// identity (`cacheKey`), so a field added here distinguishes both.
|
|
8
8
|
var queryParams: [String: String] {
|
|
9
9
|
var query: [String: String] = ["q": query]
|
|
10
10
|
if let mode { query["mode"] = mode.stringValue }
|
|
@@ -17,8 +17,8 @@ extension SearchParams {
|
|
|
17
17
|
return query
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
///
|
|
21
|
-
/// two param sets
|
|
20
|
+
/// `queryParams` sorted so key order is stable, and joined with `\u{1}` rather than a
|
|
21
|
+
/// printable separator so two different param sets don't serialize alike.
|
|
22
22
|
var cacheKey: String {
|
|
23
23
|
queryParams
|
|
24
24
|
.sorted { $0.key < $1.key }
|
|
@@ -3,10 +3,8 @@
|
|
|
3
3
|
#endif
|
|
4
4
|
|
|
5
5
|
extension Section {
|
|
6
|
-
/// Returns a copy
|
|
7
|
-
///
|
|
8
|
-
/// Same double-optional (`T??`) convention as the other copying helpers;
|
|
9
|
-
/// `children` is single-optional since it is non-optional on Section.
|
|
6
|
+
/// Returns a copy with the given fields replaced. An omitted argument keeps the field;
|
|
7
|
+
/// `.some(nil)` clears it. `children` is required, so it can only be replaced.
|
|
10
8
|
func copying(
|
|
11
9
|
title: String?? = nil,
|
|
12
10
|
style: SectionStyle?? = nil,
|
|
@@ -21,8 +19,7 @@ extension Section {
|
|
|
21
19
|
)
|
|
22
20
|
}
|
|
23
21
|
|
|
24
|
-
///
|
|
25
|
-
/// (`children` authoring sugar, search results — ADR 0010).
|
|
22
|
+
/// The canonical wrap of a flat track list into one section (ADR 0010).
|
|
26
23
|
static func untitled(_ children: [Track]) -> Section {
|
|
27
24
|
Section(title: nil, style: nil, path: nil, children: children)
|
|
28
25
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
|
|
3
3
|
extension String {
|
|
4
|
-
/// Re-decodes an ICY
|
|
5
|
-
///
|
|
6
|
-
/// shape: every scalar at or below U+00FF
|
|
7
|
-
///
|
|
8
|
-
///
|
|
4
|
+
/// Re-decodes an ICY title that AVFoundation decoded as Latin-1, using the IANA `charset`
|
|
5
|
+
/// the track declares. AVFoundation keeps no raw bytes, so a Latin-1 decode is recognised
|
|
6
|
+
/// by its shape: every scalar at or below U+00FF and at least one at or above U+0080.
|
|
7
|
+
/// Returns `self` for pure ASCII, a title with higher scalars (already decoded), an unknown
|
|
8
|
+
/// charset, or bytes the charset cannot decode.
|
|
9
9
|
func redecodingIcyTitle(charset: String) -> String {
|
|
10
10
|
var high = false
|
|
11
11
|
for scalar in unicodeScalars {
|
|
@@ -5,27 +5,23 @@ import AVFoundation
|
|
|
5
5
|
#endif
|
|
6
6
|
|
|
7
7
|
extension TimedMetadata {
|
|
8
|
-
///
|
|
9
|
-
///
|
|
10
|
-
/// decoded as Latin-1
|
|
8
|
+
/// Reads the ICY items if there are any, else the ID3 items, else the common identifiers;
|
|
9
|
+
/// nil when the chosen set yields no field. `icyCharset` re-decodes an ICY title AVFoundation
|
|
10
|
+
/// decoded as Latin-1 and never applies to ID3 or common metadata.
|
|
11
11
|
static func from(items: [AVMetadataItem], icyCharset: String? = nil) -> TimedMetadata? {
|
|
12
|
-
// Check for ICY metadata (Shoutcast/Icecast streams)
|
|
13
12
|
let icyItems = items.filter { $0.keySpace == .icy }
|
|
14
13
|
if !icyItems.isEmpty {
|
|
15
14
|
return fromIcy(items: icyItems, icyCharset: icyCharset)
|
|
16
15
|
}
|
|
17
16
|
|
|
18
|
-
// Check for ID3 metadata (MP3)
|
|
19
17
|
let id3Items = items.filter { $0.keySpace == .id3 }
|
|
20
18
|
if !id3Items.isEmpty {
|
|
21
19
|
return fromId3(items: id3Items)
|
|
22
20
|
}
|
|
23
21
|
|
|
24
|
-
// Fall back to common metadata identifiers (covers QuickTime, iTunes, etc.)
|
|
25
22
|
return fromCommon(items: items)
|
|
26
23
|
}
|
|
27
24
|
|
|
28
|
-
/// Creates TimedMetadata from ICY (Shoutcast/Icecast) metadata.
|
|
29
25
|
static func fromIcy(items: [AVMetadataItem], icyCharset: String? = nil) -> TimedMetadata? {
|
|
30
26
|
var title: String?
|
|
31
27
|
|
|
@@ -45,7 +41,6 @@ extension TimedMetadata {
|
|
|
45
41
|
)
|
|
46
42
|
}
|
|
47
43
|
|
|
48
|
-
/// Creates TimedMetadata from ID3 metadata (MP3).
|
|
49
44
|
static func fromId3(items: [AVMetadataItem]) -> TimedMetadata? {
|
|
50
45
|
var title: String?
|
|
51
46
|
var artist: String?
|
|
@@ -61,10 +56,11 @@ extension TimedMetadata {
|
|
|
61
56
|
artist = item.stringValue
|
|
62
57
|
case .id3MetadataAlbumTitle, .id3MetadataOriginalAlbumTitle:
|
|
63
58
|
album = item.stringValue
|
|
59
|
+
// TDRC (ID3v2.4) wins over TYER (ID3v2.3) whichever comes first.
|
|
64
60
|
case .id3MetadataRecordingTime:
|
|
65
|
-
date = item.stringValue
|
|
61
|
+
date = item.stringValue
|
|
66
62
|
case .id3MetadataYear:
|
|
67
|
-
date = date ?? item.stringValue
|
|
63
|
+
date = date ?? item.stringValue
|
|
68
64
|
case .id3MetadataContentType:
|
|
69
65
|
genre = item.stringValue
|
|
70
66
|
default:
|
|
@@ -82,7 +78,6 @@ extension TimedMetadata {
|
|
|
82
78
|
)
|
|
83
79
|
}
|
|
84
80
|
|
|
85
|
-
/// Creates TimedMetadata from common metadata identifiers.
|
|
86
81
|
static func fromCommon(items: [AVMetadataItem]) -> TimedMetadata? {
|
|
87
82
|
var title: String?
|
|
88
83
|
var artist: String?
|
|
@@ -101,7 +96,6 @@ extension TimedMetadata {
|
|
|
101
96
|
case .commonIdentifierCreationDate:
|
|
102
97
|
date = item.stringValue
|
|
103
98
|
default:
|
|
104
|
-
// Check by commonKey for broader compatibility
|
|
105
99
|
if let commonKey = item.commonKey {
|
|
106
100
|
switch commonKey {
|
|
107
101
|
case .commonKeyTitle:
|
|
@@ -2,9 +2,8 @@ import AVFoundation
|
|
|
2
2
|
import Foundation
|
|
3
3
|
import NitroModules
|
|
4
4
|
|
|
5
|
-
/// Extension to make Nitro Track work with AVPlayer
|
|
6
5
|
extension Track {
|
|
7
|
-
///
|
|
6
|
+
/// `artworkSource` if set, else `artwork.url`; nil when that names an SF Symbol rather than an image.
|
|
8
7
|
var artworkImageSource: ImageSource? {
|
|
9
8
|
if let source = artworkSource {
|
|
10
9
|
source
|
|
@@ -3,14 +3,8 @@
|
|
|
3
3
|
#endif
|
|
4
4
|
|
|
5
5
|
extension Track {
|
|
6
|
-
/// Returns a copy
|
|
7
|
-
///
|
|
8
|
-
/// Uses double-optional (`T??`) so callers can distinguish between:
|
|
9
|
-
/// - Omitted argument → keep existing value
|
|
10
|
-
/// - `.some(nil)` → set field to nil
|
|
11
|
-
/// - `.some(value)` → set field to value
|
|
12
|
-
///
|
|
13
|
-
/// `title` uses single-optional (`String?`) since it is non-optional on Track.
|
|
6
|
+
/// Returns a copy with only the given fields changed. For a `T??` argument, omitting it keeps
|
|
7
|
+
/// the field and `.some(nil)` clears it; `title` is non-optional on Track, so it can't be cleared.
|
|
14
8
|
func copying(
|
|
15
9
|
id: String?? = nil,
|
|
16
10
|
path: String?? = nil,
|
|
@@ -2,15 +2,10 @@
|
|
|
2
2
|
import NitroModules
|
|
3
3
|
#endif
|
|
4
4
|
|
|
5
|
-
/// A track's identity: the opaque `id` when present (non-blank), else the
|
|
6
|
-
/// playable `src`. Two tracks refer to the same item iff their identities are
|
|
7
|
-
/// equal. Browsable-only tracks (neither `id` nor `src`) have no identity —
|
|
8
|
-
/// they are addressed by `path` instead.
|
|
9
|
-
///
|
|
10
|
-
/// This is THE comparison rule for favorites matching, section scoping,
|
|
11
|
-
/// skip-in-place, the car now-playing row indicator, and the contextual
|
|
12
|
-
/// `__trackId` — see ADR 0008. Mirrors `trackIdentity` on the TS side.
|
|
13
5
|
extension Track {
|
|
6
|
+
/// `id` when non-empty, else `src`; nil for a browsable-only track, which is addressed by `path`.
|
|
7
|
+
/// Two tracks are the same item iff their identities are equal. Must match the TS and Android
|
|
8
|
+
/// rule: docs/adr/0008-track-identity-is-id-falling-back-to-src.md.
|
|
14
9
|
var identity: String? {
|
|
15
10
|
if let id, !id.isEmpty { return id }
|
|
16
11
|
return src
|
|
@@ -18,7 +13,7 @@ extension Track {
|
|
|
18
13
|
}
|
|
19
14
|
|
|
20
15
|
extension Track {
|
|
21
|
-
///
|
|
16
|
+
/// Has a `src` and isn't disabled: a track the library may queue and play.
|
|
22
17
|
var isPlayable: Bool {
|
|
23
18
|
src != nil && disabled != true
|
|
24
19
|
}
|
|
@@ -5,7 +5,9 @@ import AVFoundation
|
|
|
5
5
|
#endif
|
|
6
6
|
|
|
7
7
|
extension TrackMetadata {
|
|
8
|
-
///
|
|
8
|
+
/// Reads common, ID3 and iTunes metadata items. A common identifier wins over the other key
|
|
9
|
+
/// spaces; among those, the first item to set a field keeps it. `creationYear` falls back to the
|
|
10
|
+
/// first four characters of `creationDate`.
|
|
9
11
|
static func from(items: [AVMetadataItem]) -> TrackMetadata {
|
|
10
12
|
var title: String?
|
|
11
13
|
var artist: String?
|
|
@@ -21,7 +23,6 @@ extension TrackMetadata {
|
|
|
21
23
|
var creationYear: String?
|
|
22
24
|
|
|
23
25
|
for item in items {
|
|
24
|
-
// Try common identifiers first
|
|
25
26
|
switch item.identifier {
|
|
26
27
|
case .commonIdentifierTitle:
|
|
27
28
|
title = item.stringValue
|
|
@@ -37,7 +38,6 @@ extension TrackMetadata {
|
|
|
37
38
|
break
|
|
38
39
|
}
|
|
39
40
|
|
|
40
|
-
// Also check commonKey for broader compatibility
|
|
41
41
|
if let commonKey = item.commonKey {
|
|
42
42
|
switch commonKey {
|
|
43
43
|
case .commonKeyTitle:
|
|
@@ -59,29 +59,27 @@ extension TrackMetadata {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
// Check ID3-specific identifiers for additional fields
|
|
63
62
|
if item.keySpace == .id3, let key = item.key as? String {
|
|
64
63
|
switch key {
|
|
65
|
-
case "TIT3":
|
|
64
|
+
case "TIT3":
|
|
66
65
|
subtitle = subtitle ?? item.stringValue
|
|
67
|
-
case "TRCK":
|
|
66
|
+
case "TRCK":
|
|
68
67
|
trackNumber = trackNumber ?? item.stringValue
|
|
69
|
-
case "TCOM":
|
|
68
|
+
case "TCOM":
|
|
70
69
|
composer = composer ?? item.stringValue
|
|
71
|
-
case "TPE3":
|
|
70
|
+
case "TPE3":
|
|
72
71
|
conductor = conductor ?? item.stringValue
|
|
73
|
-
case "TCON":
|
|
72
|
+
case "TCON":
|
|
74
73
|
genre = genre ?? item.stringValue
|
|
75
|
-
case "TDRC": //
|
|
74
|
+
case "TDRC": // ID3v2.4 recording time; v2.3 has only TYER, the year
|
|
76
75
|
creationDate = creationDate ?? item.stringValue
|
|
77
|
-
case "TYER":
|
|
76
|
+
case "TYER":
|
|
78
77
|
creationYear = creationYear ?? item.stringValue
|
|
79
78
|
default:
|
|
80
79
|
break
|
|
81
80
|
}
|
|
82
81
|
}
|
|
83
82
|
|
|
84
|
-
// Check iTunes-specific identifiers
|
|
85
83
|
switch item.identifier {
|
|
86
84
|
case .iTunesMetadataSongName:
|
|
87
85
|
title = title ?? item.stringValue
|
|
@@ -104,7 +102,6 @@ extension TrackMetadata {
|
|
|
104
102
|
}
|
|
105
103
|
}
|
|
106
104
|
|
|
107
|
-
// Extract year from creationDate if creationYear not set
|
|
108
105
|
if creationYear == nil, let date = creationDate, date.count >= 4 {
|
|
109
106
|
creationYear = String(date.prefix(4))
|
|
110
107
|
}
|
|
@@ -1,26 +1,18 @@
|
|
|
1
1
|
import UIKit
|
|
2
2
|
|
|
3
3
|
extension UIApplication {
|
|
4
|
-
/// The scene
|
|
5
|
-
///
|
|
6
|
-
/// headless for CarPlay), which callers must handle rather than assume.
|
|
7
|
-
///
|
|
8
|
-
/// Replaces the deprecated `UIScreen.main` / `keyWindow` idioms — and exists
|
|
9
|
-
/// once because the walk was previously written out at each use, so the two
|
|
10
|
-
/// copies had already drifted apart.
|
|
4
|
+
/// The foreground-active window scene, else any connected window scene. Nil when the app has
|
|
5
|
+
/// no UI scene at all (running headless for CarPlay).
|
|
11
6
|
var activeWindowScene: UIWindowScene? {
|
|
12
7
|
let scenes = connectedScenes.compactMap { $0 as? UIWindowScene }
|
|
13
8
|
return scenes.first { $0.activationState == .foregroundActive } ?? scenes.first
|
|
14
9
|
}
|
|
15
10
|
}
|
|
16
11
|
|
|
17
|
-
/// The scale to rasterise at for the app's own screen.
|
|
18
|
-
///
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
/// it already reflects the environment being rendered for. CarPlay surfaces do
|
|
22
|
-
/// NOT use this — they rasterise at `carTraitCollection.displayScale`, the car
|
|
23
|
-
/// screen's own scale.
|
|
12
|
+
/// The scale to rasterise at for the app's own screen. CarPlay surfaces use
|
|
13
|
+
/// `carTraitCollection.displayScale` instead.
|
|
14
|
+
// `UITraitCollection.current` reflects the environment being rendered for only on the main actor.
|
|
15
|
+
// Not `UIScreen.main.scale`: deprecated, and unavailable on visionOS, which the podspec targets.
|
|
24
16
|
@MainActor
|
|
25
17
|
var appDisplayScale: CGFloat {
|
|
26
18
|
UITraitCollection.current.displayScale
|
|
@@ -1,19 +1,9 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
/// Nitro surfaces it as `.first(String)` / `.second(ArtworkVariants)`. Call
|
|
6
|
-
/// sites want one of two things — the URL to display, or both URLs so a
|
|
7
|
-
/// `UIImageAsset` can adapt without re-fetching — so those are the only
|
|
8
|
-
/// accessors here, and nothing below the boundary repeats the unwrap.
|
|
9
|
-
///
|
|
10
|
-
/// Deliberately Foundation-only: this is part of the SPM testable target, which
|
|
11
|
-
/// also builds for macOS, so it cannot reach for `UIUserInterfaceStyle` to name
|
|
12
|
-
/// an appearance. Picking between the two URLs is CarPlay's job anyway — it
|
|
13
|
-
/// registers both and lets UIKit choose.
|
|
3
|
+
// Foundation only: this file is in the SPM test target, which also builds for macOS, so it
|
|
4
|
+
// cannot use UIKit to pick an appearance. CarPlay registers both URLs and lets UIKit choose.
|
|
14
5
|
extension Variant_String_ArtworkVariants {
|
|
15
|
-
/// Both URLs
|
|
16
|
-
/// needs no per-appearance handling.
|
|
6
|
+
/// Both URLs when the artwork is a light/dark pair; `nil` for a single URL.
|
|
17
7
|
var variants: ArtworkVariants? {
|
|
18
8
|
switch self {
|
|
19
9
|
case .first: nil
|
|
@@ -21,13 +11,9 @@ extension Variant_String_ArtworkVariants {
|
|
|
21
11
|
}
|
|
22
12
|
}
|
|
23
13
|
|
|
24
|
-
/// The URL
|
|
25
|
-
///
|
|
26
|
-
///
|
|
27
|
-
/// Resolves a pair to its dark URL. CarPlay dark is the common case, Android
|
|
28
|
-
/// Auto is dark-only, and it is what a single-URL track would have shipped
|
|
29
|
-
/// anyway — so a caller that cannot express appearance gets the same image it
|
|
30
|
-
/// got before pairs existed.
|
|
14
|
+
/// The URL for where appearance is unknown or does not apply (now-playing metadata, values
|
|
15
|
+
/// sent to JS, the artwork transform). A pair resolves to its dark URL: CarPlay is usually
|
|
16
|
+
/// dark, Android Auto is dark-only, and it is the image a single-URL track ships.
|
|
31
17
|
var url: String {
|
|
32
18
|
switch self {
|
|
33
19
|
case let .first(url): url
|
|
@@ -36,9 +22,9 @@ extension Variant_String_ArtworkVariants {
|
|
|
36
22
|
}
|
|
37
23
|
}
|
|
38
24
|
|
|
25
|
+
// The Nitro-generated enum declares no Equatable conformance; `TabBarEntries.same` and the
|
|
26
|
+
// test stubs' synthesised `Track: Equatable` need it.
|
|
39
27
|
extension Variant_String_ArtworkVariants: Equatable {
|
|
40
|
-
/// Needed by `TabBarEntries.same`, and by the synthesised `Track: Equatable`
|
|
41
|
-
/// in the test stubs; the generated enum declares no conformance itself.
|
|
42
28
|
public static func == (lhs: Self, rhs: Self) -> Bool {
|
|
43
29
|
switch (lhs, rhs) {
|
|
44
30
|
case let (.first(l), .first(r)): l == r
|