Userinterface di merge

.gitignore

@@ -351,4 +351,5 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+.vscode/settings.json

userinterface/App.axaml.cs

@@ -17,7 +17,7 @@
 using userinterface.ViewModels.Settings;
 using userinterface.Views;
 using userspace_backend;
-using Windows.System;
+using userspace_backend.IO;
 using DATA = userspace_backend.Data;
 
 namespace userinterface;
@@ -35,10 +35,8 @@ public override void OnFrameworkInitializationCompleted()
     {
         var services = new ServiceCollection();
 
-        // Register logging
         services.AddLogging(builder =>
         {
-            // Change this to be "LogLevel.Debug" if you want to see logs.
 #if DEBUG
             builder.AddDebug();
             builder.SetMinimumLevel(LogLevel.Warning);
@@ -47,7 +45,16 @@ public override void OnFrameworkInitializationCompleted()
 #endif
         });
 
-        // Register services
+        string settingsDirectory = System.AppDomain.CurrentDomain.BaseDirectory;
+        services.AddSingleton<IBackEndLoader>(sp =>
+        {
+            var devicesRW = sp.GetRequiredService<DevicesReaderWriter>();
+            var mappingsRW = sp.GetRequiredService<MappingsReaderWriter>();
+            var profileRW = sp.GetRequiredService<ProfileReaderWriter>();
+            var settingsRW = sp.GetRequiredService<SettingsReaderWriter>();
+            return new BackEndLoader(settingsDirectory, devicesRW, mappingsRW, profileRW, settingsRW);
+        });
+
         services.AddSingleton<INotificationService>(provider =>
             new NotificationService(provider.GetRequiredService<LocalizationService>(), provider.GetRequiredService<ISettingsService>()));
         services.AddSingleton<IModalService>(provider =>
@@ -59,25 +66,15 @@ public override void OnFrameworkInitializationCompleted()
         services.AddSingleton<FrameTimerService>();
         services.AddSingleton<PreviewChartRenderer>();
         services.AddSingleton<IAnimationStateService, AnimationStateService>();
-
-        // Register backend services
-        services.AddSingleton<Bootstrapper>(provider => BootstrapBackEnd());
-        services.AddSingleton<BackEnd>(provider =>
-        {
-            var bootstrapper = provider.GetRequiredService<Bootstrapper>();
-            var backEnd = new BackEnd(bootstrapper);
-            backEnd.Load();
-            return backEnd;
-        });
-
-        // Register settings service that depends on backend
         services.AddSingleton<ISettingsService, SettingsService>();
 
         RegisterViewModels(services);
 
-        Services = services.BuildServiceProvider();
+        Services = BackEndComposer.Compose(services);
+
+        IBackEnd backEnd = Services.GetRequiredService<IBackEnd>();
+        backEnd.Load();
 
-        // Apply settings from backend after services are built
         ApplyStartupSettings();
 
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
@@ -119,7 +116,7 @@ private void RegisterViewModels(IServiceCollection services)
         // Main ViewModels
         services.AddSingleton<MainWindowViewModel>(provider =>
             new MainWindowViewModel(
-                provider.GetRequiredService<BackEnd>(),
+                provider.GetRequiredService<IBackEnd>(),
                 provider.GetRequiredService<IThemeService>(),
                 provider.GetRequiredService<ISettingsService>(),
                 provider.GetRequiredService<FrameTimerService>()));
@@ -128,12 +125,12 @@ private void RegisterViewModels(IServiceCollection services)
         // Device ViewModels
         services.AddTransient<ViewModels.Device.DevicesPageViewModel>(provider =>
             new ViewModels.Device.DevicesPageViewModel(
-                provider.GetRequiredService<BackEnd>(),
+                provider.GetRequiredService<IBackEnd>(),
                 provider.GetRequiredService<IModalService>(),
                 provider.GetRequiredService<LocalizationService>()));
         services.AddTransient<ViewModels.Device.DevicesListViewModel>(provider =>
             new ViewModels.Device.DevicesListViewModel(
-                provider.GetRequiredService<BackEnd>().Devices,
+                provider.GetRequiredService<IBackEnd>().Devices,
                 provider.GetRequiredService<IModalService>(),
                 provider.GetRequiredService<LocalizationService>()));
         services.AddTransient<ViewModels.Device.DeviceGroupsViewModel>();
@@ -178,7 +175,12 @@ protected static Bootstrapper BootstrapBackEnd()
     {
         return new Bootstrapper()
         {
-            BackEndLoader = new BackEndLoader(System.AppDomain.CurrentDomain.BaseDirectory),
+            BackEndLoader = new BackEndLoader(
+                System.AppDomain.CurrentDomain.BaseDirectory,
+                new DevicesReaderWriter(),
+                new MappingsReaderWriter(),
+                new ProfileReaderWriter(),
+                new SettingsReaderWriter()),
             DevicesToLoad =
             [
                 new DATA.Device() { Name = "Superlight 2", DPI = 32000, HWID = @"HID\VID_046D&PID_C54D&MI_00", PollingRate = 1000, DeviceGroup = "Logitech Mice" },

userinterface/Services/IViewModelFactory.cs

@@ -8,9 +8,9 @@ namespace userinterface.Services
 {
     public interface IViewModelFactory
     {
-        ProfileViewModel CreateProfileViewModel(BE.ProfileModel profileModel);
-        ProfileSettingsViewModel CreateProfileSettingsViewModel(BE.ProfileModel profileModel);
-        ProfileChartViewModel CreateProfileChartViewModel(BE.ProfileModel profileModel);
+        ProfileViewModel CreateProfileViewModel(BE.IProfileModel profileModel);
+        ProfileSettingsViewModel CreateProfileSettingsViewModel(BE.IProfileModel profileModel);
+        ProfileChartViewModel CreateProfileChartViewModel(BE.IProfileModel profileModel);
         MappingViewModel CreateMappingViewModel(BE.MappingModel mappingModel, BE.MappingsModel mappingsModel, bool isActive, Action<MappingViewModel> onActivationRequested);
     }
 }

userinterface/Services/SettingsService.cs

@@ -7,9 +7,9 @@ namespace userinterface.Services;
 
 public class SettingsService : ISettingsService
 {
-    private readonly BackEnd backEnd;
+    private readonly IBackEnd backEnd;
 
-    public SettingsService(BackEnd backEnd)
+    public SettingsService(IBackEnd backEnd)
     {
         this.backEnd = backEnd;
 

userinterface/Services/ViewModelFactory.cs

@@ -19,45 +19,45 @@ public ViewModelFactory(IServiceProvider serviceProvider)
 
         private IServiceProvider ServiceProvider { get; }
 
-        public ProfileViewModel CreateProfileViewModel(BE.ProfileModel profileModel)
+        public ProfileViewModel CreateProfileViewModel(BE.IProfileModel profileModel)
         {
             var stopwatch = Stopwatch.StartNew();
-            
+
             var viewModel = ServiceProvider.GetRequiredService<ProfileViewModel>();
             Debug.WriteLine($"ProfileViewModel service resolution: {stopwatch.ElapsedMilliseconds}ms");
-            
+
             stopwatch.Restart();
             viewModel.Initialize(profileModel);
             Debug.WriteLine($"ProfileViewModel initialize: {stopwatch.ElapsedMilliseconds}ms");
-            
+
             return viewModel;
         }
 
-        public ProfileSettingsViewModel CreateProfileSettingsViewModel(BE.ProfileModel profileModel)
+        public ProfileSettingsViewModel CreateProfileSettingsViewModel(BE.IProfileModel profileModel)
         {
             var stopwatch = Stopwatch.StartNew();
-            
+
             var viewModel = ServiceProvider.GetRequiredService<ProfileSettingsViewModel>();
             Debug.WriteLine($"ProfileSettingsViewModel service resolution: {stopwatch.ElapsedMilliseconds}ms");
-            
+
             stopwatch.Restart();
             viewModel.Initialize(profileModel);
             Debug.WriteLine($"ProfileSettingsViewModel initialize: {stopwatch.ElapsedMilliseconds}ms");
-            
+
             return viewModel;
         }
 
-        public ProfileChartViewModel CreateProfileChartViewModel(BE.ProfileModel profileModel)
+        public ProfileChartViewModel CreateProfileChartViewModel(BE.IProfileModel profileModel)
         {
             var stopwatch = Stopwatch.StartNew();
-            
+
             var viewModel = ServiceProvider.GetRequiredService<ProfileChartViewModel>();
             Debug.WriteLine($"ProfileChartViewModel service resolution: {stopwatch.ElapsedMilliseconds}ms");
-            
+
             stopwatch.Restart();
             viewModel.Initialize(profileModel);
             Debug.WriteLine($"ProfileChartViewModel initialize: {stopwatch.ElapsedMilliseconds}ms");
-            
+
             return viewModel;
         }
 

userinterface/ViewModels/Device/DeviceGroupSelectorViewModel.cs

@@ -5,29 +5,29 @@ namespace userinterface.ViewModels.Device
 {
     public partial class DeviceGroupSelectorViewModel : ViewModelBase
     {
-        protected DeviceGroupModel selectedEntry = null!;
+        protected string selectedEntry = null!;
 
-        public DeviceGroupSelectorViewModel(DeviceModel device, DeviceGroups deviceGroupsBE)
+        public DeviceGroupSelectorViewModel(IDeviceModel device, DeviceGroups deviceGroupsBE)
         {
             Device = device;
             DeviceGroupsBE = deviceGroupsBE;
             RefreshSelectedDeviceGroup();
         }
 
-        protected DeviceModel Device { get; }
+        protected IDeviceModel Device { get; }
         protected DeviceGroups DeviceGroupsBE { get; }
 
-        public ObservableCollection<DeviceGroupModel> DeviceGroupEntries =>
+        public ObservableCollection<string> DeviceGroupEntries =>
             DeviceGroupsBE.DeviceGroupModels;
 
-        public DeviceGroupModel SelectedEntry
+        public string SelectedEntry
         {
             get => selectedEntry;
             set
             {
                 if (DeviceGroupEntries.Contains(value))
                 {
-                    Device.DeviceGroup = value;
+                    Device.DeviceGroup.TryUpdateModelDirectly(value);
                     selectedEntry = value;
                 }
             }
@@ -37,15 +37,15 @@ public DeviceGroupModel SelectedEntry
 
         public void RefreshSelectedDeviceGroup()
         {
-            if (!DeviceGroupEntries.Contains(Device.DeviceGroup))
+            if (!DeviceGroupEntries.Contains(Device.DeviceGroup.ModelValue))
             {
                 IsValid = false;
                 SelectedEntry = DeviceGroups.DefaultDeviceGroup;
                 return;
             }
 
             IsValid = true;
-            selectedEntry = Device.DeviceGroup;
+            selectedEntry = Device.DeviceGroup.ModelValue;
         }
     }
 }

userinterface/ViewModels/Device/DeviceGroupViewModel.cs

@@ -7,7 +7,7 @@ namespace userinterface.ViewModels.Device
 {
     public partial class DeviceGroupViewModel : ViewModelBase
     {
-        public DeviceGroupViewModel(BE.DeviceGroupModel deviceGroupBE, BE.DeviceGroups deviceGroupsBE, bool isDefault = false)
+        public DeviceGroupViewModel(string deviceGroupBE, BE.DeviceGroups deviceGroupsBE, bool isDefault = false)
         {
             DeviceGroupBE = deviceGroupBE;
             DeviceGroupsBE = deviceGroupsBE;
@@ -17,7 +17,7 @@ public DeviceGroupViewModel(BE.DeviceGroupModel deviceGroupBE, BE.DeviceGroups d
                 () => DeleteSelf());
         }
 
-        public BE.DeviceGroupModel DeviceGroupBE { get; }
+        public string DeviceGroupBE { get; }
 
         protected BE.DeviceGroups DeviceGroupsBE { get; }
 

userinterface/ViewModels/Device/DeviceGroupsViewModel.cs

@@ -21,7 +21,7 @@ public DeviceGroupsViewModel(BE.DeviceGroups deviceGroupsBE)
 
         protected BE.DeviceGroups DeviceGroupsBE { get; }
 
-        public ObservableCollection<BE.DeviceGroupModel> DeviceGroups => DeviceGroupsBE.DeviceGroupModels;
+        public ObservableCollection<string> DeviceGroups => DeviceGroupsBE.DeviceGroupModels;
 
         public ObservableCollection<DeviceGroupViewModel> DeviceGroupViews { get; }
 

userinterface/ViewModels/Device/DeviceViewModel.cs

@@ -13,7 +13,7 @@ public partial class DeviceViewModel : ViewModelBase
     {
         private readonly IModalService modalService;
 
-        public DeviceViewModel(BE.DeviceModel deviceBE, BE.DevicesModel devicesBE, IModalService modalService, LocalizationService localizationService, bool isDefault = false, Func<DeviceViewModel, Task>? animatedDeleteCallback = null)
+        public DeviceViewModel(BE.IDeviceModel deviceBE, BE.DevicesModel devicesBE, IModalService modalService, LocalizationService localizationService, bool isDefault = false, Func<DeviceViewModel, Task>? animatedDeleteCallback = null)
         {
             DeviceBE = deviceBE;
             DevicesBE = devicesBE;
@@ -37,7 +37,7 @@ public DeviceViewModel(BE.DeviceModel deviceBE, BE.DevicesModel devicesBE, IModa
             DeleteCommand = new RelayCommand(async () => await DeleteWithAnimation());
         }
 
-        internal BE.DeviceModel DeviceBE { get; }
+        internal BE.IDeviceModel DeviceBE { get; }
 
         internal BE.DevicesModel DevicesBE { get; }
 
@@ -99,7 +99,8 @@ private async Task DeleteWithAnimation()
 
         public void DeleteSelf()
         {
-            DevicesBE.RemoveDevice(DeviceBE);
+            bool success = DevicesBE.TryRemoveElement(DeviceBE);
+            System.Diagnostics.Debug.Assert(success);
         }
     }
 }

userinterface/ViewModels/Device/DevicesListViewModel.cs

@@ -23,15 +23,15 @@ public DevicesListViewModel(BE.DevicesModel devicesBE, IModalService modalServic
             this.localizationService = localizationService;
             DeviceViews = [];
             UpdateDeviceViews();
-            DevicesBE.Devices.CollectionChanged += DevicesCollectionChanged;
+            ((INotifyCollectionChanged)DevicesBE.Elements).CollectionChanged += DevicesCollectionChanged;
 
             AddDeviceCommand = new RelayCommand(
                 () => TryAddDevice());
         }
 
         protected BE.DevicesModel DevicesBE { get; }
 
-        public ObservableCollection<BE.DeviceModel> Devices => DevicesBE.Devices;
+        public ReadOnlyObservableCollection<BE.IDeviceModel> Devices => DevicesBE.Elements;
 
         public ObservableCollection<DeviceViewModel> DeviceViews { get; }
 
@@ -52,9 +52,9 @@ private void DevicesCollectionChanged(object? sender, NotifyCollectionChangedEve
                 case NotifyCollectionChangedAction.Add:
                     if (e.NewItems != null)
                     {
-                        foreach (BE.DeviceModel device in e.NewItems)
+                        foreach (BE.IDeviceModel device in e.NewItems)
                         {
-                            int index = DevicesBE.Devices.IndexOf(device);
+                            int index = e.NewStartingIndex;
                             bool isDefault = index == 0;
                             var animateCallback = devicesListView != null ? (Func<DeviceViewModel, Task>)devicesListView.AnimateDeviceDelete : null;
                             var deviceViewModel = new DeviceViewModel(device, DevicesBE, modalService, localizationService, isDefault, animateCallback);
@@ -85,15 +85,15 @@ private void DevicesCollectionChanged(object? sender, NotifyCollectionChangedEve
         public void UpdateDeviceViews()
         {
             DeviceViews.Clear();
-            for (int i = 0; i < DevicesBE.Devices.Count; i++)
+            for (int i = 0; i < DevicesBE.Elements.Count; i++)
             {
-                var device = DevicesBE.Devices[i];
+                var device = DevicesBE.Elements[i];
                 bool isDefault = i == 0;
                 var animateCallback = devicesListView != null ? (Func<DeviceViewModel, Task>)devicesListView.AnimateDeviceDelete : null;
                 DeviceViews.Add(new DeviceViewModel(device, DevicesBE, modalService, localizationService, isDefault, animateCallback));
             }
         }
 
-        public bool TryAddDevice() => DevicesBE.TryAddDevice();
+        public bool TryAddDevice() => DevicesBE.TryAddNewDefault();
     }
 }

userinterface/ViewModels/Device/DevicesPageViewModel.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using userinterface.Services;
+using IBackEnd = userspace_backend.IBackEnd;
 using BE = userspace_backend.Model;
 
 namespace userinterface.ViewModels.Device
@@ -13,7 +14,7 @@ public partial class DevicesPageViewModel : ViewModelBase
         private readonly IModalService modalService;
         private readonly LocalizationService localizationService;
 
-        public DevicesPageViewModel(userspace_backend.BackEnd backEnd, IModalService modalService, LocalizationService localizationService)
+        public DevicesPageViewModel(IBackEnd backEnd, IModalService modalService, LocalizationService localizationService)
         {
             devicesModel = backEnd?.Devices ?? throw new ArgumentNullException(nameof(backEnd));
             this.modalService = modalService;