@neoskola/auto-play 0.3.10 → 0.3.12

package/ios/extensions/UIImage+Toggle.swift

@@ -55,4 +55,11 @@ extension UIImage {
             thumbPath.fill()
         }
     }
+
+    func resized(to targetSize: CGSize) -> UIImage {
+        let renderer = UIGraphicsImageRenderer(size: targetSize)
+        return renderer.image { _ in
+            self.draw(in: CGRect(origin: .zero, size: targetSize))
+        }
+    }
 }

package/ios/templates/NowPlayingTemplate.swift

@@ -2,7 +2,7 @@ import CarPlay
 import MediaPlayer
 import AVFoundation
 
-class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate, NowPlayingViewDelegate {
+class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate {
     var template: CPMapTemplate
     var config: NowPlayingTemplateConfig
     private var loadedImage: UIImage?
@@ -69,15 +69,30 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate, Now
         previousRootVC = window.rootViewController
 
         let customVC = NeoSkolaNowPlayingViewController()
-        customVC.delegate = self
 
         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)
 
-        if let loadedImage = loadedImage {
-            customVC.updateArtwork(image: loadedImage)
+        // 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
@@ -99,29 +114,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate, Now
         self.customViewController = nil
     }
 
-    // MARK: - NowPlayingViewDelegate
-
-    func didTapPlayPause() {
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else { return }
-            if self.config.isPlaying {
-                self.pauseAudio()
-                self.config.onPause?()
-            } else {
-                self.resumeAudio()
-                self.config.onPlay?()
-            }
-        }
-    }
-
-    func didTapPrevious() {
-        config.onPreviousTrack?()
-    }
-
-    func didTapNext() {
-        config.onNextTrack?()
-    }
-
     // MARK: - Player UI
 
     private func updatePlayerUI() {
@@ -480,7 +472,6 @@ class NowPlayingTemplate: NSObject, AutoPlayTemplate, CPMapTemplateDelegate, Now
                 DispatchQueue.main.async {
                     self.loadedImage = uiImage
                     self.updateNowPlayingInfo()
-                    self.customViewController?.updateArtwork(image: uiImage)
                 }
             }.resume()
         }

package/ios/views/NeoSkolaNowPlayingViewController.swift

@@ -1,34 +1,27 @@
 import UIKit
 
-protocol NowPlayingViewDelegate: AnyObject {
-    func didTapPlayPause()
-    func didTapPrevious()
-    func didTapNext()
-}
-
 class NeoSkolaNowPlayingViewController: UIViewController {
-    weak var delegate: NowPlayingViewDelegate?
 
     // MARK: - UI Elements
-    // Left side: artwork + info
-    private let leftColumn = UIView()
-    private let artworkImageView = UIImageView()
+    private let containerStack = UIStackView()
     private let courseNameLabel = UILabel()
     private let lessonNameLabel = UILabel()
-
-    // Right side: controls + progress
-    private let rightColumn = UIView()
     private let statusLabel = UILabel()
-    private let controlsStack = UIStackView()
-    private let prevButton = UIButton(type: .system)
-    private let playPauseButton = UIButton(type: .system)
-    private let nextButton = UIButton(type: .system)
     private let progressView = UIProgressView(progressViewStyle: .default)
     private let currentTimeLabel = UILabel()
     private let durationLabel = UILabel()
     private let timeStack = UIStackView()
 
-    private var isPlaying = false
+    // 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
 
@@ -42,171 +35,130 @@ class NeoSkolaNowPlayingViewController: UIViewController {
     // MARK: - Setup
 
     private func setupUI() {
-        // Left Column
-        leftColumn.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(leftColumn)
-
-        // Artwork
-        artworkImageView.contentMode = .scaleAspectFill
-        artworkImageView.clipsToBounds = true
-        artworkImageView.layer.cornerRadius = 10
-        artworkImageView.backgroundColor = UIColor(white: 0.15, alpha: 1.0)
-        artworkImageView.translatesAutoresizingMaskIntoConstraints = false
-        leftColumn.addSubview(artworkImageView)
-
-        let placeholderConfig = UIImage.SymbolConfiguration(pointSize: 28, weight: .light)
-        artworkImageView.image = UIImage(systemName: "music.note", withConfiguration: placeholderConfig)
-        artworkImageView.tintColor = UIColor(white: 0.3, alpha: 1.0)
-
-        // Course Name
-        courseNameLabel.font = .systemFont(ofSize: 11, weight: .medium)
-        courseNameLabel.textColor = UIColor(white: 0.5, alpha: 1.0)
+        // Course Name (subtitle - kurs adi)
+        courseNameLabel.font = .systemFont(ofSize: 13, weight: .medium)
+        courseNameLabel.textColor = UIColor(white: 0.55, alpha: 1.0)
         courseNameLabel.textAlignment = .center
         courseNameLabel.numberOfLines = 1
         courseNameLabel.adjustsFontSizeToFitWidth = true
-        courseNameLabel.minimumScaleFactor = 0.8
-        courseNameLabel.translatesAutoresizingMaskIntoConstraints = false
-        leftColumn.addSubview(courseNameLabel)
+        courseNameLabel.minimumScaleFactor = 0.7
 
-        // Lesson Name
-        lessonNameLabel.font = .systemFont(ofSize: 13, weight: .bold)
+        // Lesson Name (title - ders adi, bold)
+        lessonNameLabel.font = .systemFont(ofSize: 17, weight: .bold)
         lessonNameLabel.textColor = .white
         lessonNameLabel.textAlignment = .center
         lessonNameLabel.numberOfLines = 2
         lessonNameLabel.adjustsFontSizeToFitWidth = true
-        lessonNameLabel.minimumScaleFactor = 0.7
-        lessonNameLabel.translatesAutoresizingMaskIntoConstraints = false
-        leftColumn.addSubview(lessonNameLabel)
-
-        // Right Column
-        rightColumn.translatesAutoresizingMaskIntoConstraints = false
-        view.addSubview(rightColumn)
+        lessonNameLabel.minimumScaleFactor = 0.6
 
-        // Status Label
-        statusLabel.font = .systemFont(ofSize: 10, weight: .semibold)
+        // Status Label ("OYNATILIYOR" / "DURAKLATILDI")
+        statusLabel.font = .systemFont(ofSize: 11, weight: .semibold)
         statusLabel.textColor = UIColor.systemGreen
         statusLabel.textAlignment = .center
         statusLabel.text = "OYNATILIYOR"
-        statusLabel.translatesAutoresizingMaskIntoConstraints = false
-        rightColumn.addSubview(statusLabel)
-
-        // Controls
-        setupControls()
 
         // Progress Bar
         progressView.progressTintColor = UIColor.systemGreen
         progressView.trackTintColor = UIColor(white: 0.2, alpha: 1.0)
         progressView.progress = 0
-        progressView.translatesAutoresizingMaskIntoConstraints = false
-        rightColumn.addSubview(progressView)
 
         // Time Labels
-        currentTimeLabel.font = .monospacedDigitSystemFont(ofSize: 10, weight: .medium)
-        currentTimeLabel.textColor = UIColor(white: 0.45, alpha: 1.0)
+        currentTimeLabel.font = .monospacedDigitSystemFont(ofSize: 11, weight: .medium)
+        currentTimeLabel.textColor = UIColor(white: 0.5, alpha: 1.0)
         currentTimeLabel.text = "0:00"
-        currentTimeLabel.translatesAutoresizingMaskIntoConstraints = false
 
-        durationLabel.font = .monospacedDigitSystemFont(ofSize: 10, weight: .medium)
-        durationLabel.textColor = UIColor(white: 0.45, alpha: 1.0)
+        durationLabel.font = .monospacedDigitSystemFont(ofSize: 11, weight: .medium)
+        durationLabel.textColor = UIColor(white: 0.5, alpha: 1.0)
         durationLabel.text = "--:--"
         durationLabel.textAlignment = .right
-        durationLabel.translatesAutoresizingMaskIntoConstraints = false
 
         timeStack.axis = .horizontal
         timeStack.distribution = .equalSpacing
         timeStack.addArrangedSubview(currentTimeLabel)
         timeStack.addArrangedSubview(durationLabel)
-        timeStack.translatesAutoresizingMaskIntoConstraints = false
-        rightColumn.addSubview(timeStack)
-    }
 
-    private func setupControls() {
-        let prevConfig = UIImage.SymbolConfiguration(pointSize: 20, weight: .medium)
-        prevButton.setImage(UIImage(systemName: "backward.end.fill", withConfiguration: prevConfig), for: .normal)
-        prevButton.tintColor = .white
-        prevButton.addTarget(self, action: #selector(prevTapped), for: .touchUpInside)
-        prevButton.translatesAutoresizingMaskIntoConstraints = false
-
-        let playConfig = UIImage.SymbolConfiguration(pointSize: 36, weight: .medium)
-        playPauseButton.setImage(UIImage(systemName: "play.circle.fill", withConfiguration: playConfig), for: .normal)
-        playPauseButton.tintColor = UIColor.systemGreen
+        // 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)
-        playPauseButton.translatesAutoresizingMaskIntoConstraints = false
 
-        let nextConfig = UIImage.SymbolConfiguration(pointSize: 20, weight: .medium)
-        nextButton.setImage(UIImage(systemName: "forward.end.fill", withConfiguration: nextConfig), for: .normal)
-        nextButton.tintColor = .white
+        // 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)
-        nextButton.translatesAutoresizingMaskIntoConstraints = false
-
-        controlsStack.axis = .horizontal
-        controlsStack.alignment = .center
-        controlsStack.distribution = .equalCentering
-        controlsStack.spacing = 28
-        controlsStack.addArrangedSubview(prevButton)
-        controlsStack.addArrangedSubview(playPauseButton)
-        controlsStack.addArrangedSubview(nextButton)
-        controlsStack.translatesAutoresizingMaskIntoConstraints = false
-        rightColumn.addSubview(controlsStack)
+
+        // 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
+        containerStack.spacing = 4
+        containerStack.translatesAutoresizingMaskIntoConstraints = false
+
+        containerStack.addArrangedSubview(courseNameLabel)
+        containerStack.addArrangedSubview(lessonNameLabel)
+
+        // Spacer between lesson name and status
+        let spacer = UIView()
+        spacer.translatesAutoresizingMaskIntoConstraints = false
+        spacer.heightAnchor.constraint(equalToConstant: 6).isActive = true
+        containerStack.addArrangedSubview(spacer)
+
+        containerStack.addArrangedSubview(statusLabel)
+
+        // Spacer between status and progress
+        let spacer2 = UIView()
+        spacer2.translatesAutoresizingMaskIntoConstraints = false
+        spacer2.heightAnchor.constraint(equalToConstant: 8).isActive = true
+        containerStack.addArrangedSubview(spacer2)
+
+        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)
     }
 
     private func setupConstraints() {
         let safeArea = view.safeAreaLayoutGuide
 
         NSLayoutConstraint.activate([
-            // Left Column — sol taraf, artwork + text
-            leftColumn.topAnchor.constraint(equalTo: safeArea.topAnchor, constant: 8),
-            leftColumn.leadingAnchor.constraint(equalTo: safeArea.leadingAnchor, constant: 16),
-            leftColumn.bottomAnchor.constraint(lessThanOrEqualTo: safeArea.bottomAnchor, constant: -8),
-            leftColumn.widthAnchor.constraint(equalTo: safeArea.widthAnchor, multiplier: 0.35),
-
-            // Artwork — sol column ustunde, kare
-            artworkImageView.topAnchor.constraint(equalTo: leftColumn.topAnchor),
-            artworkImageView.centerXAnchor.constraint(equalTo: leftColumn.centerXAnchor),
-            artworkImageView.widthAnchor.constraint(equalTo: leftColumn.widthAnchor, constant: -8),
-            artworkImageView.heightAnchor.constraint(equalTo: artworkImageView.widthAnchor),
-
-            // Course Name — artwork altinda
-            courseNameLabel.topAnchor.constraint(equalTo: artworkImageView.bottomAnchor, constant: 6),
-            courseNameLabel.leadingAnchor.constraint(equalTo: leftColumn.leadingAnchor),
-            courseNameLabel.trailingAnchor.constraint(equalTo: leftColumn.trailingAnchor),
-
-            // Lesson Name — course altinda
-            lessonNameLabel.topAnchor.constraint(equalTo: courseNameLabel.bottomAnchor, constant: 2),
-            lessonNameLabel.leadingAnchor.constraint(equalTo: leftColumn.leadingAnchor),
-            lessonNameLabel.trailingAnchor.constraint(equalTo: leftColumn.trailingAnchor),
-
-            // Right Column — sag taraf, kontroller + progress
-            rightColumn.topAnchor.constraint(equalTo: safeArea.topAnchor, constant: 8),
-            rightColumn.leadingAnchor.constraint(equalTo: leftColumn.trailingAnchor, constant: 12),
-            rightColumn.trailingAnchor.constraint(equalTo: safeArea.trailingAnchor, constant: -16),
-            rightColumn.bottomAnchor.constraint(lessThanOrEqualTo: safeArea.bottomAnchor, constant: -8),
-
-            // Status — sag column ust
-            statusLabel.topAnchor.constraint(equalTo: rightColumn.topAnchor, constant: 8),
-            statusLabel.centerXAnchor.constraint(equalTo: rightColumn.centerXAnchor),
-
-            // Controls — dikey merkez
-            controlsStack.centerYAnchor.constraint(equalTo: rightColumn.centerYAnchor, constant: -4),
-            controlsStack.centerXAnchor.constraint(equalTo: rightColumn.centerXAnchor),
-
-            prevButton.widthAnchor.constraint(greaterThanOrEqualToConstant: 40),
-            prevButton.heightAnchor.constraint(greaterThanOrEqualToConstant: 40),
-            playPauseButton.widthAnchor.constraint(greaterThanOrEqualToConstant: 48),
-            playPauseButton.heightAnchor.constraint(greaterThanOrEqualToConstant: 48),
-            nextButton.widthAnchor.constraint(greaterThanOrEqualToConstant: 40),
-            nextButton.heightAnchor.constraint(greaterThanOrEqualToConstant: 40),
-
-            // Progress Bar — controls altinda
-            progressView.topAnchor.constraint(equalTo: controlsStack.bottomAnchor, constant: 10),
-            progressView.leadingAnchor.constraint(equalTo: rightColumn.leadingAnchor),
-            progressView.trailingAnchor.constraint(equalTo: rightColumn.trailingAnchor),
-            progressView.heightAnchor.constraint(equalToConstant: 3),
+            containerStack.centerYAnchor.constraint(equalTo: safeArea.centerYAnchor),
+            containerStack.leadingAnchor.constraint(equalTo: safeArea.leadingAnchor, constant: 24),
+            containerStack.trailingAnchor.constraint(equalTo: safeArea.trailingAnchor, constant: -24),
 
-            // Time Stack — progress altinda
-            timeStack.topAnchor.constraint(equalTo: progressView.bottomAnchor, constant: 3),
-            timeStack.leadingAnchor.constraint(equalTo: rightColumn.leadingAnchor),
-            timeStack.trailingAnchor.constraint(equalTo: rightColumn.trailingAnchor),
+            progressView.heightAnchor.constraint(equalToConstant: 3),
         ])
     }
 
@@ -218,15 +170,17 @@ class NeoSkolaNowPlayingViewController: UIViewController {
     }
 
     func updatePlaybackState(isPlaying: Bool) {
-        self.isPlaying = isPlaying
-
-        let config = UIImage.SymbolConfiguration(pointSize: 36, weight: .medium)
-        let iconName = isPlaying ? "pause.circle.fill" : "play.circle.fill"
-        playPauseButton.setImage(UIImage(systemName: iconName, withConfiguration: config), for: .normal)
-        playPauseButton.tintColor = isPlaying ? UIColor.systemOrange : UIColor.systemGreen
-
         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) {
@@ -239,11 +193,6 @@ class NeoSkolaNowPlayingViewController: UIViewController {
         }
     }
 
-    func updateArtwork(image: UIImage) {
-        artworkImageView.image = image
-        artworkImageView.contentMode = .scaleAspectFill
-    }
-
     // MARK: - Helpers
 
     private func formatTime(_ seconds: Double) -> String {
@@ -253,17 +202,17 @@ class NeoSkolaNowPlayingViewController: UIViewController {
         return String(format: "%d:%02d", mins, secs)
     }
 
-    // MARK: - Actions
+    // MARK: - Button Actions
 
-    @objc private func prevTapped() {
-        delegate?.didTapPrevious()
+    @objc private func previousTapped() {
+        onPreviousTrack?()
     }
 
     @objc private func playPauseTapped() {
-        delegate?.didTapPlayPause()
+        onPlayPause?()
     }
 
     @objc private func nextTapped() {
-        delegate?.didTapNext()
+        onNextTrack?()
     }
 }

package/package.json

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