@neoskola/auto-play 0.3.14 → 0.3.16

package/ios/hybrid/HybridAutoPlay.swift

@@ -188,13 +188,6 @@ class HybridAutoPlay: HybridAutoPlaySpec {
                     )
                 }
 
-                // NowPlayingTemplate: inject custom UIKit view into CPWindow
-                if let nowPlaying = template as? NowPlayingTemplate {
-                    try await MainActor.run {
-                        try nowPlaying.injectCustomView()
-                    }
-                }
-
                 if let autoDismissMs = TemplateStore.getTemplate(
                     templateId: templateId
                 )?.autoDismissMs {

package/ios/templates/NowPlayingTemplate.swift

@@ -2,18 +2,13 @@ import CarPlay
 import MediaPlayer
 import AVFoundation
 
-class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
-    var template: CPMapTemplate
+class NowPlayingTemplate: NSObject, AutoPlayTemplate {
     var config: NowPlayingTemplateConfig
     private var loadedImage: UIImage?
     private var isSetupComplete = false
     private var currentElapsedTime: Double = 0
     private var currentDuration: Double = 0
 
-    // Custom UIKit view
-    private var customViewController: NeoSkolaNowPlayingViewController?
-    private var previousRootVC: UIViewController?
-
     // Native audio player
     private var player: AVPlayer?
     private var playerItem: AVPlayerItem?
@@ -32,125 +27,27 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
     }
 
     func getTemplate() -> CPTemplate {
-        return template
+        return CPNowPlayingTemplate.shared
     }
 
     init(config: NowPlayingTemplateConfig) {
         self.config = config
-        template = CPMapTemplate(id: config.id)
 
         super.init()
 
-        template.mapDelegate = self
-        template.mapButtons = Self.buildMapButtons(isPlaying: config.isPlaying, owner: self)
-
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else { return }
-            NowPlayingSessionManager.shared.ensureSessionActive()
-            self.setupRemoteCommandCenter()
-            self.updateNowPlayingInfo()
-            self.isSetupComplete = true
-
-            if let image = config.image {
-                self.loadImageAsync(image: image)
-            }
-        }
-    }
-
-    // MARK: - CPMapButton Controls
-
-    private static func buildMapButtons(isPlaying: Bool, owner: NowPlayingTemplate) -> [CPMapButton] {
-        let buttonSize = CPButtonMaximumImageSize
-
-        // Previous track button
-        let prevImage = UIImage(systemName: "backward.end.fill")?
-            .withTintColor(.white, renderingMode: .alwaysOriginal)
-            .resized(to: buttonSize)
-        let prevButton = CPMapButton(image: prevImage ?? UIImage()) { [weak owner] _ in
-            owner?.config.onPreviousTrack?()
-        }
-
-        // Play/Pause button
-        let playPauseIconName = isPlaying ? "pause.circle.fill" : "play.circle.fill"
-        let playPauseImage = UIImage(systemName: playPauseIconName)?
-            .withTintColor(.white, renderingMode: .alwaysOriginal)
-            .resized(to: buttonSize)
-        let playPauseButton = CPMapButton(image: playPauseImage ?? UIImage()) { [weak owner] _ in
-            guard let owner = owner else { return }
-            DispatchQueue.main.async {
-                if owner.config.isPlaying {
-                    owner.pauseAudio()
-                    owner.config.onPause?()
-                } else {
-                    owner.resumeAudio()
-                    owner.config.onPlay?()
-                }
-            }
-        }
-
-        // Next track button
-        let nextImage = UIImage(systemName: "forward.end.fill")?
-            .withTintColor(.white, renderingMode: .alwaysOriginal)
-            .resized(to: buttonSize)
-        let nextButton = CPMapButton(image: nextImage ?? UIImage()) { [weak owner] _ in
-            owner?.config.onNextTrack?()
-        }
-
-        return [prevButton, playPauseButton, nextButton]
-    }
-
-    private func updateMapButtons() {
-        template.mapButtons = Self.buildMapButtons(isPlaying: config.isPlaying, owner: self)
-    }
-
-    // MARK: - Custom View Injection
+        // Set the config ID on the shared singleton so TemplateStore can find it
+        initTemplate(template: CPNowPlayingTemplate.shared, id: config.id)
 
-    @MainActor
-    func injectCustomView() throws {
-        guard let scene = SceneStore.getRootScene(),
-              let window = scene.window else {
-            throw AutoPlayError.noUiWindow("NowPlaying: window nil")
-        }
-
-        previousRootVC = window.rootViewController
-
-        let customVC = NeoSkolaNowPlayingViewController()
-
-        let titleText = Parser.parseText(text: config.title) ?? "Now Playing"
-        let subtitleText = config.subtitle.flatMap { Parser.parseText(text: $0) } ?? ""
-        customVC.updateInfo(courseName: subtitleText, lessonName: titleText)
-        customVC.updatePlaybackState(isPlaying: config.isPlaying)
-
-        window.rootViewController = customVC
-        window.makeKeyAndVisible()
-
-        self.customViewController = customVC
-    }
-
-    @MainActor
-    private func restoreOriginalView() {
-        guard let scene = SceneStore.getRootScene(),
-              let window = scene.window else { return }
+        // Setup remote commands and now playing info synchronously
+        // so they're ready before CPNowPlayingTemplate.shared is pushed
+        NowPlayingSessionManager.shared.ensureSessionActive()
+        setupRemoteCommandCenter()
+        updateNowPlayingInfo()
+        isSetupComplete = true
 
-        if let previousRootVC = previousRootVC {
-            window.rootViewController = previousRootVC
-            window.makeKeyAndVisible()
+        if let image = config.image {
+            loadImageAsync(image: image)
         }
-        self.previousRootVC = nil
-        self.customViewController = nil
-    }
-
-    // MARK: - Player UI
-
-    private func updatePlayerUI() {
-        guard let customVC = customViewController else { return }
-
-        let titleText = Parser.parseText(text: config.title) ?? ""
-        let subtitleText = config.subtitle.flatMap { Parser.parseText(text: $0) } ?? ""
-        customVC.updateInfo(courseName: subtitleText, lessonName: titleText)
-        customVC.updatePlaybackState(isPlaying: config.isPlaying)
-        customVC.updateTime(elapsed: currentElapsedTime, duration: currentDuration)
-        updateMapButtons()
     }
 
     // MARK: - Native Audio Playback
@@ -170,7 +67,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         NowPlayingSessionManager.shared.ensureSessionActive()
         config.isPlaying = true
         updateNowPlayingInfo()
-        updatePlayerUI()
         MPNowPlayingInfoCenter.default().playbackState = .playing
 
         print("[NowPlayingTemplate] Downloading audio: \(url)")
@@ -229,7 +125,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
                 if !duration.isNaN && !duration.isInfinite && duration > 0 {
                     self.currentDuration = duration
                     self.updateNowPlayingInfo()
-                    self.updatePlayerUI()
                     print("[NowPlayingTemplate] Duration resolved via KVO: \(duration)s")
                 }
             }
@@ -299,8 +194,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
         MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
 
-        updatePlayerUI()
-
         // 95% completion check
         if !completionFired && currentDuration > 0 && currentTime / currentDuration >= 0.95 {
             completionFired = true
@@ -318,7 +211,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
     private func handlePlaybackFinished() {
         config.isPlaying = false
         MPNowPlayingInfoCenter.default().playbackState = .stopped
-        updatePlayerUI()
         if !completionFired {
             completionFired = true
             config.onComplete?()
@@ -331,7 +223,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         player?.pause()
         config.isPlaying = false
         updatePlaybackState(isPlaying: false)
-        updatePlayerUI()
         reportProgress()
     }
 
@@ -341,7 +232,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         player?.play()
         config.isPlaying = true
         updatePlaybackState(isPlaying: true)
-        updatePlayerUI()
     }
 
     @MainActor
@@ -366,7 +256,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         cleanupPlayer()
         config.isPlaying = false
         MPNowPlayingInfoCenter.default().playbackState = .stopped
-        updatePlayerUI()
     }
 
     private func cleanupPlayer() {
@@ -483,7 +372,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
             self.player?.seek(to: time)
             self.currentElapsedTime = positionEvent.positionTime
             self.updateNowPlayingInfo()
-            self.updatePlayerUI()
             return .success
         }
     }
@@ -508,7 +396,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
 
     @MainActor
     func invalidate() {
-        updatePlayerUI()
         updateNowPlayingInfo()
 
         if loadedImage == nil, let image = config.image {
@@ -535,7 +422,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
     func onPopped() {
         config.onPopped?()
         cleanupPlayer()
-        restoreOriginalView()
 
         let commandCenter = MPRemoteCommandCenter.shared()
         commandCenter.playCommand.removeTarget(nil)
@@ -556,7 +442,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         NowPlayingSessionManager.shared.ensureSessionActive()
 
         if !isSetupComplete {
-            updatePlayerUI()
             updateNowPlayingInfo()
             isSetupComplete = true
         }
@@ -583,7 +468,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         config.title = AutoText(text: title, distance: nil, duration: nil)
         config.subtitle = AutoText(text: subtitle, distance: nil, duration: nil)
         updateNowPlayingInfo()
-        updatePlayerUI()
     }
 
     @MainActor
@@ -605,11 +489,5 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         nowPlayingInfo[MPNowPlayingInfoPropertyElapsedPlaybackTime] = elapsedTime
         nowPlayingInfo[MPNowPlayingInfoPropertyPlaybackRate] = config.isPlaying ? 1.0 : 0.0
         MPNowPlayingInfoCenter.default().nowPlayingInfo = nowPlayingInfo
-
-        updatePlayerUI()
     }
-
-    // MARK: - CPMapTemplateDelegate
-
-    func mapTemplate(_ mapTemplate: CPMapTemplate, panWith direction: CPMapTemplate.PanDirection) {}
 }

package/package.json

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