Remove abstract on BackRequested even in NavigableViewModel to proper…

…ly fix warnings
Mrcubix · Oct 9, 2024 · 86f7395 · 86f7395
1 parent df9e1ed
commit 86f7395
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 47 deletions.
diff --git a/Touch-Gestures.UX/ViewModels/BindingsOverviewViewModel.cs b/Touch-Gestures.UX/ViewModels/BindingsOverviewViewModel.cs
@@ -71,7 +71,6 @@ public BindingsOverviewViewModel()
         IsReady = false;
 
         NextViewModel = this;
-        BackRequested = null!;
     }
 
     public BindingsOverviewViewModel(MainViewModel mainViewModel)
@@ -83,7 +82,6 @@ public BindingsOverviewViewModel(MainViewModel mainViewModel)
         _parentViewModel.Disconnected += OnDisconnected;
 
         NextViewModel = this;
-        BackRequested = null!;
     }
 
     public BindingsOverviewViewModel(MainViewModel mainViewModel, SerializableSettings settings) : this(mainViewModel)
@@ -94,10 +92,6 @@ public BindingsOverviewViewModel(MainViewModel mainViewModel, SerializableSettin
     #region Events
 
     private event EventHandler? TabletChanged;
-
-#pragma warning disable CS0067,CS8632
-    public override event EventHandler? BackRequested;
-#pragma warning restore CS0067,CS8632
     public event EventHandler<EventArgs>? SaveRequested;
     public event EventHandler<SerializableProfile>? ProfileChanged;
 
@@ -480,7 +474,6 @@ public void Dispose()
 
         SaveRequested = null;
         ProfileChanged = null;
-        BackRequested = null;
 
         GC.SuppressFinalize(this);
     }

diff --git a/Touch-Gestures.UX/ViewModels/Controls/Setups/GestureSetupViewModel.cs b/Touch-Gestures.UX/ViewModels/Controls/Setups/GestureSetupViewModel.cs
@@ -77,8 +77,6 @@ public partial class GestureSetupViewModel : NavigableViewModel, IDisposable
 
     public GestureSetupViewModel()
     {
-        BackRequested = null!;
-
         CanGoBack = true;
         CanGoNext = false;
 
@@ -98,8 +96,6 @@ protected virtual void SubscribeToSettingsChanges()
 
     #region Events
 
-    public override event EventHandler? BackRequested;
-
     public event EventHandler? SetupCompleted;
 
     public event EventHandler? EditCompleted;
@@ -146,8 +142,6 @@ public int SelectedGestureSetupPickIndex
 
     #region Methods
 
-    protected override void GoBack() => BackRequested?.Invoke(this, EventArgs.Empty);
-
     [RelayCommand(CanExecute = nameof(CanGoNext))]
     protected virtual void GoNext() => throw new NotImplementedException("GoNext has not been overriden.");
 

diff --git a/Touch-Gestures.UX/ViewModels/GestureSelectionScreenViewModel.cs b/Touch-Gestures.UX/ViewModels/GestureSelectionScreenViewModel.cs
@@ -76,12 +76,6 @@ public string SearchText
 
     #endregion
 
-    #region Events
-
-    public override event EventHandler? BackRequested;
-
-    #endregion
-
     #region Methods
 
     public void HideMultiTouchTiles(bool isMultiTouch = true)
@@ -90,8 +84,6 @@ public void HideMultiTouchTiles(bool isMultiTouch = true)
             gestureTileViewModel.IsEnabled = isMultiTouch || gestureTileViewModel.IsMultiTouchOnly == false;
     }
 
-    protected override void GoBack() => BackRequested?.Invoke(this, EventArgs.Empty);
-
     #endregion
 
     #region Event Handlers

diff --git a/Touch-Gestures.UX/ViewModels/GestureSetupScreenViewModel.cs b/Touch-Gestures.UX/ViewModels/GestureSetupScreenViewModel.cs
@@ -10,17 +10,7 @@ public partial class GestureSetupScreenViewModel : NavigableViewModel
 {
     #region Constructors
 
-    public GestureSetupScreenViewModel()
-    {
-        BackRequested = null!;
-        CanGoBack = true;
-    }
-
-    #endregion
-
-    #region Events
-
-    public override event EventHandler? BackRequested;
+    public GestureSetupScreenViewModel() => CanGoBack = true;
 
     #endregion
 
@@ -54,7 +44,7 @@ protected override void GoBack()
         if (NextViewModel != null)
             NextViewModel.BackRequested -= OnBackRequestedAhead;
 
-        BackRequested?.Invoke(this, EventArgs.Empty);
+        base.GoBack();
     }
 
     #endregion

diff --git a/Touch-Gestures.UX/ViewModels/GestureSetupWizardViewModel.cs b/Touch-Gestures.UX/ViewModels/GestureSetupWizardViewModel.cs
@@ -50,6 +50,8 @@ public GestureSetupWizardViewModel(bool isMultiTouch = true)
         GestureSelectionScreenViewModel.GestureSelected += OnGestureSelected;
         GestureSelectionScreenViewModel.HideMultiTouchTiles(isMultiTouch);
 
+        CanGoBack = true;
+
         //GestureSetupScreenViewModel.BackRequested += OnBackRequestedAhead;
     }
 
@@ -62,8 +64,6 @@ public GestureSetupWizardViewModel(Rect bounds, bool isMultiTouch = true) : this
 
     #region Events
 
-    public override event EventHandler? BackRequested;
-
     public event EventHandler<GestureAddedEventArgs>? SetupCompleted;
 
     public event EventHandler<GestureChangedEventArgs>? EditCompleted;
@@ -77,7 +77,7 @@ protected override void GoBack()
         if (NextViewModel is GestureSetupScreenViewModel && _editedGesture == null)
             NextViewModel = GestureSelectionScreenViewModel;
         else if (NextViewModel is GestureSelectionScreenViewModel || NextViewModel is GestureSetupScreenViewModel)
-            BackRequested?.Invoke(this, EventArgs.Empty);
+            base.GoBack();
     }
 
     /// <summary>

diff --git a/Touch-Gestures.UX/ViewModels/MainViewModel.cs b/Touch-Gestures.UX/ViewModels/MainViewModel.cs
@@ -12,10 +12,7 @@
 using System.Linq;
 using TouchGestures.Lib.Entities;
 using System.Threading;
-using TouchGestures.UX.Events;
 using Avalonia.Threading;
-using System.Numerics;
-using Avalonia;
 using Newtonsoft.Json;
 using TouchGestures.Lib.Converters;
 using TouchGestures.Lib.Entities.Tablet;
@@ -120,12 +117,6 @@ private void InitializeClient()
 
     public event EventHandler<SerializableSettings>? SettingsChanged;
 
-#pragma warning disable CS0067,CS8632
-
-    public override event EventHandler? BackRequested;
-
-#pragma warning restore CS0067,CS8632
-
     public event EventHandler? Ready;
 
     public event EventHandler? Disconnected;

diff --git a/Touch-Gestures.UX/ViewModels/NavigableViewModel.cs b/Touch-Gestures.UX/ViewModels/NavigableViewModel.cs
@@ -8,13 +8,17 @@ namespace TouchGestures.UX.ViewModels;
 
 public abstract partial class NavigableViewModel : ViewModelBase
 {
-    public abstract event EventHandler? BackRequested;
+    public event EventHandler? BackRequested;
 
     public bool CanGoBack { get; init; }
 
     [ObservableProperty]
     protected NavigableViewModel? _nextViewModel = null;
 
     [RelayCommand(CanExecute = nameof(CanGoBack))]
-    protected abstract void GoBack();
+    protected virtual void GoBack()
+    {
+        if (CanGoBack)
+            BackRequested?.Invoke(this, EventArgs.Empty);
+    }
 }