Remove PageChangeRequested event

StabilityMatrix.Avalonia/App.axaml.cs

@@ -210,8 +210,7 @@ public sealed class App : Application
         services.AddSingleton<MainWindowViewModel>(provider =>
             new MainWindowViewModel(provider.GetRequiredService<ISettingsManager>(),
                 provider.GetRequiredService<IDiscordRichPresenceService>(),
-                provider.GetRequiredService<ServiceManager<ViewModelBase>>(), 
+                provider.GetRequiredService<ServiceManager<ViewModelBase>>())
-                provider.GetRequiredService<INavigationService>())
             {
                 Pages =
                 {

StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs

@@ -25,7 +25,6 @@ public partial class MainWindowViewModel : ViewModelBase
     private readonly ISettingsManager settingsManager;
     private readonly ServiceManager<ViewModelBase> dialogFactory;
     private readonly IDiscordRichPresenceService discordRichPresenceService;
-    private readonly INavigationService navigationService;
     public string Greeting => "Welcome to Avalonia!";
     
     [ObservableProperty]
@@ -46,13 +45,11 @@ public partial class MainWindowViewModel : ViewModelBase
     public MainWindowViewModel(
         ISettingsManager settingsManager, 
         IDiscordRichPresenceService discordRichPresenceService,
-        ServiceManager<ViewModelBase> dialogFactory,
+        ServiceManager<ViewModelBase> dialogFactory)
-        INavigationService navigationService)
     {
         this.settingsManager = settingsManager;
         this.dialogFactory = dialogFactory;
         this.discordRichPresenceService = discordRichPresenceService;
-        this.navigationService = navigationService;
         
         ProgressManagerViewModel = dialogFactory.Get<ProgressManagerViewModel>();
         UpdateViewModel = dialogFactory.Get<UpdateViewModel>();
@@ -65,8 +62,6 @@ public partial class MainWindowViewModel : ViewModelBase
         // Set only if null, since this may be called again when content dialogs open
         CurrentPage ??= Pages.FirstOrDefault();
         SelectedCategory ??= Pages.FirstOrDefault();
-        
-        EventManager.Instance.PageChangeRequested += OnPageChangeRequested;
     }
 
     public override async Task OnLoadedAsync()
@@ -198,19 +193,4 @@ public partial class MainWindowViewModel : ViewModelBase
 
         await dialog.ShowAsync();
     }
-
-    private void OnPageChangeRequested(object? sender, Type e)
-    {
-        CurrentPage = Pages.FirstOrDefault(p => p.GetType() == e);
-        SelectedCategory = Pages.FirstOrDefault(p => p.GetType() == e);
-    }
-
-    partial void OnSelectedCategoryChanged(object? value)
-    {
-        if (value is PageViewModelBase page)
-        {
-            // CurrentPage = page;
-            // navigationService.NavigateTo(page);
-        }
-    }
 }

StabilityMatrix.Core/Helper/EventManager.cs

@@ -16,19 +16,17 @@ public class EventManager
     }
     
     public event EventHandler<int>? GlobalProgressChanged;
-    public event EventHandler<Type>? PageChangeRequested;
     public event EventHandler? InstalledPackagesChanged;
     public event EventHandler<bool>? OneClickInstallFinished;
     public event EventHandler? TeachingTooltipNeeded;
     public event EventHandler<bool>? DevModeSettingChanged;
     public event EventHandler<UpdateInfo>? UpdateAvailable;
-    public event EventHandler<Guid> PackageLaunchRequested;
+    public event EventHandler<Guid>? PackageLaunchRequested;
     public event EventHandler? ScrollToBottomRequested;
     public event EventHandler<ProgressItem>? ProgressChanged;
     public event EventHandler<RunningPackageStatusChangedEventArgs>? RunningPackageStatusChanged; 
     
     public void OnGlobalProgressChanged(int progress) => GlobalProgressChanged?.Invoke(this, progress);
-    public void RequestPageChange(Type pageType) => PageChangeRequested?.Invoke(this, pageType);
     public void OnInstalledPackagesChanged() => InstalledPackagesChanged?.Invoke(this, EventArgs.Empty);
     public void OnOneClickInstallFinished(bool skipped) => OneClickInstallFinished?.Invoke(this, skipped);
     public void OnTeachingTooltipNeeded() => TeachingTooltipNeeded?.Invoke(this, EventArgs.Empty);