feat(banner:on-screen-time): Settings to change how long the banner s…

…tays on the screen Fixes #1467
Belphemur · May 7, 2024 · 41644f5 · 41644f5
1 parent 6aea86a
commit 41644f5
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 52 deletions.
diff --git a/SoundSwitch/Framework/Configuration/ISoundSwitchConfiguration.cs b/SoundSwitch/Framework/Configuration/ISoundSwitchConfiguration.cs
@@ -103,5 +103,7 @@ public interface ISoundSwitchConfiguration : IConfiguration
         /// How many banner notification can be displayed at the same time on the screen
         /// </summary>
         int MaxNumberNotification { get; set; }
+
+        TimeSpan BannerOnScreenTime { get; set; }
     }
 }
diff --git a/SoundSwitch/Framework/Configuration/SoundSwitchConfiguration.cs b/SoundSwitch/Framework/Configuration/SoundSwitchConfiguration.cs
@@ -65,6 +65,7 @@ public SoundSwitchConfiguration()
             NotificationSettings = NotificationTypeEnum.BannerNotification;
             BannerPosition = BannerPositionEnum.TopLeft;
             MaxNumberNotification = 5;
+            BannerOnScreenTime = TimeSpan.FromSeconds(3);
 
             AutoAddNewConnectedDevices = false;
 
@@ -73,6 +74,8 @@ public SoundSwitchConfiguration()
             MigratedFields = new HashSet<string>();
         }
 
+        public TimeSpan BannerOnScreenTime { get; set; }
+
         public int MaxNumberNotification { get; set; }
         public HashSet<string> SelectedPlaybackDeviceListId { get; }
         public HashSet<string> SelectedRecordingDeviceListId { get; }

diff --git a/SoundSwitch/Localization/SettingsStrings.Designer.cs b/SoundSwitch/Localization/SettingsStrings.Designer.cs
diff --git a/SoundSwitch/Localization/SettingsStrings.fr.resx b/SoundSwitch/Localization/SettingsStrings.fr.resx
@@ -582,4 +582,10 @@ Restaurer l'état du système quand l'application est fermée.</value>
   <data name="troubleshooting" xml:space="preserve">
     <value>Dépannage</value>
   </data>
+  <data name="notification.banner.onscreen.time" xml:space="preserve">
+    <value>Seconde visible</value>
+  </data>
+  <data name="notification.banner.onscreen.time.tooltip" xml:space="preserve">
+    <value>Durée de visibilité de la bannière à l'écran en secondes.</value>
+  </data>
 </root>
diff --git a/SoundSwitch/Localization/SettingsStrings.resx b/SoundSwitch/Localization/SettingsStrings.resx
@@ -561,4 +561,10 @@ Restore the state of the system when the application is closed.</value>
   <data name="position.option.center" xml:space="preserve">
     <value>Center</value>
   </data>
+  <data name="notification.banner.onscreen.time" xml:space="preserve">
+    <value>On screen time</value>
+  </data>
+  <data name="notification.banner.onscreen.time.tooltip" xml:space="preserve">
+    <value>How long the banner stays on the screen in seconds.</value>
+  </data>
 </root>
diff --git a/SoundSwitch/Model/AppModel.cs b/SoundSwitch/Model/AppModel.cs
@@ -70,6 +70,22 @@ private AppModel()
 
         public ProfileManager ProfileManager { get; private set; }
 
+        public int BannerOnScreenTimeSecs
+        {
+            get => (int)BannerOnScreenTime.TotalSeconds;
+            set => BannerOnScreenTime = TimeSpan.FromSeconds(value);
+        }
+        public TimeSpan BannerOnScreenTime
+        {
+            get => AppConfigs.Configuration.BannerOnScreenTime;
+            set
+            {
+                if (value <= TimeSpan.FromSeconds(1)) return;
+                if(value >= TimeSpan.FromMinutes(1)) return;
+                AppConfigs.Configuration.BannerOnScreenTime = value;
+                AppConfigs.Configuration.Save();
+            }
+        }
         /// <summary>
         /// How many notification to show at the same time
         /// </summary>

diff --git a/SoundSwitch/Model/IAppModel.cs b/SoundSwitch/Model/IAppModel.cs
@@ -128,6 +128,9 @@ public interface IAppModel : IDisposable
         /// </summary>
         bool IsSingleNotification { get; set; }
 
+        TimeSpan BannerOnScreenTime { get; set; }
+        int BannerOnScreenTimeSecs { get; set; }
+
         #endregion
 
         #region Events

diff --git a/SoundSwitch/UI/Forms/Settings.Designer.cs b/SoundSwitch/UI/Forms/Settings.Designer.cs
diff --git a/SoundSwitch/UI/Forms/Settings.cs b/SoundSwitch/UI/Forms/Settings.cs
@@ -134,7 +134,13 @@ public SettingsForm(IAudioDeviceLister audioDeviceLister)
             positionComboBox.SelectedValue = AppModel.Instance.BannerPosition;
             var positionToolTip = new ToolTip();
             positionToolTip.SetToolTip(positionComboBox, SettingsStrings.position_tooltip);
-
+
+
+            var onScreenTimeTooltip = new ToolTip();
+            onScreenTimeTooltip.SetToolTip(onScreenUpDown, SettingsStrings.notification_banner_onscreen_time_tooltip);
+            onScreenTimeTooltip.SetToolTip(onScreenTimeLabel, SettingsStrings.notification_banner_onscreen_time_tooltip);
+            onScreenUpDown.DataBindings.Add(nameof(NumericUpDown.Value), AppModel.Instance, nameof(AppModel.BannerOnScreenTimeSecs), false, DataSourceUpdateMode.OnPropertyChanged);
+
             var singleNotification = new ToolTip();
             singleNotification.SetToolTip(singleNotificationCheckbox, SettingsStrings.notification_single_tooltip);
             singleNotificationCheckbox.DataBindings.Add(nameof(CheckBox.Checked), AppModel.Instance, nameof(AppModel.IsSingleNotification), false, DataSourceUpdateMode.OnPropertyChanged);
@@ -369,7 +375,8 @@ private void LocalizeForm()
             usePrimaryScreenCheckbox.Text = SettingsStrings.usePrimaryScreen;
             positionLabel.Text = SettingsStrings.position;
             singleNotificationCheckbox.Text = SettingsStrings.notification_single;
-
+            onScreenTimeLabel.Text = SettingsStrings.notification_banner_onscreen_time;
+
             // Settings - Troubleshooting
             resetAudioDevicesGroupBox.Text = SettingsStrings.resetAudioDevices;
             resetAudioDevicesLabel.Text = SettingsStrings.resetAudioDevices_desc;