DisplaySettings: disable player shuffle button

BLeeEZ · May 20, 2024 · c41a012 · c41a012
1 parent 3105ff6
commit c41a012
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 0 deletions.
diff --git a/Amperfy/Screens/Player/PopupPlayer+Visuals.swift b/Amperfy/Screens/Player/PopupPlayer+Visuals.swift
@@ -25,6 +25,7 @@ import AmperfyKit
 extension PopupPlayerVC {
 
     func refresh() {
+        refreshContextQueueSectionHeader()
         refreshUserQueueSectionHeader()
         refreshCellMasks()
         refreshVisibleCellsSubtitleColor()

diff --git a/Amperfy/Screens/Player/PopupPlayerVC.swift b/Amperfy/Screens/Player/PopupPlayerVC.swift
@@ -207,6 +207,11 @@ class PopupPlayerVC: UIViewController, UIScrollViewDelegate {
             userQueueSectionView.display(name: PlayerQueueType.user.description, buttonPressAction: self.clearUserQueue)
         }
     }
+
+    func refreshContextQueueSectionHeader() {
+        guard let contextNextQueueSectionHeader = contextNextQueueSectionHeader else { return }
+        contextNextQueueSectionHeader.refresh()
+    }
 
     // MARK: - UIScrollViewDelegate
     func scrollViewDidScroll(_ scrollView: UIScrollView) {

diff --git a/Amperfy/Screens/Player/SectionHeader/ContextQueueNextSectionHeader.swift b/Amperfy/Screens/Player/SectionHeader/ContextQueueNextSectionHeader.swift
@@ -85,6 +85,7 @@ class ContextQueueNextSectionHeader: UIView {
 
     func refreshShuffleButton() {
         guard let rootView = rootView else { return }
+        shuffleButton.isEnabled = appDelegate.storage.settings.isPlayerShuffleButtonEnabled
         shuffleButton.isSelected = player.isShuffle
         var config = rootView.getPlayerButtonConfiguration(isSelected: shuffleButton.isSelected)
         config.image = .shuffle

diff --git a/Amperfy/Screens/ViewController/SettingsHostVC.swift b/Amperfy/Screens/ViewController/SettingsHostVC.swift
@@ -67,6 +67,11 @@ class SettingsHostVC: UIViewController {
             self.appDelegate.storage.settings.isShowArtistDuration = newValue
         }))
 
+        settings.isPlayerShuffleButtonEnabled = self.appDelegate.storage.settings.isPlayerShuffleButtonEnabled
+        changesAgent.append(settings.$isPlayerShuffleButtonEnabled.sink(receiveValue: { newValue in
+            self.appDelegate.storage.settings.isPlayerShuffleButtonEnabled = newValue
+        }))
+
         settings.isShowMusicPlayerSkipButtons = self.appDelegate.storage.settings.isShowMusicPlayerSkipButtons
         changesAgent.append(settings.$isShowMusicPlayerSkipButtons.sink(receiveValue: { newValue in
             self.appDelegate.storage.settings.isShowMusicPlayerSkipButtons = newValue

diff --git a/Amperfy/SwiftUI/Settings/DisplaySettingsView.swift b/Amperfy/SwiftUI/Settings/DisplaySettingsView.swift
@@ -92,6 +92,21 @@ struct DisplaySettingsView: View {
                 , footer: {
                     Text("Display artist duration in table rows.")
                 })
+
+                Section(content: {
+                    HStack {
+                        Text("Disable Player Shuffle Button")
+                        Spacer()
+                        Toggle(isOn: Binding<Bool>(
+                            get: { !settings.isPlayerShuffleButtonEnabled },
+                            set: { settings.isPlayerShuffleButtonEnabled = !$0 }
+                        )) {}
+                            .frame(width: 130)
+                    }
+                }
+                , footer: {
+                    Text("Player Shuffle Button is displayed but it can't be interacted with.")
+                })
             }
         }
         .navigationTitle("Display")

diff --git a/Amperfy/SwiftUI/Settings/ObservableSettings.swift b/Amperfy/SwiftUI/Settings/ObservableSettings.swift
@@ -28,6 +28,7 @@ final class Settings: ObservableObject {
     @Published var isShowSongDuration = false
     @Published var isShowAlbumDuration = false
     @Published var isShowArtistDuration = false
+    @Published var isPlayerShuffleButtonEnabled = true
     @Published var screenLockPreventionPreference: ScreenLockPreventionPreference = .defaultValue
     @Published var streamingMaxBitrateWifiPreference: StreamingMaxBitratePreference = .defaultValue
     @Published var streamingMaxBitrateCellularPreference: StreamingMaxBitratePreference = .defaultValue

diff --git a/AmperfyKit/Storage/PersistentStorage.swift b/AmperfyKit/Storage/PersistentStorage.swift
@@ -231,6 +231,7 @@ public class PersistentStorage {
         case ShowSongDuration = "showSongDuration"
         case ShowAlbumDuration = "showAlbumDuration"
         case ShowArtistDuration = "showArtistDuration"
+        case PlayerShuffleButtonEnabled = "enablePlayerShuffleButton"
         case ShowMusicPlayerSkipButtons = "showMusicPlayerSkipButtons"
 
         case SongActionOnTab = "songActionOnTab"
@@ -335,6 +336,11 @@ public class PersistentStorage {
             set { UserDefaults.standard.set(newValue, forKey: UserDefaultsKey.ShowArtistDuration.rawValue) }
         }
 
+        public var isPlayerShuffleButtonEnabled: Bool {
+            get { return UserDefaults.standard.object(forKey: UserDefaultsKey.PlayerShuffleButtonEnabled.rawValue) as? Bool ?? true }
+            set { UserDefaults.standard.set(newValue, forKey: UserDefaultsKey.PlayerShuffleButtonEnabled.rawValue) }
+        }
+
         public var isShowMusicPlayerSkipButtons: Bool {
             get { return UserDefaults.standard.object(forKey: UserDefaultsKey.ShowMusicPlayerSkipButtons.rawValue) as? Bool ?? false }
             set { UserDefaults.standard.set(newValue, forKey: UserDefaultsKey.ShowMusicPlayerSkipButtons.rawValue) }