@neoskola/auto-play 0.3.12 → 0.3.13

package/ios/templates/NowPlayingTemplate.swift

@@ -42,7 +42,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         super.init()
 
         template.mapDelegate = self
-        template.mapButtons = []
+        template.mapButtons = Self.buildMapButtons(isPlaying: config.isPlaying, owner: self)
 
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
@@ -57,6 +57,47 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         }
     }
 
+    // MARK: - CPMapButton Controls (transparent touch handlers)
+
+    private static func buildMapButtons(isPlaying: Bool, owner: NowPlayingTemplate) -> [CPMapButton] {
+        // 1x1 transparent image for invisible buttons
+        let renderer = UIGraphicsImageRenderer(size: CGSize(width: 1, height: 1))
+        let clearImage = renderer.image { ctx in
+            UIColor.clear.setFill()
+            ctx.fill(CGRect(x: 0, y: 0, width: 1, height: 1))
+        }
+
+        // Previous track button
+        let prevButton = CPMapButton(image: clearImage) { [weak owner] _ in
+            owner?.config.onPreviousTrack?()
+        }
+
+        // Play/Pause button
+        let playPauseButton = CPMapButton(image: clearImage) { [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 nextButton = CPMapButton(image: clearImage) { [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
 
     @MainActor
@@ -75,26 +116,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         customVC.updateInfo(courseName: subtitleText, lessonName: titleText)
         customVC.updatePlaybackState(isPlaying: config.isPlaying)
 
-        // Wire button callbacks
-        customVC.onPreviousTrack = { [weak self] in
-            self?.config.onPreviousTrack?()
-        }
-        customVC.onPlayPause = { [weak self] in
-            guard let self = self else { return }
-            DispatchQueue.main.async {
-                if self.config.isPlaying {
-                    self.pauseAudio()
-                    self.config.onPause?()
-                } else {
-                    self.resumeAudio()
-                    self.config.onPlay?()
-                }
-            }
-        }
-        customVC.onNextTrack = { [weak self] in
-            self?.config.onNextTrack?()
-        }
-
         window.rootViewController = customVC
         window.makeKeyAndVisible()
 
@@ -124,6 +145,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         customVC.updateInfo(courseName: subtitleText, lessonName: titleText)
         customVC.updatePlaybackState(isPlaying: config.isPlaying)
         customVC.updateTime(elapsed: currentElapsedTime, duration: currentDuration)
+        updateMapButtons()
     }
 
     // MARK: - Native Audio Playback

package/ios/views/NeoSkolaNowPlayingViewController.swift

@@ -12,16 +12,11 @@ class NeoSkolaNowPlayingViewController: UIViewController {
     private let durationLabel = UILabel()
     private let timeStack = UIStackView()
 
-    // MARK: - Button Controls
+    // MARK: - Button Controls (visual only, touch handled by CPMapButton)
     private let buttonStack = UIStackView()
-    private let previousButton = UIButton(type: .system)
-    private let playPauseButton = UIButton(type: .system)
-    private let nextButton = UIButton(type: .system)
-
-    // MARK: - Callbacks
-    var onPreviousTrack: (() -> Void)?
-    var onPlayPause: (() -> Void)?
-    var onNextTrack: (() -> Void)?
+    private let previousButton = UIButton(type: .custom)
+    private let playPauseButton = UIButton(type: .custom)
+    private let nextButton = UIButton(type: .custom)
 
     // MARK: - Lifecycle
 
@@ -84,16 +79,18 @@ class NeoSkolaNowPlayingViewController: UIViewController {
                 .withTintColor(.white, renderingMode: .alwaysOriginal),
             for: .normal
         )
-        previousButton.addTarget(self, action: #selector(previousTapped), for: .touchUpInside)
+        previousButton.backgroundColor = .clear
+        previousButton.isUserInteractionEnabled = false
 
         // Play/Pause Button
         playPauseButton.setImage(
             UIImage(systemName: "play.circle.fill",
                     withConfiguration: UIImage.SymbolConfiguration(pointSize: 44, weight: .medium))?
-                .withTintColor(.systemGreen, renderingMode: .alwaysOriginal),
+                .withTintColor(.white, renderingMode: .alwaysOriginal),
             for: .normal
         )
-        playPauseButton.addTarget(self, action: #selector(playPauseTapped), for: .touchUpInside)
+        playPauseButton.backgroundColor = .clear
+        playPauseButton.isUserInteractionEnabled = false
 
         // Next Button
         nextButton.setImage(
@@ -102,7 +99,8 @@ class NeoSkolaNowPlayingViewController: UIViewController {
                 .withTintColor(.white, renderingMode: .alwaysOriginal),
             for: .normal
         )
-        nextButton.addTarget(self, action: #selector(nextTapped), for: .touchUpInside)
+        nextButton.backgroundColor = .clear
+        nextButton.isUserInteractionEnabled = false
 
         // Button Stack (horizontal)
         buttonStack.axis = .horizontal
@@ -174,11 +172,10 @@ class NeoSkolaNowPlayingViewController: UIViewController {
         statusLabel.textColor = isPlaying ? UIColor.systemGreen : UIColor.systemGray
 
         let iconName = isPlaying ? "pause.circle.fill" : "play.circle.fill"
-        let color: UIColor = isPlaying ? .systemOrange : .systemGreen
         playPauseButton.setImage(
             UIImage(systemName: iconName,
                     withConfiguration: UIImage.SymbolConfiguration(pointSize: 44, weight: .medium))?
-                .withTintColor(color, renderingMode: .alwaysOriginal),
+                .withTintColor(.white, renderingMode: .alwaysOriginal),
             for: .normal
         )
     }
@@ -202,17 +199,4 @@ class NeoSkolaNowPlayingViewController: UIViewController {
         return String(format: "%d:%02d", mins, secs)
     }
 
-    // MARK: - Button Actions
-
-    @objc private func previousTapped() {
-        onPreviousTrack?()
-    }
-
-    @objc private func playPauseTapped() {
-        onPlayPause?()
-    }
-
-    @objc private func nextTapped() {
-        onNextTrack?()
-    }
 }

package/package.json

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