chore: Cleanup

Author: nlogozzo

Nickvision.Application.GNOME/Helpers/IServiceCollectionExtensions.cs

@@ -0,0 +1,16 @@
+using Microsoft.Extensions.DependencyInjection;
+using Nickvision.Application.GNOME.Views;
+
+namespace Nickvision.Application.GNOME.Helpers;
+
+public static class IServiceCollectionExtensions
+{
+    extension(IServiceCollection collection)
+    {
+        public IServiceCollection AddControls()
+        {
+            collection.AddTransient<PreferencesDialog>();
+            return collection;
+        }
+    }
+}

Nickvision.Application.GNOME/Program.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Hosting;
+using Nickvision.Application.GNOME.Helpers;
 using Nickvision.Application.GNOME.Views;
 using Nickvision.Application.Shared.Helpers;
 using Nickvision.Desktop.GNOME.Helpers;
@@ -13,9 +14,10 @@ public static async Task Main(string[] args)
         var newArgs = new string[args.Length + 1];
         newArgs[0] = "org.nickvision.application";
         args.CopyTo(newArgs, 1);
-        var builder = Host.CreateApplicationBuilder();
+        var builder = Host.CreateApplicationBuilder(args);
         builder.ConfigureApplication(newArgs);
         builder.ConfigureAdw<MainWindow>();
+        builder.Services.AddControls();
         var app = builder.Build();
         await app.RunAsync();
     }

Nickvision.Application.GNOME/Views/MainWindow.cs

@@ -179,11 +179,7 @@ private async void OpenFolder(Gio.SimpleAction sender, Gio.SimpleAction.Activate
 
     private void CloseFolder(Gio.SimpleAction sender, Gio.SimpleAction.ActivateSignalArgs args) => _controller.CloseFolder();
 
-    private void Preferences(Gio.SimpleAction sender, Gio.SimpleAction.ActivateSignalArgs args)
-    {
-        var preferencesDialog = ActivatorUtilities.CreateInstance<PreferencesDialog>(_serviceProvider);
-        preferencesDialog.Present(this);
-    }
+    private void Preferences(Gio.SimpleAction sender, Gio.SimpleAction.ActivateSignalArgs args) => _serviceProvider.GetRequiredService<PreferencesDialog>().Present(this);
 
     private void KeyboardShortcuts(Gio.SimpleAction sender, Gio.SimpleAction.ActivateSignalArgs args) => _serviceProvider.GetRequiredService<ShortcutsDialog>().Present(this);
 

Nickvision.Application.Shared/Helpers/HostApplicationBuilderExtensions.cs

@@ -28,7 +28,7 @@ public IHostApplicationBuilder ConfigureApplication(string[] args)
             builder.ConfigureNickvision(args);
             builder.Services.AddSingleton<IFolderService, FolderService>();
             builder.Services.AddSingleton<MainWindowController>();
-            builder.Services.AddSingleton<PreferencesViewController>();
+            builder.Services.AddTransient<PreferencesViewController>();
             return builder;
         }
     }

Nickvision.Application.WinUI/App.xaml.cs

@@ -20,7 +20,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         if (_window is null)
         {
-            _window = ActivatorUtilities.CreateInstance<MainWindow>(_serviceProvider);
+            _window = _serviceProvider.GetRequiredService<MainWindow>();
         }
         _window.Activate();
     }

Nickvision.Application.WinUI/Helpers/IServiceCollectionExtensions.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.DependencyInjection;
+using Nickvision.Application.WinUI.Controls;
+using Nickvision.Application.WinUI.Views;
+
+namespace Nickvision.Application.WinUI.Helpers;
+
+public static class IServiceCollectionExtensions
+{
+    extension(IServiceCollection collection)
+    {
+        public IServiceCollection AddControls()
+        {
+            collection.AddSingleton<MainWindow>();
+            collection.AddTransient<SettingsPage>();
+            collection.AddTransient<AboutDialog>();
+            return collection;
+        }
+    }
+}

Nickvision.Application.WinUI/Program.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Hosting;
 using Nickvision.Application.Shared.Helpers;
+using Nickvision.Application.WinUI.Helpers;
 using Nickvision.Desktop.WinUI.Helpers;
 using System;
 using System.Runtime.InteropServices;
@@ -15,9 +16,10 @@ public static partial class Program
     private static void Main(string[] args)
     {
         XamlCheckProcessRequirements();
-        var builder = Host.CreateApplicationBuilder();
+        var builder = Host.CreateApplicationBuilder(args);
         builder.ConfigureApplication(args);
         builder.ConfigureWinUI<App>();
+        builder.Services.AddControls();
         var app = builder.Build();
         app.Run();
     }

Nickvision.Application.WinUI/Views/MainWindow.xaml.cs

@@ -116,7 +116,7 @@ private void NavView_SelectionChanged(NavigationView sender, NavigationViewSelec
             var tag = item.Tag as string;
             FrameCustom.Content = tag switch
             {
-                "Settings" => ActivatorUtilities.CreateInstance<SettingsPage>(_serviceProvider),
+                "Settings" => _serviceProvider.GetRequiredService<SettingsPage>(),
                 _ => null
             };
             ViewStack.SelectedIndex = tag switch
@@ -247,7 +247,7 @@ private async void CheckForUpdates(object sender, RoutedEventArgs e)
 
     private async void About(object sender, RoutedEventArgs e)
     {
-        var aboutDialog = ActivatorUtilities.CreateInstance<AboutDialog>(_serviceProvider);
+        var aboutDialog = _serviceProvider.GetRequiredService<AboutDialog>();
         aboutDialog.DebugInformation = _controller.GetDebugInformation();
         aboutDialog.RequestedTheme = MainGrid.ActualTheme;
         aboutDialog.XamlRoot = MainGrid.XamlRoot;

resources/po/application.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-02-22 23:49-0500\n"
+"POT-Creation-Date: 2026-02-23 11:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -114,7 +114,7 @@ msgid_plural "There are {0} files in the folder"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Nickvision.Application.GNOME/Views/MainWindow.cs:208
+#: Nickvision.Application.GNOME/Views/MainWindow.cs:204
 #: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:77
 msgid "GitHub Repo"
 msgstr ""

resources/po/ru.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-02-22 23:49-0500\n"
+"POT-Creation-Date: 2026-02-23 11:04-0500\n"
 "PO-Revision-Date: 2023-05-23 06:33+0300\n"
 "Last-Translator: Fyodor Sobolev\n"
 "Language-Team: Russian\n"
@@ -117,7 +117,7 @@ msgstr[0] "В папке {0} файл."
 msgstr[1] "В папке {0} файла."
 msgstr[2] "В папке {0} файлов."
 
-#: Nickvision.Application.GNOME/Views/MainWindow.cs:208
+#: Nickvision.Application.GNOME/Views/MainWindow.cs:204
 #: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:77
 msgid "GitHub Repo"
 msgstr "Репозиторий GitHub"