Dependency Injection Code Quality

Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs

@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Forms;
-using Flow.Launcher.Core.Resource;
 using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Core.ExternalPlugins.Environments
@@ -55,14 +54,14 @@ internal IEnumerable<PluginPair> Setup()
             }
 
             var noRuntimeMessage = string.Format(
-                InternationalizationManager.Instance.GetTranslation("runtimePluginInstalledChooseRuntimePrompt"),
+                API.GetTranslation("runtimePluginInstalledChooseRuntimePrompt"),
                 Language,
                 EnvName,
                 Environment.NewLine
             );
             if (API.ShowMsgBox(noRuntimeMessage, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
             {
-                var msg = string.Format(InternationalizationManager.Instance.GetTranslation("runtimePluginChooseRuntimeExecutable"), EnvName);
+                var msg = string.Format(API.GetTranslation("runtimePluginChooseRuntimeExecutable"), EnvName);
                 string selectedFile;
 
                 selectedFile = GetFileFromDialog(msg, FileDialogFilter);
@@ -85,7 +84,7 @@ internal IEnumerable<PluginPair> Setup()
             }
             else
             {
-                API.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("runtimePluginUnableToSetExecutablePath"), Language));
+                API.ShowMsgBox(string.Format(API.GetTranslation("runtimePluginUnableToSetExecutablePath"), Language));
                 Log.Error("PluginsLoader",
                     $"Not able to successfully set {EnvName} path, setting's plugin executable path variable is still an empty string.",
                     $"{Language}Environment");

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -28,7 +28,7 @@ public static class PluginManager
         public static List<PluginPair> AllPlugins { get; private set; }
         public static readonly HashSet<PluginPair> GlobalPlugins = new();
         public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new();
-
+        
         // We should not initialize API in static constructor because it will create another API instance
         private static IPublicAPI api = null;
         private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
@@ -205,8 +205,9 @@ public static async Task InitializePluginsAsync()
                 }
             }
 
-            InternationalizationManager.Instance.AddPluginLanguageDirectories(GetPluginsForInterface<IPluginI18n>());
-            InternationalizationManager.Instance.ChangeLanguage(Ioc.Default.GetRequiredService<Settings>().Language);
+            var translater = Ioc.Default.GetRequiredService<Internationalization>();
+            translater.AddPluginLanguageDirectories(GetPluginsForInterface<IPluginI18n>());
+            translater.ChangeLanguage(Ioc.Default.GetRequiredService<Settings>().Language);
 
             if (failedPlugins.Any())
             {

Flow.Launcher.Core/Resource/LocalizedDescriptionAttribute.cs

@@ -1,23 +1,24 @@
 using System.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Resource
 {
     public class LocalizedDescriptionAttribute : DescriptionAttribute
     {
-        private readonly Internationalization _translator;
+        private static readonly IPublicAPI _api = Ioc.Default.GetRequiredService<IPublicAPI>();
         private readonly string _resourceKey;
 
         public LocalizedDescriptionAttribute(string resourceKey)
         {
-            _translator = InternationalizationManager.Instance;
             _resourceKey = resourceKey;
         }
 
         public override string Description
         {
             get
             {
-                string description = _translator.GetTranslation(_resourceKey);
+                string description = _api.GetTranslation(_resourceKey);
                 return string.IsNullOrWhiteSpace(description) ? 
                     string.Format("[[{0}]]", _resourceKey) : description;
             }

Flow.Launcher.Core/Resource/Theme.cs

@@ -116,7 +116,7 @@ public bool ChangeTheme(string theme)
                 Log.Error($"|Theme.ChangeTheme|Theme <{theme}> path can't be found");
                 if (theme != defaultTheme)
                 {
-                    _api.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("theme_load_failure_path_not_exists"), theme));
+                    _api.ShowMsgBox(string.Format(_api.GetTranslation("theme_load_failure_path_not_exists"), theme));
                     ChangeTheme(defaultTheme);
                 }
                 return false;
@@ -126,7 +126,7 @@ public bool ChangeTheme(string theme)
                 Log.Error($"|Theme.ChangeTheme|Theme <{theme}> fail to parse");
                 if (theme != defaultTheme)
                 {
-                    _api.ShowMsgBox(string.Format(InternationalizationManager.Instance.GetTranslation("theme_load_failure_parse_error"), theme));
+                    _api.ShowMsgBox(string.Format(_api.GetTranslation("theme_load_failure_parse_error"), theme));
                     ChangeTheme(defaultTheme);
                 }
                 return false;

Flow.Launcher.Core/Resource/TranslationConverter.cs

@@ -1,19 +1,23 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Resource
 {
     public class TranslationConverter : IValueConverter
     {
+        private static readonly IPublicAPI _api = Ioc.Default.GetRequiredService<IPublicAPI>();
+
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var key = value.ToString();
-            if (String.IsNullOrEmpty(key))
+            if (string.IsNullOrEmpty(key))
                 return key;
-            return InternationalizationManager.Instance.GetTranslation(key);
+            return _api.GetTranslation(key);
         }
 
-        public object ConvertBack(object value, System.Type targetType, object parameter, CultureInfo culture) => throw new System.InvalidOperationException();
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new InvalidOperationException();
     }
 }

Flow.Launcher.Core/Updater.cs

@@ -8,7 +8,6 @@
 using System.Windows;
 using JetBrains.Annotations;
 using Squirrel;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Http;
@@ -146,8 +145,7 @@ private async Task<UpdateManager> GitHubUpdateManagerAsync(string repository)
 
         public string NewVersionTips(string version)
         {
-            var translator = InternationalizationManager.Instance;
-            var tips = string.Format(translator.GetTranslation("newVersionTips"), version);
+            var tips = string.Format(_api.GetTranslation("newVersionTips"), version);
 
             return tips;
         }

Flow.Launcher/ActionKeywords.xaml.cs

@@ -1,15 +1,12 @@
 using System.Windows;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.ViewModel;
-using Flow.Launcher.Core;
 
 namespace Flow.Launcher
 {
     public partial class ActionKeywords
     {
         private readonly PluginPair plugin;
-        private readonly Internationalization translater = InternationalizationManager.Instance;
         private readonly PluginViewModel pluginViewModel;
 
         public ActionKeywords(PluginViewModel pluginViewModel)
@@ -43,7 +40,7 @@ private void btnDone_OnClick(object sender, RoutedEventArgs _)
             }
             else
             {
-                string msg = translater.GetTranslation("newActionKeywordsHasBeenAssigned");
+                string msg = App.API.GetTranslation("newActionKeywordsHasBeenAssigned");
                 App.API.ShowMsgBox(msg);
             }
         }

Flow.Launcher/App.xaml.cs

@@ -127,8 +127,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
 
                 AbstractPluginEnvironment.PreStartPluginExecutablePathUpdate(_settings);
 
-                // TODO: Clean InternationalizationManager.Instance and InternationalizationManager.Instance.GetTranslation in future
-                InternationalizationManager.Instance.ChangeLanguage(_settings.Language);
+                Ioc.Default.GetRequiredService<Internationalization>().ChangeLanguage(_settings.Language);
 
                 PluginManager.LoadPlugins(_settings.PluginSettings);
 
@@ -148,8 +147,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
                 HotKeyMapper.Initialize();
 
                 // main windows needs initialized before theme change because of blur settings
-                // TODO: Clean ThemeManager.Instance in future
-                ThemeManager.Instance.ChangeTheme(_settings.Theme);
+                Ioc.Default.GetRequiredService<Theme>().ChangeTheme(_settings.Theme);
 
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
@@ -186,8 +184,7 @@ private void AutoStartup()
                     // but if it fails (permissions, etc) then don't keep retrying
                     // this also gives the user a visual indication in the Settings widget
                     _settings.StartFlowLauncherOnSystemStartup = false;
-                    Notification.Show(InternationalizationManager.Instance.GetTranslation("setAutoStartFailed"),
-                        e.Message);
+                    API.ShowMsg(API.GetTranslation("setAutoStartFailed"), e.Message);
                 }
             }
         }

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;
@@ -60,15 +59,15 @@ public void UpdateItem(CustomPluginHotkey item)
                 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,17 +1,14 @@
-using Flow.Launcher.Core.Resource;
-using System;
-using System.Windows;
+using System.Windows;
 using System.Windows.Input;
 using Flow.Launcher.SettingPages.ViewModels;
-using Flow.Launcher.Core;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
-        public string Key { get; set; } = String.Empty;
-        public string Value { get; set; } = String.Empty;
+        public string Key { get; set; } = string.Empty;
+        public string Value { get; set; } = string.Empty;
         private string originalKey { get; } = null;
         private string originalValue { get; } = null;
         private bool update { get; } = false;
@@ -41,15 +38,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,8 +55,8 @@ 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");
+            string errorMsg = string.Format(App.API.GetTranslation("registerHotkeyFailed"), hotkeyStr);
+            string errorMsgTitle = App.API.GetTranslation("MessageBoxTitle");
             MessageBoxEx.Show(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,8 +106,8 @@ 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");
+            string errorMsg = string.Format(App.API.GetTranslation("unregisterHotkeyFailed"), hotkeyStr);
+            string errorMsgTitle = App.API.GetTranslation("MessageBoxTitle");
             MessageBoxEx.Show(errorMsg, errorMsgTitle);
         }
     }

Flow.Launcher/HotkeyControl.xaml.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
@@ -211,7 +211,7 @@ 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();