Use dependency injection instead of navigation parameter

Author: Jack251970

Flow.Launcher/MainWindow.xaml.cs

@@ -445,7 +445,7 @@ private void CheckFirstLaunch()
 
         private void OpenWelcomeWindow()
         {
-            var WelcomeWindow = new WelcomeWindow(_settings);
+            var WelcomeWindow = new WelcomeWindow();
             WelcomeWindow.Show();
         }
 

Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs

@@ -1,19 +1,16 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows.Navigation;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Core.Resource;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Resources.Pages
 {
     public partial class WelcomePage1
     {
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
         private Internationalization _translater => InternationalizationManager.Instance;
@@ -37,4 +34,4 @@ public string CustomLanguage
         }
 
     }
-}
+}

Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs

@@ -1,11 +1,11 @@
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
-using System;
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.Input;
 using Flow.Launcher.ViewModel;
 using System.Windows.Media;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -15,11 +15,7 @@ public partial class WelcomePage2
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Parameter setting.");
-
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 

Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs

@@ -1,5 +1,5 @@
-using System;
-using System.Windows.Navigation;
+using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.Resources.Pages
@@ -8,10 +8,7 @@ public partial class WelcomePage3
     {
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else if(Settings is null)
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 

Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs

@@ -1,5 +1,5 @@
-using Flow.Launcher.Infrastructure.UserSettings;
-using System;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Infrastructure.UserSettings;
 using System.Windows.Navigation;
 
 namespace Flow.Launcher.Resources.Pages
@@ -8,10 +8,7 @@ public partial class WelcomePage4
     {
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 

Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs

@@ -1,9 +1,9 @@
-using System;
-using System.Windows;
+using System.Windows;
 using System.Windows.Navigation;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Microsoft.Win32;
 using Flow.Launcher.Infrastructure;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Resources.Pages
 {
@@ -15,10 +15,7 @@ public partial class WelcomePage5
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (e.ExtraData is Settings settings)
-                Settings = settings;
-            else
-                throw new ArgumentException("Unexpected Navigation Parameter for Settings");
+            Settings = Ioc.Default.GetRequiredService<Settings>();
             InitializeComponent();
         }
 

Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs

@@ -54,7 +54,7 @@ public SettingsPaneAboutViewModel(Settings settings, Updater updater)
     [RelayCommand]
     private void OpenWelcomeWindow()
     {
-        var window = new WelcomeWindow(_settings);
+        var window = new WelcomeWindow();
         window.ShowDialog();
     }
 

Flow.Launcher/WelcomeWindow.xaml.cs

@@ -2,21 +2,17 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Controls;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Resources.Pages;
 using ModernWpf.Media.Animation;
 
 namespace Flow.Launcher
 {
     public partial class WelcomeWindow : Window
     {
-        private readonly Settings settings;
-
-        public WelcomeWindow(Settings settings)
+        public WelcomeWindow()
         {
             InitializeComponent();
             BackButton.IsEnabled = false;
-            this.settings = settings;
         }
 
         private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()
@@ -57,7 +53,7 @@ private void ForwardButton_Click(object sender, RoutedEventArgs e)
             pageNum++;
             UpdateView();
 
-            ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _transitionInfo);
+            ContentFrame.Navigate(PageTypeSelector(pageNum), null, _transitionInfo);
         }
 
         private void BackwardButton_Click(object sender, RoutedEventArgs e)
@@ -66,7 +62,7 @@ private void BackwardButton_Click(object sender, RoutedEventArgs e)
             {
                 pageNum--;
                 UpdateView();
-                ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _backTransitionInfo);
+                ContentFrame.Navigate(PageTypeSelector(pageNum), null, _backTransitionInfo);
             }
             else
             {
@@ -109,7 +105,7 @@ private void OnActivated(object sender, EventArgs e)
 
         private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
         {
-            ContentFrame.Navigate(PageTypeSelector(1), settings); /* Set First Page */
+            ContentFrame.Navigate(PageTypeSelector(1)); /* Set First Page */
         }
     }
 }