Move NavSpeed user setting to Commands

Ruben2776 · Feb 14, 2025 · 9efb8e1 · 9efb8e1
1 parent 6e0645f
commit 9efb8e1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/src/PicView.Avalonia/ViewModels/MainViewModel.cs b/src/PicView.Avalonia/ViewModels/MainViewModel.cs
@@ -1599,13 +1599,27 @@ public MainViewModel(IPlatformSpecificService? platformSpecificService)
 
         NextButtonCommand = ReactiveCommand.Create(() =>
         {
+            var button = UIHelper.GetBottomBar?.NextButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                NavigationManager.NavigateAndPositionCursor(next: true, arrow: false, vm: this)
             );
         });
 
         NextArrowButtonCommand = ReactiveCommand.Create( () =>
         {
+            var button = UIHelper.GetMainView?.ClickArrowRight?.PolyButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                 NavigationManager.NavigateAndPositionCursor(next:true, arrow: true, vm: this)
             );
@@ -1623,13 +1637,27 @@ public MainViewModel(IPlatformSpecificService? platformSpecificService)
 
         PreviousButtonCommand = ReactiveCommand.Create( () =>
         {
+            var button = UIHelper.GetBottomBar?.PreviousButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                 NavigationManager.NavigateAndPositionCursor(next:false, arrow: false, vm: this)
             );
         });
 
         PreviousArrowButtonCommand = ReactiveCommand.Create( () =>
         {
+            var button = UIHelper.GetMainView?.ClickArrowLeft?.PolyButton;
+            if (button != null)
+            {
+                button.Interval =
+                    (int)TimeSpan.FromSeconds(SettingsHelper.Settings.UIProperties.NavSpeed).TotalMilliseconds;
+            }
+
             Task.Run(() =>
                 NavigationManager.NavigateAndPositionCursor(next:false, arrow: true, vm: this)
             );

diff --git a/src/PicView.Avalonia/Views/BottomBar.axaml.cs b/src/PicView.Avalonia/Views/BottomBar.axaml.cs
@@ -1,4 +1,3 @@
-using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -66,14 +65,6 @@ public BottomBar()
                 NextButton.Foreground = new SolidColorBrush(color);
                 PreviousButton.Foreground = new SolidColorBrush(color);
             }
-
-            // TODO add interval to mainviewmodel
-            NextButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
-
-            PreviousButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
-
         };
     }
 

diff --git a/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowLeft.axaml.cs b/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowLeft.axaml.cs
@@ -16,10 +16,6 @@ public ClickArrowLeft()
             }
             HideInterfaceLogic.AddHoverButtonEvents(this, PolyButton, vm);
             PointerWheelChanged += async (_, e) => await vm.ImageViewer.PreviewOnPointerWheelChanged(this, e);
-
-            // TODO add interval to mainviewmodel
-            PolyButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
         };
     }
 }
diff --git a/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowRight.axaml.cs b/src/PicView.Avalonia/Views/UC/Buttons/ClickArrowRight.axaml.cs
@@ -16,10 +16,6 @@ public ClickArrowRight()
             }
             HideInterfaceLogic.AddHoverButtonEvents(this, PolyButton, vm);
             PointerWheelChanged += async (_, e) => await vm.ImageViewer.PreviewOnPointerWheelChanged(this, e);
-
-            // TODO add interval to mainviewmodel
-            PolyButton.Interval =
-                (int)TimeSpan.FromSeconds(Settings.UIProperties.NavSpeed).TotalMilliseconds;
         };
     }
 }