Refactor Application Settings with AppConfig and JSON Storage Support for Packaged/Unpackaged Apps #1924

WinUIGallery/App.xaml.cs

@@ -31,6 +31,7 @@ sealed partial class App : Application
     public App()
     {
         InitializeComponent();
+        SettingsHelper.Init();
         UnhandledException += HandleExceptions;
     }
 

WinUIGallery/Controls/PageHeader.xaml.cs

@@ -101,7 +101,7 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
         }
         if (Item != null)
         {
-            FavoriteButton.IsChecked = SettingsHelper.Contains(SettingsKeys.Favorites, Item.UniqueId);
+            FavoriteButton.IsChecked = SettingsHelper.Config.Favorites.Contains(Item.UniqueId);
         }
     }
 
@@ -121,11 +121,13 @@ private void FavoriteButton_Click(object sender, RoutedEventArgs e)
         {
             if (toggleButton.IsChecked == true)
             {
-                SettingsHelper.TryAddItem(SettingsKeys.Favorites, Item.UniqueId, InsertPosition.Last);
+                SettingsHelper.Config.Favorites.AddLastFavoriteOrRecentlyVisited(Item.UniqueId, true);
+                SettingsHelper.Save();
             }
             else
             {
-                SettingsHelper.TryRemoveItem(SettingsKeys.Favorites, Item.UniqueId);
+                SettingsHelper.Config.Favorites.Remove(Item.UniqueId);
+                SettingsHelper.Save();
             }
         }
     }

WinUIGallery/Helpers/NavigationOrientationHelper.cs

@@ -8,37 +8,16 @@ namespace WinUIGallery.Helpers;
 
 public static partial class NavigationOrientationHelper
 {
-    private static bool _isLeftMode = true;
-    private static ApplicationData appData = ApplicationData.GetDefault();
     public static bool IsLeftMode()
     {
-        if (NativeMethods.IsAppPackaged)
-        {
-            var valueFromSettings = appData.LocalSettings.Values[SettingsKeys.IsLeftMode];
-            if (valueFromSettings == null)
-            {
-                appData.LocalSettings.Values[SettingsKeys.IsLeftMode] = true;
-                valueFromSettings = true;
-            }
-            return (bool)valueFromSettings;
-        }
-        else
-        {
-            return _isLeftMode;
-        }
+        return SettingsHelper.Config.IsLeftMode;
     }
 
     public static void IsLeftModeForElement(bool isLeftMode)
     {
         UpdateNavigationViewForElement(isLeftMode);
-        if (NativeMethods.IsAppPackaged)
-        {
-            appData.LocalSettings.Values[SettingsKeys.IsLeftMode] = isLeftMode;
-        }
-        else
-        {
-            _isLeftMode = isLeftMode;
-        }
+        SettingsHelper.Config.IsLeftMode = isLeftMode;
+        SettingsHelper.Save();
     }
 
     public static void UpdateNavigationViewForElement(bool isLeftMode)

WinUIGallery/Helpers/ProtocolActivationClipboardHelper.cs

@@ -15,40 +15,17 @@ namespace WinUIGallery.Helpers;
 /// </summary>
 public static partial class ProtocolActivationClipboardHelper
 {
-    private static bool _showCopyLinkTeachingTip = true;
-    private static ApplicationData appData = ApplicationData.GetDefault();
-
     public static bool ShowCopyLinkTeachingTip
     {
         get
         {
-            if (NativeMethods.IsAppPackaged)
-            {
-                object valueFromSettings = appData.LocalSettings.Values[SettingsKeys.ShowCopyLinkTeachingTip];
-                if (valueFromSettings == null)
-                {
-                    appData.LocalSettings.Values[SettingsKeys.ShowCopyLinkTeachingTip] = true;
-                    valueFromSettings = true;
-                }
-                return (bool)valueFromSettings;
-            }
-            else
-            {
-                return _showCopyLinkTeachingTip;
-            }
+            return SettingsHelper.Config.IsShowCopyLinkTeachingTip;
         }
 
         set
         {
-            if (NativeMethods.IsAppPackaged)
-            {
-                appData.LocalSettings.Values[SettingsKeys.ShowCopyLinkTeachingTip] = value;
-
-            }
-            else
-            {
-                _showCopyLinkTeachingTip = value;
-            }
+            SettingsHelper.Config.IsShowCopyLinkTeachingTip = value;
+            SettingsHelper.Save();
         }
     }
 

WinUIGallery/Helpers/SettingsHelper/AppConfig.cs

@@ -0,0 +1,53 @@
+using Microsoft.UI.Xaml;
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace WinUIGallery.Helpers;
+
+public partial class AppConfig
+{
+    internal static readonly string RootDirectoryPath = Path.Combine(GetAppDataFolderPath(), ProcessInfoHelper.ProductNameAndVersion);
+    internal static readonly string AppConfigPath = Path.Combine(RootDirectoryPath, "AppConfig.json");
+    private static string GetAppDataFolderPath()
+    {
+        // This can be replaced with Microsoft.Windows.Storage.ApplicationData.GetForUnPackaged(), once it is available in the WASDK.
+        var unpackaged = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+        return NativeMethods.IsAppPackaged ? Microsoft.Windows.Storage.ApplicationData.GetDefault().LocalFolder.Path : unpackaged;
+    }
+
+    /// <summary>
+    /// Gets or sets the currently selected application theme.
+    /// </summary>
+    public ElementTheme SelectedAppTheme { get; set; } = ElementTheme.Default;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the navigation is in left mode.
+    /// </summary>
+    public bool IsLeftMode { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the teaching tip for copying links is shown.
+    /// </summary>
+    public bool IsShowCopyLinkTeachingTip { get; set; }
+
+    /// <summary>
+    /// Gets or sets the list of favorite items.
+    /// </summary>
+    public List<string> Favorites { get; set; } = new();
+
+    /// <summary>
+    /// Gets or sets the list of recently visited items.
+    /// </summary>
+    public List<string> RecentlyVisited { get; set; } = new();
+
+    /// <summary>
+    /// Represents the maximum number of recently visited samples to retain.
+    /// </summary>
+    public int MaxRecentlyVisitedSamples { get; set; } = 7;
+
+    /// <summary>
+    /// Gets or sets the maximum number of favorite samples allowed.
+    /// </summary>
+    public int MaxFavoriteSamples { get; set; } = 0;
+}

WinUIGallery/Helpers/SettingsHelper/AppConfigJsonContext.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace WinUIGallery.Helpers;
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(AppConfig))]
+internal partial class AppConfigJsonContext : JsonSerializerContext
+{
+}