Dependency Code Quality

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -205,7 +205,7 @@ public static async Task InitializePluginsAsync()
                 }
                 catch (Exception e)
                 {
-                    Log.Exception(nameof(PluginManager), $"Fail to Init plugin: {pair.Metadata.Name}", e);
+                    Log.Exception(ClassName, $"Fail to Init plugin: {pair.Metadata.Name}", e);
                     pair.Metadata.Disabled = true;
                     failedPlugins.Enqueue(pair);
                 }

Flow.Launcher.Core/Updater.cs

@@ -9,8 +9,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Http;
@@ -131,7 +129,7 @@ private static async Task<UpdateManager> GitHubUpdateManagerAsync(string reposit
 
             await using var jsonStream = await Http.GetStreamAsync(api).ConfigureAwait(false);
 
-            var releases = await System.Text.Json.JsonSerializer.DeserializeAsync<List<GithubRelease>>(jsonStream).ConfigureAwait(false);
+            var releases = await JsonSerializer.DeserializeAsync<List<GithubRelease>>(jsonStream).ConfigureAwait(false);
             var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
             var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
 
@@ -146,10 +144,9 @@ private static async Task<UpdateManager> GitHubUpdateManagerAsync(string reposit
             return manager;
         }
 
-        private static string NewVersionTips(string version)
+        private string NewVersionTips(string version)
         {
-            var translator = Ioc.Default.GetRequiredService<Internationalization>();
-            var tips = string.Format(translator.GetTranslation("newVersionTips"), version);
+            var tips = string.Format(_api.GetTranslation("newVersionTips"), version);
 
             return tips;
         }

Flow.Launcher/ActionKeywords.xaml.cs

@@ -1,29 +1,26 @@
 using System.Windows;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
-using Flow.Launcher.Core;
 using System.Linq;
 using System.Collections.Generic;
 
 namespace Flow.Launcher
 {
     public partial class ActionKeywords
     {
-        private readonly PluginPair plugin;
-        private readonly Internationalization translater = InternationalizationManager.Instance;
-        private readonly PluginViewModel pluginViewModel;
+        private readonly PluginPair _plugin;
+        private readonly PluginViewModel _pluginViewModel;
 
         public ActionKeywords(PluginViewModel pluginViewModel)
         {
             InitializeComponent();
-            plugin = pluginViewModel.PluginPair;
-            this.pluginViewModel = pluginViewModel;
+            _plugin = pluginViewModel.PluginPair;
+            _pluginViewModel = pluginViewModel;
         }
 
         private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
         {
-            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, plugin.Metadata.ActionKeywords.ToArray());
+            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeparator, _plugin.Metadata.ActionKeywords.ToArray());
             tbAction.Focus();
         }
 
@@ -34,7 +31,7 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
 
         private void btnDone_OnClick(object sender, RoutedEventArgs _)
         {
-            var oldActionKeywords = plugin.Metadata.ActionKeywords;
+            var oldActionKeywords = _plugin.Metadata.ActionKeywords;
 
             var newActionKeywords = tbAction.Text.Split(Query.ActionKeywordSeparator).ToList();
             newActionKeywords.RemoveAll(string.IsNullOrEmpty);
@@ -48,7 +45,7 @@ private void btnDone_OnClick(object sender, RoutedEventArgs _)
             {
                 if (oldActionKeywords.Count != newActionKeywords.Count)
                 {
-                    ReplaceActionKeyword(plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
+                    ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
                     return;
                 }
 
@@ -58,18 +55,16 @@ private void btnDone_OnClick(object sender, RoutedEventArgs _)
                 if (sortedOldActionKeywords.SequenceEqual(sortedNewActionKeywords))
                 {
                     // User just changes the sequence of action keywords
-                    var msg = translater.GetTranslation("newActionKeywordsSameAsOld");
-                    MessageBoxEx.Show(msg);
+                    App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsSameAsOld"));
                 }
                 else
                 {
-                    ReplaceActionKeyword(plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
+                    ReplaceActionKeyword(_plugin.Metadata.ID, removedActionKeywords, addedActionKeywords);
                 }
             }
             else
             {
-                string msg = translater.GetTranslation("newActionKeywordsHasBeenAssigned");
-                App.API.ShowMsgBox(msg);
+                App.API.ShowMsgBox(App.API.GetTranslation("newActionKeywordsHasBeenAssigned"));
             }
         }
 
@@ -85,7 +80,7 @@ private void ReplaceActionKeyword(string id, IReadOnlyList<string> removedAction
             }
 
             // Update action keywords text and close window
-            pluginViewModel.OnActionKeywordsChanged();
+            _pluginViewModel.OnActionKeywordsChanged();
             Close();
         }
     }

Flow.Launcher/App.xaml.cs

@@ -343,7 +343,7 @@ public void Dispose()
 
         public void OnSecondAppStarted()
         {
-            Ioc.Default.GetRequiredService<MainViewModel>().Show();
+            API.ShowMainWindow();
         }
 
         #endregion

Flow.Launcher/Converters/TextConverter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.Converters;
@@ -23,7 +22,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         if (translationKey is null)
             return id;
 
-        return InternationalizationManager.Instance.GetTranslation(translationKey);
+        return App.API.GetTranslation(translationKey);
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new InvalidOperationException();

Flow.Launcher/CustomQueryHotkeySetting.xaml.cs

@@ -1,5 +1,4 @@
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Helper;
+using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.UserSettings;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -53,22 +52,21 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
             Close();
         }
 
-
         public void UpdateItem(CustomPluginHotkey item)
         {
             updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>
                 o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
             if (updateCustomHotkey == null)
             {
-                App.API.ShowMsgBox(InternationalizationManager.Instance.GetTranslation("invalidPluginHotkey"));
+                App.API.ShowMsgBox(App.API.GetTranslation("invalidPluginHotkey"));
                 Close();
                 return;
             }
 
             tbAction.Text = updateCustomHotkey.ActionKeyword;
             HotkeyControl.SetHotkey(updateCustomHotkey.Hotkey, false);
             update = true;
-            lblAdd.Text = InternationalizationManager.Instance.GetTranslation("update");
+            lblAdd.Text = App.API.GetTranslation("update");
         }
 
         private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)

Flow.Launcher/CustomShortcutSetting.xaml.cs

@@ -1,9 +1,7 @@
-using Flow.Launcher.Core.Resource;
-using System;
+using System;
 using System.Windows;
 using System.Windows.Input;
 using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Core;
 
 namespace Flow.Launcher
 {
@@ -41,15 +39,15 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
 
         private void BtnAdd_OnClick(object sender, RoutedEventArgs e)
         {
-            if (String.IsNullOrEmpty(Key) || String.IsNullOrEmpty(Value))
+            if (string.IsNullOrEmpty(Key) || string.IsNullOrEmpty(Value))
             {
-                App.API.ShowMsgBox(InternationalizationManager.Instance.GetTranslation("emptyShortcut"));
+                App.API.ShowMsgBox(App.API.GetTranslation("emptyShortcut"));
                 return;
             }
             // Check if key is modified or adding a new one
             if (((update && originalKey != Key) || !update) && _hotkeyVm.DoesShortcutExist(Key))
             {
-                App.API.ShowMsgBox(InternationalizationManager.Instance.GetTranslation("duplicateShortcut"));
+                App.API.ShowMsgBox(App.API.GetTranslation("duplicateShortcut"));
                 return;
             }
             DialogResult = !update || originalKey != Key || originalValue != Value;

Flow.Launcher/Helper/HotKeyMapper.cs

@@ -3,7 +3,6 @@
 using System;
 using NHotkey;
 using NHotkey.Wpf;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.ViewModel;
 using ChefKeys;
 using Flow.Launcher.Infrastructure.Logger;
@@ -56,9 +55,9 @@ private static void SetWithChefKeys(string hotkeyStr)
                 string.Format("|HotkeyMapper.SetWithChefKeys|Error registering hotkey: {0} \nStackTrace:{1}",
                               e.Message,
                               e.StackTrace));
-            string errorMsg = string.Format(InternationalizationManager.Instance.GetTranslation("registerHotkeyFailed"), hotkeyStr);
-            string errorMsgTitle = InternationalizationManager.Instance.GetTranslation("MessageBoxTitle");
-            MessageBoxEx.Show(errorMsg, errorMsgTitle);
+            string errorMsg = string.Format(App.API.GetTranslation("registerHotkeyFailed"), hotkeyStr);
+            string errorMsgTitle = App.API.GetTranslation("MessageBoxTitle");
+            App.API.ShowMsgBox(errorMsg, errorMsgTitle);
         }
     }
 
@@ -82,8 +81,8 @@ internal static void SetHotkey(HotkeyModel hotkey, EventHandler<HotkeyEventArgs>
                               e.Message,
                               e.StackTrace,
                               hotkeyStr));
-            string errorMsg = string.Format(InternationalizationManager.Instance.GetTranslation("registerHotkeyFailed"), hotkeyStr);
-            string errorMsgTitle = InternationalizationManager.Instance.GetTranslation("MessageBoxTitle");
+            string errorMsg = string.Format(App.API.GetTranslation("registerHotkeyFailed"), hotkeyStr);
+            string errorMsgTitle = App.API.GetTranslation("MessageBoxTitle");
             App.API.ShowMsgBox(errorMsg, errorMsgTitle);
         }
     }
@@ -107,9 +106,9 @@ internal static void RemoveHotkey(string hotkeyStr)
                 string.Format("|HotkeyMapper.RemoveHotkey|Error removing hotkey: {0} \nStackTrace:{1}",
                               e.Message,
                               e.StackTrace));
-            string errorMsg = string.Format(InternationalizationManager.Instance.GetTranslation("unregisterHotkeyFailed"), hotkeyStr);
-            string errorMsgTitle = InternationalizationManager.Instance.GetTranslation("MessageBoxTitle");
-            MessageBoxEx.Show(errorMsg, errorMsgTitle);
+            string errorMsg = string.Format(App.API.GetTranslation("unregisterHotkeyFailed"), hotkeyStr);
+            string errorMsgTitle = App.API.GetTranslation("MessageBoxTitle");
+            App.API.ShowMsgBox(errorMsg, errorMsgTitle);
         }
     }
 
@@ -137,8 +136,8 @@ internal static void SetCustomQueryHotkey(CustomPluginHotkey hotkey)
             if (_mainViewModel.ShouldIgnoreHotkeys())
                 return;
 
-            _mainViewModel.Show();
-            _mainViewModel.ChangeQueryText(hotkey.ActionKeyword, true);
+            App.API.ShowMainWindow();
+            App.API.ChangeQuery(hotkey.ActionKeyword, true);
         });
     }
 

Flow.Launcher/HotkeyControl.xaml.cs

@@ -5,7 +5,6 @@
 using System.Windows;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Helper;
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.UserSettings;
@@ -65,7 +64,6 @@ private static void OnHotkeyChanged(DependencyObject d, DependencyPropertyChange
             hotkeyControl.RefreshHotkeyInterface(hotkeyControl.Hotkey);
         }
 
-
         public static readonly DependencyProperty ChangeHotkeyProperty = DependencyProperty.Register(
             nameof(ChangeHotkey),
             typeof(ICommand),
@@ -79,7 +77,6 @@ public ICommand? ChangeHotkey
             set { SetValue(ChangeHotkeyProperty, value); }
         }
 
-
         public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
             nameof(Type),
             typeof(HotkeyType),
@@ -227,19 +224,18 @@ private void RefreshHotkeyInterface(string hotkey)
         private static bool CheckHotkeyAvailability(HotkeyModel hotkey, bool validateKeyGesture) =>
             hotkey.Validate(validateKeyGesture) && HotKeyMapper.CheckAvailability(hotkey);
 
-        public string EmptyHotkey => InternationalizationManager.Instance.GetTranslation("none");
+        public string EmptyHotkey => App.API.GetTranslation("none");
 
         public ObservableCollection<string> KeysToDisplay { get; set; } = new();
 
         public HotkeyModel CurrentHotkey { get; private set; } = new(false, false, false, false, Key.None);
 
-
         public void GetNewHotkey(object sender, RoutedEventArgs e)
         {
-            OpenHotkeyDialog();
+            _ = OpenHotkeyDialogAsync();
         }
 
-        private async Task OpenHotkeyDialog()
+        private async Task OpenHotkeyDialogAsync()
         {
             if (!string.IsNullOrEmpty(Hotkey))
             {
@@ -262,12 +258,11 @@ private async Task OpenHotkeyDialog()
             }
         }
 
-
         private void SetHotkey(HotkeyModel keyModel, bool triggerValidate = true)
         {
             if (triggerValidate)
             {
-                bool hotkeyAvailable = false;
+                bool hotkeyAvailable;
                 // TODO: This is a temporary way to enforce changing only the open flow hotkey to Win, and will be removed by PR #3157
                 if (keyModel.ToString() == "LWin" || keyModel.ToString() == "RWin")
                 {