From f9983b587712bdc439022f4ac19bda46133d9ab8 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Wed, 22 Jan 2025 12:25:56 +0800
Subject: [PATCH] Move dependency injection codes to constructor

---
 Flow.Launcher/App.xaml.cs | 47 +++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
index a64c9e750..d983ab000 100644
--- a/Flow.Launcher/App.xaml.cs
+++ b/Flow.Launcher/App.xaml.cs
@@ -30,7 +30,31 @@ namespace Flow.Launcher
         public static IPublicAPI API { get; private set; }
         private const string Unique = "Flow.Launcher_Unique_Application_Mutex";
         private static bool _disposed;
-        private Settings _settings;
+        private readonly Settings _settings;
+
+        public App()
+        {
+            // Initialize settings
+            var storage = new FlowLauncherJsonStorage<Settings>();
+            _settings = storage.Load();
+            _settings.Initialize(storage);
+            _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
+
+            // Configure the dependency injection container
+            var host = Host.CreateDefaultBuilder()
+                .UseContentRoot(AppContext.BaseDirectory)
+                .ConfigureServices(services => services
+                    .AddSingleton(_ => _settings)
+                    .AddSingleton<Updater>()
+                    .AddSingleton<Portable>()
+                    .AddSingleton<SettingWindowViewModel>()
+                    .AddSingleton<IAlphabet, PinyinAlphabet>()
+                    .AddSingleton<StringMatcher>()
+                    .AddSingleton<IPublicAPI, PublicAPIInstance>()
+                    .AddSingleton<MainViewModel>()
+                ).Build();
+            Ioc.Default.ConfigureServices(host.Services);
+        }
 
         [STAThread]
         public static void Main()
@@ -49,27 +73,6 @@ namespace Flow.Launcher
         {
             await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
             {
-                // Initialize settings
-                var storage = new FlowLauncherJsonStorage<Settings>();
-                _settings = storage.Load();
-                _settings.Initialize(storage);
-                _settings.WMPInstalled = WindowsMediaPlayerHelper.IsWindowsMediaPlayerInstalled();
-
-                // Configure the dependency injection container
-                var host = Host.CreateDefaultBuilder()
-                    .UseContentRoot(AppContext.BaseDirectory)
-                    .ConfigureServices(services => services
-                        .AddSingleton(_ => _settings)
-                        .AddSingleton<Updater>()
-                        .AddSingleton<Portable>()
-                        .AddSingleton<SettingWindowViewModel>()
-                        .AddSingleton<IAlphabet, PinyinAlphabet>()
-                        .AddSingleton<StringMatcher>()
-                        .AddSingleton<IPublicAPI, PublicAPIInstance>()
-                        .AddSingleton<MainViewModel>()
-                    ).Build();
-                Ioc.Default.ConfigureServices(host.Services);
-
                 API = Ioc.Default.GetRequiredService<IPublicAPI>();
 
                 Ioc.Default.GetRequiredService<Updater>().Initialize(Launcher.Properties.Settings.Default.GithubRepo);