@neoskola/auto-play 0.3.21 → 0.3.23

package/ios/templates/NeoSkolaNowPlayingTemplate.swift

@@ -0,0 +1,69 @@
+import CarPlay
+import Security
+import UIKit
+
+enum NeoSkolaNowPlayingPresentationStyle {
+    case systemNowPlaying
+    case fallbackList
+}
+
+enum NeoSkolaNowPlayingTemplate {
+    private static let carPlayAudioEntitlement = "com.apple.developer.carplay-audio"
+
+    static func preferredPresentationStyle() -> NeoSkolaNowPlayingPresentationStyle {
+        return hasCarPlayAudioEntitlement() ? .systemNowPlaying : .fallbackList
+    }
+
+    @MainActor
+    static func configureSystemButtons(
+        isPlaying: Bool,
+        canGoPrevious: Bool,
+        canGoNext: Bool,
+        onPrevious: @escaping () -> Void,
+        onTogglePlayPause: @escaping () -> Void,
+        onNext: @escaping () -> Void
+    ) {
+        let previous = CPNowPlayingImageButton(
+            image: symbolImage("backward.fill"),
+            handler: { _ in onPrevious() }
+        )
+        previous.isEnabled = canGoPrevious
+
+        let playPause = CPNowPlayingImageButton(
+            image: symbolImage(isPlaying ? "pause.fill" : "play.fill"),
+            handler: { _ in onTogglePlayPause() }
+        )
+        playPause.isEnabled = true
+
+        let next = CPNowPlayingImageButton(
+            image: symbolImage("forward.fill"),
+            handler: { _ in onNext() }
+        )
+        next.isEnabled = canGoNext
+
+        CPNowPlayingTemplate.shared.updateNowPlayingButtons([previous, playPause, next])
+    }
+
+    @MainActor
+    static func clearSystemButtons() {
+        CPNowPlayingTemplate.shared.updateNowPlayingButtons([])
+    }
+
+    private static func hasCarPlayAudioEntitlement() -> Bool {
+        guard let task = SecTaskCreateFromSelf(nil) else {
+            return false
+        }
+        guard let value = SecTaskCopyValueForEntitlement(
+            task,
+            carPlayAudioEntitlement as CFString,
+            nil
+        ) else {
+            return false
+        }
+        return (value as? Bool) ?? false
+    }
+
+    private static func symbolImage(_ name: String) -> UIImage {
+        return UIImage(systemName: name) ?? UIImage()
+    }
+}

package/ios/templates/NowPlayingTemplate.swift

@@ -3,8 +3,10 @@ import MediaPlayer
 import AVFoundation
 
 class NowPlayingTemplate: AutoPlayTemplate {
-    var template: CPListTemplate
+    var template: CPTemplate
     var config: NowPlayingTemplateConfig
+    private let presentationStyle: NeoSkolaNowPlayingPresentationStyle
+    private var fallbackTemplate: CPListTemplate?
     private var loadedImage: UIImage?
     private var isSetupComplete = false
     private var currentElapsedTime: Double = 0
@@ -33,32 +35,42 @@ class NowPlayingTemplate: AutoPlayTemplate {
 
     init(config: NowPlayingTemplateConfig) {
         self.config = config
+        self.presentationStyle = NeoSkolaNowPlayingTemplate.preferredPresentationStyle()
 
-        // CarPlay-safe custom player screen using CPListTemplate.
-        let titleText = Parser.parseText(text: config.title) ?? "Now Playing"
-        let subtitleText = config.subtitle.flatMap { Parser.parseText(text: $0) } ?? ""
-
-        let initialInfoItem = CPListItem(
-            text: titleText,
-            detailText: subtitleText,
-            image: UIImage(systemName: "music.note"),
-            accessoryImage: nil,
-            accessoryType: .none
-        )
-        initialInfoItem.isEnabled = false
-
-        let initialSection = CPListSection(
-            items: [initialInfoItem],
-            header: nil,
-            sectionIndexTitle: nil
-        )
-
-        template = CPListTemplate(
-            title: "Now Playing",
-            sections: [initialSection],
-            assistantCellConfiguration: nil,
-            id: config.id
-        )
+        if presentationStyle == .systemNowPlaying {
+            template = CPNowPlayingTemplate.shared
+            fallbackTemplate = nil
+            print("[NowPlayingTemplate] Using CPNowPlayingTemplate (carplay-audio entitlement detected)")
+        } else {
+            let titleText = Parser.parseText(text: config.title) ?? "Now Playing"
+            let subtitleText = config.subtitle.flatMap { Parser.parseText(text: $0) } ?? ""
+
+            let initialInfoItem = CPListItem(
+                text: titleText,
+                detailText: subtitleText,
+                image: UIImage(systemName: "music.note"),
+                accessoryImage: nil,
+                accessoryType: .none
+            )
+            initialInfoItem.isEnabled = false
+
+            let initialSection = CPListSection(
+                items: [initialInfoItem],
+                header: nil,
+                sectionIndexTitle: nil
+            )
+
+            let listTemplate = CPListTemplate(
+                title: "Now Playing",
+                sections: [initialSection],
+                assistantCellConfiguration: nil,
+                id: config.id
+            )
+
+            template = listTemplate
+            fallbackTemplate = listTemplate
+            print("[NowPlayingTemplate] carplay-audio entitlement missing, using fallback CPListTemplate UI")
+        }
 
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
@@ -77,6 +89,38 @@ class NowPlayingTemplate: AutoPlayTemplate {
     // MARK: - Player UI
 
     private func updatePlayerUI() {
+        if presentationStyle == .systemNowPlaying {
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
+                NeoSkolaNowPlayingTemplate.configureSystemButtons(
+                    isPlaying: self.config.isPlaying,
+                    canGoPrevious: self.config.onPreviousTrack != nil,
+                    canGoNext: self.config.onNextTrack != nil,
+                    onPrevious: { [weak self] in
+                        self?.config.onPreviousTrack?()
+                    },
+                    onTogglePlayPause: { [weak self] in
+                        guard let self = self else { return }
+                        Task { @MainActor in
+                            if self.config.isPlaying {
+                                self.pauseAudio()
+                                self.config.onPause?()
+                            } else {
+                                self.resumeAudio()
+                                self.config.onPlay?()
+                            }
+                        }
+                    },
+                    onNext: { [weak self] in
+                        self?.config.onNextTrack?()
+                    }
+                )
+            }
+            return
+        }
+
+        guard let fallbackTemplate = fallbackTemplate else { return }
+
         let titleText = Parser.parseText(text: config.title) ?? "Now Playing"
         let subtitleText = config.subtitle.flatMap { Parser.parseText(text: $0) } ?? ""
         let elapsedText = formatTime(currentElapsedTime)
@@ -144,14 +188,16 @@ class NowPlayingTemplate: AutoPlayTemplate {
                 return
             }
 
-            if self.config.isPlaying {
-                self.pauseAudio()
-                self.config.onPause?()
-            } else {
-                self.resumeAudio()
-                self.config.onPlay?()
+            Task { @MainActor in
+                if self.config.isPlaying {
+                    self.pauseAudio()
+                    self.config.onPause?()
+                } else {
+                    self.resumeAudio()
+                    self.config.onPlay?()
+                }
+                completion()
             }
-            completion()
         }
 
         let nextItem = CPListItem(
@@ -185,7 +231,7 @@ class NowPlayingTemplate: AutoPlayTemplate {
             sectionIndexTitle: nil
         )
 
-        template.updateSections([infoSection, timelineSection, controlSection])
+        fallbackTemplate.updateSections([infoSection, timelineSection, controlSection])
     }
 
     private func formatTime(_ seconds: Double) -> String {
@@ -594,6 +640,12 @@ class NowPlayingTemplate: AutoPlayTemplate {
         config.onPopped?()
         cleanupPlayer()
 
+        if presentationStyle == .systemNowPlaying {
+            Task { @MainActor in
+                NeoSkolaNowPlayingTemplate.clearSystemButtons()
+            }
+        }
+
         let commandCenter = MPRemoteCommandCenter.shared()
         commandCenter.playCommand.removeTarget(nil)
         commandCenter.pauseCommand.removeTarget(nil)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neoskola/auto-play",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",