Skip to content

Improve station tap behavior and bump to 3.0.0 #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fethica merged 4 commits into from
Feb 8, 2026
Merged

Improve station tap behavior and bump to 3.0.0 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1522cd9
Replace fallback station image with app icon
fethica Feb 8, 2026
cb01218
Play stopped/paused station on tap instead of opening popup
fethica Feb 8, 2026
55b61ef
Hide now playing bar button when player is idle
fethica Feb 8, 2026
34698be
Bump version to 3.0.0
fethica Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions SwiftRadio.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
CA58087D2D40BAC000F8082B /* CarPlaySceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA58087B2D40BAC000F8082B /* CarPlaySceneDelegate.swift */; };
CA5F00022F40A00000000002 /* GradientBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5F00012F40A00000000001 /* GradientBackgroundView.swift */; };
CA5F00032F40A00000000003 /* GradientBackgroundView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA5F00012F40A00000000001 /* GradientBackgroundView.swift */; };
CA5F00042F41000000000001 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = CA5F00062F41000000000003 /* Localizable.xcstrings */; };
CA5F00052F41000000000002 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = CA5F00062F41000000000003 /* Localizable.xcstrings */; };
CA900001200000000000000A /* MarqueeLabel in Frameworks */ = {isa = PBXBuildFile; productRef = CA900002200000000000000A /* MarqueeLabel */; };
CAB4E8292D3D7DC7001282E9 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAB4E8282D3D7DC7001282E9 /* SceneDelegate.swift */; };
CAB4E82A2D3D7DC7001282E9 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAB4E8282D3D7DC7001282E9 /* SceneDelegate.swift */; };
Expand Down Expand Up @@ -103,8 +105,6 @@
CEE9A27C2B535C780018FE68 /* AlbumArtworkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9A27A2B535C780018FE68 /* AlbumArtworkView.swift */; };
CEE9A27E2B54A5520018FE68 /* ControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9A27D2B54A5520018FE68 /* ControlsView.swift */; };
CEE9A27F2B54A5520018FE68 /* ControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE9A27D2B54A5520018FE68 /* ControlsView.swift */; };
CA5F00042F41000000000001 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = CA5F00062F41000000000003 /* Localizable.xcstrings */; };
CA5F00052F41000000000002 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = CA5F00062F41000000000003 /* Localizable.xcstrings */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -173,6 +173,7 @@
CA3A11032D4E000000111002 /* Content.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Content.swift; sourceTree = "<group>"; };
CA58087B2D40BAC000F8082B /* CarPlaySceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlaySceneDelegate.swift; sourceTree = "<group>"; };
CA5F00012F40A00000000001 /* GradientBackgroundView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientBackgroundView.swift; sourceTree = "<group>"; };
CA5F00062F41000000000003 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
CAB4E8282D3D7DC7001282E9 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
CE0A4994291F3A220071C0CC /* SwiftRadio.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SwiftRadio.entitlements; sourceTree = "<group>"; };
CE321FF229371140001572BD /* Bundle+appName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+appName.swift"; sourceTree = "<group>"; };
Expand All @@ -193,7 +194,6 @@
CEE9A2772B5345C30018FE68 /* NowPlayingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NowPlayingViewController.swift; sourceTree = "<group>"; };
CEE9A27A2B535C780018FE68 /* AlbumArtworkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumArtworkView.swift; sourceTree = "<group>"; };
CEE9A27D2B54A5520018FE68 /* ControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlsView.swift; sourceTree = "<group>"; };
CA5F00062F41000000000003 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -856,7 +856,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.8;
MARKETING_VERSION = 3.0.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
PRODUCT_BUNDLE_IDENTIFIER = com.matthewfecher.SwiftRadio;
PRODUCT_NAME = SwiftRadio;
Expand Down Expand Up @@ -888,7 +888,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.8;
MARKETING_VERSION = 3.0.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
PRODUCT_BUNDLE_IDENTIFIER = com.matthewfecher.SwiftRadio;
PRODUCT_NAME = SwiftRadio;
Expand Down Expand Up @@ -923,7 +923,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.8;
MARKETING_VERSION = 3.0.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
OTHER_SWIFT_FLAGS = "-D CarPlay";
PRODUCT_BUNDLE_IDENTIFIER = com.fethica.SwiftRadio;
Expand Down Expand Up @@ -960,7 +960,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.0.8;
MARKETING_VERSION = 3.0.0;
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
OTHER_SWIFT_FLAGS = "-D CarPlay";
PRODUCT_BUNDLE_IDENTIFIER = com.fethica.SwiftRadio;
Expand Down
6 changes: 5 additions & 1 deletion SwiftRadio/Coordinators/MainCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import UIKit
import MessageUI
import SafariServices
import LNPopupController
import FRadioPlayer

class MainCoordinator: NavigationCoordinator {
var childCoordinators: [Coordinator] = []
Expand All @@ -21,6 +22,7 @@ class MainCoordinator: NavigationCoordinator {
return vc
}()

private let player = FRadioPlayer.shared
private var isPopupBarPresented = false

func start() {
Expand Down Expand Up @@ -101,8 +103,10 @@ extension MainCoordinator: StationsViewControllerDelegate {
if isNewStation {
StationsManager.shared.set(station: station)
presentPopupBarIfNeeded()
} else {
} else if player.isPlaying {
navigationController.openPopup(animated: true)
} else {
player.togglePlaying()
}
}

Expand Down
Binary file modified SwiftRadio/Images.xcassets/Stations/stationImage.imageset/stationImage.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SwiftRadio/Images.xcassets/Stations/stationImage.imageset/stationImage@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified SwiftRadio/Images.xcassets/Stations/stationImage.imageset/stationImage@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions SwiftRadio/ViewControllers/StationsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ class StationsViewController: BaseController, Handoffable {
return view
}()

private lazy var nowPlayingBarButton: UIBarButtonItem = {
let barButton = UIBarButtonItem(customView: nowPlayingIndicator)
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(nowPlayingBarButtonPressed))
nowPlayingIndicator.addGestureRecognizer(tapGesture)
nowPlayingIndicator.isUserInteractionEnabled = true
return barButton
}()

private lazy var nowPlayingIndicator: UIView = {
let container = UIView()
container.addSubview(equalizerView)
Expand Down Expand Up @@ -136,30 +144,22 @@ class StationsViewController: BaseController, Handoffable {
navigationItem.rightBarButtonItem = nil
return
}

guard navigationItem.rightBarButtonItem == nil else { return }
let barButton = UIBarButtonItem(customView: nowPlayingIndicator)
barButton.target = self
barButton.action = #selector(nowPlayingBarButtonPressed)

let tapGesture = UITapGestureRecognizer(target: self, action: #selector(nowPlayingBarButtonPressed))
nowPlayingIndicator.addGestureRecognizer(tapGesture)
nowPlayingIndicator.isUserInteractionEnabled = true

navigationItem.rightBarButtonItem = barButton
updateNowPlayingAnimation()
}

private func updateNowPlayingAnimation() {
if isBuffering {
equalizerView.stopAnimating()
bufferingView.startAnimating()
navigationItem.rightBarButtonItem = nowPlayingBarButton
} else if player.isPlaying {
bufferingView.stopAnimating()
equalizerView.startAnimating()
navigationItem.rightBarButtonItem = nowPlayingBarButton
} else {
equalizerView.stopAnimating()
bufferingView.stopAnimating()
navigationItem.rightBarButtonItem = nil
}
}

Expand Down