remove some usage of Ioc.GetRequiredService when injection is possible.

Author: taooceros

Flow.Launcher.Infrastructure/StringMatcher.cs

@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Flow.Launcher.Infrastructure.UserSettings;
 
 namespace Flow.Launcher.Infrastructure
 {
@@ -14,15 +15,11 @@ public class StringMatcher
 
         private readonly IAlphabet _alphabet;
 
-        public StringMatcher()
-        {
-            _alphabet = Ioc.Default.GetRequiredService<IAlphabet>();
-        }
-
         // This is a workaround to allow unit tests to set the instance
-        public StringMatcher(IAlphabet alphabet)
+        public StringMatcher(IAlphabet alphabet, Settings settings)
         {
             _alphabet = alphabet;
+            UserSettingSearchPrecision = settings.QuerySearchPrecision;
         }
 
         public static MatchResult FuzzySearch(string query, string stringToCompare)

Flow.Launcher/App.xaml.cs

@@ -91,8 +91,6 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
 
                 AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);
 
-                Ioc.Default.GetRequiredService<StringMatcher>().UserSettingSearchPrecision = _settings.QuerySearchPrecision;
-
                 // TODO: Clean InternationalizationManager.Instance and InternationalizationManager.Instance.GetTranslation in future
                 InternationalizationManager.Instance.ChangeLanguage(_settings.Language);
 

Flow.Launcher/PublicAPIInstance.cs

@@ -247,7 +247,7 @@ public void SavePluginSettings()
         public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null)
         {
             using var explorer = new Process();
-            var explorerInfo = _settingsVM.Settings.CustomExplorer;
+            var explorerInfo = _settingsVM._settings.CustomExplorer;
 
             explorer.StartInfo = new ProcessStartInfo
             {
@@ -268,7 +268,7 @@ private void OpenUri(Uri uri, bool? inPrivate = null)
         {
             if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
             {
-                var browserInfo = _settingsVM.Settings.CustomBrowser;
+                var browserInfo = _settingsVM._settings.CustomBrowser;
 
                 var path = browserInfo.Path == "*" ? "" : browserInfo.Path;
 

Flow.Launcher/SettingWindow.xaml.cs

@@ -27,7 +27,7 @@ public partial class SettingWindow
     public SettingWindow()
     {
         var viewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
-        _settings = viewModel.Settings;
+        _settings = Ioc.Default.GetRequiredService<Settings>();
         DataContext = viewModel;
         _viewModel = viewModel;
         _updater = Ioc.Default.GetRequiredService<Updater>();

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -6,42 +6,42 @@ namespace Flow.Launcher.ViewModel;
 
 public partial class SettingWindowViewModel : BaseModel
 {
-    public Settings Settings { get; init; }
+    public readonly Settings _settings; 
 
-    public SettingWindowViewModel()
+    public SettingWindowViewModel(Settings settings)
     {
-        Settings = Ioc.Default.GetRequiredService<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;
     }
 }