Hide now playing bar button when player is idle

Author: fethica

SwiftRadio/ViewControllers/StationsViewController.swift

@@ -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)
@@ -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
         }
     }