Transitioned to Json Settings

Files/App.xaml.cs

@@ -5,10 +5,17 @@
 using Files.Filesystem.FilesystemHistory;
 using Files.Helpers;
 using Files.Models.Settings;
+using Files.Services;
+using Files.Services.Implementation;
 using Files.SettingsInterfaces;
 using Files.UserControls.MultitaskingControl;
 using Files.ViewModels;
 using Files.Views;
+using Microsoft.AppCenter;
+using Microsoft.AppCenter.Analytics;
+using Microsoft.AppCenter.Crashes;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.Notifications;
@@ -59,6 +66,10 @@ sealed partial class App : Application
         public static OngoingTasksViewModel OngoingTasksViewModel { get; } = new OngoingTasksViewModel();
         public static SecondaryTileHelper SecondaryTileHelper { get; private set; } = new SecondaryTileHelper();
 
+        public static string AppVersion = $"{Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}.{Package.Current.Id.Version.Build}.{Package.Current.Id.Version.Revision}";
+
+        public IServiceProvider Services { get; private set; }
+
         public App()
         {
             // Initialize logger
@@ -69,13 +80,46 @@ public App()
             InitializeComponent();
             Suspending += OnSuspending;
             LeavingBackground += OnLeavingBackground;
+
+            this.Services = ConfigureServices();
+            Ioc.Default.ConfigureServices(Services);
+        }
+
+        private IServiceProvider ConfigureServices()
+        {
+            ServiceCollection services = new ServiceCollection();
+
+            services
+                // Loggers:
+
+                // Settings:
+                // Base IUserSettingsService as parent
+                .AddSingleton<IUserSettingsService, UserSettingsService>()
+                // Children settings (from IUserSettingsService)
+                .AddSingleton<IFilesAndFoldersSettingsService, FilesAndFoldersSettingsService>((sp) => new FilesAndFoldersSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
+                .AddSingleton<IStartupSettingsService, StartupSettingsService>((sp) => new StartupSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
+                .AddSingleton<IMultitaskingSettingsService, MultitaskingSettingsService>((sp) => new MultitaskingSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
+                .AddSingleton<IWidgetsSettingsService, WidgetsSettingsService>((sp) => new WidgetsSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
+                .AddSingleton<ISidebarSettingsService, SidebarSettingsService>((sp) => new SidebarSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
+                .AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()))
+                .AddSingleton<IAppearanceSettingsService, AppearanceSettingsService>((sp) => new AppearanceSettingsService(sp.GetService<IUserSettingsService>().GetSharingContext()));
+
+            // Dialogs:
+            // 
+            // FileSystem operations:
+            // TODO: IFilesystemHelpersService, IFilesystemOperationsService
+
+            return services.BuildServiceProvider();
         }
 
         private static async Task EnsureSettingsAndConfigurationAreBootstrapped()
         {
+            StartAppCenter();
+
             if (AppSettings == null)
             {
                 AppSettings = await SettingsViewModel.CreateInstance();
+                RegistryToJsonSettingsMerger.MergeSettings();
             }
 
             ExternalResourcesHelper ??= new ExternalResourcesHelper();
@@ -91,6 +135,23 @@ private static async Task EnsureSettingsAndConfigurationAreBootstrapped()
             SidebarPinnedController ??= new SidebarPinnedController();
         }
 
+        private static async void StartAppCenter()
+        {
+            try
+            {
+                if (!AppCenter.Configured)
+                {
+                    var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri(@"ms-appx:///Resources/AppCenterKey.txt"));
+                    var lines = await FileIO.ReadTextAsync(file);
+                    var obj = Newtonsoft.Json.Linq.JObject.Parse(lines);
+                    AppCenter.Start((string)obj.SelectToken("key"), typeof(Analytics), typeof(Crashes));
+                }
+            }
+            catch
+            {
+            }
+        }
+
         public static async Task LoadOtherStuffAsync()
         {
             // Start off a list of tasks we need to run before we can continue startup
@@ -405,9 +466,14 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
 
         public static void SaveSessionTabs() // Enumerates through all tabs and gets the Path property and saves it to AppSettings.LastSessionPages
         {
-            if (AppSettings != null)
+            IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();
+            if (App.BundlesSettings != null)
+            {
+                App.BundlesSettings.FlushSettings();
+            }
+            if (userSettingsService?.StartupSettingsService != null)
             {
-                AppSettings.LastSessionPages = MainPageViewModel.AppInstances.DefaultIfEmpty().Select(tab =>
+                userSettingsService.StartupSettingsService.LastSessionTabList = MainPageViewModel.AppInstances.DefaultIfEmpty().Select(tab =>
                 {
                     if (tab != null && tab.TabItemArguments != null)
                     {
@@ -418,7 +484,7 @@ public static void SaveSessionTabs() // Enumerates through all tabs and gets the
                         var defaultArg = new TabItemArguments() { InitialPageType = typeof(PaneHolderPage), NavigationArg = "NewTab".GetLocalized() };
                         return defaultArg.Serialize();
                     }
-                }).ToArray();
+                }).ToList();
             }
         }
 

Files/BaseLayout.cs

@@ -6,10 +6,12 @@
 using Files.Helpers;
 using Files.Helpers.ContextFlyouts;
 using Files.Interacts;
+using Files.Services;
 using Files.UserControls;
 using Files.ViewModels;
 using Files.ViewModels.Previews;
 using Files.Views;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.UI;
 using System;
@@ -42,6 +44,8 @@ public abstract class BaseLayout : Page, IBaseLayout, INotifyPropertyChanged
     {
         private readonly DispatcherTimer jumpTimer;
 
+        protected IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
+
         protected Task<NamedPipeAsAppServiceConnection> Connection => AppServiceConnectionHelper.Instance;
 
         public SelectedItemsPropertiesViewModel SelectedItemsPropertiesViewModel { get; }
@@ -415,7 +419,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
                 // pathRoot will be empty on recycle bin path
                 var workingDir = ParentShellPageInstance.FilesystemViewModel.WorkingDirectory;
                 string pathRoot = GetPathRoot(workingDir);
-                if (string.IsNullOrEmpty(pathRoot) || workingDir.StartsWith(AppSettings.RecycleBinPath)) // Can't go up from recycle bin
+                if (string.IsNullOrEmpty(pathRoot) || workingDir.StartsWith(CommonPaths.RecycleBinPath)) // Can't go up from recycle bin
                 {
                     ParentShellPageInstance.NavToolbarViewModel.CanNavigateToParent = false;
                 }
@@ -424,7 +428,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
                     ParentShellPageInstance.NavToolbarViewModel.CanNavigateToParent = true;
                 }
 
-                ParentShellPageInstance.InstanceViewModel.IsPageTypeRecycleBin = workingDir.StartsWith(App.AppSettings.RecycleBinPath);
+                ParentShellPageInstance.InstanceViewModel.IsPageTypeRecycleBin = workingDir.StartsWith(CommonPaths.RecycleBinPath);
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeMtpDevice = workingDir.StartsWith("\\\\?\\");
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeFtp = FtpHelpers.IsFtpPath(workingDir);
                 ParentShellPageInstance.InstanceViewModel.IsPageTypeZipFolder = ZipStorageFolder.IsZipPath(workingDir);
@@ -618,7 +622,7 @@ private async Task LoadMenuItemsAsync()
             secondaryElements.OfType<FrameworkElement>().ForEach(i => i.MinWidth = 250); // Set menu min width
             secondaryElements.ForEach(i => ItemContextMenuFlyout.SecondaryCommands.Add(i));
 
-            if (AppSettings.AreFileTagsEnabled && !InstanceViewModel.IsPageTypeSearchResults && !InstanceViewModel.IsPageTypeRecycleBin && !InstanceViewModel.IsPageTypeFtp && !InstanceViewModel.IsPageTypeZipFolder)
+            if (UserSettingsService.FilesAndFoldersSettingsService.AreFileTagsEnabled && !InstanceViewModel.IsPageTypeSearchResults && !InstanceViewModel.IsPageTypeRecycleBin && !InstanceViewModel.IsPageTypeFtp && !InstanceViewModel.IsPageTypeZipFolder)
             {
                 AddFileTagsItemToMenu(ItemContextMenuFlyout);
             }
@@ -655,7 +659,7 @@ private void AddFileTagsItemToMenu(Microsoft.UI.Xaml.Controls.CommandBarFlyout c
         private void AddShellItemsToMenu(List<ContextMenuFlyoutItemViewModel> shellMenuItems, Microsoft.UI.Xaml.Controls.CommandBarFlyout contextMenuFlyout, bool shiftPressed)
         {
             var openWithSubItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(ShellContextmenuHelper.GetOpenWithItems(shellMenuItems));
-            var mainShellMenuItems = shellMenuItems.RemoveFrom(!App.AppSettings.MoveOverflowMenuItemsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 4);
+            var mainShellMenuItems = shellMenuItems.RemoveFrom(!UserSettingsService.AppearanceSettingsService.MoveOverflowMenuItemsToSubMenu ? int.MaxValue : shiftPressed ? 6 : 4);
             var overflowShellMenuItems = shellMenuItems.Except(mainShellMenuItems).ToList();
 
             var overflowItems = ItemModelListToContextFlyoutHelper.GetMenuFlyoutItemsFromModel(overflowShellMenuItems);

Files/Constants.cs

@@ -15,6 +15,13 @@ public static class AdaptiveLayout
             public const float ExtraSmallThreshold = 15.0f;
         }
 
+        public static class CommonPaths
+        {
+            public const string RecycleBinPath = @"Shell:RecycleBinFolder";
+
+            public const string NetworkFolderPath = @"Shell:NetworkPlacesFolder";
+        }
+
         public static class ImageRes
         {
             // See imageres.dll for more icon indexes to add
@@ -106,6 +113,8 @@ public static class LocalSettings
 
             public const string BundlesSettingsFileName = "bundles.json";
 
+            public const string UserSettingsFileName = "user_settings.json";
+
             public const string FileTagSettingsFileName = "filetags.json";
         }
 

Files/DataModels/SidebarPinnedModel.cs

@@ -3,8 +3,10 @@
 using Files.DataModels.NavigationControlItems;
 using Files.Filesystem;
 using Files.Helpers;
+using Files.Services;
 using Files.UserControls;
 using Files.ViewModels;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Uwp;
 using Newtonsoft.Json;
 using System;
@@ -22,15 +24,14 @@ namespace Files.DataModels
 {
     public class SidebarPinnedModel
     {
+        private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
+
         public static IList<IconFileInfo> IconResources = null;
 
         private SidebarPinnedController controller;
 
         private LocationItem favoriteSection, homeSection;
 
-        [JsonIgnore]
-        public SettingsViewModel AppSettings => App.AppSettings;
-
         [JsonIgnore]
         public MainViewModel MainViewModel => App.MainViewModel;
 
@@ -53,8 +54,8 @@ public void AddDefaultItems()
         {
             var udp = UserDataPaths.GetDefault();
 
-            FavoriteItems.Add(AppSettings.DesktopPath);
-            FavoriteItems.Add(AppSettings.DownloadsPath);
+            FavoriteItems.Add(CommonPaths.DesktopPath);
+            FavoriteItems.Add(CommonPaths.DownloadsPath);
             FavoriteItems.Add(udp.Documents);
         }
 
@@ -63,7 +64,7 @@ private void RemoveFavoritesSideBarSection()
             try
             {
                 var item = (from n in SidebarControl.SideBarItems where n.Text.Equals("SidebarFavorites".GetLocalized()) select n).FirstOrDefault();
-                if (!App.AppSettings.ShowFavoritesSection && item != null)
+                if (!UserSettingsService.SidebarSettingsService.ShowFavoritesSection && item != null)
                 {
                     SidebarControl.SideBarItems.Remove(item);
                 }
@@ -74,7 +75,7 @@ private void RemoveFavoritesSideBarSection()
 
         public async void UpdateFavoritesSectionVisibility()
         {
-            if (App.AppSettings.ShowFavoritesSection)
+            if (UserSettingsService.SidebarSettingsService.ShowFavoritesSection)
             {
                 await AddAllItemsToSidebar();
             }
@@ -118,11 +119,11 @@ public async Task ShowHideRecycleBinItemAsync(bool show)
                         Text = ApplicationData.Current.LocalSettings.Values.Get("RecycleBin_Title", "Recycle Bin"),
                         IsDefaultLocation = true,
                         Icon = UIHelpers.GetImageForIconOrNull(IconResources?.FirstOrDefault(x => x.Index == Constants.ImageRes.RecycleBin)?.Image),
-                        Path = App.AppSettings.RecycleBinPath
+                        Path = CommonPaths.RecycleBinPath
                     };
                     // Add recycle bin to sidebar, title is read from LocalSettings (provided by the fulltrust process)
                     // TODO: the very first time the app is launched localized name not available
-                    if (!favoriteSection.ChildItems.Any(x => x.Path == App.AppSettings.RecycleBinPath))
+                    if (!favoriteSection.ChildItems.Any(x => x.Path == CommonPaths.RecycleBinPath))
                     {
                         await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => favoriteSection.ChildItems.Add(recycleBinItem));
                     }
@@ -131,7 +132,7 @@ public async Task ShowHideRecycleBinItemAsync(bool show)
                 {
                     foreach (INavigationControlItem item in favoriteSection.ChildItems.ToList())
                     {
-                        if (item is LocationItem && item.Path == App.AppSettings.RecycleBinPath)
+                        if (item is LocationItem && item.Path == CommonPaths.RecycleBinPath)
                         {
                             await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => favoriteSection.ChildItems.Remove(item));
                         }
@@ -261,7 +262,7 @@ public async Task AddItemToSidebarAsync(string path)
             var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, item));
             if (res || (FilesystemResult)FolderHelpers.CheckFolderAccessWithWin32(path))
             {
-                var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(App.AppSettings.RecycleBinPath));
+                var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(CommonPaths.RecycleBinPath));
                 int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;
                 var locationItem = new LocationItem
                 {
@@ -309,7 +310,7 @@ public async Task AddItemToSidebarAsync(string path)
         /// <param name="section">The section.</param>
         private void AddItemToSidebarAsync(LocationItem section)
         {
-            var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(App.AppSettings.RecycleBinPath));
+            var lastItem = favoriteSection.ChildItems.LastOrDefault(x => x.ItemType == NavigationControlItemType.Location && !x.Path.Equals(CommonPaths.RecycleBinPath));
             int insertIndex = lastItem != null ? favoriteSection.ChildItems.IndexOf(lastItem) + 1 : 0;
 
             if (!favoriteSection.ChildItems.Contains(section))
@@ -330,7 +331,7 @@ public async Task AddAllItemsToSidebar()
                 IconResources = (await SidebarViewModel.LoadSidebarIconResources())?.ToList();
             }
 
-            if (!App.AppSettings.ShowFavoritesSection)
+            if (!UserSettingsService.SidebarSettingsService.ShowFavoritesSection)
             {
                 SidebarControl.SideBarItemsSemaphore.Release();
             }
@@ -382,7 +383,7 @@ public async Task AddAllItemsToSidebar()
                     SidebarControl.SideBarItemsSemaphore.Release();
                 }
 
-                await ShowHideRecycleBinItemAsync(App.AppSettings.PinRecycleBinToSideBar);
+                await ShowHideRecycleBinItemAsync(UserSettingsService.SidebarSettingsService.PinRecycleBinToSideBar);
             }
         }
 

Files/EventArguments/BaseJsonSettingsModelEventArgs.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace Files.EventArguments
+{
+    public sealed class SettingChangedEventArgs : EventArgs
+    {
+        public readonly string settingName;
+
+        public readonly object newValue;
+
+        public SettingChangedEventArgs(string settingName, object newValue)
+        {
+            this.settingName = settingName;
+            this.newValue = newValue;
+        }
+    }
+}