Use dependency injection for setting page view models

Jack251970 · Jack251970 · commit 84b0393fd0fd · 2025-04-24T21:51:14.000+08:00
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
@@ -19,6 +19,7 @@
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
+using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -74,14 +75,23 @@ public App()
                         .AddSingleton(_ => _settings)
                         .AddSingleton(sp => new Updater(sp.GetRequiredService<IPublicAPI>(), Launcher.Properties.Settings.Default.GithubRepo))
                         .AddSingleton<Portable>()
-                        .AddSingleton<SettingWindowViewModel>()
                         .AddSingleton<IAlphabet, PinyinAlphabet>()
                         .AddSingleton<StringMatcher>()
                         .AddSingleton<Internationalization>()
                         .AddSingleton<IPublicAPI, PublicAPIInstance>()
                         .AddSingleton<MainViewModel>()
                         .AddSingleton<Theme>()
+                        // Welcome view model & setting window view model is very simple so we just use one instance
+                        .AddSingleton<SettingWindowViewModel>()
                         .AddSingleton<WelcomeViewModel>()
+                        // Setting page view models are complex so we use transient instance
+                        .AddTransient<SettingsPaneAboutViewModel>()
+                        .AddTransient<SettingsPaneGeneralViewModel>()
+                        .AddTransient<SettingsPaneHotkeyViewModel>()
+                        .AddTransient<SettingsPanePluginsViewModel>()
+                        .AddTransient<SettingsPanePluginStoreViewModel>()
+                        .AddTransient<SettingsPaneProxyViewModel>()
+                        .AddTransient<SettingsPaneThemeViewModel>()
                     ).Build();
                 Ioc.Default.ConfigureServices(host.Services);
             }
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
@@ -19,10 +19,10 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
     public Settings Settings { get; }
 
     private readonly Updater _updater;
-    private readonly IPortable _portable;
+    private readonly Portable _portable;
     private readonly Internationalization _translater;
 
-    public SettingsPaneGeneralViewModel(Settings settings, Updater updater, IPortable portable, Internationalization translater)
+    public SettingsPaneGeneralViewModel(Settings settings, Updater updater, Portable portable, Internationalization translater)
     {
         Settings = settings;
         _updater = updater;
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -1,8 +1,6 @@
 ﻿using System.Windows.Navigation;
-using Flow.Launcher.Core;
-using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Infrastructure.UserSettings;
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -14,9 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            var updater = Ioc.Default.GetRequiredService<Updater>();
-            _viewModel = new SettingsPaneAboutViewModel(settings, updater);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
@@ -1,9 +1,5 @@
 ﻿using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Core;
-using Flow.Launcher.Core.Configuration;
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
 
 namespace Flow.Launcher.SettingPages.Views;
@@ -16,11 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            var updater = Ioc.Default.GetRequiredService<Updater>();
-            var portable = Ioc.Default.GetRequiredService<Portable>();
-            var translater = Ioc.Default.GetRequiredService<Internationalization>();
-            _viewModel = new SettingsPaneGeneralViewModel(settings, updater, portable, translater);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneGeneralViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -1,7 +1,6 @@
 ﻿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 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            _viewModel = new SettingsPaneHotkeyViewModel(settings);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneHotkeyViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -5,7 +5,6 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.ViewModel;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -17,8 +16,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            _viewModel = new SettingsPanePluginStoreViewModel();
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
@@ -2,7 +2,6 @@
 using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.SettingPages.Views;
 
@@ -14,8 +13,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            _viewModel = new SettingsPanePluginsViewModel(settings);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginsViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
@@ -1,8 +1,6 @@
 ﻿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;
 
@@ -14,13 +12,10 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            var updater = Ioc.Default.GetRequiredService<Updater>();
-            _viewModel = new SettingsPaneProxyViewModel(settings, updater);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneProxyViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
-
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
@@ -1,27 +1,21 @@
 ﻿using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.SettingPages.ViewModels;
-using Page = ModernWpf.Controls.Page;
 
 namespace Flow.Launcher.SettingPages.Views;
 
-public partial class SettingsPaneTheme : Page
+public partial class SettingsPaneTheme
 {
     private SettingsPaneThemeViewModel _viewModel = null!;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            var settings = Ioc.Default.GetRequiredService<Settings>();
-            var theme = Ioc.Default.GetRequiredService<Theme>();
-            _viewModel = new SettingsPaneThemeViewModel(settings, theme);
+            _viewModel = Ioc.Default.GetRequiredService<SettingsPaneThemeViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
-
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -5,42 +5,42 @@ namespace Flow.Launcher.ViewModel;
 
 public partial class SettingWindowViewModel : BaseModel
 {
-    public Settings Settings { get; }
+    private readonly Settings _settings;
 
     public SettingWindowViewModel(Settings settings)
     {
-        Settings = settings;
+        _settings = settings;
     }
 
     /// <summary>
     /// Save Flow settings. Plugins settings are not included.
     /// </summary>
     public void Save()
     {
-        Settings.Save();
+        _settings.Save();
     }
 
     public double SettingWindowWidth
     {
-        get => Settings.SettingWindowWidth;
-        set => Settings.SettingWindowWidth = value;
+        get => _settings.SettingWindowWidth;
+        set => _settings.SettingWindowWidth = value;
     }
 
     public double SettingWindowHeight
     {
-        get => Settings.SettingWindowHeight;
-        set => Settings.SettingWindowHeight = value;
+        get => _settings.SettingWindowHeight;
+        set => _settings.SettingWindowHeight = value;
     }
 
     public double? SettingWindowTop
     {
-        get => Settings.SettingWindowTop;
-        set => Settings.SettingWindowTop = value;
+        get => _settings.SettingWindowTop;
+        set => _settings.SettingWindowTop = value;
     }
 
     public double? SettingWindowLeft
     {
-        get => Settings.SettingWindowLeft;
-        set => Settings.SettingWindowLeft = value;
+        get => _settings.SettingWindowLeft;
+        set => _settings.SettingWindowLeft = value;
     }
 }
diff --git a/Flow.Launcher/ViewModel/WelcomeViewModel.cs b/Flow.Launcher/ViewModel/WelcomeViewModel.cs
@@ -18,6 +18,7 @@ public int PageNum
                 {
                     _pageNum = value;
                     OnPropertyChanged();
+                    OnPropertyChanged(nameof(PageDisplay));
                     UpdateView();
                 }
             }
@@ -47,7 +48,6 @@ public bool NextEnabled
 
         private void UpdateView()
         {
-            OnPropertyChanged(nameof(PageDisplay));
             if (PageNum == 1)
             {
                 BackEnabled = false;

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`using System.Windows.Navigation;`
`2`		`-using Flow.Launcher.Core;`
`3`		`-using Flow.Launcher.SettingPages.ViewModels;`
`4`		`-using Flow.Launcher.Infrastructure.UserSettings;`
`5`	`2`	`using CommunityToolkit.Mvvm.DependencyInjection;`
	`3`	`+using Flow.Launcher.SettingPages.ViewModels;`
`6`	`4`
`7`	`5`	`namespace Flow.Launcher.SettingPages.Views;`
`8`	`6`
`@@ -14,9 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`12`	`{`
`15`	`13`	`if (!IsInitialized)`
`16`	`14`	`{`
`17`		`- var settings = Ioc.Default.GetRequiredService<Settings>();`
`18`		`- var updater = Ioc.Default.GetRequiredService<Updater>();`
`19`		`- _viewModel = new SettingsPaneAboutViewModel(settings, updater);`
	`15`	`+ _viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();`
`20`	`16`	`DataContext = _viewModel;`
`21`	`17`	`InitializeComponent();`
`22`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System.Windows.Navigation;`
`2`	`2`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`3`	`3`	`using Flow.Launcher.SettingPages.ViewModels;`
`4`		`-using Flow.Launcher.Infrastructure.UserSettings;`
`5`	`4`
`6`	`5`	`namespace Flow.Launcher.SettingPages.Views;`
`7`	`6`
`@@ -13,8 +12,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`13`	`12`	`{`
`14`	`13`	`if (!IsInitialized)`
`15`	`14`	`{`
`16`		`- var settings = Ioc.Default.GetRequiredService<Settings>();`
`17`		`- _viewModel = new SettingsPaneHotkeyViewModel(settings);`
	`15`	`+ _viewModel = Ioc.Default.GetRequiredService<SettingsPaneHotkeyViewModel>();`
`18`	`16`	`DataContext = _viewModel;`
`19`	`17`	`InitializeComponent();`
`20`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`6`	`6`	`using Flow.Launcher.SettingPages.ViewModels;`
`7`	`7`	`using Flow.Launcher.ViewModel;`
`8`		`-using Flow.Launcher.Infrastructure.UserSettings;`
`9`	`8`
`10`	`9`	`namespace Flow.Launcher.SettingPages.Views;`
`11`	`10`
`@@ -17,8 +16,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`17`	`16`	`{`
`18`	`17`	`if (!IsInitialized)`
`19`	`18`	`{`
`20`		`- var settings = Ioc.Default.GetRequiredService<Settings>();`
`21`		`- _viewModel = new SettingsPanePluginStoreViewModel();`
	`19`	`+ _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();`
`22`	`20`	`DataContext = _viewModel;`
`23`	`21`	`InitializeComponent();`
`24`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Windows.Navigation;`
`3`	`3`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`4`	`4`	`using Flow.Launcher.SettingPages.ViewModels;`
`5`		`-using Flow.Launcher.Infrastructure.UserSettings;`
`6`	`5`
`7`	`6`	`namespace Flow.Launcher.SettingPages.Views;`
`8`	`7`
`@@ -14,8 +13,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`13`	`{`
`15`	`14`	`if (!IsInitialized)`
`16`	`15`	`{`
`17`		`- var settings = Ioc.Default.GetRequiredService<Settings>();`
`18`		`- _viewModel = new SettingsPanePluginsViewModel(settings);`
	`16`	`+ _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginsViewModel>();`
`19`	`17`	`DataContext = _viewModel;`
`20`	`18`	`InitializeComponent();`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,21 @@`
`1`	`1`	`using System.Windows.Navigation;`
`2`	`2`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`3`		`-using Flow.Launcher.Core.Resource;`
`4`		`-using Flow.Launcher.Infrastructure.UserSettings;`
`5`	`3`	`using Flow.Launcher.SettingPages.ViewModels;`
`6`		`-using Page = ModernWpf.Controls.Page;`
`7`	`4`
`8`	`5`	`namespace Flow.Launcher.SettingPages.Views;`
`9`	`6`
`10`		`-public partial class SettingsPaneTheme : Page`
	`7`	`+public partial class SettingsPaneTheme`
`11`	`8`	`{`
`12`	`9`	`private SettingsPaneThemeViewModel _viewModel = null!;`
`13`	`10`
`14`	`11`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`15`	`12`	`{`
`16`	`13`	`if (!IsInitialized)`
`17`	`14`	`{`
`18`		`- var settings = Ioc.Default.GetRequiredService<Settings>();`
`19`		`- var theme = Ioc.Default.GetRequiredService<Theme>();`
`20`		`- _viewModel = new SettingsPaneThemeViewModel(settings, theme);`
	`15`	`+ _viewModel = Ioc.Default.GetRequiredService<SettingsPaneThemeViewModel>();`
`21`	`16`	`DataContext = _viewModel;`
`22`	`17`	`InitializeComponent();`
`23`	`18`	`}`
`24`		`-`
`25`	`19`	`base.OnNavigatedTo(e);`
`26`	`20`	`}`
`27`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,42 +5,42 @@ namespace Flow.Launcher.ViewModel;`
`5`	`5`
`6`	`6`	`public partial class SettingWindowViewModel : BaseModel`
`7`	`7`	`{`
`8`		`- public Settings Settings { get; }`
	`8`	`+ private readonly Settings _settings;`
`9`	`9`
`10`	`10`	`public SettingWindowViewModel(Settings settings)`
`11`	`11`	`{`
`12`		`- Settings = settings;`
	`12`	`+ _settings = settings;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`/// <summary>`
`16`	`16`	`/// Save Flow settings. Plugins settings are not included.`
`17`	`17`	`/// </summary>`
`18`	`18`	`public void Save()`
`19`	`19`	`{`
`20`		`- Settings.Save();`
	`20`	`+ _settings.Save();`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public double SettingWindowWidth`
`24`	`24`	`{`
`25`		`- get => Settings.SettingWindowWidth;`
`26`		`- set => Settings.SettingWindowWidth = value;`
	`25`	`+ get => _settings.SettingWindowWidth;`
	`26`	`+ set => _settings.SettingWindowWidth = value;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public double SettingWindowHeight`
`30`	`30`	`{`
`31`		`- get => Settings.SettingWindowHeight;`
`32`		`- set => Settings.SettingWindowHeight = value;`
	`31`	`+ get => _settings.SettingWindowHeight;`
	`32`	`+ set => _settings.SettingWindowHeight = value;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public double? SettingWindowTop`
`36`	`36`	`{`
`37`		`- get => Settings.SettingWindowTop;`
`38`		`- set => Settings.SettingWindowTop = value;`
	`37`	`+ get => _settings.SettingWindowTop;`
	`38`	`+ set => _settings.SettingWindowTop = value;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public double? SettingWindowLeft`
`42`	`42`	`{`
`43`		`- get => Settings.SettingWindowLeft;`
`44`		`- set => Settings.SettingWindowLeft = value;`
	`43`	`+ get => _settings.SettingWindowLeft;`
	`44`	`+ set => _settings.SettingWindowLeft = value;`
`45`	`45`	`}`
`46`	`46`	`}`