Skip to content

A Swiss Army knife for developers.

Added a setting changed event to ISettingsProvider

Etienne Baudoux87bb182a96c6
diff --git a/src/dev/def/DevTools.Core/Settings/ISettingsProvider.cs b/src/dev/def/DevTools.Core/Settings/ISettingsProvider.cs
index 69e2bf84b..dd0e7d45e 100644
--- a/src/dev/def/DevTools.Core/Settings/ISettingsProvider.cs
+++ b/src/dev/def/DevTools.Core/Settings/ISettingsProvider.cs
@@ -1,10 +1,17 @@
-namespace DevTools.Core.Settings
+using System;
+
+namespace DevTools.Core.Settings
{
/// <summary>
/// Provides a set of methods to manage the application's settings.
/// </summary>
public interface ISettingsProvider
{
+ /// <summary>
+ /// Raised when a setting value has changed.
+ /// </summary>
+ event EventHandler<SettingChangedEventArgs>? SettingChanged;
+
/// <summary>
/// Gets the value of a defined setting.
/// </summary>
diff --git a/src/dev/def/DevTools.Core/Settings/SettingChangedEventArgs.cs b/src/dev/def/DevTools.Core/Settings/SettingChangedEventArgs.cs
new file mode 100644
index 000000000..eccf500ed
--- /dev/null
+++ b/src/dev/def/DevTools.Core/Settings/SettingChangedEventArgs.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace DevTools.Core.Settings
+{
+ public sealed class SettingChangedEventArgs : EventArgs
+ {
+ public string SettingName { get; }
+
+ public object? NewValue { get; }
+
+ public SettingChangedEventArgs(string settingName, object? newValue)
+ {
+ SettingName = settingName;
+ NewValue = newValue;
+ }
+ }
+}
diff --git a/src/dev/impl/DevTools.Core.Impl/Settings/SettingsProvider.cs b/src/dev/impl/DevTools.Core.Impl/Settings/SettingsProvider.cs
index 5d9eec7a4..e39f326e4 100644
--- a/src/dev/impl/DevTools.Core.Impl/Settings/SettingsProvider.cs
+++ b/src/dev/impl/DevTools.Core.Impl/Settings/SettingsProvider.cs
@@ -17,6 +17,8 @@ namespace DevTools.Core.Impl.Settings
private readonly ApplicationDataContainer _roamingSettings = ApplicationData.Current.RoamingSettings;
private readonly ApplicationDataContainer _localSettings = ApplicationData.Current.LocalSettings;
+ public event EventHandler<SettingChangedEventArgs>? SettingChanged;
+
public T GetSetting<T>(SettingDefinition<T> settingDefinition)
{
ApplicationDataContainer applicationDataContainer;
@@ -67,6 +69,8 @@ namespace DevTools.Core.Impl.Settings
{
_localSettings.Values[settingDefinition.Name] = valueToSave;
}
+
+ SettingChanged?.Invoke(this, new SettingChangedEventArgs(settingDefinition.Name, value));
}
public void ResetSetting<T>(SettingDefinition<T> settingDefinition)
@@ -79,6 +83,8 @@ namespace DevTools.Core.Impl.Settings
{
_localSettings.Values.Remove(settingDefinition.Name);
}
+
+ SettingChanged?.Invoke(this, new SettingChangedEventArgs(settingDefinition.Name, settingDefinition.DefaultValue));
}
}
}
diff --git a/src/dev/impl/DevTools.Core.Impl/Theme/ThemeListener.cs b/src/dev/impl/DevTools.Core.Impl/Theme/ThemeListener.cs
index 702d898ad..d8c61444b 100644
--- a/src/dev/impl/DevTools.Core.Impl/Theme/ThemeListener.cs
+++ b/src/dev/impl/DevTools.Core.Impl/Theme/ThemeListener.cs
@@ -33,6 +33,8 @@ namespace DevTools.Core.Impl.Theme
_thread = thread;
_settingsProvider = settingsProvider;
+ _settingsProvider.SettingChanged += SettingsProvider_SettingChanged;
+
CurrentSystemTheme = Application.Current.RequestedTheme == ApplicationTheme.Dark ? AppTheme.Dark : AppTheme.Light;
IsHighContrast = _accessible.HighContrast;
@@ -90,6 +92,14 @@ namespace DevTools.Core.Impl.Theme
}
}
+ private void SettingsProvider_SettingChanged(object sender, SettingChangedEventArgs e)
+ {
+ if (string.Equals(PredefinedSettings.Theme.Name, e.SettingName, StringComparison.Ordinal))
+ {
+ ApplyDesiredColorTheme();
+ }
+ }
+
/// <summary>
/// Set our current properties and fire a change notification.
/// </summary>
diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.cs b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.cs
index 76c6d5f9e..15f99bbd8 100644
--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.cs
+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.cs
@@ -13,7 +13,6 @@ namespace DevTools.Impl.Views.Settings
[Export(typeof(SettingsToolViewModel))]
public sealed class SettingsToolViewModel : ObservableRecipient, IToolViewModel
{
- private readonly IThemeListener _themeListener;
private readonly ISettingsProvider _settingsProvider;
public Type View { get; } = typeof(SettingsToolPage);
@@ -23,11 +22,7 @@ namespace DevTools.Impl.Views.Settings
internal AppTheme Theme
{
get => _settingsProvider.GetSetting(PredefinedSettings.Theme);
- set
- {
- _settingsProvider.SetSetting(PredefinedSettings.Theme, value);
- _themeListener.ApplyDesiredColorTheme();
- }
+ set => _settingsProvider.SetSetting(PredefinedSettings.Theme, value);
}
internal bool SmartDetection
@@ -44,10 +39,8 @@ namespace DevTools.Impl.Views.Settings
[ImportingConstructor]
public SettingsToolViewModel(
- IThemeListener themeListener,
ISettingsProvider settingsProvider)
{
- _themeListener = themeListener;
_settingsProvider = settingsProvider;
}
}