add player controls hide delay option

Author: United600

Screenbox.Core/Services/ISettingsService.cs

@@ -12,6 +12,7 @@ public interface ISettingsService
         bool PlayerTapGesture { get; set; }
         bool PlayerShowControls { get; set; }
         bool PlayerShowChapters { get; set; }
+        int PlayerControlsHideDelay { get; set; }
         int PersistentVolume { get; set; }
         string PersistentSubtitleLanguage { get; set; }
         bool ShowRecent { get; set; }

Screenbox.Core/Services/SettingsService.cs

@@ -20,6 +20,7 @@ public sealed class SettingsService : ISettingsService
         private const string PlayerSeekGestureKey = "Player/Gesture/Seek";
         private const string PlayerTapGestureKey = "Player/Gesture/Tap";
         private const string PlayerShowControlsKey = "Player/ShowControls";
+        private const string PlayerControlsHideDelayKey = "Player/ControlsHideDelay";
         private const string PlayerLivelyPathKey = "Player/Lively/Path";
         private const string LibrariesUseIndexerKey = "Libraries/UseIndexer";
         private const string LibrariesSearchRemovableStorageKey = "Libraries/SearchRemovableStorage";
@@ -114,6 +115,12 @@ public bool PlayerShowControls
             set => SetValue(PlayerShowControlsKey, value);
         }
 
+        public int PlayerControlsHideDelay
+        {
+            get => GetValue<int>(PlayerControlsHideDelayKey);
+            set => SetValue(PlayerControlsHideDelayKey, value);
+        }
+
         public bool SearchRemovableStorage
         {
             get => GetValue<bool>(LibrariesSearchRemovableStorageKey);
@@ -169,6 +176,7 @@ public SettingsService()
             SetDefault(PlayerSeekGestureKey, true);
             SetDefault(PlayerTapGestureKey, true);
             SetDefault(PlayerShowControlsKey, true);
+            SetDefault(PlayerControlsHideDelayKey, 3);
             SetDefault(PersistentVolumeKey, 100);
             SetDefault(MaxVolumeKey, 100);
             SetDefault(LibrariesUseIndexerKey, true);

Screenbox.Core/ViewModels/PlayerPageViewModel.cs

@@ -576,9 +576,11 @@ public bool TryHideControls(bool skipFocusCheck = false)
             return true;
         }
 
-        private void DelayHideControls(int delayInSeconds = 3)
+        private void DelayHideControls()
         {
             if (PlayerVisibility != PlayerVisibilityState.Visible || AudioOnly) return;
+            
+            int delayInSeconds = _settingsService.PlayerControlsHideDelay;
             _controlsVisibilityTimer.Debounce(() => TryHideControls(), TimeSpan.FromSeconds(delayInSeconds));
         }
 
@@ -592,7 +594,7 @@ private void FocusManagerOnFocusChanged(object sender, FocusManagerGotFocusEvent
         {
             if (_visibilityOverride) return;
             ControlsHidden = false;
-            DelayHideControls(4);
+            DelayHideControls();
         }
 
         private async void ProcessOpeningMedia(MediaViewModel? current)

Screenbox.Core/ViewModels/SettingsPageViewModel.cs

@@ -29,6 +29,7 @@ public sealed partial class SettingsPageViewModel : ObservableRecipient
         [ObservableProperty] private bool _playerTapGesture;
         [ObservableProperty] private bool _playerShowControls;
         [ObservableProperty] private bool _playerShowChapters;
+        [ObservableProperty] private int _playerControlsHideDelay;
         [ObservableProperty] private int _volumeBoost;
         [ObservableProperty] private bool _useIndexer;
         [ObservableProperty] private bool _showRecent;
@@ -99,6 +100,15 @@ public SettingsPageViewModel(ISettingsService settingsService, ILibraryService l
             _playerTapGesture = _settingsService.PlayerTapGesture;
             _playerShowControls = _settingsService.PlayerShowControls;
             _playerShowChapters = _settingsService.PlayerShowChapters;
+            _playerControlsHideDelay = _settingsService.PlayerControlsHideDelay switch
+            {
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => 3,
+                5 => 4,
+                _ => 2  // Default to 3 seconds (Index 2)
+            };
             _useIndexer = _settingsService.UseIndexer;
             _showRecent = _settingsService.ShowRecent;
             _theme = ((int)_settingsService.Theme + 2) % 3;
@@ -187,6 +197,21 @@ partial void OnPlayerShowChaptersChanged(bool value)
             Messenger.Send(new SettingsChangedMessage(nameof(PlayerShowChapters), typeof(SettingsPageViewModel)));
         }
 
+        partial void OnPlayerControlsHideDelayChanged(int value)
+        {
+            _settingsService.PlayerControlsHideDelay = value switch
+            {
+                // Index => Seconds
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                _ => 3
+            };
+            Messenger.Send(new SettingsChangedMessage(nameof(PlayerControlsHideDelay), typeof(SettingsPageViewModel)));
+        }
+
         partial void OnUseIndexerChanged(bool value)
         {
             _settingsService.UseIndexer = value;

Screenbox/Pages/SettingsPage.xaml

@@ -413,6 +413,23 @@
                         <ctc:SettingsCard Header="{x:Bind strings:Resources.SettingsShowChaptersHeader}">
                             <ToggleSwitch IsOn="{x:Bind ViewModel.PlayerShowChapters, Mode=TwoWay}" />
                         </ctc:SettingsCard>
+                        <ctc:SettingsCard Header="{x:Bind strings:Resources.SettingsControlsHideDelayHeader}">
+                            <ComboBox
+                                MinWidth="150"
+                                AutomationProperties.HelpText="{x:Bind strings:Resources.SettingsControlsHideDelayHeader}"
+                                SelectedIndex="{x:Bind ViewModel.PlayerControlsHideDelay, Mode=TwoWay}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate x:DataType="x:String">
+                                        <TextBlock Text="{x:Bind Converter={StaticResource ResourceNameToResourceStringConverter}}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                                <x:String>HideDelay1s</x:String>
+                                <x:String>HideDelay2s</x:String>
+                                <x:String>HideDelay3s</x:String>
+                                <x:String>HideDelay4s</x:String>
+                                <x:String>HideDelay5s</x:String>
+                            </ComboBox>
+                        </ctc:SettingsCard>
                     </ctc:SettingsExpander.Items>
                 </ctc:SettingsExpander>
 

Screenbox/Strings/en-US/Resources.resw

@@ -944,6 +944,24 @@
   <data name="SettingsShowChaptersHeader" xml:space="preserve">
     <value>Display chapter name when available</value>
   </data>
+  <data name="SettingsControlsHideDelayHeader" xml:space="preserve">
+    <value>Dismiss controls after this amount of time without interaction</value>
+  </data>
+  <data name="HideDelay1s" xml:space="preserve">
+    <value>1 second</value>
+  </data>
+  <data name="HideDelay2s" xml:space="preserve">
+    <value>2 seconds</value>
+  </data>
+  <data name="HideDelay3s" xml:space="preserve">
+    <value>3 seconds</value>
+  </data>
+  <data name="HideDelay4s" xml:space="preserve">
+    <value>4 seconds</value>
+  </data>
+  <data name="HideDelay5s" xml:space="preserve">
+    <value>5 seconds</value>
+  </data>
   <data name="SettingsLanguageSelectionHeader" xml:space="preserve">
     <value>App language</value>
   </data>