Merge pull request #3311 from Jack251970/remove_panel_data

Jack251970 · web-flow · commit c34fd6344130 · 2025-03-16T11:28:54.000+08:00
Use dependency injection instead of navigation parameter
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -1,6 +1,8 @@
-﻿using System;
-using System.Windows.Navigation;
+﻿using System.Windows.Navigation;
+using Flow.Launcher.Core;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.Infrastructure.UserSettings;
+using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -12,8 +14,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings, Updater: { } updater })
-                throw new ArgumentException("Settings are required for SettingsPaneAbout.");
+            var settings = Ioc.Default.GetRequiredService<Settings>();
+            var updater = Ioc.Default.GetRequiredService<Updater>();
             _viewModel = new SettingsPaneAboutViewModel(settings, updater);
             DataContext = _viewModel;
             InitializeComponent();
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
@@ -1,5 +1,7 @@
-﻿using System;
-using System.Windows.Navigation;
+﻿using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Core;
+using Flow.Launcher.Core.Configuration;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
@@ -13,8 +15,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings, Updater: {} updater, Portable: {} portable })
-                throw new ArgumentException("Settings, Updater and Portable are required for SettingsPaneGeneral.");
+            var settings = Ioc.Default.GetRequiredService<Settings>();
+            var updater = Ioc.Default.GetRequiredService<Updater>();
+            var portable = Ioc.Default.GetRequiredService<Portable>();
             _viewModel = new SettingsPaneGeneralViewModel(settings, updater, portable);
             DataContext = _viewModel;
             InitializeComponent();
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -1,6 +1,7 @@
-﻿using System;
-using System.Windows.Navigation;
+﻿using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -12,8 +13,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })
-                throw new ArgumentException("Settings are required for SettingsPaneHotkey.");
+            var settings = Ioc.Default.GetRequiredService<Settings>();
             _viewModel = new SettingsPaneHotkeyViewModel(settings);
             DataContext = _viewModel;
             InitializeComponent();
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -1,10 +1,11 @@
-﻿using System;
-using System.ComponentModel;
+﻿using System.ComponentModel;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -16,8 +17,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })
-                throw new ArgumentException($"Settings are required for {nameof(SettingsPanePluginStore)}.");
+            var settings = Ioc.Default.GetRequiredService<Settings>();
             _viewModel = new SettingsPanePluginStoreViewModel();
             DataContext = _viewModel;
             InitializeComponent();
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
@@ -1,7 +1,8 @@
-﻿using System;
-using System.Windows.Input;
+﻿using System.Windows.Input;
 using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -13,8 +14,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })
-                throw new ArgumentException("Settings are required for SettingsPaneHotkey.");
+            var settings = Ioc.Default.GetRequiredService<Settings>();
             _viewModel = new SettingsPanePluginsViewModel(settings);
             DataContext = _viewModel;
             InitializeComponent();
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
@@ -1,6 +1,8 @@
-﻿using System;
-using System.Windows.Navigation;
+﻿using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Core;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -12,8 +14,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings, Updater: { } updater })
-                throw new ArgumentException($"Settings are required for {nameof(SettingsPaneProxy)}.");
+            var settings = Ioc.Default.GetRequiredService<Settings>();
+            var updater = Ioc.Default.GetRequiredService<Updater>();
             _viewModel = new SettingsPaneProxyViewModel(settings, updater);
             DataContext = _viewModel;
             InitializeComponent();
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
@@ -1,10 +1,9 @@
-﻿using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
+﻿using System.Windows.Controls;
 using System.Windows.Navigation;
+using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
 using Page = ModernWpf.Controls.Page;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -16,8 +15,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })
-                throw new ArgumentException($"Settings are required for {nameof(SettingsPaneTheme)}.");
+            var settings = Ioc.Default.GetRequiredService<Settings>();
             _viewModel = new SettingsPaneThemeViewModel(settings);
             DataContext = _viewModel;
             InitializeComponent();
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -4,8 +4,6 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Core;
-using Flow.Launcher.Core.Configuration;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
@@ -18,8 +16,6 @@ namespace Flow.Launcher;
 
 public partial class SettingWindow
 {
-    private readonly Updater _updater;
-    private readonly IPortable _portable;
     private readonly IPublicAPI _api;
     private readonly Settings _settings;
     private readonly SettingWindowViewModel _viewModel;
@@ -30,8 +26,6 @@ public SettingWindow()
         _settings = Ioc.Default.GetRequiredService<Settings>();
         DataContext = viewModel;
         _viewModel = viewModel;
-        _updater = Ioc.Default.GetRequiredService<Updater>();
-        _portable = Ioc.Default.GetRequiredService<Portable>();
         _api = Ioc.Default.GetRequiredService<IPublicAPI>();
         InitializePosition();
         InitializeComponent();
@@ -166,10 +160,9 @@ private double WindowTop()
 
     private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
     {
-        var paneData = new PaneData(_settings, _updater, _portable);
         if (args.IsSettingsSelected)
         {
-            ContentFrame.Navigate(typeof(SettingsPaneGeneral), paneData);
+            ContentFrame.Navigate(typeof(SettingsPaneGeneral));
         }
         else
         {
@@ -191,7 +184,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
                 nameof(About) => typeof(SettingsPaneAbout),
                 _ => typeof(SettingsPaneGeneral)
             };
-            ContentFrame.Navigate(pageType, paneData);
+            ContentFrame.Navigate(pageType);
         }
     }
 
@@ -211,6 +204,4 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
     {
         NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */
     }
-
-    public record PaneData(Settings Settings, Updater Updater, IPortable Portable);
 }

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`using System.Windows.Input;`
`5`	`5`	`using System.Windows.Interop;`
`6`	`6`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`7`		`-using Flow.Launcher.Core;`
`8`		`-using Flow.Launcher.Core.Configuration;`
`9`	`7`	`using Flow.Launcher.Helper;`
`10`	`8`	`using Flow.Launcher.Infrastructure.UserSettings;`
`11`	`9`	`using Flow.Launcher.Plugin;`
`@@ -18,8 +16,6 @@ namespace Flow.Launcher;`
`18`	`16`
`19`	`17`	`public partial class SettingWindow`
`20`	`18`	`{`
`21`		`- private readonly Updater _updater;`
`22`		`- private readonly IPortable _portable;`
`23`	`19`	`private readonly IPublicAPI _api;`
`24`	`20`	`private readonly Settings _settings;`
`25`	`21`	`private readonly SettingWindowViewModel _viewModel;`
`@@ -30,8 +26,6 @@ public SettingWindow()`
`30`	`26`	`_settings = Ioc.Default.GetRequiredService<Settings>();`
`31`	`27`	`DataContext = viewModel;`
`32`	`28`	`_viewModel = viewModel;`
`33`		`- _updater = Ioc.Default.GetRequiredService<Updater>();`
`34`		`- _portable = Ioc.Default.GetRequiredService<Portable>();`
`35`	`29`	`_api = Ioc.Default.GetRequiredService<IPublicAPI>();`
`36`	`30`	`InitializePosition();`
`37`	`31`	`InitializeComponent();`
`@@ -166,10 +160,9 @@ private double WindowTop()`
`166`	`160`
`167`	`161`	`private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)`
`168`	`162`	`{`
`169`		`- var paneData = new PaneData(_settings, _updater, _portable);`
`170`	`163`	`if (args.IsSettingsSelected)`
`171`	`164`	`{`
`172`		`- ContentFrame.Navigate(typeof(SettingsPaneGeneral), paneData);`
	`165`	`+ ContentFrame.Navigate(typeof(SettingsPaneGeneral));`
`173`	`166`	`}`
`174`	`167`	`else`
`175`	`168`	`{`
`@@ -191,7 +184,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi`
`191`	`184`	`nameof(About) => typeof(SettingsPaneAbout),`
`192`	`185`	`_ => typeof(SettingsPaneGeneral)`
`193`	`186`	`};`
`194`		`- ContentFrame.Navigate(pageType, paneData);`
	`187`	`+ ContentFrame.Navigate(pageType);`
`195`	`188`	`}`
`196`	`189`	`}`
`197`	`190`
`@@ -211,6 +204,4 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)`
`211`	`204`	`{`
`212`	`205`	`NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */`
`213`	`206`	`}`
`214`		`-`
`215`		`- public record PaneData(Settings Settings, Updater Updater, IPortable Portable);`
`216`	`207`	`}`