Fix website opening from popup, use stop for live streams, square station image

Author: fethica

SwiftRadio/ViewControllers/InfoDetailViewController.swift

@@ -36,8 +36,8 @@ class InfoDetailViewController: BaseController {
 
     private let stationImageView: UIImageView = {
         let iv = UIImageView(image: UIImage(named: "stationImage"))
-        iv.contentMode = .scaleAspectFit
-        iv.layer.cornerRadius = 12
+        iv.contentMode = .scaleAspectFill
+        iv.layer.cornerRadius = 20
         iv.clipsToBounds = true
         iv.translatesAutoresizingMaskIntoConstraints = false
         return iv

SwiftRadio/ViewControllers/NowPlayingViewController.swift

@@ -156,7 +156,11 @@ class NowPlayingViewController: UIViewController {
         mainStackView.translatesAutoresizingMaskIntoConstraints = false
 
         controlsView.playingAction = { [unowned self] in
-            player.togglePlaying()
+            if player.isPlaying, player.duration == 0 {
+                player.stop()
+            } else {
+                player.togglePlaying()
+            }
         }
 
         controlsView.nextAction = { [unowned self] in
@@ -274,12 +278,17 @@ class NowPlayingViewController: UIViewController {
     }
 
     private func updatePopupBarPlayPauseButton(isPlaying: Bool) {
-        let imageName = isPlaying ? "pause.fill" : "play.fill"
+        let isLive = player.duration == 0
+        let imageName = isPlaying ? (isLive ? "stop.fill" : "pause.fill") : "play.fill"
         playPauseButton.image = UIImage(systemName: imageName)
     }
 
     @objc private func popupBarPlayPauseTapped() {
-        player.togglePlaying()
+        if player.isPlaying, player.duration == 0 {
+            player.stop()
+        } else {
+            player.togglePlaying()
+        }
     }
 }