Remove instance for Internationalization & Theme

Jack251970 · Jack251970 · commit a3964f56672d · 2025-02-23T13:51:37.000+08:00
diff --git a/Flow.Launcher.Core/Plugin/PluginManager.cs b/Flow.Launcher.Core/Plugin/PluginManager.cs
@@ -204,7 +204,7 @@ public static async Task InitializePluginsAsync()
             }
 
             InternationalizationManager.Instance.AddPluginLanguageDirectories(GetPluginsForInterface<IPluginI18n>());
-            InternationalizationManager.Instance.ChangeLanguage(InternationalizationManager.Instance.Settings.Language);
+            InternationalizationManager.Instance.ChangeLanguage(Ioc.Default.GetRequiredService<Settings>().Language);
 
             if (failedPlugins.Any())
             {
diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs
@@ -17,17 +17,18 @@ namespace Flow.Launcher.Core.Resource
 {
     public class Internationalization
     {
-        public Settings Settings { get; set; }
         private const string Folder = "Languages";
         private const string DefaultLanguageCode = "en";
         private const string DefaultFile = "en.xaml";
         private const string Extension = ".xaml";
+        private readonly Settings _settings;
         private readonly List<string> _languageDirectories = new List<string>();
         private readonly List<ResourceDictionary> _oldResources = new List<ResourceDictionary>();
         private readonly string SystemLanguageCode;
 
-        public Internationalization()
+        public Internationalization(Settings settings)
         {
+            _settings = settings;
             AddFlowLauncherLanguageDirectory();
             SystemLanguageCode = GetSystemLanguageCodeAtStartup();
         }
@@ -142,7 +143,7 @@ private void ChangeLanguage(Language language, bool isSystem)
             CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
 
             // Raise event after culture is set
-            Settings.Language = isSystem ? Constant.SystemLanguageCode : language.LanguageCode;
+            _settings.Language = isSystem ? Constant.SystemLanguageCode : language.LanguageCode;
             _ = Task.Run(() =>
             {
                 UpdatePluginMetadataTranslations();
@@ -153,7 +154,7 @@ public bool PromptShouldUsePinyin(string languageCodeToSet)
         {
             var languageToSet = GetLanguageByLanguageCode(languageCodeToSet);
 
-            if (Settings.ShouldUsePinyin)
+            if (_settings.ShouldUsePinyin)
                 return false;
 
             if (languageToSet != AvailableLanguages.Chinese && languageToSet != AvailableLanguages.Chinese_TW)
diff --git a/Flow.Launcher.Core/Resource/InternationalizationManager.cs b/Flow.Launcher.Core/Resource/InternationalizationManager.cs
@@ -1,26 +1,10 @@
-﻿namespace Flow.Launcher.Core.Resource
+﻿using CommunityToolkit.Mvvm.DependencyInjection;
+
+namespace Flow.Launcher.Core.Resource
 {
     public static class InternationalizationManager
     {
-        private static Internationalization instance;
-        private static object syncObject = new object();
-
         public static Internationalization Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    lock (syncObject)
-                    {
-                        if (instance == null)
-                        {
-                            instance = new Internationalization();
-                        }
-                    }
-                }
-                return instance;
-            }
-        }
+            => Ioc.Default.GetRequiredService<Internationalization>();
     }
-}
+}
diff --git a/Flow.Launcher.Core/Resource/Theme.cs b/Flow.Launcher.Core/Resource/Theme.cs
@@ -25,11 +25,11 @@ public class Theme
 
         private const int ShadowExtraMargin = 32;
 
-        private readonly IPublicAPI API = Ioc.Default.GetRequiredService<IPublicAPI>();
+        private readonly IPublicAPI API;
+        private readonly Settings Settings;
         private readonly List<string> _themeDirectories = new List<string>();
         private ResourceDictionary _oldResource;
         private string _oldTheme;
-        public Settings Settings { get; set; }
         private const string Folder = Constant.Themes;
         private const string Extension = ".xaml";
         private string DirectoryPath => Path.Combine(Constant.ProgramDirectory, Folder);
@@ -39,8 +39,11 @@ public class Theme
 
         private double mainWindowWidth;
 
-        public Theme()
+        public Theme(IPublicAPI publicAPI, Settings settings)
         {
+            API = publicAPI;
+            Settings = settings;
+
             _themeDirectories.Add(DirectoryPath);
             _themeDirectories.Add(UserDirectoryPath);
             MakeSureThemeDirectoriesExist();
diff --git a/Flow.Launcher.Core/Resource/ThemeManager.cs b/Flow.Launcher.Core/Resource/ThemeManager.cs
@@ -1,26 +1,10 @@
-﻿namespace Flow.Launcher.Core.Resource
+﻿using CommunityToolkit.Mvvm.DependencyInjection;
+
+namespace Flow.Launcher.Core.Resource
 {
     public class ThemeManager
     {
-        private static Theme instance;
-        private static object syncObject = new object();
-
         public static Theme Instance
-        {
-            get
-            {
-                if (instance == null)
-                {
-                    lock (syncObject)
-                    {
-                        if (instance == null)
-                        {
-                            instance = new Theme();
-                        }
-                    }
-                }
-                return instance;
-            }
-        }
+            => Ioc.Default.GetRequiredService<Theme>();
     }
 }
diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
@@ -17,7 +17,6 @@
 using Flow.Launcher.Plugin;
 using System.Text.Json.Serialization;
 using System.Threading;
-using CommunityToolkit.Mvvm.DependencyInjection;
 
 namespace Flow.Launcher.Core
 {
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
@@ -50,8 +50,10 @@ public App()
                     .AddSingleton<SettingWindowViewModel>()
                     .AddSingleton<IAlphabet, PinyinAlphabet>()
                     .AddSingleton<StringMatcher>()
+                    .AddSingleton<Internationalization>()
                     .AddSingleton<IPublicAPI, PublicAPIInstance>()
                     .AddSingleton<MainViewModel>()
+                    .AddSingleton<Theme>()
                 ).Build();
             Ioc.Default.ConfigureServices(host.Services);
 
@@ -93,7 +95,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
 
                 Ioc.Default.GetRequiredService<StringMatcher>().UserSettingSearchPrecision = _settings.QuerySearchPrecision;
 
-                InternationalizationManager.Instance.Settings = _settings;
+                // TODO: Clean InternationalizationManager.Instance and InternationalizationManager.Instance.GetTranslation in future
                 InternationalizationManager.Instance.ChangeLanguage(_settings.Language);
 
                 PluginManager.LoadPlugins(_settings.PluginSettings);
@@ -114,7 +116,7 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
                 HotKeyMapper.Initialize(mainVM);
 
                 // main windows needs initialized before theme change because of blur settings
-                ThemeManager.Instance.Settings = _settings;
+                // TODO: Clean ThemeManager.Instance in future
                 ThemeManager.Instance.ChangeTheme(_settings.Theme);
 
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public static async Task InitializePluginsAsync()`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`InternationalizationManager.Instance.AddPluginLanguageDirectories(GetPluginsForInterface<IPluginI18n>());`
`207`		`- InternationalizationManager.Instance.ChangeLanguage(InternationalizationManager.Instance.Settings.Language);`
	`207`	`+ InternationalizationManager.Instance.ChangeLanguage(Ioc.Default.GetRequiredService<Settings>().Language);`
`208`	`208`
`209`	`209`	`if (failedPlugins.Any())`
`210`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,17 +17,18 @@ namespace Flow.Launcher.Core.Resource`
`17`	`17`	`{`
`18`	`18`	`public class Internationalization`
`19`	`19`	`{`
`20`		`- public Settings Settings { get; set; }`
`21`	`20`	`private const string Folder = "Languages";`
`22`	`21`	`private const string DefaultLanguageCode = "en";`
`23`	`22`	`private const string DefaultFile = "en.xaml";`
`24`	`23`	`private const string Extension = ".xaml";`
	`24`	`+ private readonly Settings _settings;`
`25`	`25`	`private readonly List<string> _languageDirectories = new List<string>();`
`26`	`26`	`private readonly List<ResourceDictionary> _oldResources = new List<ResourceDictionary>();`
`27`	`27`	`private readonly string SystemLanguageCode;`
`28`	`28`
`29`		`- public Internationalization()`
	`29`	`+ public Internationalization(Settings settings)`
`30`	`30`	`{`
	`31`	`+ _settings = settings;`
`31`	`32`	`AddFlowLauncherLanguageDirectory();`
`32`	`33`	`SystemLanguageCode = GetSystemLanguageCodeAtStartup();`
`33`	`34`	`}`
`@@ -142,7 +143,7 @@ private void ChangeLanguage(Language language, bool isSystem)`
`142`	`143`	`CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;`
`143`	`144`
`144`	`145`	`// Raise event after culture is set`
`145`		`- Settings.Language = isSystem ? Constant.SystemLanguageCode : language.LanguageCode;`
	`146`	`+ _settings.Language = isSystem ? Constant.SystemLanguageCode : language.LanguageCode;`
`146`	`147`	`_ = Task.Run(() =>`
`147`	`148`	`{`
`148`	`149`	`UpdatePluginMetadataTranslations();`
`@@ -153,7 +154,7 @@ public bool PromptShouldUsePinyin(string languageCodeToSet)`
`153`	`154`	`{`
`154`	`155`	`var languageToSet = GetLanguageByLanguageCode(languageCodeToSet);`
`155`	`156`
`156`		`- if (Settings.ShouldUsePinyin)`
	`157`	`+ if (_settings.ShouldUsePinyin)`
`157`	`158`	`return false;`
`158`	`159`
`159`	`160`	`if (languageToSet != AvailableLanguages.Chinese && languageToSet != AvailableLanguages.Chinese_TW)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`using Flow.Launcher.Plugin;`
`18`	`18`	`using System.Text.Json.Serialization;`
`19`	`19`	`using System.Threading;`
`20`		`-using CommunityToolkit.Mvvm.DependencyInjection;`
`21`	`20`
`22`	`21`	`namespace Flow.Launcher.Core`
`23`	`22`	`{`