Fix EnVarsViewModel View type & Use new GetDialog

Author: ionite34

StabilityMatrix.Avalonia/ViewModels/Dialogs/EnvVarsViewModel.cs

@@ -1,18 +1,19 @@
-using System;
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using Avalonia.Collections;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Injectio.Attributes;
+using StabilityMatrix.Avalonia.Controls;
 using StabilityMatrix.Avalonia.Languages;
 using StabilityMatrix.Avalonia.ViewModels.Base;
+using StabilityMatrix.Avalonia.Views.Dialogs;
 using StabilityMatrix.Core.Attributes;
 using StabilityMatrix.Core.Models;
 
 namespace StabilityMatrix.Avalonia.ViewModels.Dialogs;
 
-[View(typeof(EnvVarsViewModel))]
+[View(typeof(EnvVarsDialog))]
 [ManagedService]
 [RegisterTransient<EnvVarsViewModel>]
 public partial class EnvVarsViewModel : ContentDialogViewModelBase
@@ -43,4 +44,15 @@ private void RemoveSelectedRow(int selectedIndex)
             Debug.WriteLine($"RemoveSelectedRow: Index {selectedIndex} out of range");
         }
     }
+
+    public override BetterContentDialog GetDialog()
+    {
+        var dialog = base.GetDialog();
+
+        dialog.PrimaryButtonText = Resources.Action_Save;
+        dialog.IsPrimaryButtonEnabled = true;
+        dialog.CloseButtonText = Resources.Action_Cancel;
+
+        return dialog;
+    }
 }

StabilityMatrix.Avalonia/ViewModels/Settings/MainSettingsViewModel.cs

@@ -97,7 +97,7 @@ public partial class MainSettingsViewModel : PageViewModelBase
     [ObservableProperty]
     private string? selectedTheme;
 
-    public IReadOnlyList<string> AvailableThemes { get; } = new[] { "Light", "Dark", "System", };
+    public IReadOnlyList<string> AvailableThemes { get; } = new[] { "Light", "Dark", "System" };
 
     [ObservableProperty]
     private CultureInfo selectedLanguage;
@@ -112,7 +112,7 @@ public partial class MainSettingsViewModel : PageViewModelBase
         Enum.GetValues<NumberFormatMode>().Where(mode => mode != default).ToList();
 
     public IReadOnlyList<float> AnimationScaleOptions { get; } =
-        new[] { 0f, 0.25f, 0.5f, 0.75f, 1f, 1.25f, 1.5f, 1.75f, 2f, };
+        new[] { 0f, 0.25f, 0.5f, 0.75f, 1f, 1.25f, 1.5f, 1.75f, 2f };
 
     public IReadOnlyList<HolidayMode> HolidayModes { get; } = Enum.GetValues<HolidayMode>().ToList();
 
@@ -179,8 +179,10 @@ public partial class MainSettingsViewModel : PageViewModelBase
     [ObservableProperty]
     private MemoryInfo memoryInfo;
 
-    private readonly DispatcherTimer hardwareInfoUpdateTimer =
-        new() { Interval = TimeSpan.FromSeconds(2.627) };
+    private readonly DispatcherTimer hardwareInfoUpdateTimer = new()
+    {
+        Interval = TimeSpan.FromSeconds(2.627),
+    };
 
     public Task<CpuInfo> CpuInfoAsync => HardwareHelper.GetCpuInfoAsync();
 
@@ -343,8 +345,8 @@ public override async Task OnLoadedAsync()
         var gpuInfos = HardwareHelper.IterGpuInfo();
         GpuInfoCollection = new ObservableCollection<GpuInfo>(gpuInfos);
         PreferredGpu ??=
-            GpuInfos.FirstOrDefault(
-                gpu => gpu.Name?.Contains("nvidia", StringComparison.InvariantCultureIgnoreCase) ?? false
+            GpuInfos.FirstOrDefault(gpu =>
+                gpu.Name?.Contains("nvidia", StringComparison.InvariantCultureIgnoreCase) ?? false
             ) ?? GpuInfos.FirstOrDefault();
 
         // Start accounts update
@@ -405,7 +407,7 @@ partial void OnSelectedThemeChanged(string? value)
         {
             "Dark" => ThemeVariant.Dark,
             "Light" => ThemeVariant.Light,
-            _ => ThemeVariant.Default
+            _ => ThemeVariant.Default,
         };
     }
 
@@ -428,7 +430,7 @@ partial void OnSelectedLanguageChanged(CultureInfo? oldValue, CultureInfo newVal
                 Content = Resources.Text_RelaunchRequiredToApplyLanguage,
                 DefaultButton = ContentDialogButton.Primary,
                 PrimaryButtonText = Resources.Action_Relaunch,
-                CloseButtonText = Resources.Action_RelaunchLater
+                CloseButtonText = Resources.Action_RelaunchLater,
             };
 
             Dispatcher.UIThread.InvokeAsync(async () =>
@@ -496,13 +498,7 @@ private async Task OpenEnvVarsDialog()
             current.Select(kvp => new EnvVarKeyPair(kvp.Key, kvp.Value))
         );
 
-        var dialog = new BetterContentDialog
-        {
-            Content = new EnvVarsDialog { DataContext = viewModel },
-            PrimaryButtonText = Resources.Action_Save,
-            IsPrimaryButtonEnabled = true,
-            CloseButtonText = Resources.Action_Cancel,
-        };
+        var dialog = viewModel.GetDialog();
 
         if (await dialog.ShowAsync() == ContentDialogResult.Primary)
         {
@@ -539,7 +535,7 @@ private async Task CheckPythonVersion()
             Title = Resources.Label_PythonVersionInfo,
             Content = result,
             PrimaryButtonText = Resources.Action_OK,
-            IsPrimaryButtonEnabled = true
+            IsPrimaryButtonEnabled = true,
         };
         await dialog.ShowAsync();
     }
@@ -568,7 +564,7 @@ await DialogHelper.GetTextEntryDialogResultAsync(
             FileName = processPath,
             Args = dialogResult.Value.Text,
             WorkingDirectory = Compat.AppCurrentDir,
-            EnvironmentVariables = settingsManager.Settings.EnvironmentVariables.ToImmutableDictionary()
+            EnvironmentVariables = settingsManager.Settings.EnvironmentVariables.ToImmutableDictionary(),
         };
 
         ConsoleProcessRunner.RunProcessStepAsync(step).SafeFireAndForget();
@@ -607,7 +603,7 @@ await DialogHelper.GetTextEntryDialogResultAsync(
             FileName = processPath,
             Args = dialogResult.Value.Text,
             WorkingDirectory = Compat.AppCurrentDir,
-            EnvironmentVariables = settingsManager.Settings.EnvironmentVariables.ToImmutableDictionary()
+            EnvironmentVariables = settingsManager.Settings.EnvironmentVariables.ToImmutableDictionary(),
         };
 
         ConsoleProcessRunner.RunProcessStepAsync(step).SafeFireAndForget();
@@ -646,8 +642,8 @@ private async Task FixGitLongPaths()
                 Resources.Label_AppData
             ),
             new CommandItem(
-                new AsyncRelayCommand(
-                    () => ProcessRunner.OpenFolderBrowser(Compat.AppDataHome.JoinDir("Logs"))
+                new AsyncRelayCommand(() =>
+                    ProcessRunner.OpenFolderBrowser(Compat.AppDataHome.JoinDir("Logs"))
                 ),
                 Resources.Label_Logs
             ),
@@ -660,11 +656,11 @@ private async Task FixGitLongPaths()
                 Resources.Label_Checkpoints
             ),
             new CommandItem(
-                new AsyncRelayCommand(
-                    () => ProcessRunner.OpenFolderBrowser(settingsManager.LibraryDir.JoinDir("Packages"))
+                new AsyncRelayCommand(() =>
+                    ProcessRunner.OpenFolderBrowser(settingsManager.LibraryDir.JoinDir("Packages"))
                 ),
                 Resources.Label_Packages
-            )
+            ),
         ];
 
     #endregion
@@ -724,7 +720,7 @@ private async Task AddToGlobalStartMenu()
             Content = "You will be prompted for administrator privileges. Continue?",
             PrimaryButtonText = Resources.Action_Yes,
             CloseButtonText = Resources.Action_Cancel,
-            DefaultButton = ContentDialogButton.Primary
+            DefaultButton = ContentDialogButton.Primary,
         };
 
         if (await dialog.ShowAsync() != ContentDialogResult.Primary)
@@ -793,7 +789,7 @@ public async Task PickNewDataDirectory()
             IsPrimaryButtonEnabled = false,
             IsSecondaryButtonEnabled = false,
             IsFooterVisible = false,
-            Content = new SelectDataDirectoryDialog { DataContext = viewModel }
+            Content = new SelectDataDirectoryDialog { DataContext = viewModel },
         };
 
         var result = await dialog.ShowAsync();
@@ -861,34 +857,34 @@ public void LoadDebugInfo()
         var assembly = Assembly.GetExecutingAssembly();
         var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
         DebugPaths = $"""
-                      Current Working Directory [Environment.CurrentDirectory]
-                        "{Environment.CurrentDirectory}"
-                      App Directory [Assembly.GetExecutingAssembly().Location]
-                        "{assembly.Location}"
-                      App Directory [AppContext.BaseDirectory]
-                        "{AppContext.BaseDirectory}"
-                      AppData Directory [SpecialFolder.ApplicationData]
-                        "{appData}"
-                      """;
+            Current Working Directory [Environment.CurrentDirectory]
+              "{Environment.CurrentDirectory}"
+            App Directory [Assembly.GetExecutingAssembly().Location]
+              "{assembly.Location}"
+            App Directory [AppContext.BaseDirectory]
+              "{AppContext.BaseDirectory}"
+            AppData Directory [SpecialFolder.ApplicationData]
+              "{appData}"
+            """;
 
         // 1. Check portable mode
         var appDir = Compat.AppCurrentDir;
         var expectedPortableFile = Path.Combine(appDir, "Data", ".sm-portable");
         var isPortableMode = File.Exists(expectedPortableFile);
 
         DebugCompatInfo = $"""
-                            Platform: {Compat.Platform}
-                            AppData: {Compat.AppData}
-                            AppDataHome: {Compat.AppDataHome}
-                            AppCurrentDir: {Compat.AppCurrentDir}
-                            ExecutableName: {Compat.GetExecutableName()}
-                            AppName: {Compat.GetAppName()}
-                            -- Settings --
-                            Expected Portable Marker file: {expectedPortableFile}
-                            Portable Marker file exists: {isPortableMode}
-                            IsLibraryDirSet = {settingsManager.IsLibraryDirSet}
-                            IsPortableMode = {settingsManager.IsPortableMode}
-                            """;
+            Platform: {Compat.Platform}
+            AppData: {Compat.AppData}
+            AppDataHome: {Compat.AppDataHome}
+            AppCurrentDir: {Compat.AppCurrentDir}
+            ExecutableName: {Compat.GetExecutableName()}
+            AppName: {Compat.GetAppName()}
+            -- Settings --
+            Expected Portable Marker file: {expectedPortableFile}
+            Portable Marker file exists: {isPortableMode}
+            IsLibraryDirSet = {settingsManager.IsLibraryDirSet}
+            IsPortableMode = {settingsManager.IsPortableMode}
+            """;
 
         // Get Gpu info
         var gpuInfo = "";
@@ -920,7 +916,7 @@ private async Task DebugContentDialog()
             DefaultButton = ContentDialogButton.Primary,
             Title = "Test title",
             PrimaryButtonText = Resources.Action_OK,
-            CloseButtonText = Resources.Action_Close
+            CloseButtonText = Resources.Action_Close,
         };
 
         var result = await dialog.ShowAsync();
@@ -968,7 +964,7 @@ private async Task DebugMakeImageGrid()
 
         var bitmap = WriteableBitmap.Decode(stream);
 
-        var galleryImages = new List<ImageSource> { new(bitmap), };
+        var galleryImages = new List<ImageSource> { new(bitmap) };
         galleryImages.AddRange(files.Select(f => new ImageSource(f.Path.ToString())));
 
         var imageBox = new ImageGalleryCard
@@ -978,7 +974,7 @@ private async Task DebugMakeImageGrid()
             DataContext = dialogFactory.Get<ImageGalleryCardViewModel>(vm =>
             {
                 vm.ImageSources.AddRange(galleryImages);
-            })
+            }),
         };
 
         var dialog = new BetterContentDialog
@@ -1045,8 +1041,8 @@ private async Task DebugTrackedDownload()
     {
         var textFields = new TextBoxField[]
         {
-            new() { Label = "Url", },
-            new() { Label = "File path" }
+            new() { Label = "Url" },
+            new() { Label = "File path" },
         };
 
         var dialog = DialogHelper.CreateTextEntryDialog("Add download", "", textFields);
@@ -1080,7 +1076,7 @@ private async Task DebugRobocopy()
         var textFields = new TextBoxField[]
         {
             new() { Label = "Source" },
-            new() { Label = "Destination" }
+            new() { Label = "Destination" },
         };
 
         var dialog = DialogHelper.CreateTextEntryDialog("Robocopy", "", textFields);
@@ -1113,7 +1109,7 @@ private async Task DebugRobocopy()
             new CommandItem(DebugShowGitVersionSelectorDialogCommand),
             new CommandItem(DebugShowMockGitVersionSelectorDialogCommand),
             new CommandItem(DebugWhichCommand),
-            new CommandItem(DebugRobocopyCommand)
+            new CommandItem(DebugRobocopyCommand),
         ];
 
     [RelayCommand]
@@ -1124,7 +1120,7 @@ private async Task DebugShowGitVersionSelectorDialog()
             GitVersionProvider = new CachedCommandGitVersionProvider(
                 "https://github.com/ltdrdata/ComfyUI-Manager",
                 prerequisiteHelper
-            )
+            ),
         };
         var dialog = vm.GetDialog();
 
@@ -1192,7 +1188,7 @@ private async Task DebugFindLocalModelFromIndex()
         var textFields = new TextBoxField[]
         {
             new() { Label = "Blake3 Hash" },
-            new() { Label = "SharedFolderType" }
+            new() { Label = "SharedFolderType" },
         };
 
         var dialog = DialogHelper.CreateTextEntryDialog("Find Local Model", "", textFields);
@@ -1293,7 +1289,7 @@ await nativeManager.ShowNotification(
             {
                 Title = "Test Notification",
                 Body = "Here is some message",
-                Buttons = { ("Action", "__Debug_Action"), ("Close", "__Debug_Close"), }
+                Buttons = { ("Action", "__Debug_Action"), ("Close", "__Debug_Close") },
             }
         );
     }
@@ -1323,8 +1319,8 @@ private async Task DebugExtractImagePromptsToTxt()
         if (files.Count == 0)
             return;
 
-        var images = await Task.Run(
-            () => files.Select(f => LocalImageFile.FromPath(f.TryGetLocalPath()!)).ToList()
+        var images = await Task.Run(() =>
+            files.Select(f => LocalImageFile.FromPath(f.TryGetLocalPath()!)).ToList()
         );
 
         var successfulFiles = new List<LocalImageFile>();
@@ -1412,7 +1408,7 @@ private async Task OnWindowsLongPathsToggleClick()
             {
                 Title = Resources.Label_ChangesApplied,
                 Content = Resources.Text_RestartMayBeRequiredForSystemChanges,
-                CloseButtonText = Resources.Action_Close
+                CloseButtonText = Resources.Action_Close,
             }.ShowAsync();
         }
         catch (Win32Exception e)