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
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
|
|
3
3
|
enum ArtworkFreshness {
|
|
4
|
-
///
|
|
4
|
+
/// Used when no response states a lifetime; matches Kingfisher's default disk expiry.
|
|
5
5
|
static let defaultLifetime: TimeInterval = 7 * 24 * 60 * 60
|
|
6
6
|
|
|
7
|
-
/// The shortest lifetime
|
|
8
|
-
///
|
|
9
|
-
///
|
|
7
|
+
/// The shortest lifetime stated across `responses` (every redirect and the final response):
|
|
8
|
+
/// `max-age` minus `Age`, or 0 for `no-cache` or `no-store`. Responses that state none are
|
|
9
|
+
/// ignored; `defaultLifetime` when none states one.
|
|
10
10
|
static func lifetime(of responses: [HTTPURLResponse]) -> TimeInterval {
|
|
11
11
|
responses.compactMap(lifetime(of:)).min() ?? defaultLifetime
|
|
12
12
|
}
|
|
@@ -19,7 +19,7 @@ enum ArtworkFreshness {
|
|
|
19
19
|
let name = parts[0].trimmingCharacters(in: .whitespaces).lowercased()
|
|
20
20
|
let value = parts.count == 2 ? parts[1].trimmingCharacters(in: .whitespaces).trimmingCharacters(in: ["\""]) : nil
|
|
21
21
|
switch name {
|
|
22
|
-
// `no-cache="field"`
|
|
22
|
+
// `no-cache="field"` restricts reuse of that field only, not of the response.
|
|
23
23
|
case "no-cache" where value == nil, "no-store":
|
|
24
24
|
return 0
|
|
25
25
|
case "max-age":
|
|
@@ -33,7 +33,7 @@ enum ArtworkFreshness {
|
|
|
33
33
|
return max(0, maxAge - age)
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
/// RFC 9111
|
|
36
|
+
/// RFC 9111 delta-seconds: digits only (so `inf` or `1e999` are rejected), capped at 2^31.
|
|
37
37
|
private static func deltaSeconds(_ value: String) -> TimeInterval? {
|
|
38
38
|
guard !value.isEmpty, value.allSatisfy({ ("0" ... "9").contains($0) }), let seconds = TimeInterval(value)
|
|
39
39
|
else { return nil }
|
|
@@ -4,10 +4,12 @@ import NitroModules
|
|
|
4
4
|
import os.log
|
|
5
5
|
import UIKit
|
|
6
6
|
|
|
7
|
-
///
|
|
7
|
+
/// Loads artwork through Kingfisher, refetching an HTTP image once its cached copy is stale.
|
|
8
8
|
enum ArtworkImageFetcher {
|
|
9
9
|
private static let logger = Logger(subsystem: "com.audiobrowser", category: "ArtworkImageFetcher")
|
|
10
10
|
|
|
11
|
+
/// Returns nil when the image cannot be loaded, logging a failed fetch (not an unparseable URI). A stale image whose refetch fails
|
|
12
|
+
/// falls back to the cached copy. `svgScale` wins over `downsampleTo`.
|
|
11
13
|
/// - Parameter waitsForConnectivity: A fetch that fails for want of a connection waits for one
|
|
12
14
|
/// and tries again. A cancelled fetch that is waiting ends when the connection returns.
|
|
13
15
|
@MainActor
|
|
@@ -34,13 +36,9 @@ enum ArtworkImageFetcher {
|
|
|
34
36
|
if let svgScale {
|
|
35
37
|
processor = SVGProcessor(size: nil, scale: svgScale)
|
|
36
38
|
} else if let downsampleTo {
|
|
37
|
-
//
|
|
38
|
-
//
|
|
39
|
-
//
|
|
40
|
-
// happen. The processed image is cached under a size-qualified key;
|
|
41
|
-
// cacheOriginalImage keeps the untouched original in the disk cache so
|
|
42
|
-
// the same URL at another target size re-processes instead of
|
|
43
|
-
// re-downloading.
|
|
39
|
+
// The only sizing that is guaranteed: a size hint sent upstream is advisory and a CDN may
|
|
40
|
+
// return the original. cacheOriginalImage keeps the original on disk so another target
|
|
41
|
+
// size re-processes it instead of downloading it again.
|
|
44
42
|
processor = DownsamplingImageProcessor(size: downsampleTo.size)
|
|
45
43
|
options.append(.scaleFactor(downsampleTo.scale))
|
|
46
44
|
options.append(.cacheOriginalImage)
|
|
@@ -53,7 +51,7 @@ enum ArtworkImageFetcher {
|
|
|
53
51
|
// Each processed variant is fresh on its own: a variant cached before the image changed
|
|
54
52
|
// would otherwise outlive the refetch of another.
|
|
55
53
|
let key = url.absoluteString + (processor?.identifier ?? "")
|
|
56
|
-
// Only
|
|
54
|
+
// Only HTTP fetches record a lifetime, so any other scheme would otherwise refetch on every call.
|
|
57
55
|
let isFresh = if ["http", "https"].contains(url.scheme?.lowercased()) { await freshness.isFresh(key) } else { true }
|
|
58
56
|
let result: Result<UIImage, any Error> = if isFresh {
|
|
59
57
|
await retrieve(url, options: options + retry, freshnessKey: key)
|
|
@@ -71,8 +69,9 @@ enum ArtworkImageFetcher {
|
|
|
71
69
|
|
|
72
70
|
private static let freshness = FreshnessStore()
|
|
73
71
|
|
|
74
|
-
/// Fetches
|
|
75
|
-
///
|
|
72
|
+
/// Fetches past the cache. On failure returns the cached copy if there is one; otherwise, with
|
|
73
|
+
/// `retry`, a connectivity failure waits for a connection and fetches again. The first fetch
|
|
74
|
+
/// skips `retry` so a cached copy is shown without waiting for the network.
|
|
76
75
|
@MainActor
|
|
77
76
|
private static func refetch(
|
|
78
77
|
_ url: URL,
|
|
@@ -89,7 +88,7 @@ enum ArtworkImageFetcher {
|
|
|
89
88
|
return await retrieve(url, options: options + [.forceRefresh] + retry, freshnessKey: freshnessKey)
|
|
90
89
|
}
|
|
91
90
|
|
|
92
|
-
/// Fetches through Kingfisher
|
|
91
|
+
/// Fetches through Kingfisher and records the freshness lifetime of an image that was downloaded.
|
|
93
92
|
@MainActor
|
|
94
93
|
private static func retrieve(
|
|
95
94
|
_ url: URL,
|
|
@@ -98,7 +97,7 @@ enum ArtworkImageFetcher {
|
|
|
98
97
|
) async -> Result<UIImage, any Error> {
|
|
99
98
|
do {
|
|
100
99
|
let result = try await KingfisherManager.shared.retrieveImage(with: url, options: options)
|
|
101
|
-
//
|
|
100
|
+
// `.none` also covers an image re-processed from the cached original; only metrics mark a download.
|
|
102
101
|
if result.cacheType == .none, let metrics = result.metrics {
|
|
103
102
|
let responses = metrics.rawMetrics.transactionMetrics.compactMap { $0.response as? HTTPURLResponse }
|
|
104
103
|
await freshness.record(freshnessKey, lifetime: ArtworkFreshness.lifetime(of: responses))
|
|
@@ -110,7 +109,7 @@ enum ArtworkImageFetcher {
|
|
|
110
109
|
}
|
|
111
110
|
}
|
|
112
111
|
|
|
113
|
-
///
|
|
112
|
+
/// Cache keys whose image is still fresh, each stored on disk with its lifetime as expiry.
|
|
114
113
|
private actor FreshnessStore {
|
|
115
114
|
private let storage = try? DiskStorage.Backend<Data>(
|
|
116
115
|
config: DiskStorage.Config(name: "com.audiobrowser.artwork-freshness", sizeLimit: 0),
|
|
@@ -143,8 +142,8 @@ private extension KingfisherError {
|
|
|
143
142
|
}
|
|
144
143
|
}
|
|
145
144
|
|
|
146
|
-
///
|
|
147
|
-
///
|
|
145
|
+
/// Retries a connectivity failure once a connection is back, up to `maxRetries` times; any other
|
|
146
|
+
/// failure, a 404 included, stops immediately.
|
|
148
147
|
private struct ConnectivityRetry: RetryStrategy {
|
|
149
148
|
private static let maxRetries = 3
|
|
150
149
|
|
|
@@ -156,9 +155,9 @@ private struct ConnectivityRetry: RetryStrategy {
|
|
|
156
155
|
Self.whenConnected { retryHandler(.retry(userInfo: nil)) }
|
|
157
156
|
}
|
|
158
157
|
|
|
159
|
-
/// Calls `body` once
|
|
160
|
-
/// reports the current path when it starts, so a reconnect cannot
|
|
161
|
-
///
|
|
158
|
+
/// Calls `body` once there is a usable path, immediately if there is one already: a monitor
|
|
159
|
+
/// reports the current path when it starts, so a reconnect cannot be missed. The handler keeps
|
|
160
|
+
/// the monitor alive until it fires.
|
|
162
161
|
private static func whenConnected(_ body: @escaping @Sendable () -> Void) {
|
|
163
162
|
let monitor = NWPathMonitor()
|
|
164
163
|
monitor.pathUpdateHandler = { path in
|
|
@@ -170,6 +169,6 @@ private struct ConnectivityRetry: RetryStrategy {
|
|
|
170
169
|
monitor.start(queue: queue)
|
|
171
170
|
}
|
|
172
171
|
|
|
173
|
-
|
|
172
|
+
// Serial, so a monitor's handler never runs concurrently with itself.
|
|
174
173
|
private static let queue = DispatchQueue(label: "com.audiobrowser.artwork-connectivity", qos: .utility)
|
|
175
174
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
extension Array where Element: Sendable {
|
|
2
|
-
/// `transform`
|
|
3
|
-
/// caller cancels every transform still running.
|
|
2
|
+
/// Runs `transform` on every element concurrently and returns the results in element order.
|
|
3
|
+
/// Cancelling the caller cancels every transform still running.
|
|
4
4
|
func concurrentMap<T: Sendable>(_ transform: @escaping @MainActor (Element) async -> T) async -> [T] {
|
|
5
5
|
await withTaskGroup(of: (Int, T).self) { group in
|
|
6
6
|
for (index, element) in enumerated() {
|
package/ios/Util/Emitter.swift
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
|
|
3
|
-
/// Opaque token returned by `addListener` for targeted removal.
|
|
4
3
|
public struct EmitterToken: Sendable {
|
|
5
4
|
fileprivate let id: Int
|
|
6
5
|
}
|
|
7
6
|
|
|
8
|
-
///
|
|
7
|
+
/// Delivers each event to every listener, synchronously on the emitting thread. Any method may be
|
|
8
|
+
/// called from any thread, including from inside a listener.
|
|
9
9
|
public final class Emitter<T>: @unchecked Sendable {
|
|
10
10
|
private let lock = NSLock()
|
|
11
11
|
private var nextId = 0
|
|
@@ -13,9 +13,6 @@ public final class Emitter<T>: @unchecked Sendable {
|
|
|
13
13
|
|
|
14
14
|
public init() {}
|
|
15
15
|
|
|
16
|
-
/// Adds a listener to this emitter
|
|
17
|
-
/// - Parameter listener: The callback to invoke when an event is emitted
|
|
18
|
-
/// - Returns: A token that can be passed to `removeListener` for targeted removal
|
|
19
16
|
@discardableResult
|
|
20
17
|
public func addListener(_ listener: @escaping (T) -> Void) -> EmitterToken {
|
|
21
18
|
lock.lock()
|
|
@@ -29,8 +26,6 @@ public final class Emitter<T>: @unchecked Sendable {
|
|
|
29
26
|
return EmitterToken(id: id)
|
|
30
27
|
}
|
|
31
28
|
|
|
32
|
-
/// Removes a specific listener by its token
|
|
33
|
-
/// - Parameter token: The token returned by `addListener`
|
|
34
29
|
public func removeListener(_ token: EmitterToken) {
|
|
35
30
|
lock.lock()
|
|
36
31
|
defer { lock.unlock() }
|
|
@@ -40,11 +35,11 @@ public final class Emitter<T>: @unchecked Sendable {
|
|
|
40
35
|
snapshot = next
|
|
41
36
|
}
|
|
42
37
|
|
|
43
|
-
/// Emits an event to all registered listeners
|
|
44
|
-
/// - Parameter event: The event data to emit
|
|
45
38
|
public func emit(_ event: T) {
|
|
39
|
+
// Listeners run outside the lock, so one may add or remove listeners; a listener removed
|
|
40
|
+
// during an emit still receives that event.
|
|
46
41
|
lock.lock()
|
|
47
|
-
let current = snapshot
|
|
42
|
+
let current = snapshot
|
|
48
43
|
lock.unlock()
|
|
49
44
|
|
|
50
45
|
for entry in current {
|
|
@@ -80,8 +75,8 @@ extension Emitter {
|
|
|
80
75
|
}
|
|
81
76
|
|
|
82
77
|
extension Emitter {
|
|
83
|
-
/// Like `subscribe`, but `handler` runs on the main actor
|
|
84
|
-
///
|
|
78
|
+
/// Like `subscribe`, but `handler` runs later on the main actor, in a Task, whichever thread
|
|
79
|
+
/// emitted. Off main it may run before the emit returns.
|
|
85
80
|
func subscribeOnMain(_ handler: @escaping @MainActor (T) -> Void) -> Subscription {
|
|
86
81
|
subscribe { value in
|
|
87
82
|
let event = MainActorHop(value: value)
|
|
@@ -90,7 +85,7 @@ extension Emitter {
|
|
|
90
85
|
}
|
|
91
86
|
}
|
|
92
87
|
|
|
93
|
-
/// Carries
|
|
88
|
+
/// Carries a non-Sendable emitted value to the main actor, where it is only read.
|
|
94
89
|
private struct MainActorHop<T>: @unchecked Sendable {
|
|
95
90
|
let value: T
|
|
96
91
|
}
|
|
@@ -2,7 +2,7 @@ import Foundation
|
|
|
2
2
|
import Network
|
|
3
3
|
import os.log
|
|
4
4
|
|
|
5
|
-
/// The device's connectivity
|
|
5
|
+
/// The device's connectivity from NWPathMonitor; `changed` emits each change on the main thread.
|
|
6
6
|
final class NetworkMonitor: @unchecked Sendable {
|
|
7
7
|
// MARK: - Properties
|
|
8
8
|
|
|
@@ -10,7 +10,7 @@ final class NetworkMonitor: @unchecked Sendable {
|
|
|
10
10
|
private let monitor: NWPathMonitor
|
|
11
11
|
private let queue = DispatchQueue(label: "com.audiobrowser.networkmonitor")
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
// Guards `_isOnline` only; never held across an emit.
|
|
14
14
|
private let lock = NSLock()
|
|
15
15
|
private var _isOnline = false
|
|
16
16
|
|
|
@@ -42,9 +42,8 @@ final class NetworkMonitor: @unchecked Sendable {
|
|
|
42
42
|
init() {
|
|
43
43
|
monitor = NWPathMonitor()
|
|
44
44
|
|
|
45
|
-
// Seeded before `start`:
|
|
46
|
-
//
|
|
47
|
-
// fires shortly after `start`, is the last writer.
|
|
45
|
+
// Seeded before `start`: written after it, a `currentPath` the monitor hasn't finished
|
|
46
|
+
// evaluating could clobber the handler's real update. The handler stays the last writer.
|
|
48
47
|
let initialStatus = monitor.currentPath.status == .satisfied
|
|
49
48
|
logger.notice("NetworkMonitor initialized, initial isOnline=\(initialStatus)")
|
|
50
49
|
_isOnline = initialStatus
|
|
@@ -56,7 +55,6 @@ final class NetworkMonitor: @unchecked Sendable {
|
|
|
56
55
|
monitor.start(queue: queue)
|
|
57
56
|
}
|
|
58
57
|
|
|
59
|
-
/// Stops monitoring and cleans up resources.
|
|
60
58
|
func destroy() {
|
|
61
59
|
monitor.cancel()
|
|
62
60
|
}
|
|
@@ -32,7 +32,7 @@ enum OutputPicker {
|
|
|
32
32
|
logger.error("openOutputPicker: no UIButton found inside AVRoutePickerView")
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
// On iPad the picker's popover anchors to this view.
|
|
35
|
+
// On iPad the picker's popover anchors to this view, so it outlives the tap.
|
|
36
36
|
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
|
|
37
37
|
routePicker.removeFromSuperview()
|
|
38
38
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Foundation
|
|
2
2
|
|
|
3
|
-
/// A value that exists once `provider` returns one.
|
|
4
|
-
///
|
|
3
|
+
/// A value that exists once `provider` returns one. Nothing is cached, so the provider's current
|
|
4
|
+
/// answer always wins; the provider is not polled, so the owner calls `check()` when it may have
|
|
5
|
+
/// become non-nil.
|
|
5
6
|
@MainActor
|
|
6
7
|
final class ReadyValue<T: Sendable> {
|
|
7
8
|
private let provider: () -> T?
|
|
@@ -1,22 +1,18 @@
|
|
|
1
1
|
import os.log
|
|
2
2
|
import UIKit
|
|
3
3
|
|
|
4
|
-
/// Renders SF Symbols to PNG files in the caches directory
|
|
5
|
-
///
|
|
4
|
+
/// Renders SF Symbols to PNG files in the caches directory, as `file://` URIs that
|
|
5
|
+
/// React Native's `<Image>` and native image loaders both accept.
|
|
6
6
|
///
|
|
7
|
-
/// Artwork format: `sf:symbol.name?bg=#RRGGBB&fg=#RRGGBB`
|
|
8
|
-
///
|
|
9
|
-
/// - `fg`: foreground/symbol color (default: #000000)
|
|
7
|
+
/// Artwork format: `sf:symbol.name?bg=#RRGGBB&fg=#RRGGBB` (3- or 6-digit hex).
|
|
8
|
+
/// `bg` defaults to transparent, `fg` to black.
|
|
10
9
|
final class SFSymbolRenderer: @unchecked Sendable {
|
|
11
10
|
@MainActor static let shared = SFSymbolRenderer()
|
|
12
11
|
static let defaultCanvasSize = CGSize(width: 200, height: 200)
|
|
13
12
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
/// the only cache validation — without a version key, every device that had
|
|
18
|
-
/// rendered a symbol once would keep serving the OLD pixels forever after a
|
|
19
|
-
/// render change.
|
|
13
|
+
// Part of the cache filename: bump it whenever the rendering changes. The caches
|
|
14
|
+
// directory survives app updates and the existence check is the only validation,
|
|
15
|
+
// so without a bump devices keep serving the old pixels.
|
|
20
16
|
private static let renderVersion = 1
|
|
21
17
|
|
|
22
18
|
private let logger = Logger(subsystem: "com.audiobrowser", category: "SFSymbolRenderer")
|
|
@@ -32,14 +28,9 @@ final class SFSymbolRenderer: @unchecked Sendable {
|
|
|
32
28
|
try? FileManager.default.createDirectory(at: cacheDirectory, withIntermediateDirectories: true)
|
|
33
29
|
}
|
|
34
30
|
|
|
35
|
-
///
|
|
36
|
-
///
|
|
37
|
-
///
|
|
38
|
-
///
|
|
39
|
-
/// - Parameters:
|
|
40
|
-
/// - artworkValue: The artwork string (e.g. "sf:heart.fill?bg=#000&fg=#fff" or "heart.fill")
|
|
41
|
-
/// - canvasSize: The canvas size in points (rendered at device scale)
|
|
42
|
-
/// - Returns: A file URI string, or nil if the symbol doesn't exist or rendering fails
|
|
31
|
+
/// Returns the `file://` URI of the PNG for `artworkValue` (with or without the `sf:`
|
|
32
|
+
/// prefix), rendering it only when no file for it exists yet. `canvasSize` is in points,
|
|
33
|
+
/// drawn at device scale. Nil when there is no such symbol or the file can't be written.
|
|
43
34
|
func render(_ artworkValue: String, canvasSize: CGSize = defaultCanvasSize) -> String? {
|
|
44
35
|
let safeArtwork = artworkValue.unicodeScalars
|
|
45
36
|
.filter { CharacterSet.alphanumerics.contains($0) || $0 == "_" }
|
|
@@ -95,16 +86,15 @@ final class SFSymbolRenderer: @unchecked Sendable {
|
|
|
95
86
|
width: size.width,
|
|
96
87
|
height: size.height,
|
|
97
88
|
))
|
|
98
|
-
}.withRenderingMode(.alwaysOriginal)
|
|
89
|
+
}.withRenderingMode(.alwaysOriginal) // Keeps the drawn tint inside a tinted view.
|
|
99
90
|
}
|
|
100
91
|
|
|
101
|
-
/// Whether the given artwork string is an SF Symbol reference.
|
|
102
92
|
static func isSFSymbol(_ artwork: String) -> Bool {
|
|
103
93
|
artwork.hasPrefix("sf:")
|
|
104
94
|
}
|
|
105
95
|
|
|
106
|
-
///
|
|
107
|
-
///
|
|
96
|
+
/// `"sf:heart.fill?bg=#000&fg=#fff"` → `("heart.fill", black, white)`; a colour that is
|
|
97
|
+
/// absent is nil, one that is not 3 or 6 characters long is black.
|
|
108
98
|
static func parseArtwork(_ value: String) -> (symbolName: String, backgroundColor: UIColor?, symbolColor: UIColor?) {
|
|
109
99
|
let (symbolName, params) = parseArtworkValue(value)
|
|
110
100
|
let bg = params["bg"].map { UIColor(hex: $0) }
|
|
@@ -112,8 +102,6 @@ final class SFSymbolRenderer: @unchecked Sendable {
|
|
|
112
102
|
return (symbolName, bg, fg)
|
|
113
103
|
}
|
|
114
104
|
|
|
115
|
-
/// Parses an SF Symbol artwork string, stripping the `sf:` prefix if present.
|
|
116
|
-
/// `"sf:heart.fill?bg=#000&fg=#fff"` → `("heart.fill", ["bg": "000", "fg": "fff"])`
|
|
117
105
|
private static func parseArtworkValue(_ value: String) -> (symbolName: String, params: [String: String]) {
|
|
118
106
|
let stripped = value.hasPrefix("sf:") ? String(value.dropFirst(3)) : value
|
|
119
107
|
guard let questionMark = stripped.firstIndex(of: "?") else {
|
|
@@ -134,6 +122,8 @@ final class SFSymbolRenderer: @unchecked Sendable {
|
|
|
134
122
|
}
|
|
135
123
|
|
|
136
124
|
extension UIColor {
|
|
125
|
+
/// `#` optional. Any length but 3 or 6 is black; the digits are not validated
|
|
126
|
+
/// (`init(declaredHex:)` does that).
|
|
137
127
|
convenience init(hex: String) {
|
|
138
128
|
let hex = hex.trimmingCharacters(in: CharacterSet(charactersIn: "#"))
|
|
139
129
|
var rgb: UInt64 = 0
|
|
@@ -155,11 +145,8 @@ extension UIColor {
|
|
|
155
145
|
}
|
|
156
146
|
}
|
|
157
147
|
|
|
158
|
-
///
|
|
159
|
-
///
|
|
160
|
-
/// to "no declaration" (the system default) instead of rendering black —
|
|
161
|
-
/// matching how unknown enum values decode. `init(hex:)` keeps its lenient
|
|
162
|
-
/// black fallback for the `sf:` artwork params it has always served.
|
|
148
|
+
/// Nil unless 3 or 6 hex digits (`#` optional), so an unparseable declared colour
|
|
149
|
+
/// (`style.cardTint`) falls back to the system default instead of black.
|
|
163
150
|
convenience init?(declaredHex hex: String) {
|
|
164
151
|
let digits = hex.trimmingCharacters(in: CharacterSet(charactersIn: "#"))
|
|
165
152
|
guard [3, 6].contains(digits.count),
|
|
@@ -2,21 +2,18 @@ import Kingfisher
|
|
|
2
2
|
import SwiftDraw
|
|
3
3
|
import UIKit
|
|
4
4
|
|
|
5
|
-
/// Kingfisher processor that
|
|
5
|
+
/// Kingfisher processor that rasterizes SVG data with SwiftDraw.
|
|
6
6
|
struct SVGProcessor: ImageProcessor {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
/// CarPlay rasterizes SVGs (one screen, one scale), so this is insurance
|
|
11
|
-
/// against a second call site rather than a live fix.
|
|
7
|
+
// Kingfisher keys its cache on the URL and this identifier only (`.scaleFactor` is
|
|
8
|
+
// not in the key), so every render parameter must be here or different
|
|
9
|
+
// rasterizations of one URL collide.
|
|
12
10
|
var identifier: String {
|
|
13
11
|
"com.audiobrowser.svgprocessor(\(size?.width ?? -1)x\(size?.height ?? -1)@\(scale))"
|
|
14
12
|
}
|
|
15
13
|
|
|
16
|
-
///
|
|
14
|
+
/// Points; nil renders at the SVG's intrinsic size.
|
|
17
15
|
let size: CGSize?
|
|
18
16
|
|
|
19
|
-
/// Scale factor for rendering. Resolved at init time to avoid MainActor issues.
|
|
20
17
|
let scale: CGFloat
|
|
21
18
|
|
|
22
19
|
@MainActor
|
|
@@ -30,7 +27,6 @@ struct SVGProcessor: ImageProcessor {
|
|
|
30
27
|
case let .data(data):
|
|
31
28
|
return renderSVG(from: data)
|
|
32
29
|
case let .image(image):
|
|
33
|
-
// Already an image, return as-is
|
|
34
30
|
return image
|
|
35
31
|
@unknown default:
|
|
36
32
|
return nil
|