From aab3472036c8217a8a2e6f4c9011b7578c676361 Mon Sep 17 00:00:00 2001
From: Vit Nemecky <vit.nemecky@centrum.cz>
Date: Thu, 26 Dec 2024 20:44:11 +0100
Subject: [PATCH 1/4] Settings page for a device (BuWizz 1 & 2) (#64)

---
 BrickController2/BrickController2/App.xaml    | 17 +++-
 .../BuWizz/BuWizz2OutputLevels.cs             |  9 ++
 .../BuWizz/BuWizzOutputLevels.cs              |  8 ++
 .../DeviceManagement/BuWizz2Device.cs         | 24 +++--
 .../DeviceManagement/BuwizzDevice.cs          | 14 ++-
 .../DI/DeviceManagementModule.cs              |  6 +-
 .../DeviceManagement/Device.cs                | 45 ++++++++-
 .../DeviceManagement/DeviceDTO.cs             |  7 ++
 .../DeviceManagement/DeviceFactory.cs         |  6 +-
 .../DeviceManagement/DeviceManager.cs         |  6 +-
 .../DeviceManagement/DeviceRepository.cs      | 40 ++++++--
 .../DeviceManagement/DeviceSetting.cs         | 25 +++++
 .../DeviceManagement/IDeviceRepository.cs     |  3 +-
 .../Extensions/DeviceSettingExtensions.cs     | 26 ++++++
 .../TranslationResources.Designer.cs          | 20 +++-
 .../Resources/TranslationResources.de.resx    | 15 +++
 .../Resources/TranslationResources.resx       | 18 ++++
 .../UI/Pages/DeviceListPage.xaml              |  8 ++
 .../BrickController2/UI/Pages/DevicePage.xaml |  3 +
 .../UI/Pages/DeviceSettingsPage.xaml          | 91 +++++++++++++++++++
 .../UI/Pages/DeviceSettingsPage.xaml.cs       | 18 ++++
 .../UI/Templates/DataTemplatesSelector.cs     | 23 +++++
 .../BrickController2/UI/Themes/DarkTheme.xaml |  1 +
 .../UI/Themes/LightTheme.xaml                 |  1 +
 .../ViewModels/DeviceBoolSettingViewModel.cs  | 27 ++++++
 .../ViewModels/DeviceEnumSettingViewModel.cs  | 48 ++++++++++
 .../UI/ViewModels/DeviceListPageViewModel.cs  | 13 +++
 .../UI/ViewModels/DevicePageViewModel.cs      | 22 ++++-
 .../ViewModels/DeviceSettingViewModelBase.cs  | 37 ++++++++
 .../ViewModels/DeviceSettingsPageViewModel.cs | 55 +++++++++++
 30 files changed, 608 insertions(+), 28 deletions(-)
 create mode 100644 BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizz2OutputLevels.cs
 create mode 100644 BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizzOutputLevels.cs
 create mode 100644 BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
 create mode 100644 BrickController2/BrickController2/Extensions/DeviceSettingExtensions.cs
 create mode 100644 BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
 create mode 100644 BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml.cs
 create mode 100644 BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs

diff --git a/BrickController2/BrickController2/App.xaml b/BrickController2/BrickController2/App.xaml
index 132be36f..fd0716b3 100644
--- a/BrickController2/BrickController2/App.xaml
+++ b/BrickController2/BrickController2/App.xaml
@@ -27,7 +27,22 @@
         <Style TargetType="Switch">
             <Setter Property="BackgroundColor" Value="{DynamicResource TransparentColor}"/>
             <Setter Property="OnColor" Value="{DynamicResource SwitchOnColor}"/>
-            <Setter Property="ThumbColor" Value="{DynamicResource SwitchThumbColor}"/>
+            <Setter Property="VisualStateManager.VisualStateGroups">
+                <VisualStateGroupList>
+                    <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="On">
+                            <VisualState.Setters>
+                                <Setter Property="ThumbColor" Value="{DynamicResource SwitchThumbColor}" />
+                            </VisualState.Setters>
+                        </VisualState>
+                        <VisualState x:Name="Off">
+                            <VisualState.Setters>
+                                <Setter Property="ThumbColor" Value="{DynamicResource SwitchThumbColorOff}" />
+                            </VisualState.Setters>
+                        </VisualState>
+                    </VisualStateGroup>
+                </VisualStateGroupList>
+            </Setter>
         </Style>
 
         <Style TargetType="Picker">
diff --git a/BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizz2OutputLevels.cs b/BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizz2OutputLevels.cs
new file mode 100644
index 00000000..0eb1c6d0
--- /dev/null
+++ b/BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizz2OutputLevels.cs
@@ -0,0 +1,9 @@
+namespace BrickController2.DeviceManagement.BuWizz;
+
+public enum BuWizz2OutputLevels
+{
+    Low,
+    Normal,
+    High,
+    Ludicrous,
+}
diff --git a/BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizzOutputLevels.cs b/BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizzOutputLevels.cs
new file mode 100644
index 00000000..2055f107
--- /dev/null
+++ b/BrickController2/BrickController2/DeviceManagement/BuWizz/BuWizzOutputLevels.cs
@@ -0,0 +1,8 @@
+namespace BrickController2.DeviceManagement.BuWizz;
+
+public enum BuWizzOutputLevels
+{
+    Low,
+    Normal,
+    High
+}
diff --git a/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs b/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs
index 856a1924..d7aedaa5 100644
--- a/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs
+++ b/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs
@@ -1,4 +1,5 @@
-using BrickController2.Helpers;
+using BrickController2.DeviceManagement.BuWizz;
+using BrickController2.Helpers;
 using BrickController2.PlatformServices.BluetoothLE;
 using System;
 using System.Collections.Generic;
@@ -21,10 +22,13 @@ internal class BuWizz2Device : BluetoothDevice
 
         private static readonly TimeSpan VoltageMeasurementTimeout = TimeSpan.FromSeconds(5);
 
+        private const string SwapChannelsSettingName = "BuWizz2SwapChannels";
+        private const string DefaultOutputLevelName = "BuWizz2DefaultOutputLevel";
+        private const BuWizz2OutputLevels DefaultLevel = BuWizz2OutputLevels.Normal;
+
         private readonly int[] _outputValues = new int[4];
         private readonly int[] _lastOutputValues = new int[4];
         private readonly object _outputLock = new object();
-        private readonly bool _swapChannels;
 
         private DateTime _batteryMeasurementTimestamp;
         private byte _batteryVoltageRaw;
@@ -37,18 +41,24 @@ internal class BuWizz2Device : BluetoothDevice
         private IGattCharacteristic? _modelNumberCharacteristic;
         private IGattCharacteristic? _firmwareRevisionCharacteristic;
 
-        public BuWizz2Device(string name, string address, byte[] deviceData, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
+        public BuWizz2Device(string name, string address, byte[] deviceData, IEnumerable<DeviceSetting> settings, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
             : base(name, address, deviceRepository, bleService)
         {
             // On BuWizz2 with manufacturer data 0x4e054257001e the ports are swapped
             // (no normal BuWizz2es manufacturer data is 0x4e054257001b)
-            _swapChannels = deviceData != null && deviceData.Length >= 6 && deviceData[5] == 0x1E;
+            var swapChannels = deviceData != null && deviceData.Length >= 6 && deviceData[5] == 0x1E;
+
+            // apply values (if any) or default
+            SetSettingValue(SwapChannelsSettingName, settings, swapChannels);
+            SetSettingValue(DefaultOutputLevelName, settings, DefaultLevel);
+            // update output value again to apply settings
+            _outputLevel = DefaultOutputLevel;
         }
 
         public override DeviceType DeviceType => DeviceType.BuWizz2;
         public override int NumberOfChannels => 4;
         public override int NumberOfOutputLevels => 4;
-        public override int DefaultOutputLevel => 1;
+        public override int DefaultOutputLevel => (int)GetSettingValue(DefaultOutputLevelName, DefaultLevel);
         protected override bool AutoConnectOnFirstConnect => false;
 
         public override string BatteryVoltageSign => "V";
@@ -215,13 +225,15 @@ protected override async Task ProcessOutputsAsync(CancellationToken token)
             }
         }
 
+        private bool SwapChannels => base.GetSettingValue<bool>(SwapChannelsSettingName);
+
         private async Task<bool> SendOutputValuesAsync(int v0, int v1, int v2, int v3, CancellationToken token)
         {
             try
             {
                 var sendOutputBuffer = new byte[] { 0x10, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-                if (_swapChannels)
+                if (SwapChannels)
                 {
                     sendOutputBuffer[1] = (byte)(v1 / 2);
                     sendOutputBuffer[2] = (byte)(v0 / 2);
diff --git a/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs b/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs
index 7ecf7a9b..599e0f08 100644
--- a/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs
+++ b/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs
@@ -1,4 +1,5 @@
-using BrickController2.PlatformServices.BluetoothLE;
+using BrickController2.DeviceManagement.BuWizz;
+using BrickController2.PlatformServices.BluetoothLE;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,6 +17,9 @@ internal class BuWizzDevice : BluetoothDevice
 
         private static readonly TimeSpan LastOutputTimeout = TimeSpan.FromMilliseconds(1500);
 
+        private const string DefaultOutputLevelName = "BuWizzDefaultOutputLevel";
+        private const BuWizzOutputLevels DefaultLevel = BuWizzOutputLevels.Normal;
+
         private readonly int[] _outputValues = new int[4];
         private readonly object _outputLock = new object();
 
@@ -24,15 +28,19 @@ internal class BuWizzDevice : BluetoothDevice
 
         private IGattCharacteristic? _characteristic;
 
-        public BuWizzDevice(string name, string address, byte[] deviceData, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
+        public BuWizzDevice(string name, string address, byte[] deviceData, IEnumerable<DeviceSetting> settings, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
             : base(name, address, deviceRepository, bleService)
         {
+            // apply values (if any) or default
+            SetSettingValue(DefaultOutputLevelName, settings, DefaultLevel);
+            // update output value again to apply settings
+            _outputLevel = DefaultOutputLevel;
         }
 
         public override DeviceType DeviceType => DeviceType.BuWizz;
         public override int NumberOfChannels => 4;
         public override int NumberOfOutputLevels => 3;
-        public override int DefaultOutputLevel => 1;
+        public override int DefaultOutputLevel => (int)GetSettingValue(DefaultOutputLevelName, DefaultLevel);
         protected override bool AutoConnectOnFirstConnect => false;
 
         public override void SetOutput(int channel, float value)
diff --git a/BrickController2/BrickController2/DeviceManagement/DI/DeviceManagementModule.cs b/BrickController2/BrickController2/DeviceManagement/DI/DeviceManagementModule.cs
index 2c21dbc7..689009ca 100644
--- a/BrickController2/BrickController2/DeviceManagement/DI/DeviceManagementModule.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DI/DeviceManagementModule.cs
@@ -27,7 +27,11 @@ protected override void Load(ContainerBuilder builder)
             builder.Register<DeviceFactory>(c =>
             {
                 IComponentContext ctx = c.Resolve<IComponentContext>();
-                return (deviceType, name, address, deviceData) => ctx.ResolveKeyed<Device>(deviceType, new NamedParameter("name", name), new NamedParameter("address", address), new NamedParameter("deviceData", deviceData));
+                return (deviceType, name, address, deviceData, settings) => ctx.ResolveOptionalKeyed<Device>(deviceType,
+                    new NamedParameter("name", name),
+                    new NamedParameter("address", address),
+                    new NamedParameter("deviceData", deviceData),
+                    new NamedParameter("settings", settings));
             });
         }
     }
diff --git a/BrickController2/BrickController2/DeviceManagement/Device.cs b/BrickController2/BrickController2/DeviceManagement/Device.cs
index 066e0295..b988dad3 100644
--- a/BrickController2/BrickController2/DeviceManagement/Device.cs
+++ b/BrickController2/BrickController2/DeviceManagement/Device.cs
@@ -1,6 +1,8 @@
-using BrickController2.Helpers;
+using BrickController2.Extensions;
+using BrickController2.Helpers;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -9,6 +11,7 @@ namespace BrickController2.DeviceManagement
     public abstract class Device : NotifyPropertyChangedSource
     {
         private readonly IDeviceRepository _deviceRepository;
+        private readonly Dictionary<string, DeviceSetting> _settings = [];
         protected readonly AsyncLock _asyncLock = new AsyncLock();
 
         private string _name;
@@ -111,6 +114,46 @@ public async Task RenameDeviceAsync(Device device, string newName)
             }
         }
 
+        public async Task UpdateDeviceSettingsAsync(IEnumerable<DeviceSetting> settings)
+        {
+            using (await _asyncLock.LockAsync())
+            {
+                // update provided settings, but existing with matching type only
+                foreach (var setting in settings ?? [])
+                {
+                    if (_settings.TryGetValue(setting.Name, out var storedSetting) && setting.Type == storedSetting.Type)
+                    {
+                        storedSetting.Value = setting.Value;
+                    }
+                }
+
+                await _deviceRepository.UpdateDeviceAsync(DeviceType, Address, CurrentSettings);
+            }
+        }
+        public bool HasSettings => _settings.Values.Any();
+        public IReadOnlyCollection<DeviceSetting> CurrentSettings => _settings.Values;
+
+        protected TValue GetSettingValue<TValue>(string settingName, TValue defaultValue = default!)
+        {
+            if (_settings.TryGetValue(settingName, out var setting) && setting.Value is TValue value)
+            {
+                return value;
+            }
+
+            return defaultValue;
+        }
+
+        protected void SetSettingValue<TValue>(string settingName, IEnumerable<DeviceSetting>? settings, TValue defaultValue)
+            where TValue: struct
+        {
+            var foundSetting = settings?.FirstOrDefault(s => s.Name == settingName);
+            _settings[settingName] = new DeviceSetting
+            {
+                Name = settingName,
+                Value = foundSetting.GetValue(defaultValue)
+            };
+        }
+
         public override string ToString()
         {
             return Name;
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs b/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs
index 10aeac3e..d8882b7e 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs
@@ -1,5 +1,7 @@
 using SQLite;
+using SQLiteNetExtensions.Attributes;
 using System;
+using System.Collections.ObjectModel;
 
 namespace BrickController2.DeviceManagement
 {
@@ -13,5 +15,10 @@ internal class DeviceDTO
         public string Name { get; set; } = string.Empty;
         public string Address { get; set; } = string.Empty;
         public byte[] DeviceData { get; set; } = Array.Empty<byte>();
+
+        [TextBlob(nameof(SettingsBlobed))]
+        public ObservableCollection<DeviceSetting> Settings { get; set; } = [];
+
+        public string? SettingsBlobed { get; set; }
     }
 }
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs b/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs
index a4157b4b..e48c7270 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs
@@ -1,4 +1,6 @@
-namespace BrickController2.DeviceManagement
+using System.Collections.Generic;
+
+namespace BrickController2.DeviceManagement
 {
-    internal delegate Device DeviceFactory(DeviceType deviceType, string name, string address, byte[] deviceData);
+    internal delegate Device? DeviceFactory(DeviceType deviceType, string name, string address, byte[] deviceData, IEnumerable<DeviceSetting> settings);
 }
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceManager.cs b/BrickController2/BrickController2/DeviceManagement/DeviceManager.cs
index 61f5e831..2d97275e 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceManager.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceManager.cs
@@ -54,7 +54,7 @@ public async Task LoadDevicesAsync()
                 var deviceDTOs = await _deviceRepository.GetDevicesAsync();
                 foreach (var deviceDTO in deviceDTOs)
                 {
-                    var device = _deviceFactory(deviceDTO.DeviceType, deviceDTO.Name, deviceDTO.Address, deviceDTO.DeviceData);
+                    var device = _deviceFactory(deviceDTO.DeviceType, deviceDTO.Name, deviceDTO.Address, deviceDTO.DeviceData, deviceDTO.Settings);
                     if (device != null)
                     {
                         Devices.Add(device);
@@ -97,10 +97,10 @@ async Task FoundDevice(DeviceType deviceType, string deviceName, string deviceAd
                         return;
                     }
 
-                    var device = _deviceFactory(deviceType, deviceName, deviceAddress, deviceData);
+                    var device = _deviceFactory(deviceType, deviceName, deviceAddress, deviceData, []);
                     if (device != null)
                     {
-                        await _deviceRepository.InsertDeviceAsync(device.DeviceType, device.Name, device.Address, deviceData);
+                        await _deviceRepository.InsertDeviceAsync(device.DeviceType, device.Name, device.Address, deviceData, device.CurrentSettings);
 
                         await _uiThreadService.RunOnMainThread(() => Devices.Add(device));
                     }
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs b/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs
index 2a6c80a6..2453efc0 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs
@@ -1,7 +1,9 @@
 using BrickController2.Database;
 using BrickController2.Helpers;
 using SQLite;
+using SQLiteNetExtensionsAsync.Extensions;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace BrickController2.DeviceManagement
@@ -34,17 +36,24 @@ public async Task<IEnumerable<DeviceDTO>> GetDevicesAsync()
             using (await _lock.LockAsync())
             {
                 await InitAsync();
-                return await _databaseConnection.Table<DeviceDTO>().ToListAsync();
+                return await _databaseConnection.GetAllWithChildrenAsync<DeviceDTO>();
             }
         }
 
-        public async Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] devicedata)
+        public async Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] devicedata, IEnumerable<DeviceSetting> settings)
         {
             using (await _lock.LockAsync())
             {
-                var device = new DeviceDTO { DeviceType = type, Address = address, Name = name, DeviceData = devicedata };
+                var device = new DeviceDTO
+                {
+                    DeviceType = type,
+                    Address = address,
+                    Name = name,
+                    DeviceData = devicedata,
+                    Settings = new(settings)
+                };
                 await InitAsync();
-                await _databaseConnection.InsertAsync(device);
+                await _databaseConnection.InsertWithChildrenAsync(device);
             }
         }
 
@@ -52,7 +61,7 @@ public async Task DeleteDeviceAsync(DeviceType type, string address)
         {
             using (await _lock.LockAsync())
             {
-                var device = await _databaseConnection.Table<DeviceDTO>().Where(d => d.DeviceType == type && d.Address == address).FirstOrDefaultAsync();
+                var device = await GetDevice(type, address);
                 if (device != null)
                 {
                     await _databaseConnection.DeleteAsync(device);
@@ -72,13 +81,30 @@ public async Task UpdateDeviceAsync(DeviceType type, string address, string newN
         {
             using (await _lock.LockAsync())
             {
-                var device = await _databaseConnection.Table<DeviceDTO>().Where(d => d.DeviceType == type && d.Address == address).FirstOrDefaultAsync();
+                var device = await GetDevice(type, address);
                 if (device != null)
                 {
                     device.Name = newName;
-                    await _databaseConnection.UpdateAsync(device);
+                    await _databaseConnection.UpdateWithChildrenAsync(device);
                 }
             }
         }
+
+        public async Task UpdateDeviceAsync(DeviceType type, string address, IEnumerable<DeviceSetting> settings)
+        {
+            using (await _lock.LockAsync())
+            {
+                var device = await GetDevice(type, address);
+                if (device != null)
+                {
+                    device.Settings = new(settings);
+                    await _databaseConnection.UpdateWithChildrenAsync(device);
+                }
+            }
+        }
+
+        private async Task<DeviceDTO?> GetDevice(DeviceType type, string address)
+            => (await _databaseConnection.GetAllWithChildrenAsync<DeviceDTO>(d => d.DeviceType == type && d.Address == address))
+                .FirstOrDefault();
     }
 }
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs b/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
new file mode 100644
index 00000000..3b0002ef
--- /dev/null
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
@@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System;
+
+namespace BrickController2.DeviceManagement;
+
+public record DeviceSetting
+{
+    /// <summary>Unique setting name</summary>
+    [JsonProperty]
+    public string Name { get; init; } = default!;
+
+    /// <summary>Current setting value</summary>
+    [JsonProperty]
+    public object Value { get; set; } = default!;
+
+    /// <summary>Type of setting value</summary>
+    [JsonIgnore]
+    public Type Type => Value?.GetType() ?? typeof(void);
+
+    [JsonIgnore]
+    public bool IsBoolType => Type == typeof(bool);
+
+    [JsonIgnore]
+    public bool IsEnumType => Type.IsEnum;
+}
diff --git a/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs b/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs
index d3a0c4b2..12d99c98 100644
--- a/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs
+++ b/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs
@@ -6,9 +6,10 @@ namespace BrickController2.DeviceManagement
     internal interface IDeviceRepository
     {
         Task<IEnumerable<DeviceDTO>> GetDevicesAsync();
-        Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] manufacturerData);
+        Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] manufacturerData, IEnumerable<DeviceSetting> settings);
         Task DeleteDeviceAsync(DeviceType type, string address);
         Task DeleteDevicesAsync();
         Task UpdateDeviceAsync(DeviceType type, string address, string newName);
+        Task UpdateDeviceAsync(DeviceType type, string address, IEnumerable<DeviceSetting> settings);
     }
 }
diff --git a/BrickController2/BrickController2/Extensions/DeviceSettingExtensions.cs b/BrickController2/BrickController2/Extensions/DeviceSettingExtensions.cs
new file mode 100644
index 00000000..d6ffc5de
--- /dev/null
+++ b/BrickController2/BrickController2/Extensions/DeviceSettingExtensions.cs
@@ -0,0 +1,26 @@
+using BrickController2.DeviceManagement;
+using System;
+
+namespace BrickController2.Extensions;
+
+public static class DeviceSettingExtensions
+{
+    public static TValue GetValue<TValue>(this DeviceSetting? setting, TValue defaultValue)
+    {
+        if (setting == null)
+            return defaultValue;
+
+        // special handling of enums
+        if (typeof(TValue).IsEnum)
+        {
+            var safeValue = Convert.ChangeType(setting.Value, Enum.GetUnderlyingType(typeof(TValue)));
+            if (Enum.IsDefined(typeof(TValue), safeValue))
+            {
+                return (TValue)Enum.ToObject(typeof(TValue), safeValue);
+            }
+            return defaultValue;
+        }
+
+        return (TValue)setting.Value;
+    }
+}
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.Designer.cs b/BrickController2/BrickController2/Resources/TranslationResources.Designer.cs
index c4b366c5..8380028e 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.Designer.cs
+++ b/BrickController2/BrickController2/Resources/TranslationResources.Designer.cs
@@ -19,7 +19,7 @@ namespace BrickController2.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class TranslationResources {
@@ -312,6 +312,15 @@ internal static string BuWizz2OutputLevel {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Swap channels.
+        /// </summary>
+        internal static string BuWizz2SwapChannels {
+            get {
+                return ResourceManager.GetString("BuWizz2SwapChannels", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to BuWizz output level.
         /// </summary>
@@ -546,6 +555,15 @@ internal static string Devices {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Device settings.
+        /// </summary>
+        internal static string DeviceSettings {
+            get {
+                return ResourceManager.GetString("DeviceSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Device type.
         /// </summary>
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.de.resx b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
index f144146b..974537a0 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.de.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
@@ -192,6 +192,9 @@
   <data name="BuWizz2OutputLevel" xml:space="preserve">
     <value>BuWizz 2 Ausgabelautstärke</value>
   </data>
+  <data name="BuWizz2SwapChannels" xml:space="preserve">
+    <value>Kanäle tauschen</value>
+  </data>
   <data name="BuWizzOutputLevel" xml:space="preserve">
     <value>BuWizz Ausgabelautstärke</value>
   </data>
@@ -504,4 +507,16 @@
   <data name="Yes" xml:space="preserve">
     <value>Ja</value>
   </data>
+  <data name="BuWizz2DefaultOutputLevel" xml:space="preserve">
+    <value>Standardausgangspegel</value>
+  </data>
+	<data name="BuWizzDefaultOutputLevel" xml:space="preserve">
+    <value>Standardausgangspegel</value>
+  </data>
+	<data name="On" xml:space="preserve">
+    <value>Ein</value>
+  </data>
+	<data name="Off" xml:space="preserve">
+    <value>Aus</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.resx b/BrickController2/BrickController2/Resources/TranslationResources.resx
index e7316017..48099dc7 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.resx
@@ -201,6 +201,9 @@
   <data name="BuWizz2OutputLevel" xml:space="preserve">
     <value>BuWizz 2 output level</value>
   </data>
+  <data name="BuWizz2SwapChannels" xml:space="preserve">
+    <value>Swap channels</value>
+  </data>
   <data name="BuWizzOutputLevel" xml:space="preserve">
     <value>BuWizz output level</value>
   </data>
@@ -279,6 +282,9 @@
   <data name="Devices" xml:space="preserve">
     <value>Devices</value>
   </data>
+  <data name="DeviceSettings" xml:space="preserve">
+    <value>Device settings</value>
+  </data>
   <data name="DeviceType" xml:space="preserve">
     <value>Device type</value>
   </data>
@@ -528,4 +534,16 @@
   <data name="Yes" xml:space="preserve">
     <value>Yes</value>
   </data>
+  <data name="BuWizz2DefaultOutputLevel" xml:space="preserve">
+    <value>Default output level</value>
+  </data>
+	<data name="BuWizzDefaultOutputLevel" xml:space="preserve">
+    <value>Default output level</value>
+  </data>
+	<data name="On" xml:space="preserve">
+    <value>On</value>
+  </data>
+	<data name="Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml b/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
index d8bef2af..d3747763 100644
--- a/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
@@ -39,6 +39,14 @@
                                         <SwipeItem Text="{extensions:Translate Delete}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource DeleteSwipeItemBackgroundColor}" Command="{Binding BindingContext.DeleteDeviceCommand, Source={x:Reference Page}}" CommandParameter="{Binding .}"/>
                                     </SwipeItems>
                                 </SwipeView.LeftItems>
+                                <SwipeView.RightItems>
+                                    <SwipeItems Mode="Reveal">
+                                        <controls:SwipeIcon Text="{extensions:Translate Settings}" Icon="settings" BackgroundColor="{DynamicResource SwipeItemBackgroundColor}"
+                                                            IsVisible="{Binding HasSettings}"
+                                                            Command="{Binding BindingContext.DeviceSettingsCommand, Source={x:Reference Page}}"
+                                                            CommandParameter="{Binding .}"/>
+                                    </SwipeItems>
+                                </SwipeView.RightItems>
                                 <VerticalStackLayout>
                                     <Grid Style="{StaticResource CollectionItemGridStyle}">
                                         <Grid.GestureRecognizers>
diff --git a/BrickController2/BrickController2/UI/Pages/DevicePage.xaml b/BrickController2/BrickController2/UI/Pages/DevicePage.xaml
index ea6ef53c..bb2163b1 100644
--- a/BrickController2/BrickController2/UI/Pages/DevicePage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/DevicePage.xaml
@@ -24,6 +24,9 @@
     <NavigationPage.TitleView>
         <Grid HorizontalOptions="FillAndExpand">
             <Label Text="{extensions:Translate Device}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center"/>
+            <HorizontalStackLayout HorizontalOptions="End" Margin="12,0" Spacing="12">
+                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_settings.png}" Command="{Binding OpenDeviceSettingsPageCommand}" Style="{StaticResource NavigationBarImageButtonStyle}"/>
+            </HorizontalStackLayout>
         </Grid>
     </NavigationPage.TitleView>
 
diff --git a/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
new file mode 100644
index 00000000..f38de83c
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<local:PageBase
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:BrickController2.UI.Controls"
+    xmlns:converters="clr-namespace:BrickController2.UI.Converters"
+    xmlns:extensions="clr-namespace:BrickController2.UI.MarkupExtensions"
+    xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
+    xmlns:local="clr-namespace:BrickController2.UI.Pages"
+    xmlns:vm="clr-namespace:BrickController2.UI.ViewModels"
+    xmlns:t="clr-namespace:BrickController2.UI.Templates"
+    x:Class="BrickController2.UI.Pages.DeviceSettingsPage"
+    Title="{extensions:Translate DeviceSettings}"
+    ios:Page.UseSafeArea="True"
+    BackgroundColor="{DynamicResource PageBackgroundColor}">
+
+    <local:PageBase.Resources>
+        <ResourceDictionary>
+            <converters:InverseBoolConverter x:Key="InverseBool"/>
+            <t:DataTemplatesSelector x:Key="TemplatesSelector">
+                <t:DataTemplatesSelector.BoolDataTemplate>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="2*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <Label Grid.Column="0" Text="{Binding DisplayName}" FontSize="Large" VerticalOptions="Center"/>
+                            <HorizontalStackLayout Grid.Column="1" Spacing="20">
+                                <Switch IsToggled="{Binding Value}" HorizontalOptions="Center" />
+                                <Label Text="{extensions:Translate On}" FontSize="Medium" VerticalOptions="Center" IsVisible="{Binding Value}"/>
+                                <Label Text="{extensions:Translate Off}" FontSize="Medium" VerticalOptions="Center" IsVisible="{Binding Value, Converter={StaticResource InverseBool}}"/>
+                            </HorizontalStackLayout>
+                        </Grid>
+                    </DataTemplate>
+                </t:DataTemplatesSelector.BoolDataTemplate>
+
+                <t:DataTemplatesSelector.EnumDataTemplate>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="2*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <Label Grid.Column="0" Text="{Binding DisplayName}" FontSize="Large" VerticalOptions="Center"/>
+                            <Button Grid.Column="1" Text="{Binding CurrentItem}" Command="{Binding SelectItemCommand}" Style="{StaticResource PickerButtonStyle}" HorizontalOptions="FillAndExpand"/>
+                        </Grid>
+                    </DataTemplate>
+                </t:DataTemplatesSelector.EnumDataTemplate>
+            </t:DataTemplatesSelector>
+        </ResourceDictionary>
+    </local:PageBase.Resources>
+
+    <local:PageBase.Content>
+        <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
+            <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <!-- Header -->
+                <Grid Grid.Row="0" Style="{StaticResource HeaderGridStyle}">
+                    <Label Text="{Binding Device.Name}" TextColor="{DynamicResource EditableTextColor}" FontSize="Large" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center" />
+                </Grid>
+
+                <!-- Setting list -->
+                <CollectionView Grid.Row="1" ItemsSource="{Binding Settings}" SelectionMode="None" Margin="10,20,10,10"
+                                ItemTemplate="{StaticResource TemplatesSelector}">
+                    <CollectionView.ItemsLayout>
+                        <GridItemsLayout Orientation="Vertical" VerticalItemSpacing="30" />
+                    </CollectionView.ItemsLayout>
+                </CollectionView>
+
+            </Grid>
+
+            <controls:Dialogs x:Name="Dialogs" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All"/>
+
+        </AbsoluteLayout>
+    </local:PageBase.Content>
+
+</local:PageBase>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml.cs b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml.cs
new file mode 100644
index 00000000..2798a31c
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml.cs
@@ -0,0 +1,18 @@
+using BrickController2.UI.Services.Background;
+using BrickController2.UI.Services.Dialog;
+using BrickController2.UI.ViewModels;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace BrickController2.UI.Pages
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class DeviceSettingsPage
+    {
+        public DeviceSettingsPage(PageViewModelBase vm, IBackgroundService backgroundService, IDialogServerHost dialogServerHost)
+            : base(backgroundService, dialogServerHost)
+        {
+            InitializeComponent();
+            AfterInitialize(vm);
+        }
+    }
+}
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs b/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
new file mode 100644
index 00000000..70569c2c
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
@@ -0,0 +1,23 @@
+using BrickController2.UI.ViewModels;
+using Microsoft.Maui.Controls;
+
+namespace BrickController2.UI.Templates;
+
+public class DataTemplatesSelector : DataTemplateSelector
+{
+    public DataTemplate BoolDataTemplate { get; set; } = default!;
+
+    public DataTemplate EnumDataTemplate { get; set; } = default!;
+
+    protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
+    {
+        var itemType = item.GetType();
+
+        if (itemType == typeof(DeviceBoolSettingViewModel))
+            return BoolDataTemplate;
+        if (itemType == typeof(DeviceEnumSettingViewModel))
+            return EnumDataTemplate;
+
+        return default!;
+    }
+}
diff --git a/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml b/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
index f61ae490..a6f514de 100644
--- a/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
+++ b/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
@@ -29,6 +29,7 @@
     <Color x:Key="CollectionViewSelectedItemBackgroundColor">#404040</Color>
     <Color x:Key="SwitchOnColor">Green</Color>
     <Color x:Key="SwitchThumbColor">LightGreen</Color>
+    <Color x:Key="SwitchThumbColorOff">#606060</Color>
     <Color x:Key="SliderMinimumTrackColor">#606060</Color>
     <Color x:Key="SliderMaximumTrackColor">#606060</Color>
     <Color x:Key="SliderThumbColor">LightGray</Color>
diff --git a/BrickController2/BrickController2/UI/Themes/LightTheme.xaml b/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
index af383f66..5f82c472 100644
--- a/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
+++ b/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
@@ -29,6 +29,7 @@
     <Color x:Key="CollectionViewSelectedItemBackgroundColor">Gray</Color>
     <Color x:Key="SwitchOnColor">LightGreen</Color>
     <Color x:Key="SwitchThumbColor">DarkGreen</Color>
+    <Color x:Key="SwitchThumbColorOff">Gray</Color>
     <Color x:Key="SliderMinimumTrackColor">#c0c0c0</Color>
     <Color x:Key="SliderMaximumTrackColor">#c0c0c0</Color>
     <Color x:Key="SliderThumbColor">#303030</Color>
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
new file mode 100644
index 00000000..30fae056
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
@@ -0,0 +1,27 @@
+using BrickController2.DeviceManagement;
+using BrickController2.UI.Services.Translation;
+
+namespace BrickController2.UI.ViewModels
+{
+    public class DeviceBoolSettingViewModel : DeviceSettingViewModelBase
+    {
+        public DeviceBoolSettingViewModel(DeviceSettingsPageViewModel parent, DeviceSetting setting, ITranslationService translationService) 
+            : base(parent, setting, translationService)
+        {
+        }
+
+        public object Value
+        {
+            get => Setting.Value;
+            set
+            {
+                if (Setting.Value != value)
+                {
+                    HasChanged |= true;
+                    Setting.Value = value;
+                    RaisePropertyChanged();
+                }
+            }
+        }
+    }
+}
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
new file mode 100644
index 00000000..9018bf00
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
@@ -0,0 +1,48 @@
+using BrickController2.DeviceManagement;
+using BrickController2.UI.Commands;
+using BrickController2.UI.Services.Translation;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace BrickController2.UI.ViewModels
+{
+    public class DeviceEnumSettingViewModel : DeviceSettingViewModelBase
+    {
+        public DeviceEnumSettingViewModel(DeviceSettingsPageViewModel parentModel,
+            DeviceSetting setting,
+            ITranslationService translationService)
+             : base(parentModel, setting, translationService)
+        {
+            SelectItemCommand = new SafeCommand(SelectItemAsync);
+        }
+
+        public IEnumerable<string> Items => Enum.GetNames(Setting.Type);
+        public ICommand SelectItemCommand { get; }
+
+        public string CurrentItem
+        {
+            get => Enum.GetName(Setting.Type, Setting.Value)!;
+            set
+            {
+                var enumValue = Enum.Parse(Setting.Type, value);
+                if (!enumValue.Equals(Setting.Value))
+                {
+                    HasChanged |= true;
+                    Setting.Value = enumValue;
+                    RaisePropertyChanged();
+                }
+            }
+        }
+
+        private async Task SelectItemAsync()
+        {
+            var result = await ShowSelectionDialogAsync<string>(Items);
+            if (result.IsOk)
+            {
+                CurrentItem = result.SelectedItem;
+            }
+        }
+    }
+}
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs
index 4e8f6fd7..46a8e41c 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs
@@ -31,6 +31,7 @@ public DeviceListPageViewModel(
             ScanCommand = new SafeCommand(async () => await ScanAsync(), () => !DeviceManager.IsScanning);
             DeviceTappedCommand = new SafeCommand<Device>(async device => await NavigationService.NavigateToAsync<DevicePageViewModel>(new NavigationParameters(("device", device))));
             DeleteDeviceCommand = new SafeCommand<Device>(async device => await DeleteDeviceAsync(device));
+            DeviceSettingsCommand = new SafeCommand<Device>(OpenDeviceSettingsAsync);
         }
 
         public IDeviceManager DeviceManager { get; }
@@ -38,6 +39,7 @@ public DeviceListPageViewModel(
         public ICommand ScanCommand { get; }
         public ICommand DeviceTappedCommand { get; }
         public ICommand DeleteDeviceCommand { get; }
+        public ICommand DeviceSettingsCommand { get; }
 
         public override void OnAppearing()
         {
@@ -74,6 +76,17 @@ await _dialogService.ShowProgressDialogAsync(
             }
         }
 
+        private async Task OpenDeviceSettingsAsync(Device device)
+        {
+            try
+            {
+                await NavigationService.NavigateToAsync<DeviceSettingsPageViewModel>(new (device));
+            }
+            catch (OperationCanceledException)
+            {
+            }
+        }
+
         private async Task ScanAsync()
         {
             if (!DeviceManager.IsBluetoothOn)
diff --git a/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
index 02356c40..f100f947 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
@@ -38,6 +38,8 @@ public DevicePageViewModel(
             _dialogService = dialogService;
 
             Device = parameters.Get<Device>("device");
+            BuWizzOutputLevel = Device.DefaultOutputLevel;
+            BuWizz2OutputLevel = Device.DefaultOutputLevel;
             DeviceOutputs =  Enumerable
                 .Range(0, Device.NumberOfChannels)
                 .Select(channel => new DeviceOutputViewModel(Device, channel))
@@ -46,18 +48,25 @@ public DevicePageViewModel(
             RenameCommand = new SafeCommand(async () => await RenameDeviceAsync());
             BuWizzOutputLevelChangedCommand = new SafeCommand<int>(outputLevel => SetBuWizzOutputLevel(outputLevel));
             BuWizz2OutputLevelChangedCommand = new SafeCommand<int>(outputLevel => SetBuWizzOutputLevel(outputLevel));
+            OpenDeviceSettingsPageCommand = new SafeCommand(async () => await navigationService.NavigateToAsync<DeviceSettingsPageViewModel>(new (Device)),
+                () => CanOpenSettings);
         }
 
         public Device Device { get; }
         public bool IsBuWizzDevice => Device.DeviceType == DeviceType.BuWizz;
         public bool IsBuWizz2Device => Device.DeviceType == DeviceType.BuWizz2;
 
+        public bool CanOpenSettings => Device.HasSettings &&
+            Device.DeviceState == DeviceState.Connected &&
+            !_deviceManager.IsScanning;
+
         public ICommand RenameCommand { get; }
         public ICommand BuWizzOutputLevelChangedCommand { get; }
         public ICommand BuWizz2OutputLevelChangedCommand { get; }
+        public ICommand OpenDeviceSettingsPageCommand { get; }
 
-        public int BuWizzOutputLevel { get; set; } = 1;
-        public int BuWizz2OutputLevel { get; set; } = 1;
+        public int BuWizzOutputLevel { get; set; }
+        public int BuWizz2OutputLevel { get; set; }
 
         public IEnumerable<DeviceOutputViewModel> DeviceOutputs { get; }
 
@@ -204,6 +213,8 @@ await _dialogService.ShowMessageBoxAsync(
                             {
                                 SetBuWizzOutputLevel(BuWizz2OutputLevel);
                             }
+                            // update command enablement
+                            UpdateCommandsAvailability();
                         }
                     }
                 }
@@ -216,6 +227,13 @@ await _dialogService.ShowMessageBoxAsync(
 
         private void OnDeviceDisconnected(Device device)
         {
+            // update command enablement
+            UpdateCommandsAvailability();
+        }
+
+        private void UpdateCommandsAvailability()
+        {
+            OpenDeviceSettingsPageCommand.RaiseCanExecuteChanged();
         }
 
         private void SetBuWizzOutputLevel(int level)
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
new file mode 100644
index 00000000..0d03cf8b
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
@@ -0,0 +1,37 @@
+using BrickController2.DeviceManagement;
+using BrickController2.Helpers;
+using BrickController2.UI.Services.Dialog;
+using BrickController2.UI.Services.Translation;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace BrickController2.UI.ViewModels
+{
+    public abstract class DeviceSettingViewModelBase : NotifyPropertyChangedSource
+    {
+        protected readonly ITranslationService TranslationService;
+
+        protected DeviceSettingViewModelBase(DeviceSettingsPageViewModel parent,
+            DeviceSetting setting,
+            ITranslationService translationService)
+        {
+            Setting = setting with { };
+            Parent = parent;
+            TranslationService = translationService;
+        }
+
+        public string DisplayName => TranslationService.Translate(Setting.Name);
+
+        public bool HasChanged { get; protected set; }
+
+        public DeviceSetting Setting { get; }
+        public DeviceSettingsPageViewModel Parent { get; }
+
+        protected Task<SelectionDialogResult<T>> ShowSelectionDialogAsync<T>(IEnumerable<T> items) where T : notnull
+            => Parent.DialogService.ShowSelectionDialogAsync(
+                items,
+                DisplayName,
+                TranslationService.Translate("Cancel"),
+                Parent.DisappearingToken);
+    }
+}
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
new file mode 100644
index 00000000..0f61d245
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
@@ -0,0 +1,55 @@
+using BrickController2.DeviceManagement;
+using BrickController2.UI.Services.Dialog;
+using BrickController2.UI.Services.Navigation;
+using BrickController2.UI.Services.Translation;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace BrickController2.UI.ViewModels;
+
+public class DeviceSettingsPageViewModel : PageViewModelBase
+{
+    public DeviceSettingsPageViewModel(
+        INavigationService navigationService,
+        ITranslationService translationService,
+        IDialogService dialogService,
+        NavigationParameters parameters) : base(navigationService, translationService)
+    {
+        Device = parameters.Get<Device>("device");
+        Settings = new ObservableCollection<DeviceSettingViewModelBase>(Device.CurrentSettings.Select(ToViewModel));
+        DialogService = dialogService;
+    }
+
+    public Device Device { get; }
+    public IDialogService DialogService { get; }
+
+    public ObservableCollection<DeviceSettingViewModelBase> Settings { get; }
+
+    public override async void OnDisappearing()
+    {
+        base.OnDisappearing();
+
+        // update changed settings on exit
+        var changedSettings = Settings
+            .Where(s => s.HasChanged)
+            .Select(s => s.Setting)
+            .ToArray();
+
+        if (changedSettings.Any())
+            await Device.UpdateDeviceSettingsAsync(changedSettings);
+    }
+
+    private DeviceSettingViewModelBase ToViewModel(DeviceSetting setting)
+    {
+        if (setting.IsBoolType)
+        {
+            return new DeviceBoolSettingViewModel(this, setting, TranslationService);
+        }
+        if (setting.IsEnumType)
+        {
+            return new DeviceEnumSettingViewModel(this, setting, TranslationService);
+        }
+        throw new InvalidOperationException($"The specified type {setting.Type} is not supported.");
+    }
+}

From 715d0f41a3d6fc714305255afd0150dfd5bb40d6 Mon Sep 17 00:00:00 2001
From: Vit Nemecky <vit.nemecky@centrum.cz>
Date: Sun, 29 Dec 2024 11:10:25 +0100
Subject: [PATCH 2/4] Allow to reset all device settings to defaults (#81)

* Allow to reset all settings to defaults
* Finetune styling
* Apply changes using progress dialog
---
 .../DeviceManagement/Device.cs                |  3 +-
 .../DeviceManagement/DeviceSetting.cs         |  6 ++
 .../Resources/TranslationResources.de.resx    |  3 +
 .../Resources/TranslationResources.resx       |  3 +
 .../UI/Commands/CommandExtensions.cs          | 14 ++++
 .../UI/Commands/SafeCommand.cs                |  4 +-
 .../UI/Pages/DeviceListPage.xaml              |  8 +--
 .../UI/Pages/DeviceSettingsPage.xaml          | 29 ++++++--
 .../BrickController2/UI/Themes/DarkTheme.xaml |  1 +
 .../UI/Themes/LightTheme.xaml                 |  1 +
 .../ViewModels/DeviceBoolSettingViewModel.cs  |  7 +-
 .../ViewModels/DeviceEnumSettingViewModel.cs  |  7 +-
 .../UI/ViewModels/DeviceListPageViewModel.cs  |  2 +-
 .../UI/ViewModels/DevicePageViewModel.cs      |  2 +-
 .../ViewModels/DeviceSettingViewModelBase.cs  |  8 ++-
 .../ViewModels/DeviceSettingsPageViewModel.cs | 68 ++++++++++++++++---
 16 files changed, 138 insertions(+), 28 deletions(-)
 create mode 100644 BrickController2/BrickController2/UI/Commands/CommandExtensions.cs

diff --git a/BrickController2/BrickController2/DeviceManagement/Device.cs b/BrickController2/BrickController2/DeviceManagement/Device.cs
index b988dad3..caa65413 100644
--- a/BrickController2/BrickController2/DeviceManagement/Device.cs
+++ b/BrickController2/BrickController2/DeviceManagement/Device.cs
@@ -150,7 +150,8 @@ protected void SetSettingValue<TValue>(string settingName, IEnumerable<DeviceSet
             _settings[settingName] = new DeviceSetting
             {
                 Name = settingName,
-                Value = foundSetting.GetValue(defaultValue)
+                Value = foundSetting.GetValue(defaultValue),
+                DefaultValue = defaultValue
             };
         }
 
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs b/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
index 3b0002ef..0a41d6d6 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
@@ -10,9 +10,15 @@ public record DeviceSetting
     public string Name { get; init; } = default!;
 
     /// <summary>Current setting value</summary>
+    /// <remarks>Type should match <see cref="DefaultValue"/></remarks>
     [JsonProperty]
     public object Value { get; set; } = default!;
 
+    /// <summary>Default setting value</summary>
+    /// <remarks>This is not persisted, but kept in memory only</remarks>
+    [JsonIgnore]
+    public object DefaultValue { get; init; } = default!;
+
     /// <summary>Type of setting value</summary>
     [JsonIgnore]
     public Type Type => Value?.GetType() ?? typeof(void);
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.de.resx b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
index 974537a0..7a599855 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.de.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
@@ -519,4 +519,7 @@
 	<data name="Off" xml:space="preserve">
     <value>Aus</value>
   </data>
+  <data name="ResetToDefaults" xml:space="preserve">
+    <value>Die Einstellungen zurücksetzen</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.resx b/BrickController2/BrickController2/Resources/TranslationResources.resx
index 48099dc7..12cbe081 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.resx
@@ -546,4 +546,7 @@
 	<data name="Off" xml:space="preserve">
     <value>Off</value>
   </data>
+  <data name="ResetToDefaults" xml:space="preserve">
+    <value>Reset settings to default</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Commands/CommandExtensions.cs b/BrickController2/BrickController2/UI/Commands/CommandExtensions.cs
new file mode 100644
index 00000000..872c6e07
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Commands/CommandExtensions.cs
@@ -0,0 +1,14 @@
+using System.Windows.Input;
+
+namespace BrickController2.UI.Commands;
+
+internal static class CommandExtensions
+{
+    internal static void RaiseCanExecuteChanged(this ICommand command)
+    {
+        if (command is SafeCommand cmd)
+        {
+            cmd.RaiseCanExecuteChanged();
+        }
+    }
+}
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Commands/SafeCommand.cs b/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
index 6838c7dd..3bf5a81b 100644
--- a/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
+++ b/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
@@ -58,7 +58,7 @@ public async void Execute(object? parameter)
             }
         }
 
-        private void RaiseCanExecuteChanged()
+        internal void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
@@ -106,7 +106,7 @@ public async void Execute(object? parameter)
             }
         }
 
-        private void RaiseCanExecuteChanged()
+        internal void RaiseCanExecuteChanged()
         {
             CanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
diff --git a/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml b/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
index d3747763..95d1c33d 100644
--- a/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/DeviceListPage.xaml
@@ -41,10 +41,10 @@
                                 </SwipeView.LeftItems>
                                 <SwipeView.RightItems>
                                     <SwipeItems Mode="Reveal">
-                                        <controls:SwipeIcon Text="{extensions:Translate Settings}" Icon="settings" BackgroundColor="{DynamicResource SwipeItemBackgroundColor}"
-                                                            IsVisible="{Binding HasSettings}"
-                                                            Command="{Binding BindingContext.DeviceSettingsCommand, Source={x:Reference Page}}"
-                                                            CommandParameter="{Binding .}"/>
+                                        <SwipeItem Text="{extensions:Translate Settings}" IconImageSource="{extensions:ImageResource Source=ic_settings.png}" BackgroundColor="{DynamicResource SwipeItemBackgroundColor}"
+                                                   IsVisible="{Binding HasSettings}"
+                                                   Command="{Binding BindingContext.DeviceSettingsCommand, Source={x:Reference Page}}"
+                                                   CommandParameter="{Binding .}"/>
                                     </SwipeItems>
                                 </SwipeView.RightItems>
                                 <VerticalStackLayout>
diff --git a/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
index f38de83c..9abc13e4 100644
--- a/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
@@ -17,6 +17,11 @@
     <local:PageBase.Resources>
         <ResourceDictionary>
             <converters:InverseBoolConverter x:Key="InverseBool"/>
+            <Style x:Key="settingLabel" TargetType="Label">
+                <Setter Property="HorizontalOptions" Value="Start" />
+                <Setter Property="VerticalOptions" Value="Center" />
+                <Setter Property="FontSize" Value="Medium" />
+            </Style>
             <t:DataTemplatesSelector x:Key="TemplatesSelector">
                 <t:DataTemplatesSelector.BoolDataTemplate>
                     <DataTemplate>
@@ -29,11 +34,11 @@
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
 
-                            <Label Grid.Column="0" Text="{Binding DisplayName}" FontSize="Large" VerticalOptions="Center"/>
+                            <Label Grid.Column="0" Text="{Binding DisplayName}" Style="{StaticResource Key=settingLabel}"/>
                             <HorizontalStackLayout Grid.Column="1" Spacing="20">
                                 <Switch IsToggled="{Binding Value}" HorizontalOptions="Center" />
-                                <Label Text="{extensions:Translate On}" FontSize="Medium" VerticalOptions="Center" IsVisible="{Binding Value}"/>
-                                <Label Text="{extensions:Translate Off}" FontSize="Medium" VerticalOptions="Center" IsVisible="{Binding Value, Converter={StaticResource InverseBool}}"/>
+                                <Label Text="{extensions:Translate On}" Style="{StaticResource Key=settingLabel}" IsVisible="{Binding Value}"/>
+                                <Label Text="{extensions:Translate Off}" Style="{StaticResource Key=settingLabel}" IsVisible="{Binding Value, Converter={StaticResource InverseBool}}"/>
                             </HorizontalStackLayout>
                         </Grid>
                     </DataTemplate>
@@ -50,7 +55,7 @@
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
 
-                            <Label Grid.Column="0" Text="{Binding DisplayName}" FontSize="Large" VerticalOptions="Center"/>
+                            <Label Grid.Column="0" Text="{Binding DisplayName}" Style="{StaticResource Key=settingLabel}"/>
                             <Button Grid.Column="1" Text="{Binding CurrentItem}" Command="{Binding SelectItemCommand}" Style="{StaticResource PickerButtonStyle}" HorizontalOptions="FillAndExpand"/>
                         </Grid>
                     </DataTemplate>
@@ -59,6 +64,16 @@
         </ResourceDictionary>
     </local:PageBase.Resources>
 
+    <NavigationPage.TitleView>
+        <Grid HorizontalOptions="FillAndExpand">
+            <Label Text="{extensions:Translate DeviceSettings}" TextColor="{DynamicResource NavigationBarItemColor}" FontSize="Medium" FontAttributes="Bold" VerticalOptions="Center"/>
+            <HorizontalStackLayout HorizontalOptions="End" Margin="12,0" Spacing="12">
+                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_delete.png}" Command="{Binding ResetToDefaultsCommand}" Style="{StaticResource NavigationBarImageButtonStyle}"/>
+                <controls:ImageButton ImageSource="{extensions:ImageResource Source=ic_checkmark.png}" Command="{Binding SaveSettingsCommand}" Style="{StaticResource NavigationBarImageButtonStyle}"/>
+            </HorizontalStackLayout>
+        </Grid>
+    </NavigationPage.TitleView>
+    
     <local:PageBase.Content>
         <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
             <Grid RowSpacing="0" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
@@ -70,14 +85,14 @@
 
                 <!-- Header -->
                 <Grid Grid.Row="0" Style="{StaticResource HeaderGridStyle}">
-                    <Label Text="{Binding Device.Name}" TextColor="{DynamicResource EditableTextColor}" FontSize="Large" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center" />
+                    <Label Text="{Binding Device.Name}" TextColor="{DynamicResource PrimaryTextColor}" FontSize="Large" FontAttributes="Bold" HorizontalOptions="Start" VerticalOptions="Center" />
                 </Grid>
 
                 <!-- Setting list -->
-                <CollectionView Grid.Row="1" ItemsSource="{Binding Settings}" SelectionMode="None" Margin="10,20,10,10"
+                <CollectionView Grid.Row="1" ItemsSource="{Binding Settings}" SelectionMode="None" Margin="10,10,10,10"
                                 ItemTemplate="{StaticResource TemplatesSelector}">
                     <CollectionView.ItemsLayout>
-                        <GridItemsLayout Orientation="Vertical" VerticalItemSpacing="30" />
+                        <GridItemsLayout Orientation="Vertical" VerticalItemSpacing="10" />
                     </CollectionView.ItemsLayout>
                 </CollectionView>
 
diff --git a/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml b/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
index a6f514de..e8ef2e9f 100644
--- a/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
+++ b/BrickController2/BrickController2/UI/Themes/DarkTheme.xaml
@@ -25,6 +25,7 @@
     <Color x:Key="DialogBackgroundColor">#202020</Color>
     <Color x:Key="DialogBorderColor">Gray</Color>
     <Color x:Key="DeleteSwipeItemBackgroundColor">Red</Color>
+    <Color x:Key="SwipeItemBackgroundColor">Green</Color>
     <Color x:Key="CollectionViewHeaderBackgroundColor">#202020</Color>
     <Color x:Key="CollectionViewSelectedItemBackgroundColor">#404040</Color>
     <Color x:Key="SwitchOnColor">Green</Color>
diff --git a/BrickController2/BrickController2/UI/Themes/LightTheme.xaml b/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
index 5f82c472..67456b3e 100644
--- a/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
+++ b/BrickController2/BrickController2/UI/Themes/LightTheme.xaml
@@ -25,6 +25,7 @@
     <Color x:Key="DialogBackgroundColor">White</Color>
     <Color x:Key="DialogBorderColor">White</Color>
     <Color x:Key="DeleteSwipeItemBackgroundColor">LightPink</Color>
+    <Color x:Key="SwipeItemBackgroundColor">LightGreen</Color>
     <Color x:Key="CollectionViewHeaderBackgroundColor">#f0f0f0</Color>
     <Color x:Key="CollectionViewSelectedItemBackgroundColor">Gray</Color>
     <Color x:Key="SwitchOnColor">LightGreen</Color>
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
index 30fae056..2bbf25d7 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
@@ -17,11 +17,16 @@ public object Value
             {
                 if (Setting.Value != value)
                 {
-                    HasChanged |= true;
                     Setting.Value = value;
                     RaisePropertyChanged();
+                    Parent.OnSettingChanged();
                 }
             }
         }
+
+        internal override void ResetToDefault()
+        {
+            Value = Setting.DefaultValue;
+        }
     }
 }
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
index 9018bf00..9fb2fecf 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
@@ -29,13 +29,18 @@ public string CurrentItem
                 var enumValue = Enum.Parse(Setting.Type, value);
                 if (!enumValue.Equals(Setting.Value))
                 {
-                    HasChanged |= true;
                     Setting.Value = enumValue;
                     RaisePropertyChanged();
+                    Parent.OnSettingChanged();
                 }
             }
         }
 
+        internal override void ResetToDefault()
+        {
+            CurrentItem = Enum.GetName(Setting.Type, Setting.DefaultValue)!;
+        }
+
         private async Task SelectItemAsync()
         {
             var result = await ShowSelectionDialogAsync<string>(Items);
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs
index 46a8e41c..22ddf2cb 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceListPageViewModel.cs
@@ -80,7 +80,7 @@ private async Task OpenDeviceSettingsAsync(Device device)
         {
             try
             {
-                await NavigationService.NavigateToAsync<DeviceSettingsPageViewModel>(new (device));
+                await NavigationService.NavigateToAsync<DeviceSettingsPageViewModel>(new (("device", device)));
             }
             catch (OperationCanceledException)
             {
diff --git a/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
index f100f947..50d55a7b 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DevicePageViewModel.cs
@@ -48,7 +48,7 @@ public DevicePageViewModel(
             RenameCommand = new SafeCommand(async () => await RenameDeviceAsync());
             BuWizzOutputLevelChangedCommand = new SafeCommand<int>(outputLevel => SetBuWizzOutputLevel(outputLevel));
             BuWizz2OutputLevelChangedCommand = new SafeCommand<int>(outputLevel => SetBuWizzOutputLevel(outputLevel));
-            OpenDeviceSettingsPageCommand = new SafeCommand(async () => await navigationService.NavigateToAsync<DeviceSettingsPageViewModel>(new (Device)),
+            OpenDeviceSettingsPageCommand = new SafeCommand(async () => await navigationService.NavigateToAsync<DeviceSettingsPageViewModel>(new (("device", Device))),
                 () => CanOpenSettings);
         }
 
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
index 0d03cf8b..1b4e977d 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
@@ -9,12 +9,14 @@ namespace BrickController2.UI.ViewModels
 {
     public abstract class DeviceSettingViewModelBase : NotifyPropertyChangedSource
     {
+        private readonly object _originalValue;
         protected readonly ITranslationService TranslationService;
 
         protected DeviceSettingViewModelBase(DeviceSettingsPageViewModel parent,
             DeviceSetting setting,
             ITranslationService translationService)
         {
+            _originalValue = setting.Value;
             Setting = setting with { };
             Parent = parent;
             TranslationService = translationService;
@@ -22,11 +24,15 @@ protected DeviceSettingViewModelBase(DeviceSettingsPageViewModel parent,
 
         public string DisplayName => TranslationService.Translate(Setting.Name);
 
-        public bool HasChanged { get; protected set; }
+        public bool HasChanged => !Setting.Value.Equals(_originalValue);
+
+        public bool HasNonDefaultValue => !Setting.Value.Equals(Setting.DefaultValue);
 
         public DeviceSetting Setting { get; }
         public DeviceSettingsPageViewModel Parent { get; }
 
+        internal abstract void ResetToDefault();
+
         protected Task<SelectionDialogResult<T>> ShowSelectionDialogAsync<T>(IEnumerable<T> items) where T : notnull
             => Parent.DialogService.ShowSelectionDialogAsync(
                 items,
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
index 0f61d245..0feebea2 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
@@ -1,15 +1,21 @@
 using BrickController2.DeviceManagement;
+using BrickController2.UI.Commands;
 using BrickController2.UI.Services.Dialog;
 using BrickController2.UI.Services.Navigation;
 using BrickController2.UI.Services.Translation;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace BrickController2.UI.ViewModels;
 
 public class DeviceSettingsPageViewModel : PageViewModelBase
 {
+    private CancellationTokenSource? _disappearingTokenSource;
+
     public DeviceSettingsPageViewModel(
         INavigationService navigationService,
         ITranslationService translationService,
@@ -19,25 +25,36 @@ public DeviceSettingsPageViewModel(
         Device = parameters.Get<Device>("device");
         Settings = new ObservableCollection<DeviceSettingViewModelBase>(Device.CurrentSettings.Select(ToViewModel));
         DialogService = dialogService;
+
+        SaveSettingsCommand = new SafeCommand(ApplyChanges, () => Settings.Any(x => x.HasChanged));
+        ResetToDefaultsCommand = new SafeCommand(ResetToDefaults, () => Settings.Any(x => x.HasNonDefaultValue));
     }
 
+    public ICommand SaveSettingsCommand { get; }
+    public ICommand ResetToDefaultsCommand { get; }
+
     public Device Device { get; }
     public IDialogService DialogService { get; }
 
     public ObservableCollection<DeviceSettingViewModelBase> Settings { get; }
 
-    public override async void OnDisappearing()
+    public CancellationToken DisappearingToken => _disappearingTokenSource?.Token ?? default;
+
+    public override void OnAppearing()
     {
-        base.OnDisappearing();
+        _disappearingTokenSource?.Cancel();
+        _disappearingTokenSource = new CancellationTokenSource();
+    }
 
-        // update changed settings on exit
-        var changedSettings = Settings
-            .Where(s => s.HasChanged)
-            .Select(s => s.Setting)
-            .ToArray();
+    public override void OnDisappearing()
+    {
+        _disappearingTokenSource?.Cancel();
+    }
 
-        if (changedSettings.Any())
-            await Device.UpdateDeviceSettingsAsync(changedSettings);
+    internal void OnSettingChanged()
+    {
+        SaveSettingsCommand.RaiseCanExecuteChanged();
+        ResetToDefaultsCommand.RaiseCanExecuteChanged();
     }
 
     private DeviceSettingViewModelBase ToViewModel(DeviceSetting setting)
@@ -52,4 +69,37 @@ private DeviceSettingViewModelBase ToViewModel(DeviceSetting setting)
         }
         throw new InvalidOperationException($"The specified type {setting.Type} is not supported.");
     }
+
+    private async Task ApplyChanges()
+    {
+        try
+        {
+            await DialogService.ShowProgressDialogAsync(
+                false,
+                async (progressDialog, token) =>
+                {
+                    var changedSettings = Settings
+                        .Where(s => s.HasChanged)
+                        .Select(s => s.Setting)
+                        .ToArray();
+
+                    await Device.UpdateDeviceSettingsAsync(changedSettings);
+                },
+                Translate("Saving"),
+                token: DisappearingToken);
+
+            await NavigationService.NavigateBackAsync();
+        }
+        catch (OperationCanceledException)
+        {
+        }
+    }
+
+    private void ResetToDefaults()
+    {
+        foreach (var setting in Settings.Where(s => s.HasNonDefaultValue))
+        {
+            setting.ResetToDefault();
+        }
+    }
 }

From 4e1b02891c8f8eb24a5633fc1d49ffed76dbf3b1 Mon Sep 17 00:00:00 2001
From: Vit Nemecky <vico@centrum.cz>
Date: Wed, 1 Jan 2025 21:27:28 +0100
Subject: [PATCH 3/4] finetune

---
 .../Resources/TranslationResources.de.resx        | 15 +++++++++------
 .../UI/Templates/DataTemplatesSelector.cs         |  2 +-
 .../UI/ViewModels/DeviceSettingsPageViewModel.cs  |  1 +
 .../{ => Settings}/DeviceBoolSettingViewModel.cs  |  4 ++--
 .../{ => Settings}/DeviceEnumSettingViewModel.cs  |  4 ++--
 .../{ => Settings}/DeviceSettingViewModelBase.cs  |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)
 rename BrickController2/BrickController2/UI/ViewModels/{ => Settings}/DeviceBoolSettingViewModel.cs (93%)
 rename BrickController2/BrickController2/UI/ViewModels/{ => Settings}/DeviceEnumSettingViewModel.cs (93%)
 rename BrickController2/BrickController2/UI/ViewModels/{ => Settings}/DeviceSettingViewModelBase.cs (96%)

diff --git a/BrickController2/BrickController2/Resources/TranslationResources.de.resx b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
index 7a599855..75c9c9d4 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.de.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
@@ -267,6 +267,9 @@
   <data name="Devices" xml:space="preserve">
     <value>Geräte</value>
   </data>
+  <data name="DeviceSettings" xml:space="preserve">
+    <value>Geräteeinstellungen</value>
+  </data>
   <data name="DeviceType" xml:space="preserve">
     <value>Gerätetyp</value>
   </data>
@@ -471,9 +474,6 @@
   <data name="ShortChannel" xml:space="preserve">
     <value>Ka</value>
   </data>
-  <data name="String1" xml:space="preserve">
-    <value>Joy Aktive Zone</value>
-  </data>
   <data name="System" xml:space="preserve">
     <value>System</value>
   </data>
@@ -510,16 +510,19 @@
   <data name="BuWizz2DefaultOutputLevel" xml:space="preserve">
     <value>Standardausgangspegel</value>
   </data>
-	<data name="BuWizzDefaultOutputLevel" xml:space="preserve">
+  <data name="BuWizzDefaultOutputLevel" xml:space="preserve">
     <value>Standardausgangspegel</value>
   </data>
-	<data name="On" xml:space="preserve">
+  <data name="On" xml:space="preserve">
     <value>Ein</value>
   </data>
-	<data name="Off" xml:space="preserve">
+  <data name="Off" xml:space="preserve">
     <value>Aus</value>
   </data>
   <data name="ResetToDefaults" xml:space="preserve">
     <value>Die Einstellungen zurücksetzen</value>
   </data>
+  <data name="String1" xml:space="preserve">
+    <value>Joy Aktive Zone</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs b/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
index 70569c2c..f2ffa4b9 100644
--- a/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
+++ b/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
@@ -1,4 +1,4 @@
-using BrickController2.UI.ViewModels;
+using BrickController2.UI.ViewModels.Settings;
 using Microsoft.Maui.Controls;
 
 namespace BrickController2.UI.Templates;
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
index 0feebea2..983eb540 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
@@ -3,6 +3,7 @@
 using BrickController2.UI.Services.Dialog;
 using BrickController2.UI.Services.Navigation;
 using BrickController2.UI.Services.Translation;
+using BrickController2.UI.ViewModels.Settings;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceBoolSettingViewModel.cs
similarity index 93%
rename from BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
rename to BrickController2/BrickController2/UI/ViewModels/Settings/DeviceBoolSettingViewModel.cs
index 2bbf25d7..432556ca 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceBoolSettingViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceBoolSettingViewModel.cs
@@ -1,11 +1,11 @@
 using BrickController2.DeviceManagement;
 using BrickController2.UI.Services.Translation;
 
-namespace BrickController2.UI.ViewModels
+namespace BrickController2.UI.ViewModels.Settings
 {
     public class DeviceBoolSettingViewModel : DeviceSettingViewModelBase
     {
-        public DeviceBoolSettingViewModel(DeviceSettingsPageViewModel parent, DeviceSetting setting, ITranslationService translationService) 
+        public DeviceBoolSettingViewModel(DeviceSettingsPageViewModel parent, DeviceSetting setting, ITranslationService translationService)
             : base(parent, setting, translationService)
         {
         }
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceEnumSettingViewModel.cs
similarity index 93%
rename from BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
rename to BrickController2/BrickController2/UI/ViewModels/Settings/DeviceEnumSettingViewModel.cs
index 9fb2fecf..f37608bf 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceEnumSettingViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceEnumSettingViewModel.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace BrickController2.UI.ViewModels
+namespace BrickController2.UI.ViewModels.Settings
 {
     public class DeviceEnumSettingViewModel : DeviceSettingViewModelBase
     {
@@ -43,7 +43,7 @@ internal override void ResetToDefault()
 
         private async Task SelectItemAsync()
         {
-            var result = await ShowSelectionDialogAsync<string>(Items);
+            var result = await ShowSelectionDialogAsync(Items);
             if (result.IsOk)
             {
                 CurrentItem = result.SelectedItem;
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceSettingViewModelBase.cs
similarity index 96%
rename from BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
rename to BrickController2/BrickController2/UI/ViewModels/Settings/DeviceSettingViewModelBase.cs
index 1b4e977d..af653b35 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingViewModelBase.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceSettingViewModelBase.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace BrickController2.UI.ViewModels
+namespace BrickController2.UI.ViewModels.Settings
 {
     public abstract class DeviceSettingViewModelBase : NotifyPropertyChangedSource
     {

From 221d40db2ba3ee4c55ecef1f5b906a309b795b0b Mon Sep 17 00:00:00 2001
From: Vit Nemecky <vico@centrum.cz>
Date: Sun, 5 Jan 2025 12:01:03 +0100
Subject: [PATCH 4/4] Refactor DeviceSettings as generic NamedSetting

---
 .../DeviceManagement/BuWizz2Device.cs         |   3 +-
 .../DeviceManagement/BuwizzDevice.cs          |   3 +-
 .../DeviceManagement/Device.cs                |  18 +--
 .../DeviceManagement/DeviceDTO.cs             |   5 +-
 .../DeviceManagement/DeviceFactory.cs         |   5 +-
 .../DeviceManagement/DeviceRepository.cs      |   5 +-
 .../DeviceManagement/IDeviceRepository.cs     |   7 +-
 .../Resources/TranslationResources.de.resx    |   4 +-
 .../Resources/TranslationResources.resx       |   3 +
 .../NamedSetting.cs}                          |   8 +-
 .../NamedSettingExtensions.cs}                |  14 ++-
 .../UI/Commands/SafeCommand.cs                |   6 +
 .../UI/Controls/SettingsControl.xaml          |  94 ++++++++++++++
 .../UI/Controls/SettingsControl.xaml.cs       |  14 +++
 .../BrickController2/UI/DI/UiModule.cs        |   2 +-
 .../UI/Pages/DeviceSettingsPage.xaml          |  56 +--------
 .../UI/Templates/DataTemplatesSelector.cs     |   4 +-
 .../ViewModels/DeviceSettingsPageViewModel.cs |  67 +++-------
 .../Settings/BoolSettingViewModel.cs          |  20 +++
 .../Settings/DeviceBoolSettingViewModel.cs    |  32 -----
 .../Settings/DeviceEnumSettingViewModel.cs    |  53 --------
 .../Settings/DeviceSettingViewModelBase.cs    |  43 -------
 .../Settings/EnumSettingViewModel.cs          |  47 +++++++
 .../Settings/SettingGroupViewModel.cs         |  73 +++++++++++
 .../Settings/SettingViewModelBase.cs          |  99 +++++++++++++++
 .../Settings/SettingsPageViewModelBase.cs     | 115 ++++++++++++++++++
 26 files changed, 534 insertions(+), 266 deletions(-)
 rename BrickController2/BrickController2/{DeviceManagement/DeviceSetting.cs => Settings/NamedSetting.cs} (81%)
 rename BrickController2/BrickController2/{Extensions/DeviceSettingExtensions.cs => Settings/NamedSettingExtensions.cs} (57%)
 create mode 100644 BrickController2/BrickController2/UI/Controls/SettingsControl.xaml
 create mode 100644 BrickController2/BrickController2/UI/Controls/SettingsControl.xaml.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/BoolSettingViewModel.cs
 delete mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/DeviceBoolSettingViewModel.cs
 delete mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/DeviceEnumSettingViewModel.cs
 delete mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/DeviceSettingViewModelBase.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/EnumSettingViewModel.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/SettingGroupViewModel.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/SettingViewModelBase.cs
 create mode 100644 BrickController2/BrickController2/UI/ViewModels/Settings/SettingsPageViewModelBase.cs

diff --git a/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs b/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs
index d7aedaa5..55295344 100644
--- a/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs
+++ b/BrickController2/BrickController2/DeviceManagement/BuWizz2Device.cs
@@ -1,6 +1,7 @@
 using BrickController2.DeviceManagement.BuWizz;
 using BrickController2.Helpers;
 using BrickController2.PlatformServices.BluetoothLE;
+using BrickController2.Settings;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -41,7 +42,7 @@ internal class BuWizz2Device : BluetoothDevice
         private IGattCharacteristic? _modelNumberCharacteristic;
         private IGattCharacteristic? _firmwareRevisionCharacteristic;
 
-        public BuWizz2Device(string name, string address, byte[] deviceData, IEnumerable<DeviceSetting> settings, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
+        public BuWizz2Device(string name, string address, byte[] deviceData, IEnumerable<NamedSetting> settings, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
             : base(name, address, deviceRepository, bleService)
         {
             // On BuWizz2 with manufacturer data 0x4e054257001e the ports are swapped
diff --git a/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs b/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs
index 599e0f08..d19703a3 100644
--- a/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs
+++ b/BrickController2/BrickController2/DeviceManagement/BuwizzDevice.cs
@@ -1,5 +1,6 @@
 using BrickController2.DeviceManagement.BuWizz;
 using BrickController2.PlatformServices.BluetoothLE;
+using BrickController2.Settings;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,7 +29,7 @@ internal class BuWizzDevice : BluetoothDevice
 
         private IGattCharacteristic? _characteristic;
 
-        public BuWizzDevice(string name, string address, byte[] deviceData, IEnumerable<DeviceSetting> settings, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
+        public BuWizzDevice(string name, string address, byte[] deviceData, IEnumerable<NamedSetting> settings, IDeviceRepository deviceRepository, IBluetoothLEService bleService)
             : base(name, address, deviceRepository, bleService)
         {
             // apply values (if any) or default
diff --git a/BrickController2/BrickController2/DeviceManagement/Device.cs b/BrickController2/BrickController2/DeviceManagement/Device.cs
index caa65413..ebc4303b 100644
--- a/BrickController2/BrickController2/DeviceManagement/Device.cs
+++ b/BrickController2/BrickController2/DeviceManagement/Device.cs
@@ -1,5 +1,5 @@
-using BrickController2.Extensions;
-using BrickController2.Helpers;
+using BrickController2.Helpers;
+using BrickController2.Settings;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,7 +11,7 @@ namespace BrickController2.DeviceManagement
     public abstract class Device : NotifyPropertyChangedSource
     {
         private readonly IDeviceRepository _deviceRepository;
-        private readonly Dictionary<string, DeviceSetting> _settings = [];
+        private readonly Dictionary<string, NamedSetting> _settings = [];
         protected readonly AsyncLock _asyncLock = new AsyncLock();
 
         private string _name;
@@ -114,7 +114,7 @@ public async Task RenameDeviceAsync(Device device, string newName)
             }
         }
 
-        public async Task UpdateDeviceSettingsAsync(IEnumerable<DeviceSetting> settings)
+        public async Task UpdateDeviceSettingsAsync(IEnumerable<NamedSetting> settings)
         {
             using (await _asyncLock.LockAsync())
             {
@@ -131,7 +131,7 @@ public async Task UpdateDeviceSettingsAsync(IEnumerable<DeviceSetting> settings)
             }
         }
         public bool HasSettings => _settings.Values.Any();
-        public IReadOnlyCollection<DeviceSetting> CurrentSettings => _settings.Values;
+        public IReadOnlyCollection<NamedSetting> CurrentSettings => _settings.Values;
 
         protected TValue GetSettingValue<TValue>(string settingName, TValue defaultValue = default!)
         {
@@ -143,17 +143,21 @@ protected TValue GetSettingValue<TValue>(string settingName, TValue defaultValue
             return defaultValue;
         }
 
-        protected void SetSettingValue<TValue>(string settingName, IEnumerable<DeviceSetting>? settings, TValue defaultValue)
+        protected void SetSettingValue<TValue>(string settingName, IEnumerable<NamedSetting>? settings, string group, TValue defaultValue)
             where TValue: struct
         {
             var foundSetting = settings?.FirstOrDefault(s => s.Name == settingName);
-            _settings[settingName] = new DeviceSetting
+            _settings[settingName] = new NamedSetting
             {
                 Name = settingName,
                 Value = foundSetting.GetValue(defaultValue),
+                Group = group,
                 DefaultValue = defaultValue
             };
         }
+        protected void SetSettingValue<TValue>(string settingName, IEnumerable<NamedSetting>? settings, TValue defaultValue)
+            where TValue : struct
+            => SetSettingValue(settingName, settings, string.Empty, defaultValue);
 
         public override string ToString()
         {
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs b/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs
index d8882b7e..f498b9f9 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceDTO.cs
@@ -1,4 +1,5 @@
-using SQLite;
+using BrickController2.Settings;
+using SQLite;
 using SQLiteNetExtensions.Attributes;
 using System;
 using System.Collections.ObjectModel;
@@ -17,7 +18,7 @@ internal class DeviceDTO
         public byte[] DeviceData { get; set; } = Array.Empty<byte>();
 
         [TextBlob(nameof(SettingsBlobed))]
-        public ObservableCollection<DeviceSetting> Settings { get; set; } = [];
+        public ObservableCollection<NamedSetting> Settings { get; set; } = [];
 
         public string? SettingsBlobed { get; set; }
     }
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs b/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs
index e48c7270..7ba92deb 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceFactory.cs
@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using BrickController2.Settings;
+using System.Collections.Generic;
 
 namespace BrickController2.DeviceManagement
 {
-    internal delegate Device? DeviceFactory(DeviceType deviceType, string name, string address, byte[] deviceData, IEnumerable<DeviceSetting> settings);
+    internal delegate Device? DeviceFactory(DeviceType deviceType, string name, string address, byte[] deviceData, IEnumerable<NamedSetting> settings);
 }
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs b/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs
index 2453efc0..f97ad818 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs
+++ b/BrickController2/BrickController2/DeviceManagement/DeviceRepository.cs
@@ -1,5 +1,6 @@
 using BrickController2.Database;
 using BrickController2.Helpers;
+using BrickController2.Settings;
 using SQLite;
 using SQLiteNetExtensionsAsync.Extensions;
 using System.Collections.Generic;
@@ -40,7 +41,7 @@ public async Task<IEnumerable<DeviceDTO>> GetDevicesAsync()
             }
         }
 
-        public async Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] devicedata, IEnumerable<DeviceSetting> settings)
+        public async Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] devicedata, IEnumerable<NamedSetting> settings)
         {
             using (await _lock.LockAsync())
             {
@@ -90,7 +91,7 @@ public async Task UpdateDeviceAsync(DeviceType type, string address, string newN
             }
         }
 
-        public async Task UpdateDeviceAsync(DeviceType type, string address, IEnumerable<DeviceSetting> settings)
+        public async Task UpdateDeviceAsync(DeviceType type, string address, IEnumerable<NamedSetting> settings)
         {
             using (await _lock.LockAsync())
             {
diff --git a/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs b/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs
index 12d99c98..55bf6fe5 100644
--- a/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs
+++ b/BrickController2/BrickController2/DeviceManagement/IDeviceRepository.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using BrickController2.Settings;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace BrickController2.DeviceManagement
@@ -6,10 +7,10 @@ namespace BrickController2.DeviceManagement
     internal interface IDeviceRepository
     {
         Task<IEnumerable<DeviceDTO>> GetDevicesAsync();
-        Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] manufacturerData, IEnumerable<DeviceSetting> settings);
+        Task InsertDeviceAsync(DeviceType type, string name, string address, byte[] manufacturerData, IEnumerable<NamedSetting> settings);
         Task DeleteDeviceAsync(DeviceType type, string address);
         Task DeleteDevicesAsync();
         Task UpdateDeviceAsync(DeviceType type, string address, string newName);
-        Task UpdateDeviceAsync(DeviceType type, string address, IEnumerable<DeviceSetting> settings);
+        Task UpdateDeviceAsync(DeviceType type, string address, IEnumerable<NamedSetting> settings);
     }
 }
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.de.resx b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
index 75c9c9d4..8fe32e35 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.de.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.de.resx
@@ -522,7 +522,7 @@
   <data name="ResetToDefaults" xml:space="preserve">
     <value>Die Einstellungen zurücksetzen</value>
   </data>
-  <data name="String1" xml:space="preserve">
-    <value>Joy Aktive Zone</value>
+  <data name="_defaultGroup" xml:space="preserve">
+    <value>Allgemeine Einstellungen</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/Resources/TranslationResources.resx b/BrickController2/BrickController2/Resources/TranslationResources.resx
index 12cbe081..d1568e0e 100644
--- a/BrickController2/BrickController2/Resources/TranslationResources.resx
+++ b/BrickController2/BrickController2/Resources/TranslationResources.resx
@@ -549,4 +549,7 @@
   <data name="ResetToDefaults" xml:space="preserve">
     <value>Reset settings to default</value>
   </data>
+  <data name="_defaultGroup" xml:space="preserve">
+    <value>General settings</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs b/BrickController2/BrickController2/Settings/NamedSetting.cs
similarity index 81%
rename from BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
rename to BrickController2/BrickController2/Settings/NamedSetting.cs
index 0a41d6d6..1f31c919 100644
--- a/BrickController2/BrickController2/DeviceManagement/DeviceSetting.cs
+++ b/BrickController2/BrickController2/Settings/NamedSetting.cs
@@ -1,9 +1,9 @@
 using Newtonsoft.Json;
 using System;
 
-namespace BrickController2.DeviceManagement;
+namespace BrickController2.Settings;
 
-public record DeviceSetting
+public record NamedSetting
 {
     /// <summary>Unique setting name</summary>
     [JsonProperty]
@@ -23,6 +23,10 @@ public record DeviceSetting
     [JsonIgnore]
     public Type Type => Value?.GetType() ?? typeof(void);
 
+    /// <summary>Optional group name</summary>
+    [JsonIgnore]
+    public string Group { get; set; } = default!;
+
     [JsonIgnore]
     public bool IsBoolType => Type == typeof(bool);
 
diff --git a/BrickController2/BrickController2/Extensions/DeviceSettingExtensions.cs b/BrickController2/BrickController2/Settings/NamedSettingExtensions.cs
similarity index 57%
rename from BrickController2/BrickController2/Extensions/DeviceSettingExtensions.cs
rename to BrickController2/BrickController2/Settings/NamedSettingExtensions.cs
index d6ffc5de..8cc33449 100644
--- a/BrickController2/BrickController2/Extensions/DeviceSettingExtensions.cs
+++ b/BrickController2/BrickController2/Settings/NamedSettingExtensions.cs
@@ -1,11 +1,10 @@
-using BrickController2.DeviceManagement;
-using System;
+using System;
 
-namespace BrickController2.Extensions;
+namespace BrickController2.Settings;
 
-public static class DeviceSettingExtensions
+public static class NamedSettingExtensions
 {
-    public static TValue GetValue<TValue>(this DeviceSetting? setting, TValue defaultValue)
+    public static TValue GetValue<TValue>(this NamedSetting? setting, TValue defaultValue)
     {
         if (setting == null)
             return defaultValue;
@@ -21,6 +20,9 @@ public static TValue GetValue<TValue>(this DeviceSetting? setting, TValue defaul
             return defaultValue;
         }
 
-        return (TValue)setting.Value;
+        if (setting.Value is TValue typedValue)
+            return typedValue;
+
+        return (TValue)Convert.ChangeType(setting.Value, typeof(TValue));
     }
 }
diff --git a/BrickController2/BrickController2/UI/Commands/SafeCommand.cs b/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
index 3bf5a81b..4a32faf1 100644
--- a/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
+++ b/BrickController2/BrickController2/UI/Commands/SafeCommand.cs
@@ -77,6 +77,12 @@ public SafeCommand(Action<TExecute> execute, Func<bool>? canExecute = null)
             _canExecute = _ => canExecute?.Invoke() ?? true;
         }
 
+        public SafeCommand(Action<TExecute> execute, Predicate<object?> canExecute)
+        {
+            _executeAsync = o => { execute?.Invoke(o); return Task.FromResult(true); };
+            _canExecute = o => canExecute.Invoke(o);
+        }
+
         public SafeCommand(Func<TExecute, Task> executeAsync, Predicate<object?>? canExecute = null)
         {
             _executeAsync = async o => await executeAsync.Invoke(o);
diff --git a/BrickController2/BrickController2/UI/Controls/SettingsControl.xaml b/BrickController2/BrickController2/UI/Controls/SettingsControl.xaml
new file mode 100644
index 00000000..941b7313
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/SettingsControl.xaml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:BrickController2.UI.Controls"
+    xmlns:converters="clr-namespace:BrickController2.UI.Converters"
+    xmlns:extensions="clr-namespace:BrickController2.UI.MarkupExtensions"
+    xmlns:t="clr-namespace:BrickController2.UI.Templates"
+    x:Class="BrickController2.UI.Controls.SettingsControl"
+    x:Name="Control"
+    BackgroundColor="{DynamicResource PageBackgroundColor}">
+
+    <ContentView.Resources>
+        <ResourceDictionary>
+            <converters:InverseBoolConverter x:Key="InverseBool"/>
+            <Style x:Key="settingLabel" TargetType="Label">
+                <Setter Property="HorizontalOptions" Value="Start" />
+                <Setter Property="VerticalOptions" Value="Center" />
+                <Setter Property="FontSize" Value="Medium" />
+            </Style>
+            <Style x:Key="settingsSlider" TargetType="controls:ExtendedSlider">
+                <Setter Property="MinimumTrackColor" Value="{DynamicResource PositiveColor}"/>
+                <Setter Property="Minimum" Value="35"/>
+                <Setter Property="Maximum" Value="3500"/>
+                <Setter Property="Step" Value="35"/>
+            </Style>
+            <t:DataTemplatesSelector x:Key="TemplatesSelector">
+                <t:DataTemplatesSelector.BoolDataTemplate>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="2*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <Label Grid.Column="0" Text="{Binding DisplayName}" Style="{StaticResource Key=settingLabel}"/>
+                            <HorizontalStackLayout Grid.Column="1" Spacing="20">
+                                <Switch IsToggled="{Binding Value}" HorizontalOptions="Center" />
+                                <Label Text="{extensions:Translate On}" Style="{StaticResource Key=settingLabel}" IsVisible="{Binding Value}"/>
+                                <Label Text="{extensions:Translate Off}" Style="{StaticResource Key=settingLabel}" IsVisible="{Binding Value, Converter={StaticResource InverseBool}}"/>
+                            </HorizontalStackLayout>
+                        </Grid>
+                    </DataTemplate>
+                </t:DataTemplatesSelector.BoolDataTemplate>
+
+                <t:DataTemplatesSelector.EnumDataTemplate>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="2*"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <Label Grid.Column="0" Text="{Binding DisplayName}" Style="{StaticResource Key=settingLabel}"/>
+                            <Button Grid.Column="1" Text="{Binding Value}" Command="{Binding SelectItemCommand}" Style="{StaticResource PickerButtonStyle}" HorizontalOptions="FillAndExpand"/>
+                        </Grid>
+                    </DataTemplate>
+                </t:DataTemplatesSelector.EnumDataTemplate>
+                
+            </t:DataTemplatesSelector>
+        </ResourceDictionary>
+    </ContentView.Resources>
+
+    <ContentView.Content>
+        <CollectionView ItemsSource="{Binding Settings}" SelectionMode="None" Margin="10,10,10,10"
+                        ItemTemplate="{StaticResource TemplatesSelector}" IsGrouped="{Binding IsGrouped}">
+            <CollectionView.ItemsLayout>
+                <GridItemsLayout Orientation="Vertical" VerticalItemSpacing="{OnIdiom Desktop=10, Default=20}" />
+            </CollectionView.ItemsLayout>
+            <CollectionView.GroupHeaderTemplate>
+                <DataTemplate>
+                    <SwipeView>
+                        <SwipeView.RightItems>
+                            <SwipeItems Mode="Reveal">
+                                <SwipeItem Text="{extensions:Translate Reset}" IconImageSource="{extensions:ImageResource Source=ic_delete.png}" BackgroundColor="{DynamicResource SwipeItemBackgroundColor}"
+                                           IsVisible="{Binding HasNonDefaultValue}"
+                                           Command="{Binding BindingContext.ResetGroupToDefaultCommand, Source={x:Reference Control}}" CommandParameter="{Binding .}"/>
+                            </SwipeItems>
+                        </SwipeView.RightItems>
+                        <Label Text="{Binding GroupName}" BackgroundColor="{DynamicResource CollectionViewHeaderBackgroundColor}" TextColor="{DynamicResource PrimaryTextColor}"
+                                FontSize="Medium" FontAttributes="Bold" Padding="10" />
+                    </SwipeView>
+                </DataTemplate>
+            </CollectionView.GroupHeaderTemplate>
+        </CollectionView>
+    </ContentView.Content>
+
+</ContentView>
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/Controls/SettingsControl.xaml.cs b/BrickController2/BrickController2/UI/Controls/SettingsControl.xaml.cs
new file mode 100644
index 00000000..b753bebd
--- /dev/null
+++ b/BrickController2/BrickController2/UI/Controls/SettingsControl.xaml.cs
@@ -0,0 +1,14 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace BrickController2.UI.Controls
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class SettingsControl : ContentView
+    {
+        public SettingsControl()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/BrickController2/BrickController2/UI/DI/UiModule.cs b/BrickController2/BrickController2/UI/DI/UiModule.cs
index d11113ed..b7bcce6d 100644
--- a/BrickController2/BrickController2/UI/DI/UiModule.cs
+++ b/BrickController2/BrickController2/UI/DI/UiModule.cs
@@ -32,7 +32,7 @@ protected override void Load(ContainerBuilder builder)
             builder.RegisterType<DialogService>().As<IDialogService>().As<IDialogServerHost>().SingleInstance();
 
             // Register viewmodels
-            foreach (var vmType in GetSubClassesOf<PageViewModelBase>())
+            foreach (var vmType in GetSubClassesOf<PageViewModelBase>().Where(t => !t.IsAbstract))
             {
                 builder.RegisterType(vmType).Keyed<PageViewModelBase>(vmType);
             }
diff --git a/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
index 9abc13e4..ac23f690 100644
--- a/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
+++ b/BrickController2/BrickController2/UI/Pages/DeviceSettingsPage.xaml
@@ -14,55 +14,6 @@
     ios:Page.UseSafeArea="True"
     BackgroundColor="{DynamicResource PageBackgroundColor}">
 
-    <local:PageBase.Resources>
-        <ResourceDictionary>
-            <converters:InverseBoolConverter x:Key="InverseBool"/>
-            <Style x:Key="settingLabel" TargetType="Label">
-                <Setter Property="HorizontalOptions" Value="Start" />
-                <Setter Property="VerticalOptions" Value="Center" />
-                <Setter Property="FontSize" Value="Medium" />
-            </Style>
-            <t:DataTemplatesSelector x:Key="TemplatesSelector">
-                <t:DataTemplatesSelector.BoolDataTemplate>
-                    <DataTemplate>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-
-                            <Label Grid.Column="0" Text="{Binding DisplayName}" Style="{StaticResource Key=settingLabel}"/>
-                            <HorizontalStackLayout Grid.Column="1" Spacing="20">
-                                <Switch IsToggled="{Binding Value}" HorizontalOptions="Center" />
-                                <Label Text="{extensions:Translate On}" Style="{StaticResource Key=settingLabel}" IsVisible="{Binding Value}"/>
-                                <Label Text="{extensions:Translate Off}" Style="{StaticResource Key=settingLabel}" IsVisible="{Binding Value, Converter={StaticResource InverseBool}}"/>
-                            </HorizontalStackLayout>
-                        </Grid>
-                    </DataTemplate>
-                </t:DataTemplatesSelector.BoolDataTemplate>
-
-                <t:DataTemplatesSelector.EnumDataTemplate>
-                    <DataTemplate>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="2*"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-
-                            <Label Grid.Column="0" Text="{Binding DisplayName}" Style="{StaticResource Key=settingLabel}"/>
-                            <Button Grid.Column="1" Text="{Binding CurrentItem}" Command="{Binding SelectItemCommand}" Style="{StaticResource PickerButtonStyle}" HorizontalOptions="FillAndExpand"/>
-                        </Grid>
-                    </DataTemplate>
-                </t:DataTemplatesSelector.EnumDataTemplate>
-            </t:DataTemplatesSelector>
-        </ResourceDictionary>
-    </local:PageBase.Resources>
 
     <NavigationPage.TitleView>
         <Grid HorizontalOptions="FillAndExpand">
@@ -89,12 +40,7 @@
                 </Grid>
 
                 <!-- Setting list -->
-                <CollectionView Grid.Row="1" ItemsSource="{Binding Settings}" SelectionMode="None" Margin="10,10,10,10"
-                                ItemTemplate="{StaticResource TemplatesSelector}">
-                    <CollectionView.ItemsLayout>
-                        <GridItemsLayout Orientation="Vertical" VerticalItemSpacing="10" />
-                    </CollectionView.ItemsLayout>
-                </CollectionView>
+                <controls:SettingsControl Grid.Row="1" />
 
             </Grid>
 
diff --git a/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs b/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
index f2ffa4b9..014b6f19 100644
--- a/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
+++ b/BrickController2/BrickController2/UI/Templates/DataTemplatesSelector.cs
@@ -13,9 +13,9 @@ protected override DataTemplate OnSelectTemplate(object item, BindableObject con
     {
         var itemType = item.GetType();
 
-        if (itemType == typeof(DeviceBoolSettingViewModel))
+        if (itemType == typeof(BoolSettingViewModel))
             return BoolDataTemplate;
-        if (itemType == typeof(DeviceEnumSettingViewModel))
+        if (itemType == typeof(EnumSettingViewModel))
             return EnumDataTemplate;
 
         return default!;
diff --git a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
index 983eb540..1f541055 100644
--- a/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
+++ b/BrickController2/BrickController2/UI/ViewModels/DeviceSettingsPageViewModel.cs
@@ -5,70 +5,41 @@
 using BrickController2.UI.Services.Translation;
 using BrickController2.UI.ViewModels.Settings;
 using System;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
 namespace BrickController2.UI.ViewModels;
 
-public class DeviceSettingsPageViewModel : PageViewModelBase
+public class DeviceSettingsPageViewModel : SettingsPageViewModelBase
 {
-    private CancellationTokenSource? _disappearingTokenSource;
-
     public DeviceSettingsPageViewModel(
         INavigationService navigationService,
         ITranslationService translationService,
         IDialogService dialogService,
-        NavigationParameters parameters) : base(navigationService, translationService)
+        NavigationParameters parameters)
+        : this(navigationService, translationService, dialogService, parameters.Get<Device>("device"))
     {
-        Device = parameters.Get<Device>("device");
-        Settings = new ObservableCollection<DeviceSettingViewModelBase>(Device.CurrentSettings.Select(ToViewModel));
-        DialogService = dialogService;
+    }
 
-        SaveSettingsCommand = new SafeCommand(ApplyChanges, () => Settings.Any(x => x.HasChanged));
-        ResetToDefaultsCommand = new SafeCommand(ResetToDefaults, () => Settings.Any(x => x.HasNonDefaultValue));
+    private DeviceSettingsPageViewModel(
+        INavigationService navigationService,
+        ITranslationService translationService,
+        IDialogService dialogService,
+        Device device) : base(navigationService, translationService, dialogService, device.CurrentSettings)
+    {
+        Device = device;
+        SaveSettingsCommand = new SafeCommand(ApplyChanges, () => AllSettings.Any(x => x.HasChanged));
     }
 
     public ICommand SaveSettingsCommand { get; }
-    public ICommand ResetToDefaultsCommand { get; }
 
     public Device Device { get; }
-    public IDialogService DialogService { get; }
-
-    public ObservableCollection<DeviceSettingViewModelBase> Settings { get; }
-
-    public CancellationToken DisappearingToken => _disappearingTokenSource?.Token ?? default;
-
-    public override void OnAppearing()
-    {
-        _disappearingTokenSource?.Cancel();
-        _disappearingTokenSource = new CancellationTokenSource();
-    }
-
-    public override void OnDisappearing()
-    {
-        _disappearingTokenSource?.Cancel();
-    }
 
-    internal void OnSettingChanged()
+    protected override void OnSettingChanged()
     {
+        base.OnSettingChanged();
         SaveSettingsCommand.RaiseCanExecuteChanged();
-        ResetToDefaultsCommand.RaiseCanExecuteChanged();
-    }
-
-    private DeviceSettingViewModelBase ToViewModel(DeviceSetting setting)
-    {
-        if (setting.IsBoolType)
-        {
-            return new DeviceBoolSettingViewModel(this, setting, TranslationService);
-        }
-        if (setting.IsEnumType)
-        {
-            return new DeviceEnumSettingViewModel(this, setting, TranslationService);
-        }
-        throw new InvalidOperationException($"The specified type {setting.Type} is not supported.");
     }
 
     private async Task ApplyChanges()
@@ -79,7 +50,7 @@ await DialogService.ShowProgressDialogAsync(
                 false,
                 async (progressDialog, token) =>
                 {
-                    var changedSettings = Settings
+                    var changedSettings = AllSettings
                         .Where(s => s.HasChanged)
                         .Select(s => s.Setting)
                         .ToArray();
@@ -95,12 +66,4 @@ await DialogService.ShowProgressDialogAsync(
         {
         }
     }
-
-    private void ResetToDefaults()
-    {
-        foreach (var setting in Settings.Where(s => s.HasNonDefaultValue))
-        {
-            setting.ResetToDefault();
-        }
-    }
 }
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/BoolSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/BoolSettingViewModel.cs
new file mode 100644
index 00000000..b2f17821
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/BoolSettingViewModel.cs
@@ -0,0 +1,20 @@
+using BrickController2.Settings;
+using BrickController2.UI.Services.Translation;
+
+namespace BrickController2.UI.ViewModels.Settings;
+
+public class BoolSettingViewModel : SettingViewModelBase<bool>
+{
+    public BoolSettingViewModel(NamedSetting setting,
+        SettingsPageViewModelBase parent,
+        ITranslationService translationService)
+        : base(setting, parent, translationService)
+    {
+    }
+
+    public override bool Value
+    {
+        get => (bool)SettingValue;
+        set => SettingValue = value!;
+    }
+}
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceBoolSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceBoolSettingViewModel.cs
deleted file mode 100644
index 432556ca..00000000
--- a/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceBoolSettingViewModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using BrickController2.DeviceManagement;
-using BrickController2.UI.Services.Translation;
-
-namespace BrickController2.UI.ViewModels.Settings
-{
-    public class DeviceBoolSettingViewModel : DeviceSettingViewModelBase
-    {
-        public DeviceBoolSettingViewModel(DeviceSettingsPageViewModel parent, DeviceSetting setting, ITranslationService translationService)
-            : base(parent, setting, translationService)
-        {
-        }
-
-        public object Value
-        {
-            get => Setting.Value;
-            set
-            {
-                if (Setting.Value != value)
-                {
-                    Setting.Value = value;
-                    RaisePropertyChanged();
-                    Parent.OnSettingChanged();
-                }
-            }
-        }
-
-        internal override void ResetToDefault()
-        {
-            Value = Setting.DefaultValue;
-        }
-    }
-}
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceEnumSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceEnumSettingViewModel.cs
deleted file mode 100644
index f37608bf..00000000
--- a/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceEnumSettingViewModel.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using BrickController2.DeviceManagement;
-using BrickController2.UI.Commands;
-using BrickController2.UI.Services.Translation;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace BrickController2.UI.ViewModels.Settings
-{
-    public class DeviceEnumSettingViewModel : DeviceSettingViewModelBase
-    {
-        public DeviceEnumSettingViewModel(DeviceSettingsPageViewModel parentModel,
-            DeviceSetting setting,
-            ITranslationService translationService)
-             : base(parentModel, setting, translationService)
-        {
-            SelectItemCommand = new SafeCommand(SelectItemAsync);
-        }
-
-        public IEnumerable<string> Items => Enum.GetNames(Setting.Type);
-        public ICommand SelectItemCommand { get; }
-
-        public string CurrentItem
-        {
-            get => Enum.GetName(Setting.Type, Setting.Value)!;
-            set
-            {
-                var enumValue = Enum.Parse(Setting.Type, value);
-                if (!enumValue.Equals(Setting.Value))
-                {
-                    Setting.Value = enumValue;
-                    RaisePropertyChanged();
-                    Parent.OnSettingChanged();
-                }
-            }
-        }
-
-        internal override void ResetToDefault()
-        {
-            CurrentItem = Enum.GetName(Setting.Type, Setting.DefaultValue)!;
-        }
-
-        private async Task SelectItemAsync()
-        {
-            var result = await ShowSelectionDialogAsync(Items);
-            if (result.IsOk)
-            {
-                CurrentItem = result.SelectedItem;
-            }
-        }
-    }
-}
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceSettingViewModelBase.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceSettingViewModelBase.cs
deleted file mode 100644
index af653b35..00000000
--- a/BrickController2/BrickController2/UI/ViewModels/Settings/DeviceSettingViewModelBase.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using BrickController2.DeviceManagement;
-using BrickController2.Helpers;
-using BrickController2.UI.Services.Dialog;
-using BrickController2.UI.Services.Translation;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace BrickController2.UI.ViewModels.Settings
-{
-    public abstract class DeviceSettingViewModelBase : NotifyPropertyChangedSource
-    {
-        private readonly object _originalValue;
-        protected readonly ITranslationService TranslationService;
-
-        protected DeviceSettingViewModelBase(DeviceSettingsPageViewModel parent,
-            DeviceSetting setting,
-            ITranslationService translationService)
-        {
-            _originalValue = setting.Value;
-            Setting = setting with { };
-            Parent = parent;
-            TranslationService = translationService;
-        }
-
-        public string DisplayName => TranslationService.Translate(Setting.Name);
-
-        public bool HasChanged => !Setting.Value.Equals(_originalValue);
-
-        public bool HasNonDefaultValue => !Setting.Value.Equals(Setting.DefaultValue);
-
-        public DeviceSetting Setting { get; }
-        public DeviceSettingsPageViewModel Parent { get; }
-
-        internal abstract void ResetToDefault();
-
-        protected Task<SelectionDialogResult<T>> ShowSelectionDialogAsync<T>(IEnumerable<T> items) where T : notnull
-            => Parent.DialogService.ShowSelectionDialogAsync(
-                items,
-                DisplayName,
-                TranslationService.Translate("Cancel"),
-                Parent.DisappearingToken);
-    }
-}
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/EnumSettingViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/EnumSettingViewModel.cs
new file mode 100644
index 00000000..877cf912
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/EnumSettingViewModel.cs
@@ -0,0 +1,47 @@
+using BrickController2.Settings;
+using BrickController2.UI.Commands;
+using BrickController2.UI.Services.Translation;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace BrickController2.UI.ViewModels.Settings;
+
+public class EnumSettingViewModel : SettingViewModelBase<string>
+{
+    public EnumSettingViewModel(NamedSetting setting,
+        SettingsPageViewModelBase parent,
+        ITranslationService translationService)
+    : base(setting, parent, translationService)
+    {
+        SelectItemCommand = new SafeCommand(SelectItemAsync);
+    }
+
+    public IEnumerable<string> Items => Enum.GetNames(Setting.Type);
+    public ICommand SelectItemCommand { get; }
+
+    public override string Value
+    {
+        get => Enum.GetName(Setting.Type, SettingValue)!;
+        set
+        {
+            var enumValue = Enum.Parse(Setting.Type, value);
+            SettingValue = enumValue;
+        }
+    }
+
+    public override void ResetToDefault()
+    {
+        Value = Enum.GetName(Setting.Type, Setting.DefaultValue)!;
+    }
+
+    private async Task SelectItemAsync()
+    {
+        var result = await ShowSelectionDialogAsync(Items);
+        if (result.IsOk)
+        {
+            Value = result.SelectedItem;
+        }
+    }
+}
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/SettingGroupViewModel.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/SettingGroupViewModel.cs
new file mode 100644
index 00000000..d2470e97
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/SettingGroupViewModel.cs
@@ -0,0 +1,73 @@
+using BrickController2.UI.Services.Translation;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+
+namespace BrickController2.UI.ViewModels.Settings;
+
+public class SettingGroupViewModel : ObservableCollection<SettingViewModelBase>
+{
+    private const string DefaultGroupName = "_defaultGroup";
+
+    private readonly string _groupName;
+    private readonly ITranslationService _translationService;
+    private bool _changed;
+    private bool _nonDefaultValue;
+
+    public SettingGroupViewModel(string groupName,
+        ICollection<SettingViewModelBase> settings,
+        ITranslationService translationService)
+        : base(settings)
+    {
+        _groupName = !string.IsNullOrEmpty(groupName) ? groupName : DefaultGroupName;
+        _translationService = translationService;
+        _nonDefaultValue = settings.Any(x => x.HasNonDefaultValue);
+        // subscribe to changes - collection is expected to be immutable
+        foreach (var setting in settings)
+        {
+            setting.PropertyChanged += Setting_PropertyChanged;
+        }
+    }
+
+    public bool HasChanged
+    {
+        get => _changed;
+        protected set
+        {
+            if (_changed != value)
+            {
+                _changed = value;
+                OnPropertyChanged(new PropertyChangedEventArgs(nameof(HasChanged)));
+            }
+        }
+    }
+
+    public bool HasNonDefaultValue
+    {
+        get => _nonDefaultValue;
+        protected set
+        {
+            if (_nonDefaultValue != value)
+            {
+                _nonDefaultValue = value;
+                OnPropertyChanged(new PropertyChangedEventArgs(nameof(HasNonDefaultValue)));
+            }
+        }
+    }
+
+    public string GroupName => _translationService.Translate(_groupName);
+
+    private void Setting_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        // notify group due to possible change 
+        if (e.PropertyName == nameof(SettingViewModelBase.HasChanged))
+        {
+            HasChanged = this.Any(x => x.HasChanged);
+        }
+        else if (e.PropertyName == nameof(SettingViewModelBase.HasNonDefaultValue))
+        {
+            HasNonDefaultValue = this.Any(x => x.HasNonDefaultValue);
+        }
+    }
+}
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/SettingViewModelBase.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/SettingViewModelBase.cs
new file mode 100644
index 00000000..1f668ca1
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/SettingViewModelBase.cs
@@ -0,0 +1,99 @@
+using BrickController2.Helpers;
+using BrickController2.Settings;
+using BrickController2.UI.Services.Dialog;
+using BrickController2.UI.Services.Translation;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace BrickController2.UI.ViewModels.Settings;
+
+public abstract class SettingViewModelBase : NotifyPropertyChangedSource
+{
+    protected readonly object OriginalValue;
+
+    private bool _changed;
+    private bool _hasDefaultValue;
+
+    protected SettingViewModelBase(NamedSetting setting)
+    {
+        OriginalValue = setting.Value;
+        // make editable copy
+        Setting = setting with { };
+        // initialize flag(s)
+        _hasDefaultValue = !setting.Value.Equals(Setting.DefaultValue);
+    }
+
+    public bool HasChanged
+    {
+        get => _changed;
+        protected set
+        {
+            if (_changed != value)
+            {
+                _changed = value;
+                RaisePropertyChanged();
+            }
+        }
+    }
+
+    public bool HasNonDefaultValue
+    {
+        get => _hasDefaultValue;
+        protected set
+        {
+            if (_hasDefaultValue != value)
+            {
+                _hasDefaultValue = value;
+                RaisePropertyChanged();
+            }
+        }
+    }
+
+    public NamedSetting Setting { get; }
+
+    protected object SettingValue
+    {
+        get => Setting.Value;
+        set
+        {
+            if (!Setting.Value.Equals(value))
+            {
+                Setting.Value = value!;
+                RaisePropertyChanged(nameof(SettingViewModelBase<int>.Value));
+                // update additional properties
+                HasChanged = !value.Equals(OriginalValue);
+                HasNonDefaultValue = !value.Equals(Setting.DefaultValue);
+            }
+        }
+    }
+
+    public virtual void ResetToDefault()
+    {
+        SettingValue = Setting.DefaultValue;
+    }
+}
+
+public abstract class SettingViewModelBase<TValue> : SettingViewModelBase
+{
+    protected readonly SettingsPageViewModelBase Parent;
+    protected readonly ITranslationService TranslationService;
+
+    protected SettingViewModelBase(NamedSetting setting,
+        SettingsPageViewModelBase parent,
+        ITranslationService translationService) : base(setting)
+    {
+        Parent = parent;
+        TranslationService = translationService;
+    }
+
+    public string DisplayName => TranslationService.Translate(Setting.Name);
+
+    public abstract TValue Value { get; set; }
+
+    protected Task<SelectionDialogResult<T>> ShowSelectionDialogAsync<T>(IEnumerable<T> items) where T : notnull
+        => Parent.DialogService.ShowSelectionDialogAsync(
+            items,
+            TranslationService.Translate(Setting.Name),
+            TranslationService.Translate("Cancel"),
+            Parent.DisappearingToken);
+}
diff --git a/BrickController2/BrickController2/UI/ViewModels/Settings/SettingsPageViewModelBase.cs b/BrickController2/BrickController2/UI/ViewModels/Settings/SettingsPageViewModelBase.cs
new file mode 100644
index 00000000..3e271435
--- /dev/null
+++ b/BrickController2/BrickController2/UI/ViewModels/Settings/SettingsPageViewModelBase.cs
@@ -0,0 +1,115 @@
+using BrickController2.Settings;
+using BrickController2.UI.Commands;
+using BrickController2.UI.Services.Dialog;
+using BrickController2.UI.Services.Navigation;
+using BrickController2.UI.Services.Translation;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading;
+using System.Windows.Input;
+
+namespace BrickController2.UI.ViewModels.Settings;
+
+public abstract class SettingsPageViewModelBase : PageViewModelBase
+{
+    private CancellationTokenSource? _disappearingTokenSource;
+
+    protected SettingsPageViewModelBase(
+        INavigationService navigationService,
+        ITranslationService translationService,
+        IDialogService dialogService,
+        IEnumerable<NamedSetting> settings) : base(navigationService, translationService)
+    {
+        DialogService = dialogService;
+        // prepare grouping
+        Groups = new(settings
+            .OrderBy(x => x.Name)
+            .GroupBy(x => x.Group)
+            .Select(x => new SettingGroupViewModel(x.Key, x.Select(ToViewModel).ToArray(), translationService)));
+        AllSettings = new(Groups.SelectMany(x => x));
+        // detect grouping
+        IsGrouped = settings.Any(x => !string.IsNullOrEmpty(x.Group));
+        // subscribe to change coming from via groups 
+        foreach (INotifyPropertyChanged group in Groups)
+        {
+            group.PropertyChanged += Group_PropertyChanged;
+        }
+
+        ResetToDefaultsCommand = new SafeCommand(ResetToDefaults, () => AllSettings.Any(x => x.HasNonDefaultValue));
+        ResetGroupToDefaultCommand = new SafeCommand<SettingGroupViewModel>(ResetGroupToDefaults,
+            (o) => o is SettingGroupViewModel group && group.HasNonDefaultValue);
+    }
+
+    public ICommand ResetToDefaultsCommand { get; }
+    public ICommand ResetGroupToDefaultCommand { get; }
+
+    public bool IsGrouped { get; }
+    public IEnumerable<INotifyPropertyChanged> Settings => IsGrouped ? Groups : AllSettings;
+    public CancellationToken DisappearingToken => _disappearingTokenSource?.Token ?? default;
+
+    protected ObservableCollection<SettingViewModelBase> AllSettings { get; }
+    protected ObservableCollection<SettingGroupViewModel> Groups { get; }
+    public IDialogService DialogService { get; }
+
+    public override void OnAppearing()
+    {
+        _disappearingTokenSource?.Cancel();
+        _disappearingTokenSource = new CancellationTokenSource();
+    }
+
+    public override void OnDisappearing()
+    {
+        _disappearingTokenSource?.Cancel();
+    }
+
+    protected virtual void OnSettingChanged()
+    {
+    }
+
+    protected virtual void OnDefaultValueChanged()
+    {
+        ResetToDefaultsCommand.RaiseCanExecuteChanged();
+        ResetGroupToDefaultCommand.RaiseCanExecuteChanged();
+    }
+
+    private void Group_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(SettingGroupViewModel.HasChanged))
+        {
+            OnSettingChanged();
+        }
+        else if (e.PropertyName == nameof(SettingGroupViewModel.HasNonDefaultValue))
+        {
+            OnDefaultValueChanged();
+        }
+    }
+
+    private SettingViewModelBase ToViewModel(NamedSetting setting)
+    {
+        if (setting.IsBoolType)
+        {
+            return new BoolSettingViewModel(setting, this, TranslationService);
+        }
+        if (setting.IsEnumType)
+        {
+            return new EnumSettingViewModel(setting, this, TranslationService);
+        }
+
+        throw new InvalidOperationException($"The specified type {setting.Type} is not supported.");
+    }
+
+    private void ResetToDefaults() => ResetToDefaults(AllSettings);
+
+    private static void ResetGroupToDefaults(SettingGroupViewModel group) => ResetToDefaults(group);
+
+    private static void ResetToDefaults(ICollection<SettingViewModelBase> viewModels)
+    {
+        foreach (var setting in viewModels.Where(s => s.HasNonDefaultValue))
+        {
+            setting.ResetToDefault();
+        }
+    }
+}