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.
Files changed (329) hide show
  1. package/android/src/cast/java/com/audiobrowser/cast/CastSupport.kt +8 -10
  2. package/android/src/main/java/com/audiobrowser/AudioBrowser.kt +96 -243
  3. package/android/src/main/java/com/audiobrowser/AudioBrowserLifecycleModule.kt +8 -12
  4. package/android/src/main/java/com/audiobrowser/AudioBrowserPackage.kt +1 -3
  5. package/android/src/main/java/com/audiobrowser/Callbacks.kt +1 -10
  6. package/android/src/main/java/com/audiobrowser/ForegroundStart.kt +13 -18
  7. package/android/src/main/java/com/audiobrowser/HeadlessTaskService.kt +3 -7
  8. package/android/src/main/java/com/audiobrowser/RemoteOutputs.kt +8 -10
  9. package/android/src/main/java/com/audiobrowser/Service.kt +20 -61
  10. package/android/src/main/java/com/audiobrowser/ServiceBinding.kt +9 -17
  11. package/android/src/main/java/com/audiobrowser/browser/ArtworkResolutionRegistry.kt +10 -9
  12. package/android/src/main/java/com/audiobrowser/browser/BrowseArtworkRegistry.kt +11 -8
  13. package/android/src/main/java/com/audiobrowser/browser/BrowserManager.kt +117 -448
  14. package/android/src/main/java/com/audiobrowser/browser/BrowserUrlResolution.kt +21 -60
  15. package/android/src/main/java/com/audiobrowser/browser/InertStyleDiagnostic.kt +20 -80
  16. package/android/src/main/java/com/audiobrowser/browser/JsonArtwork.kt +6 -10
  17. package/android/src/main/java/com/audiobrowser/browser/JsonModels.kt +7 -24
  18. package/android/src/main/java/com/audiobrowser/browser/RouteMatch.kt +2 -4
  19. package/android/src/main/java/com/audiobrowser/browser/SectionScope.kt +13 -31
  20. package/android/src/main/java/com/audiobrowser/browser/SimpleRouter.kt +12 -40
  21. package/android/src/main/java/com/audiobrowser/browser/StyleResolver.kt +15 -26
  22. package/android/src/main/java/com/audiobrowser/browser/TrackLoadHandler.kt +5 -15
  23. package/android/src/main/java/com/audiobrowser/extension/EnumExtensions.kt +1 -0
  24. package/android/src/main/java/com/audiobrowser/extension/NumberExt.kt +2 -0
  25. package/android/src/main/java/com/audiobrowser/extension/ResolvedTrackExt.kt +4 -8
  26. package/android/src/main/java/com/audiobrowser/extension/TappedTrack.kt +4 -6
  27. package/android/src/main/java/com/audiobrowser/extension/TrackIdentity.kt +3 -7
  28. package/android/src/main/java/com/audiobrowser/http/HttpClient.kt +13 -22
  29. package/android/src/main/java/com/audiobrowser/http/RequestConfigBuilder.kt +17 -38
  30. package/android/src/main/java/com/audiobrowser/model/IcyTitle.kt +5 -6
  31. package/android/src/main/java/com/audiobrowser/model/PlaybackMetadata.kt +4 -9
  32. package/android/src/main/java/com/audiobrowser/model/PlayerSetupOptions.kt +18 -29
  33. package/android/src/main/java/com/audiobrowser/model/PlayerUpdateOptions.kt +6 -16
  34. package/android/src/main/java/com/audiobrowser/player/AutomaticBufferManager.kt +15 -45
  35. package/android/src/main/java/com/audiobrowser/player/CapabilityControls.kt +23 -59
  36. package/android/src/main/java/com/audiobrowser/player/CrossOriginHeaderStripper.kt +14 -26
  37. package/android/src/main/java/com/audiobrowser/player/DynamicLoadControl.kt +15 -43
  38. package/android/src/main/java/com/audiobrowser/player/EnginePlayback.kt +4 -4
  39. package/android/src/main/java/com/audiobrowser/player/EqualizerController.kt +15 -21
  40. package/android/src/main/java/com/audiobrowser/player/InterceptingPlayer.kt +14 -31
  41. package/android/src/main/java/com/audiobrowser/player/LocalEngine.kt +8 -8
  42. package/android/src/main/java/com/audiobrowser/player/MediaFactory.kt +16 -27
  43. package/android/src/main/java/com/audiobrowser/player/MediaSessionCallback.kt +119 -237
  44. package/android/src/main/java/com/audiobrowser/player/MediaSessionCommandManager.kt +48 -145
  45. package/android/src/main/java/com/audiobrowser/player/NowPlayingUpdater.kt +39 -100
  46. package/android/src/main/java/com/audiobrowser/player/PlaybackErrorClassifier.kt +16 -26
  47. package/android/src/main/java/com/audiobrowser/player/PlaybackStateMachine.kt +22 -28
  48. package/android/src/main/java/com/audiobrowser/player/PlaybackStateStore.kt +28 -64
  49. package/android/src/main/java/com/audiobrowser/player/PlaybackTimer.kt +8 -4
  50. package/android/src/main/java/com/audiobrowser/player/Player.kt +117 -405
  51. package/android/src/main/java/com/audiobrowser/player/PlayerCapabilitiesExt.kt +1 -1
  52. package/android/src/main/java/com/audiobrowser/player/PlayerEngineFactory.kt +11 -19
  53. package/android/src/main/java/com/audiobrowser/player/PlayerListener.kt +30 -96
  54. package/android/src/main/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicy.kt +39 -95
  55. package/android/src/main/java/com/audiobrowser/player/ShuffleOrderLedBy.kt +7 -13
  56. package/android/src/main/java/com/audiobrowser/player/SleepTimer.kt +13 -30
  57. package/android/src/main/java/com/audiobrowser/player/SleepTimerManager.kt +7 -11
  58. package/android/src/main/java/com/audiobrowser/player/StuckRecoveryPolicy.kt +9 -22
  59. package/android/src/main/java/com/audiobrowser/player/TransformingDataSource.kt +22 -54
  60. package/android/src/main/java/com/audiobrowser/player/VolumeFader.kt +8 -15
  61. package/android/src/main/java/com/audiobrowser/remote/RemoteItem.kt +9 -8
  62. package/android/src/main/java/com/audiobrowser/remote/RemoteOutputsController.kt +13 -10
  63. package/android/src/main/java/com/audiobrowser/remote/RemotePlayback.kt +8 -8
  64. package/android/src/main/java/com/audiobrowser/remote/RemoteQueue.kt +12 -5
  65. package/android/src/main/java/com/audiobrowser/remote/RemoteSwitchingPlayer.kt +28 -48
  66. package/android/src/main/java/com/audiobrowser/sonos/DeviceDescriptionParser.kt +11 -19
  67. package/android/src/main/java/com/audiobrowser/sonos/DidlLite.kt +2 -2
  68. package/android/src/main/java/com/audiobrowser/sonos/SoapClient.kt +6 -6
  69. package/android/src/main/java/com/audiobrowser/sonos/SoapEnvelopes.kt +8 -9
  70. package/android/src/main/java/com/audiobrowser/sonos/SoapResponseParser.kt +11 -18
  71. package/android/src/main/java/com/audiobrowser/sonos/SonosDiscoverer.kt +10 -10
  72. package/android/src/main/java/com/audiobrowser/sonos/SonosOutputs.kt +10 -10
  73. package/android/src/main/java/com/audiobrowser/sonos/SonosPlayer.kt +21 -33
  74. package/android/src/main/java/com/audiobrowser/sonos/SonosRemote.kt +4 -6
  75. package/android/src/main/java/com/audiobrowser/sonos/SonosRouteProviderService.kt +9 -10
  76. package/android/src/main/java/com/audiobrowser/sonos/SonosStreamUri.kt +7 -7
  77. package/android/src/main/java/com/audiobrowser/sonos/SonosTransport.kt +5 -4
  78. package/android/src/main/java/com/audiobrowser/sonos/SsdpDiscovery.kt +8 -3
  79. package/android/src/main/java/com/audiobrowser/sonos/SsdpMessages.kt +4 -6
  80. package/android/src/main/java/com/audiobrowser/sonos/ZoneGroupState.kt +13 -11
  81. package/android/src/main/java/com/audiobrowser/tls/AiaCertChaser.kt +34 -71
  82. package/android/src/main/java/com/audiobrowser/tls/AiaChasingExtendedTrustManager.kt +20 -37
  83. package/android/src/main/java/com/audiobrowser/tls/AiaChasingTrustManager.kt +18 -27
  84. package/android/src/main/java/com/audiobrowser/tls/AiaTls.kt +14 -29
  85. package/android/src/main/java/com/audiobrowser/tls/CachingCertificateFetcher.kt +68 -133
  86. package/android/src/main/java/com/audiobrowser/util/ArtworkContentProvider.kt +10 -22
  87. package/android/src/main/java/com/audiobrowser/util/ArtworkRoutes.kt +6 -6
  88. package/android/src/main/java/com/audiobrowser/util/ArtworkUris.kt +4 -3
  89. package/android/src/main/java/com/audiobrowser/util/ArtworkVariant.kt +2 -13
  90. package/android/src/main/java/com/audiobrowser/util/Automotive.kt +2 -4
  91. package/android/src/main/java/com/audiobrowser/util/BatteryOptimizationHelper.kt +3 -9
  92. package/android/src/main/java/com/audiobrowser/util/BatteryWarningStore.kt +4 -14
  93. package/android/src/main/java/com/audiobrowser/util/BrowserPathHelper.kt +21 -85
  94. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoader.kt +7 -7
  95. package/android/src/main/java/com/audiobrowser/util/CoilArtworkLoaderHolder.kt +5 -8
  96. package/android/src/main/java/com/audiobrowser/util/CoilBitmapLoader.kt +8 -24
  97. package/android/src/main/java/com/audiobrowser/util/EqualizerManager.kt +7 -39
  98. package/android/src/main/java/com/audiobrowser/util/MediaExtrasBuilder.kt +10 -14
  99. package/android/src/main/java/com/audiobrowser/util/MetadataAdapter.kt +5 -9
  100. package/android/src/main/java/com/audiobrowser/util/NetworkConnectivityMonitor.kt +5 -9
  101. package/android/src/main/java/com/audiobrowser/util/OutputMonitor.kt +21 -50
  102. package/android/src/main/java/com/audiobrowser/util/OutputSwitcher.kt +7 -20
  103. package/android/src/main/java/com/audiobrowser/util/PlayingStateFactory.kt +3 -5
  104. package/android/src/main/java/com/audiobrowser/util/RatingFavorites.kt +4 -5
  105. package/android/src/main/java/com/audiobrowser/util/StyleWire.kt +5 -5
  106. package/android/src/main/java/com/audiobrowser/util/SvgArtworkRenderer.kt +5 -9
  107. package/android/src/main/java/com/audiobrowser/util/SystemVolumeMonitor.kt +6 -9
  108. package/android/src/main/java/com/audiobrowser/util/TrackFactory.kt +25 -47
  109. package/android/src/nocast/java/com/audiobrowser/cast/CastSupport.kt +0 -2
  110. package/android/src/test/java/com/audiobrowser/ForegroundStartTest.kt +1 -2
  111. package/android/src/test/java/com/audiobrowser/LegacyRatingTest.kt +3 -3
  112. package/android/src/test/java/com/audiobrowser/ServiceBindingTest.kt +0 -13
  113. package/android/src/test/java/com/audiobrowser/ServiceTaskRemovedTest.kt +2 -3
  114. package/android/src/test/java/com/audiobrowser/TestFixtures.kt +5 -14
  115. package/android/src/test/java/com/audiobrowser/browser/BrowseArtworkRegistryTest.kt +1 -1
  116. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerBuildApiRequestTest.kt +2 -8
  117. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerFavoritesTest.kt +2 -12
  118. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerLayerResolutionTest.kt +5 -28
  119. package/android/src/test/java/com/audiobrowser/browser/BrowserManagerTest.kt +11 -43
  120. package/android/src/test/java/com/audiobrowser/browser/BrowserUrlResolutionTest.kt +4 -13
  121. package/android/src/test/java/com/audiobrowser/browser/InertStyleDiagnosticTest.kt +2 -11
  122. package/android/src/test/java/com/audiobrowser/browser/JsonArtworkTest.kt +0 -2
  123. package/android/src/test/java/com/audiobrowser/browser/JsonStyleTest.kt +3 -8
  124. package/android/src/test/java/com/audiobrowser/browser/SectionScopeTest.kt +2 -14
  125. package/android/src/test/java/com/audiobrowser/browser/SimpleRouterTest.kt +1 -5
  126. package/android/src/test/java/com/audiobrowser/browser/StyleResolverTest.kt +2 -13
  127. package/android/src/test/java/com/audiobrowser/extension/TappedTrackTest.kt +1 -7
  128. package/android/src/test/java/com/audiobrowser/extension/TrackIdentityTest.kt +0 -5
  129. package/android/src/test/java/com/audiobrowser/http/RequestConfigBuilderTest.kt +8 -16
  130. package/android/src/test/java/com/audiobrowser/model/IcyTitleTest.kt +1 -1
  131. package/android/src/test/java/com/audiobrowser/player/BrowseTilesTest.kt +12 -29
  132. package/android/src/test/java/com/audiobrowser/player/CapabilityControlsTest.kt +3 -12
  133. package/android/src/test/java/com/audiobrowser/player/CrossOriginHeaderStripperTest.kt +0 -7
  134. package/android/src/test/java/com/audiobrowser/player/DynamicLoadControlTest.kt +0 -1
  135. package/android/src/test/java/com/audiobrowser/player/EqualizerControllerTest.kt +0 -9
  136. package/android/src/test/java/com/audiobrowser/player/LiveSeekCommandTest.kt +1 -2
  137. package/android/src/test/java/com/audiobrowser/player/MediaSessionSlotMappingTest.kt +0 -9
  138. package/android/src/test/java/com/audiobrowser/player/NowPlayingUpdaterTest.kt +15 -22
  139. package/android/src/test/java/com/audiobrowser/player/PlaybackErrorClassifierTest.kt +1 -24
  140. package/android/src/test/java/com/audiobrowser/player/PlaybackStateMachineTest.kt +0 -20
  141. package/android/src/test/java/com/audiobrowser/player/PlaybackStateStoreTrackJsonTest.kt +1 -6
  142. package/android/src/test/java/com/audiobrowser/player/PlaybackTimerTest.kt +2 -4
  143. package/android/src/test/java/com/audiobrowser/player/PlayerCastTest.kt +2 -2
  144. package/android/src/test/java/com/audiobrowser/player/PlayerEngineFactoryTest.kt +0 -3
  145. package/android/src/test/java/com/audiobrowser/player/PlayerInvalidTrackTest.kt +0 -1
  146. package/android/src/test/java/com/audiobrowser/player/PlayerSetupTest.kt +3 -2
  147. package/android/src/test/java/com/audiobrowser/player/PlayerSonosTest.kt +5 -1
  148. package/android/src/test/java/com/audiobrowser/player/PlayerSuppressionTest.kt +5 -7
  149. package/android/src/test/java/com/audiobrowser/player/RetryLoadErrorHandlingPolicyTest.kt +4 -35
  150. package/android/src/test/java/com/audiobrowser/player/SessionErrorMaskTest.kt +0 -5
  151. package/android/src/test/java/com/audiobrowser/player/ShuffleOrderLedByTest.kt +1 -8
  152. package/android/src/test/java/com/audiobrowser/player/StandardSkipTest.kt +4 -6
  153. package/android/src/test/java/com/audiobrowser/player/StuckRecoveryPolicyTest.kt +11 -11
  154. package/android/src/test/java/com/audiobrowser/player/TransformingDataSourceTest.kt +2 -23
  155. package/android/src/test/java/com/audiobrowser/remote/FakeRemote.kt +9 -10
  156. package/android/src/test/java/com/audiobrowser/remote/RemoteSwitchingPlayerTest.kt +0 -1
  157. package/android/src/test/java/com/audiobrowser/sonos/DeviceDescriptionParserTest.kt +1 -3
  158. package/android/src/test/java/com/audiobrowser/sonos/DidlLiteTest.kt +0 -1
  159. package/android/src/test/java/com/audiobrowser/sonos/SoapClientTest.kt +0 -3
  160. package/android/src/test/java/com/audiobrowser/sonos/SoapEnvelopesTest.kt +0 -1
  161. package/android/src/test/java/com/audiobrowser/sonos/SoapResponseParserTest.kt +0 -1
  162. package/android/src/test/java/com/audiobrowser/sonos/SonosDiscovererTest.kt +2 -0
  163. package/android/src/test/java/com/audiobrowser/sonos/SonosPlayerTest.kt +0 -1
  164. package/android/src/test/java/com/audiobrowser/sonos/SonosRemoteTest.kt +1 -1
  165. package/android/src/test/java/com/audiobrowser/sonos/SonosRoutesTest.kt +2 -0
  166. package/android/src/test/java/com/audiobrowser/sonos/SonosTransportTest.kt +2 -6
  167. package/android/src/test/java/com/audiobrowser/sonos/SsdpMessagesTest.kt +0 -2
  168. package/android/src/test/java/com/audiobrowser/tls/AiaCertChaserTest.kt +13 -37
  169. package/android/src/test/java/com/audiobrowser/tls/AiaChasingTrustManagerTest.kt +10 -24
  170. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherCallSiteTest.kt +15 -39
  171. package/android/src/test/java/com/audiobrowser/tls/CachingCertificateFetcherTest.kt +4 -10
  172. package/android/src/test/java/com/audiobrowser/util/ArtworkContentProviderTest.kt +2 -11
  173. package/android/src/test/java/com/audiobrowser/util/ArtworkUrisTest.kt +0 -1
  174. package/android/src/test/java/com/audiobrowser/util/BrowserPathHelperTest.kt +0 -4
  175. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderHolderTest.kt +1 -1
  176. package/android/src/test/java/com/audiobrowser/util/CoilArtworkLoaderTest.kt +0 -5
  177. package/android/src/test/java/com/audiobrowser/util/FakeImageLoader.kt +2 -2
  178. package/android/src/test/java/com/audiobrowser/util/MediaExtrasBuilderTest.kt +4 -12
  179. package/android/src/test/java/com/audiobrowser/util/OutputMonitorTest.kt +1 -1
  180. package/android/src/test/java/com/audiobrowser/util/PlayingStateFactoryTest.kt +0 -4
  181. package/android/src/test/java/com/audiobrowser/util/TrackFactoryBrowseTest.kt +1 -1
  182. package/android/src/test/java/com/audiobrowser/util/TrackFactoryMediaIdTest.kt +4 -6
  183. package/android/src/testCast/java/com/audiobrowser/cast/CastEndsTest.kt +1 -1
  184. package/android/src/testCast/java/com/audiobrowser/cast/SendingMediaItemConverterTest.kt +1 -0
  185. package/ios/AVPlayerEngine.swift +13 -21
  186. package/ios/AVPlayerEngineCallbacks.swift +2 -4
  187. package/ios/Browser/BrowseGate.swift +7 -8
  188. package/ios/Browser/BrowserConfig.swift +19 -34
  189. package/ios/Browser/BrowserError.swift +0 -1
  190. package/ios/Browser/BrowserManager.swift +29 -75
  191. package/ios/Browser/BrowserPathHelper.swift +13 -93
  192. package/ios/Browser/FavoriteSet.swift +7 -10
  193. package/ios/Browser/InertStyleDiagnostic.swift +17 -82
  194. package/ios/Browser/JsonModels.swift +11 -51
  195. package/ios/Browser/NavigationErrorState.swift +3 -2
  196. package/ios/Browser/PageResolver.swift +13 -23
  197. package/ios/Browser/RequestLayer.swift +16 -20
  198. package/ios/Browser/RequestPipeline.swift +33 -43
  199. package/ios/Browser/SearchDrillIn.swift +7 -13
  200. package/ios/Browser/SectionScope.swift +14 -26
  201. package/ios/Browser/SimpleRouter.swift +8 -15
  202. package/ios/Browser/StyleResolver.swift +12 -29
  203. package/ios/Browser/TabBarEntries.swift +6 -11
  204. package/ios/Browser/TrackIdTemplate.swift +6 -14
  205. package/ios/CarPlay/CPInterfaceController+Safe.swift +19 -28
  206. package/ios/CarPlay/CarPlayArtworkResolver.swift +5 -9
  207. package/ios/CarPlay/CarPlayController.swift +4 -4
  208. package/ios/CarPlay/CarPlayImageLoader.swift +11 -26
  209. package/ios/CarPlay/CarPlayListItemFactory.swift +30 -80
  210. package/ios/CarPlay/CarPlayNowPlayingManager.swift +19 -54
  211. package/ios/CarPlay/CarPlaySession+Navigator.swift +10 -10
  212. package/ios/CarPlay/CarPlaySession+PageLoader.swift +6 -5
  213. package/ios/CarPlay/CarPlaySession+Refresher.swift +2 -2
  214. package/ios/CarPlay/CarPlaySession+TabBar.swift +19 -26
  215. package/ios/CarPlay/CarPlaySession.swift +13 -17
  216. package/ios/CarPlay/CarPlayTemplates.swift +6 -7
  217. package/ios/CarPlay/IntentHandlers.swift +3 -5
  218. package/ios/CarPlay/MediaIntentCriteria.swift +15 -29
  219. package/ios/CarPlay/MediaIntentHandler.swift +4 -7
  220. package/ios/CarPlay/MediaIntentPlayback.swift +9 -8
  221. package/ios/CarPlay/NowPlayingButtonRules.swift +3 -4
  222. package/ios/CarPlay/SectionPresentation.swift +18 -28
  223. package/ios/CarPlay/TopTemplateReplacer.swift +8 -9
  224. package/ios/Extension/Capability+RemoteCommand.swift +3 -3
  225. package/ios/Extension/ChapterMetadata+AVFoundation.swift +2 -5
  226. package/ios/Extension/CxxVectorConformances.swift +4 -16
  227. package/ios/Extension/NavigationError+Conversion.swift +4 -7
  228. package/ios/Extension/PlayerCapabilities+Favorite.swift +0 -1
  229. package/ios/Extension/RequestConfig+Copying.swift +2 -6
  230. package/ios/Extension/ResolvedTrack+Copying.swift +2 -8
  231. package/ios/Extension/SearchParams+Query.swift +4 -4
  232. package/ios/Extension/Section+Copying.swift +3 -6
  233. package/ios/Extension/String+IcyCharset.swift +5 -5
  234. package/ios/Extension/TimedMetadata+AVFoundation.swift +6 -12
  235. package/ios/Extension/Track+AVPlayer.swift +1 -2
  236. package/ios/Extension/Track+Copying.swift +2 -8
  237. package/ios/Extension/Track+Identity.swift +4 -9
  238. package/ios/Extension/TrackMetadata+AVFoundation.swift +10 -13
  239. package/ios/Extension/UIApplication+ActiveScene.swift +6 -14
  240. package/ios/Extension/Variant+Artwork.swift +8 -22
  241. package/ios/Http/HttpClient.swift +3 -3
  242. package/ios/HybridAudioBrowser+Browser.swift +10 -16
  243. package/ios/HybridAudioBrowser+Options.swift +6 -9
  244. package/ios/HybridAudioBrowser+Player.swift +8 -16
  245. package/ios/HybridAudioBrowser+PlayerCallbacks.swift +4 -5
  246. package/ios/HybridAudioBrowser+Stubs.swift +5 -7
  247. package/ios/HybridAudioBrowser.swift +54 -79
  248. package/ios/Model/NitroTypeStubs.swift +15 -22
  249. package/ios/Model/PlayerUpdateOptions.swift +6 -21
  250. package/ios/Model/RemoteCommand.swift +2 -2
  251. package/ios/Model/TrackPlayerError.swift +9 -22
  252. package/ios/NowPlayingInfo/NowPlayingInfoController.swift +21 -40
  253. package/ios/NowPlayingInfo/SilentAudioPrimer.swift +10 -16
  254. package/ios/Observer/ItemObserver.swift +7 -5
  255. package/ios/Observer/PlayerObserver.swift +5 -5
  256. package/ios/PlaybackEvent.swift +2 -2
  257. package/ios/Player/AirPlayStallJudgement.swift +7 -9
  258. package/ios/Player/AudioSessionController.swift +14 -15
  259. package/ios/Player/DeferredSeek.swift +2 -2
  260. package/ios/Player/EndOfTrackJudgement.swift +6 -13
  261. package/ios/Player/ErrorStatus.swift +8 -7
  262. package/ios/Player/MediaLoader.swift +20 -24
  263. package/ios/Player/NowPlayingLines.swift +1 -4
  264. package/ios/Player/NowPlayingUpdater.swift +35 -61
  265. package/ios/Player/PersistedPlaybackState.swift +1 -2
  266. package/ios/Player/PlaybackFailure.swift +20 -24
  267. package/ios/Player/PlaybackPersistence.swift +5 -6
  268. package/ios/Player/PlaybackStateMachine.swift +8 -11
  269. package/ios/Player/PlaybackTimer.swift +8 -11
  270. package/ios/Player/Player.swift +6 -13
  271. package/ios/Player/PlayerEngine.swift +20 -20
  272. package/ios/Player/PlayerStatusTypes.swift +1 -2
  273. package/ios/Player/QueueManager.swift +23 -67
  274. package/ios/Player/RetryLoop.swift +39 -50
  275. package/ios/Player/ShuffleOrder.swift +17 -57
  276. package/ios/Player/SleepTimerManager.swift +13 -28
  277. package/ios/Player/VolumeFader.swift +16 -16
  278. package/ios/RemoteCommand/RemoteCommandCallbacks.swift +6 -16
  279. package/ios/RemoteCommand/RemoteCommandController.swift +8 -10
  280. package/ios/Tests/AirPlayStallJudgementTests.swift +4 -4
  281. package/ios/Tests/BrowserPathHelperTests.swift +3 -6
  282. package/ios/Tests/DeferredSeekTests.swift +1 -3
  283. package/ios/Tests/EmitterTests.swift +0 -1
  284. package/ios/Tests/EndOfTrackJudgementTests.swift +1 -6
  285. package/ios/Tests/FavoriteSetTests.swift +1 -0
  286. package/ios/Tests/GenerationMemoTests.swift +2 -2
  287. package/ios/Tests/InertStyleDiagnosticTests.swift +4 -10
  288. package/ios/Tests/JsonModelsTests.swift +5 -12
  289. package/ios/Tests/LRUCacheTests.swift +1 -5
  290. package/ios/Tests/MediaIntentCriteriaTests.swift +2 -7
  291. package/ios/Tests/MediaLoaderTests.swift +3 -12
  292. package/ios/Tests/ObserverTests.swift +3 -3
  293. package/ios/Tests/PlaybackErrorTests.swift +7 -9
  294. package/ios/Tests/PlaybackFailureTests.swift +9 -17
  295. package/ios/Tests/PlaybackPersistenceTests.swift +1 -0
  296. package/ios/Tests/PlaybackStateMachineTests.swift +1 -16
  297. package/ios/Tests/PlaybackTimerTests.swift +2 -3
  298. package/ios/Tests/PlayerPolicyTests.swift +10 -26
  299. package/ios/Tests/PlayerTests.swift +53 -88
  300. package/ios/Tests/PlayingStateTests.swift +0 -1
  301. package/ios/Tests/QueueManagerTests.swift +30 -80
  302. package/ios/Tests/RemoteCommandControllerTests.swift +5 -13
  303. package/ios/Tests/ResolvedTrackCopyingTests.swift +0 -2
  304. package/ios/Tests/RetryLoopTests.swift +12 -35
  305. package/ios/Tests/SearchDrillInTests.swift +4 -5
  306. package/ios/Tests/SectionPresentationTests.swift +3 -16
  307. package/ios/Tests/SectionScopeTests.swift +3 -6
  308. package/ios/Tests/SimpleRouterTests.swift +1 -5
  309. package/ios/Tests/SleepTimerManagerTests.swift +8 -11
  310. package/ios/Tests/StyleResolverTests.swift +4 -13
  311. package/ios/Tests/Support/ManualSleepTimerScheduler.swift +3 -8
  312. package/ios/Tests/Support/TestTypes.swift +5 -15
  313. package/ios/Tests/TabBarEntriesTests.swift +0 -2
  314. package/ios/Tests/TimedMetadataAVFoundationTests.swift +2 -3
  315. package/ios/Tests/TopTemplateReplacerTests.swift +1 -1
  316. package/ios/Tests/TrackIdTemplateTests.swift +2 -6
  317. package/ios/Tests/TrackMetadataAVFoundationTests.swift +1 -4
  318. package/ios/Tests/TrackSelectorTests.swift +3 -15
  319. package/ios/TrackSelector.swift +13 -25
  320. package/ios/Util/ArtworkFreshness.swift +6 -6
  321. package/ios/Util/ArtworkImageFetcher.swift +19 -20
  322. package/ios/Util/ConcurrentMap.swift +2 -2
  323. package/ios/Util/Emitter.swift +8 -13
  324. package/ios/Util/NetworkMonitor.swift +4 -6
  325. package/ios/Util/OutputPicker.swift +1 -1
  326. package/ios/Util/ReadyValue.swift +3 -2
  327. package/ios/Util/SFSymbolRenderer.swift +17 -30
  328. package/ios/Util/SVGProcessor.swift +5 -9
  329. package/package.json +1 -1
@@ -1,30 +1,26 @@
1
1
  import Foundation
2
2
 
3
- /// An artwork URL and the headers to fetch it with.
4
3
  struct ArtworkResolvedImage: Equatable, Sendable {
5
4
  let uri: String
6
5
  let headers: [String: String]?
7
6
  }
8
7
 
9
- /// How `CarPlayImageLoader` loads one artwork.
10
8
  enum ArtworkLoadAction: Equatable, Sendable {
11
- /// Render the `sf:` artwork at this canvas size.
9
+ /// `width` and `height` are the canvas size in points.
12
10
  case sfSymbol(artwork: String, width: Double, height: Double)
13
11
  case fetch(uri: String, headers: [String: String]?, shouldTint: Bool, isSvg: Bool)
14
12
  case none
15
13
  }
16
14
 
17
- /// Decides how CarPlay loads a track's artwork, given what the Browser layer's
18
- /// `resolveArtworkUrl` returned for it.
19
15
  enum CarPlayArtworkResolver {
20
- /// Whether to ask the Browser layer at all: CarPlay renders an SF Symbol itself.
16
+ /// False for an `sf:` symbol, which CarPlay renders itself.
21
17
  static func needsResolve(artwork: String?) -> Bool {
22
18
  !isSFSymbol(artwork)
23
19
  }
24
20
 
25
- /// An SF Symbol renders; otherwise the resolved URL is fetched, falling back to the track's
26
- /// `artwork`, then its `artworkSource` with that source's headers. `stencil` tints the image
27
- /// to the surface's appearance.
21
+ /// An `sf:` symbol renders locally. Otherwise the resolved URL is fetched; if it is missing or does not
22
+ /// parse, `artwork` is used, or `artworkSource` with its headers when `artwork` is nil. A direct URI
23
+ /// that does not parse yields `.none`. `stencil` tints the fetched image to the appearance.
28
24
  static func action(
29
25
  artwork: String?,
30
26
  artworkSource: ArtworkResolvedImage?,
@@ -2,9 +2,9 @@ import CarPlay
2
2
  import Foundation
3
3
  import os.log
4
4
 
5
- /// The CarPlay scene's controller, exposed to Objective-C for `RNABCarPlaySceneDelegate`. It
6
- /// shows a loading root until the player and a configured browser exist, then runs a
7
- /// `CarPlaySession`; `stop()` ends it.
5
+ /// The CarPlay scene's controller, called from Objective-C by `RNABCarPlaySceneDelegate`.
6
+ /// Shows a loading root until the player and a configured browser exist, then runs a
7
+ /// `CarPlaySession`.
8
8
  @MainActor
9
9
  @objc(RNABCarPlayController)
10
10
  public final class RNABCarPlayController: NSObject {
@@ -44,7 +44,7 @@ public final class RNABCarPlayController: NSObject {
44
44
  self?.restart()
45
45
  }
46
46
 
47
- // Before the config loads, the app's loading title isn't known: the spinner only.
47
+ // Before the config loads the title is unknown: the spinner alone.
48
48
  let browserManager = HybridAudioBrowser.shared?.browserManager
49
49
  let loadingTitle = browserManager?.isConfigured == true ? browserManager?.config.carPlayLoadingTitle : nil
50
50
  interfaceController.safeSetRoot(
@@ -3,14 +3,6 @@ import Foundation
3
3
  import NitroModules
4
4
  import os.log
5
5
 
6
- /// Handles all image loading and rendering for CarPlay.
7
- ///
8
- /// Responsibilities:
9
- /// - SF Symbol rendering, with light/dark variants
10
- /// - Artwork loading via BrowserManager's artwork URL resolution
11
- /// - Direct artwork loading as fallback
12
- /// - Adaptive image tinting for monochrome icons
13
- /// - Placeholder image generation
14
6
  @MainActor
15
7
  final class CarPlayImageLoader {
16
8
  private let logger = Logger(subsystem: "com.audiobrowser", category: "CarPlayImageLoader")
@@ -25,9 +17,8 @@ final class CarPlayImageLoader {
25
17
 
26
18
  // MARK: - SF Symbols
27
19
 
28
- /// Renders an SF Symbol from an artwork string (e.g. "sf:heart.fill?bg=#000&fg=#fff"). With an
29
- /// `fg` it is drawn in that color; without one it is black or white by appearance, over a grey
30
- /// tile.
20
+ /// Renders an `sf:` artwork string (e.g. "sf:heart.fill?bg=#000&fg=#fff"). With `fg` it is
21
+ /// drawn in that color; without, black or white by appearance over a grey tile.
31
22
  private func sfSymbolImage(forArtwork artwork: String, canvasSize: CGSize) -> UIImage? {
32
23
  let (name, background, tint) = SFSymbolRenderer.parseArtwork(artwork)
33
24
  let scale = carTraitCollection.displayScale
@@ -50,11 +41,9 @@ final class CarPlayImageLoader {
50
41
  return .adaptive(light: light, dark: dark, for: carTraitCollection)
51
42
  }
52
43
 
53
- /// Cached empty placeholders, keyed by point size — list items and image-row
54
- /// cells reserve different footprints.
55
44
  private var placeholders: [String: UIImage] = [:]
56
45
 
57
- /// Empty placeholder image reserving a `size`-point slot while artwork loads.
46
+ /// An empty image that reserves a `size`-point slot while artwork loads.
58
47
  func placeholderImage(size: CGSize) -> UIImage? {
59
48
  let key = "\(size.width)×\(size.height)"
60
49
  if let cached = placeholders[key] { return cached }
@@ -67,14 +56,14 @@ final class CarPlayImageLoader {
67
56
 
68
57
  // MARK: - Artwork Loading
69
58
 
70
- /// A track's artwork at `size` points, through the artwork transform when one is configured;
71
- /// nil when it has none or the load fails.
72
- /// - Parameter style: the track's resolved style block; nil for the track's own declaration,
73
- /// when there is no section to inherit from (tabs, Up Next).
59
+ /// A track's artwork at `size` points, through the artwork resolve transform when one is
60
+ /// configured; nil when it has none or the load fails.
61
+ /// - Parameter style: the track's resolved style; nil uses the track's own, for places with
62
+ /// no section to inherit from (tabs, Up Next).
74
63
  func artwork(for track: Track, style: TrackStyle? = nil, size: CGSize) async -> UIImage? {
75
- // Each variant goes through the whole single-URL path (route config, headers, SVG, the
76
- // resolve transform), so the pair cannot drift from it.
77
64
  if let variants = track.artwork?.variants {
65
+ // Each variant runs the whole single-URL path (route config, headers, SVG, the resolve
66
+ // transform), so the pair cannot drift from it.
78
67
  return await artwork(for: track, style: style, variants: variants, size: size)
79
68
  }
80
69
 
@@ -119,10 +108,8 @@ final class CarPlayImageLoader {
119
108
  return .adaptive(light: lightImage, dark: darkImage, for: carTraitCollection)
120
109
  }
121
110
 
122
- /// Fetches an image from a URL with optional headers and SVG processing.
123
- /// Rasters are downsampled to `size` points at the car's display scale —
124
- /// CPListItem.h: "size them to the display scale of the car screen". SVGs
125
- /// already rasterize at car scale via SVGProcessor.
111
+ /// Rasters downsample to `size` points at the car's display scale (CPListItem.h: "size them
112
+ /// to the display scale of the car screen"); SVGs already rasterize at car scale.
126
113
  private func fetchImage(uri: String, headers: [String: String]?, isSvg: Bool, size: CGSize) async -> UIImage? {
127
114
  let source = ImageSource(uri: uri, method: nil, headers: headers, body: nil)
128
115
  let scale = carTraitCollection.displayScale
@@ -132,7 +119,6 @@ final class CarPlayImageLoader {
132
119
  return await ArtworkImageFetcher.fetchImage(from: source, downsampleTo: (size, scale))
133
120
  }
134
121
 
135
- /// Renders an image to a bitmap with the specified tint color (for monochrome icons).
136
122
  private nonisolated func renderImageToBitmap(_ image: UIImage, tintColor: UIColor) -> UIImage {
137
123
  UIGraphicsBeginImageContextWithOptions(image.size, false, image.scale)
138
124
  defer { UIGraphicsEndImageContext() }
@@ -146,7 +132,6 @@ final class CarPlayImageLoader {
146
132
  return rendered.withRenderingMode(.alwaysOriginal)
147
133
  }
148
134
 
149
- /// A monochrome image drawn black for light appearance and white for dark.
150
135
  private func tinted(_ image: UIImage) -> UIImage {
151
136
  .adaptive(
152
137
  light: renderImageToBitmap(image, tintColor: .black),
@@ -5,10 +5,9 @@ import os.log
5
5
 
6
6
  // MARK: - Typed Item Info
7
7
 
8
- /// Typed metadata stored on CPListItems, replacing stringly-typed userInfo dictionaries.
8
+ /// Stored in a CPListItem's `userInfo`; the playing-indicator sweep finds its rows by it.
9
9
  struct CarPlayItemInfo {
10
- /// The track's identity (`id` when non-blank, else `src`) — the comparison
11
- /// key for the now-playing indicator repaint sweep.
10
+ /// `id` when non-blank, else `src`.
12
11
  let identity: String?
13
12
  }
14
13
 
@@ -24,20 +23,19 @@ extension CPListItem {
24
23
 
25
24
  // MARK: - Factory
26
25
 
27
- /// Creates CPListItems and CPListSections from Track data for CarPlay templates.
28
26
  @MainActor
29
27
  final class CarPlayListItemFactory {
30
28
  private let logger = Logger(subsystem: "com.audiobrowser", category: "CarPlayListItemFactory")
31
29
 
32
30
  private let imageLoader: CarPlayImageLoader
33
- /// The last-applied location; the factory never reads options itself.
31
+ /// The last-applied location; the session sets it, the factory never reads options itself.
34
32
  var playingIndicatorLocation: CPListItemPlayingIndicatorLocation
35
33
  private let isActiveTrack: (_ identity: String?) -> Bool
36
- /// Runs an artwork load as a task the session owns, so ending the session cancels it.
34
+ /// Runs work as a task the session owns, so ending the session cancels it.
37
35
  private let spawn: (@escaping @MainActor () async -> Void) -> Void
38
- /// A row or tile was tapped; call `completion` once CarPlay may take the next tap.
36
+ /// Call `completion` once CarPlay may take the next tap.
39
37
  private let onItemSelected: (Track, @escaping () -> Void) -> Void
40
- /// A section header's "view all" was tapped.
38
+ /// A tile section's header ("view all") was tapped.
41
39
  private let onNavigate: (_ path: String, _ title: String) -> Void
42
40
 
43
41
  init(
@@ -56,7 +54,6 @@ final class CarPlayListItemFactory {
56
54
  self.onNavigate = onNavigate
57
55
  }
58
56
 
59
- /// Loads `track`'s artwork and hands it to `apply` unless the session ended meanwhile.
60
57
  private func loadArtwork(
61
58
  for track: Track, style: TrackStyle?, size: CGSize, apply: @escaping @MainActor (UIImage?) -> Void,
62
59
  ) {
@@ -69,9 +66,8 @@ final class CarPlayListItemFactory {
69
66
 
70
67
  // MARK: - Sections
71
68
 
72
- /// Whether this OS has CarPlay's iOS 26 element API — the wrapping tile
73
- /// container and the text-less image row `SectionPresentation` degrades
74
- /// against.
69
+ /// Whether this OS has CarPlay's iOS 26 element API: the wrapping tile container and the
70
+ /// text-less image row.
75
71
  private static var supportsElements: Bool {
76
72
  if #available(iOS 26.0, *) { return true }
77
73
  return false
@@ -84,16 +80,10 @@ final class CarPlayListItemFactory {
84
80
  return CPListSection(items: items)
85
81
  }
86
82
 
87
- /// Maps the page's sections 1:1 to CPListSections (ADR 0010), respecting
88
- /// CarPlay's section and total-item budgets. Style blocks declare the
89
- /// requested presentation (resolved `section ?? page` here — ADR 0011);
90
- /// this renders CarPlay's nearest supported form (`SectionPresentation`):
91
- /// - list (default): a titled/headerless section of list rows.
92
- /// - single-line grid (`gridWrap: false`): a section holding one
93
- /// single-line image-row item — the tiles that fit render, the rest
94
- /// truncate (the platform doesn't report the fit).
95
- /// - wrapping grid: a wrapping, titled tile grid on iOS 26+; a plain list
96
- /// before that.
83
+ /// One CPListSection per non-empty page section (ADR 0010), within CarPlay's section and
84
+ /// total-item limits; a tile section counts as one item. Style resolves `section ?? page`
85
+ /// (ADR 0011) to a `SectionPresentation`: list rows, a single-line tile row whose overflow
86
+ /// truncates unreported, or a wrapping tile grid (iOS 26+; a list before).
97
87
  func createSections(from resolvedTrack: ResolvedTrack) -> [CPListSection] {
98
88
  guard let sections = resolvedTrack.normalizedSections else {
99
89
  return []
@@ -108,9 +98,6 @@ final class CarPlayListItemFactory {
108
98
  for section in sections {
109
99
  guard listSections.count < maxSections else { break }
110
100
  guard totalItemCount < maxTotalItems else { break }
111
- // An empty section is a dead end regardless of style (a "popular"
112
- // section with no entries yet) — skip it rather than render a header
113
- // with nothing under it.
114
101
  guard !section.children.isEmpty else { continue }
115
102
 
116
103
  let style = StyleResolver.sectionStyle(section: section.style, page: resolvedTrack.style)
@@ -124,9 +111,6 @@ final class CarPlayListItemFactory {
124
111
  listSections.append(Self.listSection(items, header: section.title))
125
112
  totalItemCount += items.count
126
113
  case .singleLineRow, .wrappingGrid:
127
- // Tile presentations render as one image-row item in its own
128
- // CPListSection. The title is drawn once: as the section's header
129
- // (`SectionPresentation.tileSectionHeader`), or as the item's text.
130
114
  let header = SectionPresentation.tileSectionHeader(section, supportsElements: Self.supportsElements)
131
115
  guard let item = createImageRowItem(
132
116
  for: section, text: header == nil ? section.title : nil, style: style, presentation: presentation,
@@ -141,11 +125,10 @@ final class CarPlayListItemFactory {
141
125
 
142
126
  // MARK: - List Item
143
127
 
144
- /// A list row for `track`: its identity, accessory, playing flag, artwork and tap handler.
145
128
  /// - Parameters:
146
- /// - style: The track's resolved style block (`track ?? section ?? page`); nil for the
147
- /// track's own declaration, when there is no section (Up Next).
148
- /// - handler: Replaces the default browse or play on tap.
129
+ /// - style: The resolved style (`track ?? section ?? page`); nil uses the track's own,
130
+ /// for rows outside a section (Up Next).
131
+ /// - handler: Replaces the default browse or play on tap; a disabled track still ignores the tap.
149
132
  func createListItem(
150
133
  for track: Track,
151
134
  style: TrackStyle? = nil,
@@ -160,9 +143,9 @@ final class CarPlayListItemFactory {
160
143
 
161
144
  if let src = track.src {
162
145
  item.accessoryType = .none
146
+ item.playingIndicatorLocation = playingIndicatorLocation
163
147
  // The phone's CarPlay service draws the indicator, and some iOS and CarPlay Simulator
164
148
  // combinations draw none for any app: check a real head unit before suspecting this code.
165
- item.playingIndicatorLocation = playingIndicatorLocation
166
149
  item.isPlaying = isActiveTrack(track.identity)
167
150
  if item.isPlaying {
168
151
  logger.debug("Setting isPlaying=true for: \(track.title) (src: \(src))")
@@ -171,20 +154,14 @@ final class CarPlayListItemFactory {
171
154
  item.accessoryType = .disclosureIndicator
172
155
  }
173
156
 
174
- // A resolved accessorySymbol replaces the derived accessory above
175
- // (accessoryImage outranks accessoryType in the SDK). 'none' — the
176
- // inheritance escape — keeps the derived behavior instead.
157
+ // accessoryImage outranks accessoryType in the SDK, and its setter clears accessoryType;
158
+ // 'none' resolves to nil and keeps the derived accessory.
177
159
  if let symbol = SectionPresentation.effectiveAccessorySymbol(style ?? track.style),
178
160
  let accessory = UIImage(systemName: symbol)
179
161
  {
180
- // `accessoryImage` is readonly on CPListItem; post-init updates go
181
- // through the setter (which also clears `accessoryType`, per the SDK).
182
162
  item.setAccessoryImage(accessory)
183
163
  }
184
164
 
185
- // An unavailable track grays out and goes inert — list rows are the
186
- // surface that CAN draw the fact, so it shows rather than hides
187
- // (Track.disabled's rendering ladder).
188
165
  if track.disabled == true {
189
166
  item.isEnabled = false
190
167
  }
@@ -196,11 +173,10 @@ final class CarPlayListItemFactory {
196
173
  }
197
174
  }
198
175
 
199
- // The disabled guard wraps custom handlers too (Up Next rows), so an unavailable track
200
- // stays inert even if a surface delivers the tap.
201
176
  let selection = handler ?? { [onItemSelected] _, completion in
202
177
  onItemSelected(track, completion)
203
178
  }
179
+ // Guards custom handlers too, so a disabled row stays inert if a surface delivers the tap.
204
180
  item.handler = { item, completion in
205
181
  guard track.disabled != true else {
206
182
  completion()
@@ -214,9 +190,7 @@ final class CarPlayListItemFactory {
214
190
 
215
191
  // MARK: - Image Row Item
216
192
 
217
- /// Target size for images inside an image row. The iOS 26 SDK deprecates
218
- /// `CPListImageRowItem.maximumImageSize` in favor of the element-based API,
219
- /// so read whichever the running OS considers canonical.
193
+ /// iOS 26 deprecates `CPListImageRowItem.maximumImageSize` for the element API's.
220
194
  private static var rowImageSize: CGSize {
221
195
  if #available(iOS 26.0, *) {
222
196
  return CPListImageRowItemElement.maximumImageSize
@@ -224,9 +198,6 @@ final class CarPlayListItemFactory {
224
198
  return CPListImageRowItem.maximumImageSize
225
199
  }
226
200
 
227
- /// Target artwork size for one tile. Cards, image tiles and plain row
228
- /// elements read their own class maximums ('background' selects the larger
229
- /// full-height card target); condensed tiles use the shared element size.
230
201
  private static func tileImageSize(
231
202
  family: SectionPresentation.TileElementFamily, cardImage: CardImage?,
232
203
  ) -> CGSize {
@@ -245,32 +216,23 @@ final class CarPlayListItemFactory {
245
216
  }
246
217
  }
247
218
 
248
- /// Creates the image-row item rendering a tile-presented section: a single
249
- /// truncating line (`.singleLineRow`) or a wrapping multi-line grid
250
- /// (`.wrappingGrid` — constructed on iOS 26+ only, by `SectionPresentation`).
251
- ///
252
- /// Returns nil when nothing is drawable — every child hidden by the
253
- /// disabled ladder (pre-26 only; the element APIs gray instead).
254
- ///
255
- /// - Parameter text: the row's own title; nil when the list section's
256
- /// header carries it.
219
+ /// The single image-row item a tile section renders as; nil when pre-iOS 26 hides every
220
+ /// child as disabled.
221
+ /// - Parameter text: The row's title; nil when the section header carries it.
257
222
  private func createImageRowItem(
258
223
  for section: Section, text rowText: String?, style: SectionStyle, presentation: SectionPresentation,
259
224
  ) -> CPListImageRowItem? {
260
225
  let singleLine = presentation == .singleLineRow
261
226
  let family = SectionPresentation.tileFamily(for: style)
262
- // Disabled ladder: iOS 26 elements can draw unavailability (grayed +
263
- // inert, below); the legacy image row can't, so there a disabled track
264
- // hides — never a normal-looking dead tile.
227
+ // iOS 26 elements can draw a disabled track grayed and inert; the legacy row cannot, so it
228
+ // hides the track rather than show a dead tile.
265
229
  let visibleChildren: [Track] = if #available(iOS 26.0, *) {
266
230
  section.children
267
231
  } else {
268
232
  section.children.filter { $0.disabled != true }
269
233
  }
270
234
  guard !visibleChildren.isEmpty else { return nil }
271
- // A single line shows at most CPMaximumNumberOfGridImages; the wrapping
272
- // grid takes every child (queue scope is declared, never rendered — the
273
- // cap here only limits what's drawn, and only where the platform does).
235
+ // The cap limits only what is drawn, where the platform truncates; the queue is unaffected.
274
236
  let tracks = singleLine
275
237
  ? Array(visibleChildren.prefix(CPMaximumNumberOfGridImages))
276
238
  : visibleChildren
@@ -279,13 +241,10 @@ final class CarPlayListItemFactory {
279
241
  }
280
242
 
281
243
  let item: CPListImageRowItem
282
- // Sets a loaded image on its tile's element; nil on the legacy gridImages path, which has
283
- // no elements (their types do not exist before iOS 26).
244
+ // Nil on the legacy path, whose element types do not exist before iOS 26.
284
245
  var applyImage: (@MainActor (Int, UIImage) -> Void)?
285
246
  let resolvedStyles = tracks.map { StyleResolver.trackStyle(track: $0.style, section: style) }
286
247
  if #available(iOS 26.0, *) {
287
- // One element per track, grayed when disabled, built into the row by the family's
288
- // initializer; each tile's image lands on its element.
289
248
  func row<Element: CPListImageRowItemElement>(
290
249
  _ build: (String?, [Element], Bool) -> CPListImageRowItem,
291
250
  element make: (Track, TrackStyle) -> Element,
@@ -303,11 +262,8 @@ final class CarPlayListItemFactory {
303
262
  }
304
263
  return build(rowText, elements, !singleLine)
305
264
  }
306
- // Pre-26 the family's treatment drops and the layout survives (the legacy branch below).
307
265
  switch family {
308
266
  case .cardElements:
309
- // Cards have no shape and no accessory slot; 'background' fills the card full-height
310
- // and fades the tint in behind the labels.
311
267
  item = row(CPListImageRowItem.init(text:cardElements:allowsMultipleLines:)) { track, resolved in
312
268
  CPListImageRowItemCardElement(
313
269
  image: placeholder(),
@@ -328,8 +284,7 @@ final class CarPlayListItemFactory {
328
284
  )
329
285
  }
330
286
  case .imageGridElements:
331
- // imageGridElements, never the title-less gridElements: an
332
- // artwork-less track must keep its name on screen (ADR 0010).
287
+ // Never the title-less gridElements: an artwork-less track keeps its name (ADR 0010).
333
288
  item = row(CPListImageRowItem.init(text:imageGridElements:allowsMultipleLines:)) { track, resolved in
334
289
  CPListImageRowItemImageGridElement(
335
290
  image: placeholder(),
@@ -339,8 +294,6 @@ final class CarPlayListItemFactory {
339
294
  )
340
295
  }
341
296
  case .rowElements:
342
- // Titled, so an artwork-less track keeps its name on screen
343
- // (ADR 0010); no shape and no accessory slot.
344
297
  item = row(CPListImageRowItem.init(text:elements:allowsMultipleLines:)) { track, _ in
345
298
  CPListImageRowItemRowElement(
346
299
  image: placeholder(), title: track.title, subtitle: track.subtitle,
@@ -349,7 +302,6 @@ final class CarPlayListItemFactory {
349
302
  }
350
303
  } else {
351
304
  let placeholders = tracks.map { _ in placeholder() }
352
- // Use imageTitles variant on iOS 17.4+ to show titles below each thumbnail
353
305
  if #available(iOS 17.4, *) {
354
306
  item = CPListImageRowItem(text: rowText ?? "", images: placeholders, imageTitles: tracks.map(\.title))
355
307
  } else {
@@ -357,8 +309,7 @@ final class CarPlayListItemFactory {
357
309
  }
358
310
  }
359
311
 
360
- // Header tap → navigate to section.path ("view all"). A path-less
361
- // section is a pure preview and gets no handler.
312
+ // `handler` is the header tap; a path-less section is a preview with nothing to open.
362
313
  if let path = section.path {
363
314
  let title = section.title ?? ""
364
315
  item.handler = { [onNavigate] _, completion in
@@ -367,8 +318,7 @@ final class CarPlayListItemFactory {
367
318
  }
368
319
  }
369
320
 
370
- // A disabled tile is grayed and inert (iOS 26 elements); the guard keeps it inert even if
371
- // the surface delivers the tap.
321
+ // Keeps a disabled tile inert even if the surface delivers the tap.
372
322
  item.listImageRowHandler = { [onItemSelected] _, index, completion in
373
323
  guard index < tracks.count, tracks[index].disabled != true else {
374
324
  completion()
@@ -2,8 +2,6 @@ import CarPlay
2
2
  import Foundation
3
3
  import os.log
4
4
 
5
- /// The CarPlay Now Playing template for one session: its custom buttons, the album line's
6
- /// destination, Up Next, and the events that refresh them.
7
5
  @MainActor
8
6
  final class CarPlayNowPlayingManager {
9
7
  private let logger = Logger(subsystem: "com.audiobrowser", category: "CarPlayNowPlayingManager")
@@ -13,18 +11,14 @@ final class CarPlayNowPlayingManager {
13
11
  /// Read on each use: a re-setup replaces the bridge's player.
14
12
  private var player: Player? { audioBrowser.player }
15
13
  private let listItem: (Track, ((CPSelectableListItem, @escaping () -> Void) -> Void)?) -> CPListItem
16
- /// Pushes a browse destination: the album line's.
17
14
  private let navigate: (_ path: String, _ title: String) -> Void
18
15
 
19
16
  private var subscriptions: [Subscription] = []
20
17
  private var nowPlayingObserver: NowPlayingObserver?
21
18
  private weak var upNextTemplate: CPListTemplate?
22
- /// What the built button row renders. A rebuild is skipped while it is unchanged: every
23
- /// `updateNowPlayingButtons` re-renders all the buttons.
24
- ///
25
- /// Shuffle and repeat carry their `isSelected` because CarPlay serializes the buttons to its
26
- /// UI process and draws each re-render from the serialized state before the live one: a
27
- /// button built unselected while its mode is on flashes off, then on.
19
+ /// A rebuild is skipped while this is unchanged: every `updateNowPlayingButtons` re-renders
20
+ /// all buttons. Shuffle and repeat carry `isSelected` because CarPlay draws a re-render from
21
+ /// the serialized state first: a button built unselected while its mode is on flashes off.
28
22
  private struct BuiltButtonRow: Equatable {
29
23
  let types: [CarPlayNowPlayingButton]
30
24
  let favorited: Bool?
@@ -34,19 +28,12 @@ final class CarPlayNowPlayingManager {
34
28
 
35
29
  private var builtRow: BuiltButtonRow?
36
30
 
37
- /// Browse path the album line navigates to for the active track —
38
- /// `track.albumPath`, or the pre-resolved `resolveAlbumPath` result. Resolved
39
- /// at track-change time (not at tap) so the album line only surfaces when a
40
- /// destination actually exists.
31
+ /// Resolved on track change, not on tap, so the album line shows only when a destination exists.
41
32
  private var albumArtistDestination: String?
42
- /// Drops a stale async `resolveAlbumPath` result when the track changed while
43
- /// the resolver was in flight (latest-update-wins).
33
+ /// Drops a `resolveAlbumPath` result that finishes after the track changed.
44
34
  private var albumArtistGeneration: UInt = 0
45
- /// The just-tapped track whose load is still in flight. CarPlay reads
46
- /// `isAlbumArtistButtonEnabled` when the template is displayed (a change while
47
- /// visible doesn't re-render), and Now Playing is pushed at tap time — before
48
- /// the player's `currentTrack` reflects the tap — so the flag must be derived
49
- /// from the tapped track at push time. Cleared when the active track changes.
35
+ /// The tapped track while its load runs, which wins over `currentTrack`: CarPlay reads
36
+ /// `isAlbumArtistButtonEnabled` only when Now Playing is displayed, and that push comes first.
50
37
  private var pendingAlbumArtistTrack: Track?
51
38
 
52
39
  private var config: BrowserConfig {
@@ -96,21 +83,18 @@ final class CarPlayNowPlayingManager {
96
83
  nowPlayingObserver = nil
97
84
  subscriptions = []
98
85
  pendingAlbumArtistTrack = nil
99
- // A resolve still in flight must not set the shared template for the next session.
86
+ // A resolve in flight must not set the shared template for the next session.
100
87
  albumArtistGeneration &+= 1
101
88
  }
102
89
 
103
- /// Re-renders Up Next availability, the custom buttons and the album line's destination.
104
90
  func refresh() {
105
91
  updateUpNextButton()
106
92
  refreshButtons()
107
93
  updateAlbumArtistDestination()
108
94
  }
109
95
 
110
- /// Marks `track` as the just-tapped (still loading) track and derives the album line's
111
- /// destination from it. Call before pushing Now Playing: CarPlay reads
112
- /// `isAlbumArtistButtonEnabled` at display time, so enabling it after the push renders no
113
- /// chevron.
96
+ /// Call before pushing Now Playing for a just-tapped track: enabling the album line after
97
+ /// the push renders no chevron.
114
98
  func prepare(for track: Track) {
115
99
  pendingAlbumArtistTrack = track
116
100
  updateAlbumArtistDestination()
@@ -118,11 +102,8 @@ final class CarPlayNowPlayingManager {
118
102
 
119
103
  // MARK: - Buttons
120
104
 
121
- /// Builds the custom button row from the configuration and player state, skipping the
122
- /// rebuild when nothing the row renders changed.
123
105
  private func refreshButtons() {
124
- // A gate hides the custom buttons; the transport controls stay, as a gate never blocks
125
- // playback.
106
+ // A gate hides the custom buttons; the transport controls stay, as a gate never blocks playback.
126
107
  let buttons = NowPlayingButtonRules.buttons(
127
108
  audioBrowser.browseGate.isActive ? [] : audioBrowser.playerOptions.carPlayNowPlayingButtons,
128
109
  )
@@ -149,7 +130,7 @@ final class CarPlayNowPlayingManager {
149
130
  let shuffleButton = CPNowPlayingShuffleButton { [weak self] _ in
150
131
  self?.handleShuffleButtonTapped()
151
132
  }
152
- // Pre-stamp the serialized selected state — see BuiltButtonRow.
133
+ // Pre-stamped: see BuiltButtonRow.
153
134
  shuffleButton.isSelected = row.shuffleSelected ?? false
154
135
  nowPlayingButtons.append(shuffleButton)
155
136
 
@@ -157,7 +138,7 @@ final class CarPlayNowPlayingManager {
157
138
  let repeatButton = CPNowPlayingRepeatButton { [weak self] _ in
158
139
  self?.handleRepeatButtonTapped()
159
140
  }
160
- // Pre-stamp the serialized selected state — see BuiltButtonRow.
141
+ // Pre-stamped: see BuiltButtonRow.
161
142
  repeatButton.isSelected = row.repeatSelected ?? false
162
143
  nowPlayingButtons.append(repeatButton)
163
144
 
@@ -183,12 +164,9 @@ final class CarPlayNowPlayingManager {
183
164
 
184
165
  // MARK: - Show Now Playing
185
166
 
186
- /// `popToFront` controls what happens when Now Playing is already on the
187
- /// stack but buried under templates pushed on top of it (Up Next, the album
188
- /// line's browse destination): a user-initiated surface (tap, voice play)
189
- /// pops back to it, while the deferred post-resolve calls in
190
- /// `CarPlaySession.select` pass `false` — they run seconds after the tap, and
191
- /// popping then would yank away a screen the user navigated to meanwhile.
167
+ /// Pushes Now Playing, or pops back to it when it is buried under Up Next or a browse page,
168
+ /// unless `popToFront` is false: a call seconds after the tap must not yank away a screen the
169
+ /// user opened since.
192
170
  func showNowPlaying(popToFront: Bool = true) {
193
171
  refresh()
194
172
  let nowPlayingTemplate = CPNowPlayingTemplate.shared
@@ -203,15 +181,10 @@ final class CarPlayNowPlayingManager {
203
181
 
204
182
  // MARK: - Album Line
205
183
 
206
- /// Resolves the album line's destination for the active (or just-tapped) track and enables
207
- /// the album/artist button only when one exists: `track.albumPath`, or the app's
208
- /// `resolveAlbumPath` result.
209
184
  private func updateAlbumArtistDestination() {
210
185
  albumArtistGeneration &+= 1
211
186
  let generation = albumArtistGeneration
212
187
 
213
- // The just-tapped track wins while its load is in flight: currentTrack
214
- // still points at the previous track (or nil) at push time.
215
188
  guard let track = pendingAlbumArtistTrack ?? player?.currentTrack else {
216
189
  logger.debug("AlbumArtist: no current track → disabled")
217
190
  setAlbumArtistDestination(nil)
@@ -259,7 +232,6 @@ final class CarPlayNowPlayingManager {
259
232
 
260
233
  // MARK: - Private - Button Handlers
261
234
 
262
- /// Returns the appropriate image for the favorite button based on state
263
235
  private func favoriteButtonImage(isFavorited: Bool) -> UIImage {
264
236
  let symbolName = isFavorited ? "heart.fill" : "heart"
265
237
  guard let image = UIImage(systemName: symbolName)?.fitted(
@@ -308,8 +280,7 @@ final class CarPlayNowPlayingManager {
308
280
  fileprivate func handleAlbumArtistButtonTapped() {
309
281
  guard let destination = albumArtistDestination else { return }
310
282
  let track = pendingAlbumArtistTrack ?? player?.currentTrack
311
- // The album line is what was tapped, so its text is the natural title for
312
- // the pushed destination (artist may be unset, or the live song).
283
+ // The album line is what was tapped, so it titles the destination; artist may be unset.
313
284
  let title = track?.album ?? track?.artist ?? track?.title ?? ""
314
285
  logger.info("Album/Artist button tapped, navigating to \(destination)")
315
286
  navigate(destination, title)
@@ -329,9 +300,7 @@ final class CarPlayNowPlayingManager {
329
300
 
330
301
  logger.info("Showing Up Next queue with \(tracks.count) tracks")
331
302
 
332
- // Reuse the now-playing template's button title (system-localized "Up Next"
333
- // by default, and whatever the app set otherwise) instead of hardcoding an
334
- // un-localized string.
303
+ // System-localized, or what the app set.
335
304
  let upNextTitle = CPNowPlayingTemplate.shared.upNextTitle
336
305
  let template = CPListTemplate(
337
306
  title: upNextTitle.isEmpty ? "Up Next" : upNextTitle,
@@ -344,12 +313,11 @@ final class CarPlayNowPlayingManager {
344
313
  }
345
314
 
346
315
  private func createUpNextSection(tracks: [Track]) -> CPListSection {
347
- // Clamp to CarPlay's list limit (createSections does the same for browse
348
- // lists). Taking the prefix keeps item positions aligned with queue indices.
349
316
  let maxItems = CPListTemplate.maximumItemCount
350
317
  if tracks.count > maxItems {
351
318
  logger.info("Up Next queue has \(tracks.count) tracks, clamping to CarPlay's limit of \(maxItems)")
352
319
  }
320
+ // A prefix keeps item positions equal to queue indices.
353
321
  let items = tracks.prefix(maxItems).enumerated().map { index, track -> CPListItem in
354
322
  listItem(track) { [weak self] _, completion in
355
323
  self?.logger.info("Skipping to track at index \(index): \(track.title)")
@@ -367,7 +335,6 @@ final class CarPlayNowPlayingManager {
367
335
 
368
336
  // MARK: - Now Playing Observer
369
337
 
370
- /// Private helper class for CPNowPlayingTemplateObserver conformance.
371
338
  private final class NowPlayingObserver: NSObject, CPNowPlayingTemplateObserver, @unchecked Sendable {
372
339
  private let logger = Logger(subsystem: "com.audiobrowser", category: "NowPlayingObserver")
373
340
  private weak var manager: CarPlayNowPlayingManager?
@@ -392,8 +359,6 @@ private final class NowPlayingObserver: NSObject, CPNowPlayingTemplateObserver,
392
359
  }
393
360
 
394
361
  private extension UIImage {
395
- /// Draws the image centered in `targetSize`, keeping its aspect ratio, at the car screen's
396
- /// display scale.
397
362
  func fitted(to targetSize: CGSize, scale: CGFloat) -> UIImage? {
398
363
  UIGraphicsBeginImageContextWithOptions(targetSize, false, scale)
399
364
  defer { UIGraphicsEndImageContext() }