Add more settings to const strings

marticliment · marticliment · commit 2f007a065df1 · 2025-06-15T23:16:47.000+02:00
diff --git a/src/UniGetUI.Core.Settings.Tests/SettingsTest.cs b/src/UniGetUI.Core.Settings.Tests/SettingsTest.cs
@@ -54,8 +54,8 @@ public void Dispose()
         [Fact]
         public void TestSettingsSaveToNewDirectory()
         {
-            Settings.Set("FreshBoolSetting", true);
-            Settings.SetValue("FreshValue", "test");
+            Settings.Set(Settings.FreshBoolSetting, true);
+            Settings.SetValue(Settings.FreshValue, "test");
 
             Assert.True(File.Exists(GetNewSettingPath("FreshBoolSetting")));
             Assert.True(File.Exists(GetNewSettingPath("FreshValue")));
diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_Names.cs b/src/UniGetUI.Core.Settings/SettingsEngine_Names.cs
@@ -8,7 +8,6 @@ public static partial class Settings
     public const string IconDataBaseURL = "IconDataBaseURL";
     public const string DisableLangAutoUpdater = "DisableLangAutoUpdater";
     public const string DisableDMWThreadOptimizations = "DisableDMWThreadOptimizations";
-    public const string DisableWidgetsApi = "DisableWidgetsApi";
     public const string DisableTelemetry = "DisableTelemetry";
     public const string DisableTimeoutOnPackageListingTasks = "DisableTimeoutOnPackageListingTasks";
     public const string RemoveAllDesktopShortcuts = "RemoveAllDesktopShortcuts";
@@ -28,7 +27,7 @@ public static partial class Settings
     public const string EnableUniGetUIBeta = "EnableUniGetUIBeta";
     public const string ShowVersionNumberOnTitlebar = "ShowVersionNumberOnTitlebar";
     public const string TransferredOldSettings = "TransferredOldSettings";
-    public const string /* TODO: NEEDS REVIEW */ DisableApi = "DisableApi";
+    public const string DisableApi = "DisableApi";
     public const string DisableSystemTray = "DisableSystemTray";
     public const string MaintainSuccessfulInstalls = "MaintainSuccessfulInstalls";
     public const string AutomaticallyUpdatePackages = "AutomaticallyUpdatePackages";
@@ -56,14 +55,29 @@ public static partial class Settings
     public const string WindowGeometry = "WindowGeometry";
     public const string ChangeBackupFileName = "ChangeBackupFileName";
     public const string CurrentSessionToken = "CurrentSessionToken";
-    /*public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
-    public const string EnableProxyAuth = "EnableProxyAuth";
+    public const string IgnoredPackageUpdates = "IgnoredPackageUpdates";
+    public const string DisabledManagers = "DisabledManagers";
+    public const string DeletableDesktopShortcuts = "DeletableDesktopShortcuts";
+    public const string WinGetAlreadyUpgradedPackages = "WinGetAlreadyUpgradedPackages";
+    public const string DependencyManagement = "DependencyManagement";
+    public const string DisabledPackageManagerNotifications = "DisabledPackageManagerNotifications";
+    public const string PackageListViewMode = "PackageListViewMode";
+    public const string DisableInstantSearch = "DisableInstantSearch";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string HideToggleFilters = "HideToggleFilters";
+    public const string FreshBoolSetting = "FreshBoolSetting";
+    public const string FreshValue = "FreshValue";
+    /*public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
+    public const string SidepanelWidths = "SidepanelWidths";
     */
 }
diff --git a/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs b/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs
@@ -43,13 +43,6 @@ public static bool AuthenticateToken(string? token)
 
         public async Task Start()
         {
-
-            if (Settings.Get(Settings.DisableWidgetsApi))
-            {
-                Logger.Warn("Widgets API is disabled");
-                return;
-            }
-
             ApiTokenHolder.Token = CoreTools.RandomString(64);
             Settings.SetValue(Settings.CurrentSessionToken, ApiTokenHolder.Token);
             Logger.Info("Randomly-generated background API auth token: " + ApiTokenHolder.Token);
diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs
@@ -274,7 +274,7 @@ protected override ManagerStatus LoadManager()
                     }
 
                     CoreTools.CreateSymbolicLinkDir(old_choco_path, new_choco_path);
-                    Settings.Set("ChocolateySymbolicLinkCreated", true);
+                    Settings.Set(Settings.ChocolateySymbolicLinkCreated, true);
                     Logger.Info($"Symbolic link created successfully from {old_choco_path} to {new_choco_path}.");
 
                 }
diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs
@@ -210,11 +210,11 @@ protected override OperationVeredict _getOperationResult(
 
     private static void MarkUpgradeAsDone(IPackage package)
     {
-        Settings.SetDictionaryItem<string, string>("WinGetAlreadyUpgradedPackages", package.Id, package.NewVersionString);
+        Settings.SetDictionaryItem<string, string>(Settings.WinGetAlreadyUpgradedPackages, package.Id, package.NewVersionString);
     }
 
     public static bool UpdateAlreadyInstalled(IPackage package)
     {
-        return Settings.GetDictionaryItem<string, string>("WinGetAlreadyUpgradedPackages", package.Id) == package.NewVersionString;
+        return Settings.GetDictionaryItem<string, string>(Settings.WinGetAlreadyUpgradedPackages, package.Id) == package.NewVersionString;
     }
 }
diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs
@@ -126,7 +126,7 @@ public virtual void Initialize()
         /// </summary>
         public bool IsEnabled()
         {
-            return !Settings.GetDictionaryItem<string, bool>("DisabledManagers", Name);
+            return !Settings.GetDictionaryItem<string, bool>(Settings.DisabledManagers, Name);
         }
 
         /// <summary>
diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/DesktopShortcutsDatabase.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/DesktopShortcutsDatabase.cs
@@ -16,12 +16,12 @@ public enum Status
 
     public static IReadOnlyDictionary<string, bool> GetDatabase()
     {
-        return Settings.GetDictionary<string, bool>("DeletableDesktopShortcuts") ?? new Dictionary<string, bool>();
+        return Settings.GetDictionary<string, bool>(Settings.DeletableDesktopShortcuts) ?? new Dictionary<string, bool>();
     }
 
     public static void ResetDatabase()
     {
-        Settings.ClearDictionary("DeletableDesktopShortcuts");
+        Settings.ClearDictionary(Settings.DeletableDesktopShortcuts);
     }
 
     /// <summary>
@@ -32,9 +32,9 @@ public static void ResetDatabase()
     public static void AddToDatabase(string shortcutPath, Status shortcutStatus)
     {
         if (shortcutStatus is Status.Unknown)
-            Settings.RemoveDictionaryKey<string, bool>("DeletableDesktopShortcuts", shortcutPath);
+            Settings.RemoveDictionaryKey<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath);
         else
-            Settings.SetDictionaryItem<string, bool>("DeletableDesktopShortcuts", shortcutPath, shortcutStatus is Status.Delete);
+            Settings.SetDictionaryItem<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath, shortcutStatus is Status.Delete);
     }
 
     /// <summary>
@@ -45,10 +45,10 @@ public static void AddToDatabase(string shortcutPath, Status shortcutStatus)
     public static bool Remove(string shortcutPath)
     {
         // Remove the entry if present
-        if (Settings.DictionaryContainsKey<string, bool>("DeletableDesktopShortcuts", shortcutPath))
+        if (Settings.DictionaryContainsKey<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath))
         {
             // Remove the entry and propagate changes to disk
-            Settings.SetDictionaryItem("DeletableDesktopShortcuts", shortcutPath, false);
+            Settings.SetDictionaryItem(Settings.DeletableDesktopShortcuts, shortcutPath, false);
             return true;
         }
 
@@ -88,9 +88,9 @@ public static bool DeleteFromDisk(string shortcutPath)
     public static Status GetStatus(string shortcutPath)
     {
         // Check if the package is ignored
-        if (Settings.DictionaryContainsKey<string, bool>("DeletableDesktopShortcuts", shortcutPath))
+        if (Settings.DictionaryContainsKey<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath))
         {
-            bool canDelete = Settings.GetDictionaryItem<string, bool>("DeletableDesktopShortcuts", shortcutPath);
+            bool canDelete = Settings.GetDictionaryItem<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath);
             return canDelete ? Status.Delete : Status.Maintain;
         }
 
@@ -119,7 +119,7 @@ public static List<string> GetAllShortcuts()
     {
         var shortcuts = GetShortcutsOnDisk();
 
-        foreach (var item in Settings.GetDictionary<string, bool>("DeletableDesktopShortcuts"))
+        foreach (var item in Settings.GetDictionary<string, bool>(Settings.DeletableDesktopShortcuts))
         {
             if (!shortcuts.Contains(item.Key))
                 shortcuts.Add(item.Key);
diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/IgnoredUpdatesDatabase.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/IgnoredUpdatesDatabase.cs
@@ -70,7 +70,7 @@ public string StringRepresentation()
 
     public static IReadOnlyDictionary<string, string> GetDatabase()
     {
-        return Settings.GetDictionary<string, string>("IgnoredPackageUpdates") ?? new Dictionary<string, string>();
+        return Settings.GetDictionary<string, string>(Settings.IgnoredPackageUpdates) ?? new Dictionary<string, string>();
     }
 
     public static string GetIgnoredIdForPackage(IPackage package)
@@ -85,7 +85,7 @@ public static string GetIgnoredIdForPackage(IPackage package)
     /// <param name="version">The version to ignore. Use wildcard (`*`) to ignore all versions</param>
     public static void Add(string ignoredId, string version = "*")
     {
-        Settings.SetDictionaryItem("IgnoredPackageUpdates", ignoredId, version);
+        Settings.SetDictionaryItem(Settings.IgnoredPackageUpdates, ignoredId, version);
     }
 
     /// <summary>
@@ -96,10 +96,10 @@ public static void Add(string ignoredId, string version = "*")
     public static bool Remove(string ignoredId)
     {
         // Remove the entry if present
-        if (Settings.DictionaryContainsKey<string, string>("IgnoredPackageUpdates", ignoredId))
+        if (Settings.DictionaryContainsKey<string, string>(Settings.IgnoredPackageUpdates, ignoredId))
         {
             // Remove the entry and propagate changes to disk
-            return Settings.RemoveDictionaryKey<string, string>("IgnoredPackageUpdates", ignoredId) != null;
+            return Settings.RemoveDictionaryKey<string, string>(Settings.IgnoredPackageUpdates, ignoredId) != null;
         }
 
         // Do nothing if the entry was not there
@@ -121,7 +121,7 @@ public static bool Remove(string ignoredId)
     /// <returns>True if the package is ignored, false otherwise</returns>
     public static bool HasUpdatesIgnored(string ignoredId, string version = "*")
     {
-        string? ignoredVersion = Settings.GetDictionaryItem<string, string>("IgnoredPackageUpdates", ignoredId);
+        string? ignoredVersion = Settings.GetDictionaryItem<string, string>(Settings.IgnoredPackageUpdates, ignoredId);
 
         if (ignoredVersion != null && ignoredVersion.StartsWith("<"))
         {
@@ -151,6 +151,6 @@ public static bool HasUpdatesIgnored(string ignoredId, string version = "*")
     /// If **no** versions are ignored, null will be returned.</returns>
     public static string? GetIgnoredVersion(string ignoredId)
     {
-        return Settings.GetDictionaryItem<string, string>("IgnoredPackageUpdates", ignoredId);
+        return Settings.GetDictionaryItem<string, string>(Settings.IgnoredPackageUpdates, ignoredId);
     }
 }
diff --git a/src/UniGetUI/App.xaml.cs b/src/UniGetUI/App.xaml.cs
@@ -325,7 +325,7 @@ private async Task CheckForMissingDependencies()
 
                     if (!isInstalled)
                     {
-                        if (Settings.GetDictionaryItem<string, string>("DependencyManagement", dependency.Name) == "skipped")
+                        if (Settings.GetDictionaryItem<string, string>(Settings.DependencyManagement, dependency.Name) == "skipped")
                         {
                             Logger.Error($"Dependency {dependency.Name} was not found, and the user set it to not be reminded of the missing dependency");
                         }
diff --git a/src/UniGetUI/MainWindow.xaml.cs b/src/UniGetUI/MainWindow.xaml.cs
@@ -230,7 +230,7 @@ private static void TransferOldSettingsFormats()
                     string SettingName = "Disable" + Manager.Name;
                     if (Settings.Get(SettingName))
                     {
-                        Settings.SetDictionaryItem("DisabledManagers", Manager.Name, true);
+                        Settings.SetDictionaryItem(Settings.DisabledManagers, Manager.Name, true);
                         Settings.Set(SettingName, false);
                     }
                 }
@@ -241,22 +241,22 @@ private static void TransferOldSettingsFormats()
                 {
                     if (Settings.Get($"HideToggleFilters{Page}Page"))
                     {
-                        Settings.SetDictionaryItem("HideToggleFilters", Page, true);
+                        Settings.SetDictionaryItem(Settings.HideToggleFilters, Page, true);
                         Settings.Set($"HideToggleFilters{Page}Page", false);
                     }
 
                     if (Settings.Get($"DisableInstantSearch{Page}Tab"))
                     {
-                        Settings.SetDictionaryItem("DisableInstantSearch", Page, true);
+                        Settings.SetDictionaryItem(Settings.DisableInstantSearch, Page, true);
                         Settings.Set($"DisableInstantSearch{Page}Tab", false);
                     }
 
                     if (!int.TryParse(Settings.GetValue($"SidepanelWidth{Page}Page"), out int sidepanelWidth)) sidepanelWidth = 250;
-                    Settings.SetDictionaryItem("SidepanelWidths", Page, sidepanelWidth);
+                    Settings.SetDictionaryItem(Settings.SidepanelWidths, Page, sidepanelWidth);
                     Settings.Set($"SidepanelWidth{Page}Page", false);
                 }
 
-                Settings.Set("TransferredOldSettings", true);
+                Settings.Set(Settings.TransferredOldSettings, true);
             }
         }
 
@@ -1002,7 +1002,7 @@ private void TitleBar_PaneToggleRequested(WinUIEx.TitleBar sender, object args)
 
             if(this.AppWindow.Size.Width >= 1600)
             {
-                Settings.Set("CollapseNavMenuOnWideScreen", NavigationPage.NavView.IsPaneOpen);
+                Settings.Set(Settings.CollapseNavMenuOnWideScreen, NavigationPage.NavView.IsPaneOpen);
             }
             NavigationPage.NavView.IsPaneOpen = !NavigationPage.NavView.IsPaneOpen;
         }
diff --git a/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs b/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs
@@ -104,7 +104,7 @@ private async void HandleAllDesktop_Checked(object sender, RoutedEventArgs e)
 
         private void HandleAllDesktop_Unchecked(object sender, RoutedEventArgs e)
         {
-            Settings.Set("RemoveAllDesktopShortcuts", false);
+            Settings.Set(Settings.RemoveAllDesktopShortcuts, false);
         }
 
         public void SaveChanges()
diff --git a/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs b/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs
@@ -101,15 +101,15 @@ public static async Task ShowMissingDependency(string dep_name, string exe_name,
         string fancy_command, int current, int total)
     {
 
-        if (Settings.GetDictionaryItem<string, string>("DependencyManagement", dep_name) == "skipped")
+        if (Settings.GetDictionaryItem<string, string>(Settings.DependencyManagement, dep_name) == "skipped")
         {
             Logger.Error(
                 $"Dependency {dep_name} was not found, and the user set it to not be reminded of the missing dependency");
             return;
         }
 
-        bool NotFirstTime = Settings.GetDictionaryItem<string, string>("DependencyManagement", dep_name) == "attempted";
-        Settings.SetDictionaryItem("DependencyManagement", dep_name, "attempted");
+        bool NotFirstTime = Settings.GetDictionaryItem<string, string>(Settings.DependencyManagement, dep_name) == "attempted";
+        Settings.SetDictionaryItem(Settings.DependencyManagement, dep_name, "attempted");
 
         var dialog = DialogFactory.Create();
         dialog.Title = CoreTools.Translate("Missing dependency") + (total > 1 ? $" ({current}/{total})" : "");
@@ -168,8 +168,8 @@ public static async Task ShowMissingDependency(string dep_name, string exe_name,
         {
             c.Content = CoreTools.Translate("Do not show this dialog again for {0}", dep_name);
             c.IsChecked = false;
-            c.Checked += (_, _) => Settings.SetDictionaryItem("DependencyManagement", dep_name, "skipped");
-            c.Unchecked += (_, _) => Settings.SetDictionaryItem("DependencyManagement", dep_name, "attempted");
+            c.Checked += (_, _) => Settings.SetDictionaryItem(Settings.DependencyManagement, dep_name, "skipped");
+            c.Unchecked += (_, _) => Settings.SetDictionaryItem(Settings.DependencyManagement, dep_name, "attempted");
             p.Children.Add(c);
         }
 
@@ -424,7 +424,7 @@ public static async void HandleBrokenWinGet()
 
             // Toggle bundled WinGet
             if (Settings.Get(Settings.ForceLegacyBundledWinGet))
-                Settings.Set("ForceLegacyBundledWinGet", false);
+                Settings.Set(Settings.ForceLegacyBundledWinGet, false);
 
             var c = DialogFactory.Create();
             c.Title = CoreTools.Translate("WinGet was repaired successfully");
@@ -517,11 +517,11 @@ public static async void ShowTelemetryDialog()
 
         if (res is ContentDialogResult.Primary)
         {
-            Settings.Set("DisableTelemetry", false);
+            Settings.Set(Settings.DisableTelemetry, false);
         }
         else
         {
-            Settings.Set("DisableTelemetry", true);
+            Settings.Set(Settings.DisableTelemetry, true);
         }
     }
 
@@ -543,7 +543,7 @@ public static void ShowTelemetryBanner()
         {
             Window.TelemetryWarner.Visibility = Visibility.Collapsed;
             Window.TelemetryWarner.IsOpen = false;
-            Settings.Set("ShownTelemetryBanner", true);
+            Settings.Set(Settings.ShownTelemetryBanner, true);
         };
 
         var SettingsBtn = new Button()
@@ -555,7 +555,7 @@ public static void ShowTelemetryBanner()
             Window.TelemetryWarner.Visibility = Visibility.Collapsed;
             Window.TelemetryWarner.IsOpen = false;
             ShowTelemetryDialog();
-            Settings.Set("ShownTelemetryBanner", true);
+            Settings.Set(Settings.ShownTelemetryBanner, true);
         };
 
         StackPanel btns = new() { Margin = new Thickness(4,0,4,0), Spacing = 4, Orientation = Orientation.Horizontal };
@@ -571,7 +571,7 @@ public static void ShowTelemetryBanner()
         };
         mainButton.Resources["HyperlinkButtonBackgroundPointerOver"] = new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
 
-        Window.TelemetryWarner.CloseButtonClick += (_, _) => Settings.Set("ShownTelemetryBanner", true);
+        Window.TelemetryWarner.CloseButtonClick += (_, _) => Settings.Set(Settings.ShownTelemetryBanner, true);
 
     }
 
@@ -587,7 +587,7 @@ public static async Task ConfirmSetDeleteAllShortcutsSetting()
         dialog.DefaultButton = ContentDialogButton.Close;
         if (await Window.ShowDialogAsync(dialog) is ContentDialogResult.Primary)
         {
-            Settings.Set("RemoveAllDesktopShortcuts", true);
+            Settings.Set(Settings.RemoveAllDesktopShortcuts, true);
         }
         _ = DialogHelper.ManageDesktopShortcuts();
     }
diff --git a/src/UniGetUI/Pages/MainView.xaml.cs b/src/UniGetUI/Pages/MainView.xaml.cs
@@ -145,7 +145,7 @@ public MainView()
 
             if (CoreTools.IsAdministrator() && !Settings.Get(Settings.AlreadyWarnedAboutAdmin))
             {
-                Settings.Set("AlreadyWarnedAboutAdmin", true);
+                Settings.Set(Settings.AlreadyWarnedAboutAdmin, true);
                 DialogHelper.WarnAboutAdminRights();
             }
 
diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Backup.xaml.cs
diff --git a/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs b/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs
diff --git a/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs b/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs
diff --git a/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs b/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs
diff --git a/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs b/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ protected override ManagerStatus LoadManager()`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`CoreTools.CreateSymbolicLinkDir(old_choco_path, new_choco_path);`
`277`		`- Settings.Set("ChocolateySymbolicLinkCreated", true);`
	`277`	`+ Settings.Set(Settings.ChocolateySymbolicLinkCreated, true);`
`278`	`278`	`Logger.Info($"Symbolic link created successfully from {old_choco_path} to {new_choco_path}.");`
`279`	`279`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,11 +210,11 @@ protected override OperationVeredict _getOperationResult(`
`210`	`210`
`211`	`211`	`private static void MarkUpgradeAsDone(IPackage package)`
`212`	`212`	`{`
`213`		`- Settings.SetDictionaryItem<string, string>("WinGetAlreadyUpgradedPackages", package.Id, package.NewVersionString);`
	`213`	`+ Settings.SetDictionaryItem<string, string>(Settings.WinGetAlreadyUpgradedPackages, package.Id, package.NewVersionString);`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`public static bool UpdateAlreadyInstalled(IPackage package)`
`217`	`217`	`{`
`218`		`- return Settings.GetDictionaryItem<string, string>("WinGetAlreadyUpgradedPackages", package.Id) == package.NewVersionString;`
	`218`	`+ return Settings.GetDictionaryItem<string, string>(Settings.WinGetAlreadyUpgradedPackages, package.Id) == package.NewVersionString;`
`219`	`219`	`}`
`220`	`220`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public virtual void Initialize()`
`126`	`126`	`/// </summary>`
`127`	`127`	`public bool IsEnabled()`
`128`	`128`	`{`
`129`		`- return !Settings.GetDictionaryItem<string, bool>("DisabledManagers", Name);`
	`129`	`+ return !Settings.GetDictionaryItem<string, bool>(Settings.DisabledManagers, Name);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ public enum Status`
`16`	`16`
`17`	`17`	`public static IReadOnlyDictionary<string, bool> GetDatabase()`
`18`	`18`	`{`
`19`		`- return Settings.GetDictionary<string, bool>("DeletableDesktopShortcuts") ?? new Dictionary<string, bool>();`
	`19`	`+ return Settings.GetDictionary<string, bool>(Settings.DeletableDesktopShortcuts) ?? new Dictionary<string, bool>();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static void ResetDatabase()`
`23`	`23`	`{`
`24`		`- Settings.ClearDictionary("DeletableDesktopShortcuts");`
	`24`	`+ Settings.ClearDictionary(Settings.DeletableDesktopShortcuts);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/// <summary>`
`@@ -32,9 +32,9 @@ public static void ResetDatabase()`
`32`	`32`	`public static void AddToDatabase(string shortcutPath, Status shortcutStatus)`
`33`	`33`	`{`
`34`	`34`	`if (shortcutStatus is Status.Unknown)`
`35`		`- Settings.RemoveDictionaryKey<string, bool>("DeletableDesktopShortcuts", shortcutPath);`
	`35`	`+ Settings.RemoveDictionaryKey<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath);`
`36`	`36`	`else`
`37`		`- Settings.SetDictionaryItem<string, bool>("DeletableDesktopShortcuts", shortcutPath, shortcutStatus is Status.Delete);`
	`37`	`+ Settings.SetDictionaryItem<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath, shortcutStatus is Status.Delete);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/// <summary>`
`@@ -45,10 +45,10 @@ public static void AddToDatabase(string shortcutPath, Status shortcutStatus)`
`45`	`45`	`public static bool Remove(string shortcutPath)`
`46`	`46`	`{`
`47`	`47`	`// Remove the entry if present`
`48`		`- if (Settings.DictionaryContainsKey<string, bool>("DeletableDesktopShortcuts", shortcutPath))`
	`48`	`+ if (Settings.DictionaryContainsKey<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath))`
`49`	`49`	`{`
`50`	`50`	`// Remove the entry and propagate changes to disk`
`51`		`- Settings.SetDictionaryItem("DeletableDesktopShortcuts", shortcutPath, false);`
	`51`	`+ Settings.SetDictionaryItem(Settings.DeletableDesktopShortcuts, shortcutPath, false);`
`52`	`52`	`return true;`
`53`	`53`	`}`
`54`	`54`
`@@ -88,9 +88,9 @@ public static bool DeleteFromDisk(string shortcutPath)`
`88`	`88`	`public static Status GetStatus(string shortcutPath)`
`89`	`89`	`{`
`90`	`90`	`// Check if the package is ignored`
`91`		`- if (Settings.DictionaryContainsKey<string, bool>("DeletableDesktopShortcuts", shortcutPath))`
	`91`	`+ if (Settings.DictionaryContainsKey<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath))`
`92`	`92`	`{`
`93`		`- bool canDelete = Settings.GetDictionaryItem<string, bool>("DeletableDesktopShortcuts", shortcutPath);`
	`93`	`+ bool canDelete = Settings.GetDictionaryItem<string, bool>(Settings.DeletableDesktopShortcuts, shortcutPath);`
`94`	`94`	`return canDelete ? Status.Delete : Status.Maintain;`
`95`	`95`	`}`
`96`	`96`
`@@ -119,7 +119,7 @@ public static List<string> GetAllShortcuts()`
`119`	`119`	`{`
`120`	`120`	`var shortcuts = GetShortcutsOnDisk();`
`121`	`121`
`122`		`- foreach (var item in Settings.GetDictionary<string, bool>("DeletableDesktopShortcuts"))`
	`122`	`+ foreach (var item in Settings.GetDictionary<string, bool>(Settings.DeletableDesktopShortcuts))`
`123`	`123`	`{`
`124`	`124`	`if (!shortcuts.Contains(item.Key))`
`125`	`125`	`shortcuts.Add(item.Key);`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public string StringRepresentation()`
`70`	`70`
`71`	`71`	`public static IReadOnlyDictionary<string, string> GetDatabase()`
`72`	`72`	`{`
`73`		`- return Settings.GetDictionary<string, string>("IgnoredPackageUpdates") ?? new Dictionary<string, string>();`
	`73`	`+ return Settings.GetDictionary<string, string>(Settings.IgnoredPackageUpdates) ?? new Dictionary<string, string>();`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public static string GetIgnoredIdForPackage(IPackage package)`
`@@ -85,7 +85,7 @@ public static string GetIgnoredIdForPackage(IPackage package)`
`85`	`85`	/// <param name="version">The version to ignore. Use wildcard (`*`) to ignore all versions</param>
`86`	`86`	`public static void Add(string ignoredId, string version = "*")`
`87`	`87`	`{`
`88`		`- Settings.SetDictionaryItem("IgnoredPackageUpdates", ignoredId, version);`
	`88`	`+ Settings.SetDictionaryItem(Settings.IgnoredPackageUpdates, ignoredId, version);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/// <summary>`
`@@ -96,10 +96,10 @@ public static void Add(string ignoredId, string version = "*")`
`96`	`96`	`public static bool Remove(string ignoredId)`
`97`	`97`	`{`
`98`	`98`	`// Remove the entry if present`
`99`		`- if (Settings.DictionaryContainsKey<string, string>("IgnoredPackageUpdates", ignoredId))`
	`99`	`+ if (Settings.DictionaryContainsKey<string, string>(Settings.IgnoredPackageUpdates, ignoredId))`
`100`	`100`	`{`
`101`	`101`	`// Remove the entry and propagate changes to disk`
`102`		`- return Settings.RemoveDictionaryKey<string, string>("IgnoredPackageUpdates", ignoredId) != null;`
	`102`	`+ return Settings.RemoveDictionaryKey<string, string>(Settings.IgnoredPackageUpdates, ignoredId) != null;`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`// Do nothing if the entry was not there`
`@@ -121,7 +121,7 @@ public static bool Remove(string ignoredId)`
`121`	`121`	`/// <returns>True if the package is ignored, false otherwise</returns>`
`122`	`122`	`public static bool HasUpdatesIgnored(string ignoredId, string version = "*")`
`123`	`123`	`{`
`124`		`- string? ignoredVersion = Settings.GetDictionaryItem<string, string>("IgnoredPackageUpdates", ignoredId);`
	`124`	`+ string? ignoredVersion = Settings.GetDictionaryItem<string, string>(Settings.IgnoredPackageUpdates, ignoredId);`
`125`	`125`
`126`	`126`	`if (ignoredVersion != null && ignoredVersion.StartsWith("<"))`
`127`	`127`	`{`
`@@ -151,6 +151,6 @@ public static bool HasUpdatesIgnored(string ignoredId, string version = "*")`
`151`	`151`	`/// If no versions are ignored, null will be returned.</returns>`
`152`	`152`	`public static string? GetIgnoredVersion(string ignoredId)`
`153`	`153`	`{`
`154`		`- return Settings.GetDictionaryItem<string, string>("IgnoredPackageUpdates", ignoredId);`
	`154`	`+ return Settings.GetDictionaryItem<string, string>(Settings.IgnoredPackageUpdates, ignoredId);`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ private async Task CheckForMissingDependencies()`
`325`	`325`
`326`	`326`	`if (!isInstalled)`
`327`	`327`	`{`
`328`		`- if (Settings.GetDictionaryItem<string, string>("DependencyManagement", dependency.Name) == "skipped")`
	`328`	`+ if (Settings.GetDictionaryItem<string, string>(Settings.DependencyManagement, dependency.Name) == "skipped")`
`329`	`329`	`{`
`330`	`330`	`Logger.Error($"Dependency {dependency.Name} was not found, and the user set it to not be reminded of the missing dependency");`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ private static void TransferOldSettingsFormats()`
`230`	`230`	`string SettingName = "Disable" + Manager.Name;`
`231`	`231`	`if (Settings.Get(SettingName))`
`232`	`232`	`{`
`233`		`- Settings.SetDictionaryItem("DisabledManagers", Manager.Name, true);`
	`233`	`+ Settings.SetDictionaryItem(Settings.DisabledManagers, Manager.Name, true);`
`234`	`234`	`Settings.Set(SettingName, false);`
`235`	`235`	`}`
`236`	`236`	`}`
`@@ -241,22 +241,22 @@ private static void TransferOldSettingsFormats()`
`241`	`241`	`{`
`242`	`242`	`if (Settings.Get($"HideToggleFilters{Page}Page"))`
`243`	`243`	`{`
`244`		`- Settings.SetDictionaryItem("HideToggleFilters", Page, true);`
	`244`	`+ Settings.SetDictionaryItem(Settings.HideToggleFilters, Page, true);`
`245`	`245`	`Settings.Set($"HideToggleFilters{Page}Page", false);`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`if (Settings.Get($"DisableInstantSearch{Page}Tab"))`
`249`	`249`	`{`
`250`		`- Settings.SetDictionaryItem("DisableInstantSearch", Page, true);`
	`250`	`+ Settings.SetDictionaryItem(Settings.DisableInstantSearch, Page, true);`
`251`	`251`	`Settings.Set($"DisableInstantSearch{Page}Tab", false);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`if (!int.TryParse(Settings.GetValue($"SidepanelWidth{Page}Page"), out int sidepanelWidth)) sidepanelWidth = 250;`
`255`		`- Settings.SetDictionaryItem("SidepanelWidths", Page, sidepanelWidth);`
	`255`	`+ Settings.SetDictionaryItem(Settings.SidepanelWidths, Page, sidepanelWidth);`
`256`	`256`	`Settings.Set($"SidepanelWidth{Page}Page", false);`
`257`	`257`	`}`
`258`	`258`
`259`		`- Settings.Set("TransferredOldSettings", true);`
	`259`	`+ Settings.Set(Settings.TransferredOldSettings, true);`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`@@ -1002,7 +1002,7 @@ private void TitleBar_PaneToggleRequested(WinUIEx.TitleBar sender, object args)`
`1002`	`1002`
`1003`	`1003`	`if(this.AppWindow.Size.Width >= 1600)`
`1004`	`1004`	`{`
`1005`		`- Settings.Set("CollapseNavMenuOnWideScreen", NavigationPage.NavView.IsPaneOpen);`
	`1005`	`+ Settings.Set(Settings.CollapseNavMenuOnWideScreen, NavigationPage.NavView.IsPaneOpen);`
`1006`	`1006`	`}`
`1007`	`1007`	`NavigationPage.NavView.IsPaneOpen = !NavigationPage.NavView.IsPaneOpen;`
`1008`	`1008`	`}`