Use dependency injection instead of navigation parameter

Jack251970 · Jack251970 · commit 92e6e53ab4a0 · 2025-03-05T13:39:25.000+08:00
diff --git a/Flow.Launcher/MainWindow.xaml.cs b/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();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/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
         }
 
     }
-}
+}
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/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();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/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();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/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();
         }
 
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/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();
         }
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs b/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();
     }
 
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/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 */
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ private void CheckFirstLaunch()`
`445`	`445`
`446`	`446`	`private void OpenWelcomeWindow()`
`447`	`447`	`{`
`448`		`- var WelcomeWindow = new WelcomeWindow(_settings);`
	`448`	`+ var WelcomeWindow = new WelcomeWindow();`
`449`	`449`	`WelcomeWindow.Show();`
`450`	`450`	`}`
`451`	`451`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,16 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`	`using System.Windows.Navigation;`
`4`	`3`	`using Flow.Launcher.Infrastructure.UserSettings;`
`5`	`4`	`using Flow.Launcher.Core.Resource;`
	`5`	`+using CommunityToolkit.Mvvm.DependencyInjection;`
`6`	`6`
`7`	`7`	`namespace Flow.Launcher.Resources.Pages`
`8`	`8`	`{`
`9`	`9`	`public partial class WelcomePage1`
`10`	`10`	`{`
`11`	`11`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`12`	`12`	`{`
`13`		`- if (e.ExtraData is Settings settings)`
`14`		`- Settings = settings;`
`15`		`- else`
`16`		`- throw new ArgumentException("Unexpected Navigation Parameter for Settings");`
	`13`	`+ Settings = Ioc.Default.GetRequiredService<Settings>();`
`17`	`14`	`InitializeComponent();`
`18`	`15`	`}`
`19`	`16`	`private Internationalization _translater => InternationalizationManager.Instance;`
`@@ -37,4 +34,4 @@ public string CustomLanguage`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`}`
`40`		`-}`
	`37`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using System;`
`2`		`-using System.Windows.Navigation;`
	`1`	`+using System.Windows.Navigation;`
	`2`	`+using CommunityToolkit.Mvvm.DependencyInjection;`
`3`	`3`	`using Flow.Launcher.Infrastructure.UserSettings;`
`4`	`4`
`5`	`5`	`namespace Flow.Launcher.Resources.Pages`
`@@ -8,10 +8,7 @@ public partial class WelcomePage3`
`8`	`8`	`{`
`9`	`9`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`10`	`10`	`{`
`11`		`- if (e.ExtraData is Settings settings)`
`12`		`- Settings = settings;`
`13`		`- else if(Settings is null)`
`14`		`- throw new ArgumentException("Unexpected Navigation Parameter for Settings");`
	`11`	`+ Settings = Ioc.Default.GetRequiredService<Settings>();`
`15`	`12`	`InitializeComponent();`
`16`	`13`	`}`
`17`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-using Flow.Launcher.Infrastructure.UserSettings;`
`2`		`-using System;`
	`1`	`+using CommunityToolkit.Mvvm.DependencyInjection;`
	`2`	`+using Flow.Launcher.Infrastructure.UserSettings;`
`3`	`3`	`using System.Windows.Navigation;`
`4`	`4`
`5`	`5`	`namespace Flow.Launcher.Resources.Pages`
`@@ -8,10 +8,7 @@ public partial class WelcomePage4`
`8`	`8`	`{`
`9`	`9`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`10`	`10`	`{`
`11`		`- if (e.ExtraData is Settings settings)`
`12`		`- Settings = settings;`
`13`		`- else`
`14`		`- throw new ArgumentException("Unexpected Navigation Parameter for Settings");`
	`11`	`+ Settings = Ioc.Default.GetRequiredService<Settings>();`
`15`	`12`	`InitializeComponent();`
`16`	`13`	`}`
`17`	`14`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public SettingsPaneAboutViewModel(Settings settings, Updater updater)`
`54`	`54`	`[RelayCommand]`
`55`	`55`	`private void OpenWelcomeWindow()`
`56`	`56`	`{`
`57`		`- var window = new WelcomeWindow(_settings);`
	`57`	`+ var window = new WelcomeWindow();`
`58`	`58`	`window.ShowDialog();`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -2,21 +2,17 @@`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Windows.Input;`
`4`	`4`	`using System.Windows.Controls;`
`5`		`-using Flow.Launcher.Infrastructure.UserSettings;`
`6`	`5`	`using Flow.Launcher.Resources.Pages;`
`7`	`6`	`using ModernWpf.Media.Animation;`
`8`	`7`
`9`	`8`	`namespace Flow.Launcher`
`10`	`9`	`{`
`11`	`10`	`public partial class WelcomeWindow : Window`
`12`	`11`	`{`
`13`		`- private readonly Settings settings;`
`14`		`-`
`15`		`- public WelcomeWindow(Settings settings)`
	`12`	`+ public WelcomeWindow()`
`16`	`13`	`{`
`17`	`14`	`InitializeComponent();`
`18`	`15`	`BackButton.IsEnabled = false;`
`19`		`- this.settings = settings;`
`20`	`16`	`}`
`21`	`17`
`22`	`18`	`private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()`
`@@ -57,7 +53,7 @@ private void ForwardButton_Click(object sender, RoutedEventArgs e)`
`57`	`53`	`pageNum++;`
`58`	`54`	`UpdateView();`
`59`	`55`
`60`		`- ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _transitionInfo);`
	`56`	`+ ContentFrame.Navigate(PageTypeSelector(pageNum), null, _transitionInfo);`
`61`	`57`	`}`
`62`	`58`
`63`	`59`	`private void BackwardButton_Click(object sender, RoutedEventArgs e)`
`@@ -66,7 +62,7 @@ private void BackwardButton_Click(object sender, RoutedEventArgs e)`
`66`	`62`	`{`
`67`	`63`	`pageNum--;`
`68`	`64`	`UpdateView();`
`69`		`- ContentFrame.Navigate(PageTypeSelector(pageNum), settings, _backTransitionInfo);`
	`65`	`+ ContentFrame.Navigate(PageTypeSelector(pageNum), null, _backTransitionInfo);`
`70`	`66`	`}`
`71`	`67`	`else`
`72`	`68`	`{`
`@@ -109,7 +105,7 @@ private void OnActivated(object sender, EventArgs e)`
`109`	`105`
`110`	`106`	`private void ContentFrame_Loaded(object sender, RoutedEventArgs e)`
`111`	`107`	`{`
`112`		`- ContentFrame.Navigate(PageTypeSelector(1), settings); /* Set First Page */`
	`108`	`+ ContentFrame.Navigate(PageTypeSelector(1)); /* Set First Page */`
`113`	`109`	`}`
`114`	`110`	`}`
`115`	`111`	`}`