@neoskola/auto-play 0.3.11 → 0.3.12

package/ios/templates/NowPlayingTemplate.swift

@@ -42,7 +42,7 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         super.init()
 
         template.mapDelegate = self
-        template.mapButtons = Self.buildMapButtons(isPlaying: config.isPlaying, owner: self)
+        template.mapButtons = []
 
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
@@ -57,53 +57,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
         }
     }
 
-    // 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(.systemBlue, 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 playPauseColor: UIColor = isPlaying ? .systemOrange : .systemGreen
-        let playPauseImage = UIImage(systemName: playPauseIconName)?
-            .withTintColor(playPauseColor, 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(.systemBlue, 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
 
     @MainActor
@@ -122,6 +75,26 @@ 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()
 
@@ -151,7 +124,6 @@ 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

@@ -2,7 +2,7 @@ import UIKit
 
 class NeoSkolaNowPlayingViewController: UIViewController {
 
-    // MARK: - UI Elements (info-only, no buttons)
+    // MARK: - UI Elements
     private let containerStack = UIStackView()
     private let courseNameLabel = UILabel()
     private let lessonNameLabel = UILabel()
@@ -12,6 +12,17 @@ class NeoSkolaNowPlayingViewController: UIViewController {
     private let durationLabel = UILabel()
     private let timeStack = UIStackView()
 
+    // MARK: - Button Controls
+    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)?
+
     // MARK: - Lifecycle
 
     override func viewDidLoad() {
@@ -66,6 +77,42 @@ class NeoSkolaNowPlayingViewController: UIViewController {
         timeStack.addArrangedSubview(currentTimeLabel)
         timeStack.addArrangedSubview(durationLabel)
 
+        // Previous Button
+        previousButton.setImage(
+            UIImage(systemName: "backward.end.fill",
+                    withConfiguration: UIImage.SymbolConfiguration(pointSize: 28, weight: .medium))?
+                .withTintColor(.white, renderingMode: .alwaysOriginal),
+            for: .normal
+        )
+        previousButton.addTarget(self, action: #selector(previousTapped), for: .touchUpInside)
+
+        // Play/Pause Button
+        playPauseButton.setImage(
+            UIImage(systemName: "play.circle.fill",
+                    withConfiguration: UIImage.SymbolConfiguration(pointSize: 44, weight: .medium))?
+                .withTintColor(.systemGreen, renderingMode: .alwaysOriginal),
+            for: .normal
+        )
+        playPauseButton.addTarget(self, action: #selector(playPauseTapped), for: .touchUpInside)
+
+        // Next Button
+        nextButton.setImage(
+            UIImage(systemName: "forward.end.fill",
+                    withConfiguration: UIImage.SymbolConfiguration(pointSize: 28, weight: .medium))?
+                .withTintColor(.white, renderingMode: .alwaysOriginal),
+            for: .normal
+        )
+        nextButton.addTarget(self, action: #selector(nextTapped), for: .touchUpInside)
+
+        // Button Stack (horizontal)
+        buttonStack.axis = .horizontal
+        buttonStack.alignment = .center
+        buttonStack.distribution = .equalSpacing
+        buttonStack.spacing = 40
+        buttonStack.addArrangedSubview(previousButton)
+        buttonStack.addArrangedSubview(playPauseButton)
+        buttonStack.addArrangedSubview(nextButton)
+
         // Main container stack (vertical)
         containerStack.axis = .vertical
         containerStack.alignment = .fill
@@ -92,6 +139,14 @@ class NeoSkolaNowPlayingViewController: UIViewController {
         containerStack.addArrangedSubview(progressView)
         containerStack.addArrangedSubview(timeStack)
 
+        // Spacer between time and buttons
+        let spacer3 = UIView()
+        spacer3.translatesAutoresizingMaskIntoConstraints = false
+        spacer3.heightAnchor.constraint(equalToConstant: 16).isActive = true
+        containerStack.addArrangedSubview(spacer3)
+
+        containerStack.addArrangedSubview(buttonStack)
+
         view.addSubview(containerStack)
     }
 
@@ -117,6 +172,15 @@ class NeoSkolaNowPlayingViewController: UIViewController {
     func updatePlaybackState(isPlaying: Bool) {
         statusLabel.text = isPlaying ? "OYNATILIYOR" : "DURAKLATILDI"
         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),
+            for: .normal
+        )
     }
 
     func updateTime(elapsed: Double, duration: Double) {
@@ -137,4 +201,18 @@ class NeoSkolaNowPlayingViewController: UIViewController {
         let secs = Int(seconds) % 60
         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.11",
+  "version": "0.3.12",
   "description": "Android Auto and Apple CarPlay for react-native",
   "main": "lib/index",
   "module": "lib/index",