Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

feat: change style to one page only

itsfatduckf2a852867519
diff --git a/optimizerDuck/Core/Interfaces/IToggleFeature.cs b/optimizerDuck/Core/Interfaces/IToggleFeature.cs
index 8bc661d..7b31f0b 100644
--- a/optimizerDuck/Core/Interfaces/IToggleFeature.cs
+++ b/optimizerDuck/Core/Interfaces/IToggleFeature.cs
@@ -1,5 +1,4 @@
using optimizerDuck.Core.Models.UI;
-using Wpf.Ui.Controls;
namespace optimizerDuck.Core.Interfaces;
@@ -8,7 +7,8 @@ public interface IToggleFeature
string Name { get; }
string Description { get; }
OptimizationRisk Risk { get; }
- SymbolRegular Icon { get; }
+ Guid Id { get; }
+ ToggleFeatureType Type { get; }
Task<bool> GetStateAsync();
Task EnableAsync();
diff --git a/optimizerDuck/Core/Models/UI/OptimizationTags.cs b/optimizerDuck/Core/Models/UI/OptimizationTags.cs
index 9906183..8493ee3 100644
--- a/optimizerDuck/Core/Models/UI/OptimizationTags.cs
+++ b/optimizerDuck/Core/Models/UI/OptimizationTags.cs
@@ -174,6 +174,14 @@ public static class OptimizationTagsToDisplay
}
}
+public enum ToggleFeatureType
+{
+ Registry,
+ Service,
+ ScheduledTask,
+ PowerShell
+}
+
/// <summary>
/// Represents the UI display data for an optimization tag.
/// </summary>
diff --git a/optimizerDuck/Core/ToggleFeatures/AI/AIToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/AI/AIToggleFeatures.cs
index deae995..862ba7f 100644
--- a/optimizerDuck/Core/ToggleFeatures/AI/AIToggleFeatures.cs
+++ b/optimizerDuck/Core/ToggleFeatures/AI/AIToggleFeatures.cs
@@ -1,73 +1,68 @@
+using System.Collections.ObjectModel;
+using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Core.ToggleFeatures;
-using Wpf.Ui.Controls;
+using optimizerDuck.Services.Managers;
namespace optimizerDuck.Core.ToggleFeatures.AI;
-public class DisableWindowsCopilot : BaseToggleFeature
+[ToggleFeatureCategory]
+public class AI : IToggleFeatureCategory
{
- public override string Name => "ToggleFeature.DisableWindowsCopilot.Name";
- public override string Description => "ToggleFeature.DisableWindowsCopilot.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.Brain24;
+ public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.AI.Name"];
+ public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.AI;
+ public ObservableCollection<IToggleFeature> Features { get; init; } = [];
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-AI-001", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableWindowsCopilot : RegistryToggleFeature
{
- Path = @"HKCU\Software\Policies\Microsoft\Windows\Windows Copilot",
- Name = "TurnOffWindowsCopilot",
- OnValue = 1,
- OffValue = 0,
- DefaultValue = 0
- };
-}
-
-public class DisableBingInWindowsSearch : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.DisableBingInWindowsSearch.Name";
- public override string Description => "ToggleFeature.DisableBingInWindowsSearch.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.Search24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Policies\Microsoft\Windows\Windows Copilot",
+ Name = "TurnOffWindowsCopilot",
+ OnValue = 1,
+ OffValue = 0,
+ DefaultValue = 0
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-AI-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableBingInWindowsSearch : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Search",
- Name = "BingSearchEnabled",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
-}
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Search",
+ Name = "BingSearchEnabled",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
-public class DisableSuggestionsInStart : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.DisableSuggestionsInStart.Name";
- public override string Description => "ToggleFeature.DisableSuggestionsInStart.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.Lightbulb24;
-
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-AI-003", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableSuggestionsInStart : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager",
- Name = "SubscribedContent-338389Enabled",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
-}
-
-public class DisableTailoredExperiences : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.DisableTailoredExperiences.Name";
- public override string Description => "ToggleFeature.DisableTailoredExperiences.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.Person24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager",
+ Name = "SubscribedContent-338389Enabled",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-AI-004", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableTailoredExperiences : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Privacy",
- Name = "TailoredExperiencesWithDiagnosticDataEnabled",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Privacy",
+ Name = "TailoredExperiencesWithDiagnosticDataEnabled",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
}
diff --git a/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs b/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs
index 0a41f6e..0ffb15f 100644
--- a/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs
+++ b/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs
@@ -1,4 +1,6 @@
+using System.Reflection;
using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Services.Managers;
using Wpf.Ui.Controls;
@@ -7,34 +9,41 @@ namespace optimizerDuck.Core.ToggleFeatures;
public abstract class BaseToggleFeature : IToggleFeature
{
- protected RegistryToggle? Toggle { get; init; }
+ private ToggleFeatureAttribute? _meta;
- public abstract string Name { get; }
- public abstract string Description { get; }
- public abstract OptimizationRisk Risk { get; }
- public abstract SymbolRegular Icon { get; }
+ private ToggleFeatureAttribute Meta =>
+ _meta ??= GetType().GetCustomAttribute<ToggleFeatureAttribute>()
+ ?? throw new InvalidOperationException(
+ $"{GetType().Name} is missing [ToggleFeature] attribute");
- public virtual async Task<bool> GetStateAsync()
+ public Type? OwnerType { get; set; }
+
+ public string OwnerKey =>
+ OwnerType?.Name
+ ?? throw new InvalidOperationException(
+ $"{GetType().Name} has no owner assigned");
+
+ public Guid Id => Guid.Parse(Meta.Id);
+ public OptimizationRisk Risk => Meta.Risk;
+ public ToggleFeatureType Type => Meta.Type;
+
+ public string FeatureKey => GetType().Name;
+
+ public string Name => Loc.Instance[$"ToggleFeature.{FeatureKey}.Name"];
+ public string Description => Loc.Instance[$"ToggleFeature.{FeatureKey}.Description"];
+
+ public virtual Task<bool> GetStateAsync()
{
- if (Toggle == null)
- return false;
- return await Task.FromResult(Toggle.GetState());
+ return Task.FromResult(false);
}
- public virtual async Task EnableAsync()
+ public virtual Task EnableAsync()
{
- if (Toggle != null)
- Toggle.SetState(true);
- await Task.CompletedTask;
+ return Task.CompletedTask;
}
- public virtual async Task DisableAsync()
+ public virtual Task DisableAsync()
{
- if (Toggle != null)
- Toggle.SetState(false);
- await Task.CompletedTask;
+ return Task.CompletedTask;
}
-
- public string LocalizedName => Loc.Instance[$"ToggleFeature.{GetType().Name}.Name"];
- public string LocalizedDescription => Loc.Instance[$"ToggleFeature.{GetType().Name}.Description"];
}
diff --git a/optimizerDuck/Core/ToggleFeatures/Privacy/PrivacyToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/Privacy/PrivacyToggleFeatures.cs
index 98f010f..5b582f5 100644
--- a/optimizerDuck/Core/ToggleFeatures/Privacy/PrivacyToggleFeatures.cs
+++ b/optimizerDuck/Core/ToggleFeatures/Privacy/PrivacyToggleFeatures.cs
@@ -1,56 +1,55 @@
+using System.Collections.ObjectModel;
+using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Core.ToggleFeatures;
-using Wpf.Ui.Controls;
+using optimizerDuck.Services.Managers;
namespace optimizerDuck.Core.ToggleFeatures.Privacy;
-public class DisableTelemetry : BaseToggleFeature
+[ToggleFeatureCategory]
+public class Privacy : IToggleFeatureCategory
{
- public override string Name => "ToggleFeature.DisableTelemetry.Name";
- public override string Description => "ToggleFeature.DisableTelemetry.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Moderate;
- public override SymbolRegular Icon => SymbolRegular.DataUsage24;
+ public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.Privacy.Name"];
+ public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.Privacy;
+ public ObservableCollection<IToggleFeature> Features { get; init; } = [];
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-Privacy-001", Risk = OptimizationRisk.Moderate, Type = ToggleFeatureType.Registry)]
+ public class DisableTelemetry : RegistryToggleFeature
{
- Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\DataCollection",
- Name = "AllowTelemetry",
- OnValue = 0,
- OffValue = 3,
- DefaultValue = 3
- };
-}
-
-public class DisableDiagnosticData : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.DisableDiagnosticData.Name";
- public override string Description => "ToggleFeature.DisableDiagnosticData.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.ArrowExportUp24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\DataCollection",
+ Name = "AllowTelemetry",
+ OnValue = 0,
+ OffValue = 3,
+ DefaultValue = 3
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-Privacy-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableDiagnosticData : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack",
- Name = "ShowedToastAtLevel",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
-}
-
-public class DisableFeedbackNotifications : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.DisableFeedbackNotifications.Name";
- public override string Description => "ToggleFeature.DisableFeedbackNotifications.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.ChatBubblesQuestion24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack",
+ Name = "ShowedToastAtLevel",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-Privacy-003", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableFeedbackNotifications : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\FeedbackHub\Privacy",
- Name = "FeedbackStorageAllowed",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\FeedbackHub\Privacy",
+ Name = "FeedbackStorageAllowed",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
}
diff --git a/optimizerDuck/Core/ToggleFeatures/RegistryToggle.cs b/optimizerDuck/Core/ToggleFeatures/RegistryToggle.cs
index e085375..038f303 100644
--- a/optimizerDuck/Core/ToggleFeatures/RegistryToggle.cs
+++ b/optimizerDuck/Core/ToggleFeatures/RegistryToggle.cs
@@ -6,33 +6,151 @@ public class RegistryToggle
{
public string Path { get; init; } = string.Empty;
public string Name { get; init; } = string.Empty;
- public int OnValue { get; init; }
- public int OffValue { get; init; }
- public int DefaultValue { get; init; }
+ public object OnValue { get; init; } = 1;
+ public object OffValue { get; init; } = 0;
+ public object DefaultValue { get; init; } = 0;
+ public bool CheckKeyExists { get; init; } = false;
+ public RegistryValueKind ValueKind { get; init; } = RegistryValueKind.DWord;
+
+ private static readonly Dictionary<string, object?> _cache = new();
+ private static readonly object _lock = new();
public bool GetState()
+ {
+ lock (_lock)
+ {
+ var cacheKey = $"{Path}\\{Name}";
+ if (_cache.TryGetValue(cacheKey, out var cached))
+ {
+ return CompareValues(cached);
+ }
+
+ var state = GetStateInternal();
+ _cache[cacheKey] = GetRawValue();
+ return state;
+ }
+ }
+
+ private object? GetRawValue()
{
try
{
- var value = Registry.GetValue(Path, Name, DefaultValue);
- if (value == null)
- return false;
- return (int)value == OnValue;
+ using var key = GetRegistryKey(Path, false);
+ if (key == null)
+ return CheckKeyExists ? null : DefaultValue;
+
+ var value = key.GetValue(Name, DefaultValue);
+ return value;
}
catch
{
- return false;
+ return CheckKeyExists ? null : DefaultValue;
}
}
- public void SetState(bool isOn)
+ private bool GetStateInternal()
{
try
{
- Registry.SetValue(Path, Name, isOn ? OnValue : OffValue, RegistryValueKind.DWord);
+ using var key = GetRegistryKey(Path, false);
+ if (key == null)
+ {
+ return CompareValues(CheckKeyExists ? null : DefaultValue);
+ }
+
+ var value = key.GetValue(Name, DefaultValue);
+ return CompareValues(value);
}
catch
{
+ return CompareValues(DefaultValue);
}
}
+
+ private bool CompareValues(object? value)
+ {
+ if (value == null && OnValue == null)
+ return true;
+ if (value == null || OnValue == null)
+ return false;
+
+ if (value is int intVal && OnValue is int onInt)
+ return intVal == onInt;
+
+ if (value is string strVal)
+ return strVal.Equals(OnValue.ToString(), StringComparison.OrdinalIgnoreCase);
+
+ return value.Equals(OnValue);
+ }
+
+ public void SetState(bool isOn)
+ {
+ lock (_lock)
+ {
+ var cacheKey = $"{Path}\\{Name}";
+ _cache.Remove(cacheKey);
+
+ try
+ {
+ using var key = GetRegistryKey(Path, true);
+ if (key == null)
+ return;
+
+ var value = isOn ? OnValue : OffValue;
+ key.SetValue(Name, value, ValueKind);
+ _cache[cacheKey] = value;
+ }
+ catch
+ {
+ }
+ }
+ }
+
+ public void ClearCache()
+ {
+ lock (_lock)
+ {
+ var cacheKey = $"{Path}\\{Name}";
+ _cache.Remove(cacheKey);
+ }
+ }
+
+ public static void ClearAllCache()
+ {
+ lock (_lock)
+ {
+ _cache.Clear();
+ }
+ }
+
+ private static RegistryKey? GetRegistryKey(string path, bool writable)
+ {
+ if (string.IsNullOrEmpty(path))
+ return null;
+
+ var rootKeyName = path.Split('\\')[0].Replace("HKEY_CURRENT_USER", "HKCU")
+ .Replace("HKEY_LOCAL_MACHINE", "HKLM")
+ .Replace("HKEY_CLASSES_ROOT", "HKCR")
+ .Replace("HKEY_USERS", "HKU")
+ .Replace("HKEY_CURRENT_CONFIG", "HKCC");
+
+ var subPath = string.Join("\\", path.Split('\\').Skip(1));
+
+ var rootKey = rootKeyName switch
+ {
+ "HKCU" => Registry.CurrentUser,
+ "HKLM" => Registry.LocalMachine,
+ "HKCR" => Registry.ClassesRoot,
+ "HKU" => Registry.Users,
+ "HKCC" => Registry.CurrentConfig,
+ _ => null
+ };
+
+ if (rootKey == null)
+ return null;
+
+ return writable
+ ? rootKey.CreateSubKey(subPath, true)
+ : rootKey.OpenSubKey(subPath, false);
+ }
}
diff --git a/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs
index 06c0971..6690d93 100644
--- a/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs
+++ b/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs
@@ -1,39 +1,42 @@
+using System.Collections.ObjectModel;
+using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Core.ToggleFeatures;
-using Wpf.Ui.Controls;
+using optimizerDuck.Services.Managers;
namespace optimizerDuck.Core.ToggleFeatures.System;
-public class DisableAutomaticWindowsUpdate : BaseToggleFeature
+[ToggleFeatureCategory]
+public class System : IToggleFeatureCategory
{
- public override string Name => "ToggleFeature.DisableAutomaticWindowsUpdate.Name";
- public override string Description => "ToggleFeature.DisableAutomaticWindowsUpdate.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Risky;
- public override SymbolRegular Icon => SymbolRegular.ArrowSync24;
+ public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.System.Name"];
+ public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.System;
+ public ObservableCollection<IToggleFeature> Features { get; init; } = [];
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-System-001", Risk = OptimizationRisk.Risky, Type = ToggleFeatureType.Registry)]
+ public class DisableAutomaticWindowsUpdate : RegistryToggleFeature
{
- Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU",
- Name = "NoAutoUpdate",
- OnValue = 1,
- OffValue = 0,
- DefaultValue = 0
- };
-}
-
-public class DisableStorageSense : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.DisableStorageSense.Name";
- public override string Description => "ToggleFeature.DisableStorageSense.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.Storage24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU",
+ Name = "NoAutoUpdate",
+ OnValue = 1,
+ OffValue = 0,
+ DefaultValue = 0
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-System-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableStorageSense : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\StorageSense",
- Name = "StorageSenseStatus",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\StorageSense",
+ Name = "StorageSenseStatus",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
}
diff --git a/optimizerDuck/Core/ToggleFeatures/ToggleFeatureCategory.cs b/optimizerDuck/Core/ToggleFeatures/ToggleFeatureCategory.cs
index 6df7ec9..a8e5fcc 100644
--- a/optimizerDuck/Core/ToggleFeatures/ToggleFeatureCategory.cs
+++ b/optimizerDuck/Core/ToggleFeatures/ToggleFeatureCategory.cs
@@ -1,14 +1,12 @@
using System.Collections.ObjectModel;
using optimizerDuck.Core.Interfaces;
-using Wpf.Ui.Controls;
+using optimizerDuck.Core.Models.UI;
namespace optimizerDuck.Core.ToggleFeatures;
-public class ToggleFeatureCategory
+public class ToggleFeatureCategory : IToggleFeatureCategory
{
public required string Name { get; init; }
- public required string Description { get; init; }
- public required SymbolRegular Icon { get; init; }
- public required Type PageType { get; init; }
+ public ToggleFeatureCategoryOrder Order { get; init; }
public ObservableCollection<IToggleFeature> Features { get; init; } = [];
}
diff --git a/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs
index 171a5e0..3be8d28 100644
--- a/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs
+++ b/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs
@@ -1,90 +1,82 @@
+using System.Collections.ObjectModel;
+using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Core.ToggleFeatures;
-using Wpf.Ui.Controls;
+using optimizerDuck.Services.Managers;
namespace optimizerDuck.Core.ToggleFeatures.UserExperience;
-public class DisableTaskbarNewsAndInterests : BaseToggleFeature
+[ToggleFeatureCategory]
+public class UserExperience : IToggleFeatureCategory
{
- public override string Name => "ToggleFeature.DisableTaskbarNewsAndInterests.Name";
- public override string Description => "ToggleFeature.DisableTaskbarNewsAndInterests.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.News24;
+ public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.UserExperience.Name"];
+ public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.UserExperience;
+ public ObservableCollection<IToggleFeature> Features { get; init; } = [];
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-UX-001", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableTaskbarNewsAndInterests : RegistryToggleFeature
{
- Path = @"HKLM\SOFTWARE\Policies\Microsoft\Dsh",
- Name = "AllowNewsAndInterests",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
-}
-
-public class EnableDarkMode : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.EnableDarkMode.Name";
- public override string Description => "ToggleFeature.EnableDarkMode.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.WeatherMoon24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKLM\SOFTWARE\Policies\Microsoft\Dsh",
+ Name = "AllowNewsAndInterests",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-UX-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class EnableDarkMode : RegistryToggleFeature
{
- Path = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
- Name = "AppsUseLightTheme",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
-}
-
-public class DisableVisualEffects : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.DisableVisualEffects.Name";
- public override string Description => "ToggleFeature.DisableVisualEffects.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.PaintBrush24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
+ Name = "AppsUseLightTheme",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-UX-003", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class DisableVisualEffects : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
- Name = "TaskbarAnimations",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
-}
-
-public class ShowSecondsInSystemClock : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.ShowSecondsInSystemClock.Name";
- public override string Description => "ToggleFeature.ShowSecondsInSystemClock.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.Clock24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
+ Name = "TaskbarAnimations",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-UX-004", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class ShowSecondsInSystemClock : RegistryToggleFeature
{
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
- Name = "ShowSecondsInSystemClock",
- OnValue = 1,
- OffValue = 0,
- DefaultValue = 0
- };
-}
-
-public class EnableClassicContextMenu : BaseToggleFeature
-{
- public override string Name => "ToggleFeature.EnableClassicContextMenu.Name";
- public override string Description => "ToggleFeature.EnableClassicContextMenu.Description";
- public override OptimizationRisk Risk => OptimizationRisk.Safe;
- public override SymbolRegular Icon => SymbolRegular.List24;
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
+ Name = "ShowSecondsInSystemClock",
+ OnValue = 1,
+ OffValue = 0,
+ DefaultValue = 0
+ };
+ }
- protected new RegistryToggle Toggle { get; } = new()
+ [ToggleFeature(Id = "TF-UX-005", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
+ public class EnableClassicContextMenu : RegistryToggleFeature
{
- Path = @"HKCU\SOFTWARE\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32",
- Name = "",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
+ public RegistryToggle Toggle { get; } = new()
+ {
+ Path = @"HKCU\SOFTWARE\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32",
+ Name = "",
+ OnValue = 0,
+ OffValue = 1,
+ DefaultValue = 1,
+ CheckKeyExists = true
+ };
+ }
}
diff --git a/optimizerDuck/Services/ToggleFeaturesRegistry.cs b/optimizerDuck/Services/ToggleFeaturesRegistry.cs
index df36833..3a91c9c 100644
--- a/optimizerDuck/Services/ToggleFeaturesRegistry.cs
+++ b/optimizerDuck/Services/ToggleFeaturesRegistry.cs
@@ -1,82 +1,56 @@
using System.Collections.ObjectModel;
-using optimizerDuck.Core.ToggleFeatures;
-using optimizerDuck.Core.ToggleFeatures.AI;
-using optimizerDuck.Core.ToggleFeatures.Privacy;
-using optimizerDuck.Core.ToggleFeatures.System;
-using optimizerDuck.Core.ToggleFeatures.UserExperience;
-using optimizerDuck.UI.Views.Pages.ToggleFeatures;
-using Wpf.Ui.Controls;
-using SysToggle = optimizerDuck.Core.ToggleFeatures.System;
+using System.Reflection;
+using optimizerDuck.Common.Helpers;
+using optimizerDuck.Core.Interfaces;
namespace optimizerDuck.Services;
public class ToggleFeaturesRegistry
{
- public ObservableCollection<ToggleFeatureCategory> Categories { get; } = [];
+ private static ToggleFeaturesRegistry? _instance;
+ public static ToggleFeaturesRegistry Instance => _instance ??= new ToggleFeaturesRegistry();
+
+ public IToggleFeatureCategory[] Categories { get; private set; } = [];
public void RegisterCategories()
{
- Categories.Add(new ToggleFeatureCategory
- {
- Name = "ToggleFeature.Category.AI.Name",
- Description = "ToggleFeature.Category.AI.Description",
- Icon = SymbolRegular.Brain24,
- PageType = typeof(AIToggleFeaturePage),
- Features =
+ var categories = ReflectionHelper
+ .FindImplementationsInLoadedAssemblies<IToggleFeatureCategory>()
+ .Select(t =>
{
- new DisableWindowsCopilot(),
- new DisableBingInWindowsSearch(),
- new DisableSuggestionsInStart(),
- new DisableTailoredExperiences()
- }
- });
+ var featureTypes = t.GetNestedTypes(BindingFlags.Public)
+ .Where(nt => typeof(IToggleFeature).IsAssignableFrom(nt) && !nt.IsAbstract)
+ .ToList();
- Categories.Add(new ToggleFeatureCategory
- {
- Name = "ToggleFeature.Category.UserExperience.Name",
- Description = "ToggleFeature.Category.UserExperience.Description",
- Icon = SymbolRegular.Window24,
- PageType = typeof(UserExperienceToggleFeaturePage),
- Features =
- {
- new DisableTaskbarNewsAndInterests(),
- new EnableDarkMode(),
- new DisableVisualEffects(),
- new ShowSecondsInSystemClock(),
- new EnableClassicContextMenu()
- }
- });
+ var features = new ObservableCollection<IToggleFeature>(
+ featureTypes
+ .Select(nt => Activator.CreateInstance(nt)!)
+ .Cast<IToggleFeature>()
+ .ToList()
+ );
- Categories.Add(new ToggleFeatureCategory
- {
- Name = "ToggleFeature.Category.Privacy.Name",
- Description = "ToggleFeature.Category.Privacy.Description",
- Icon = SymbolRegular.Shield24,
- PageType = typeof(PrivacyToggleFeaturePage),
- Features =
- {
- new DisableTelemetry(),
- new DisableDiagnosticData(),
- new DisableFeedbackNotifications()
- }
- });
+ if (features.Count == 0)
+ return null;
- Categories.Add(new ToggleFeatureCategory
- {
- Name = "ToggleFeature.Category.System.Name",
- Description = "ToggleFeature.Category.System.Description",
- Icon = SymbolRegular.Settings24,
- PageType = typeof(SystemToggleFeaturePage),
- Features =
- {
- new SysToggle.DisableAutomaticWindowsUpdate(),
- new SysToggle.DisableStorageSense()
- }
- });
+ var instance = (IToggleFeatureCategory)Activator.CreateInstance(t)!;
+
+ var featuresProp = t.GetProperty(nameof(IToggleFeatureCategory.Features),
+ BindingFlags.Public | BindingFlags.Instance);
+ if (featuresProp != null && featuresProp.CanWrite)
+ featuresProp.SetValue(instance, features);
+
+ return instance;
+ })
+ .Where(c => c != null)
+ .Cast<IToggleFeatureCategory>()
+ .OrderBy(c => c.Order)
+ .ToArray();
+
+ Categories = categories;
}
- public ToggleFeatureCategory? GetCategoryByName(string name)
+ public IToggleFeatureCategory? GetCategory(Type type)
{
- return Categories.FirstOrDefault(c => c.Name == name);
+ return Categories.FirstOrDefault(c => c.GetType() == type);
}
}
diff --git a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs
index af096be..f634e7a 100644
--- a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs
@@ -1,41 +1,165 @@
using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
-using optimizerDuck.Core.ToggleFeatures;
+using optimizerDuck.Core.Interfaces;
using optimizerDuck.Services;
-using Wpf.Ui;
-using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Pages;
-public partial class ToggleFeaturesViewModel : ViewModel
+public partial class ToggleFeaturesViewModel : ObservableObject
{
- private readonly INavigationService _navigationService;
+ [ObservableProperty]
+ private ObservableCollection<CategoryViewModel> _categories = [];
+
+ [ObservableProperty]
+ private string _searchText = string.Empty;
[ObservableProperty]
- private ObservableCollection<ToggleFeatureCategory> _categories = [];
+ private bool _isLoading = true;
- public ToggleFeaturesViewModel(INavigationService navigationService)
+ public ToggleFeaturesViewModel()
{
- _navigationService = navigationService;
}
- public void Initialize()
+ public async Task InitializeAsync()
{
+ IsLoading = true;
+
var registry = ToggleFeaturesRegistry.Instance;
- if (registry.Categories.Count == 0)
+ if (registry.Categories.Length == 0)
{
registry.RegisterCategories();
}
- Categories = registry.Categories;
+
+ var categoryViewModels = new ObservableCollection<CategoryViewModel>();
+
+ foreach (var category in registry.Categories)
+ {
+ var categoryVm = new CategoryViewModel
+ {
+ Name = category.Name,
+ Features = new ObservableCollection<FeatureViewModel>()
+ };
+
+ foreach (var feature in category.Features)
+ {
+ var featureVm = new FeatureViewModel(feature);
+ categoryVm.Features.Add(featureVm);
+ }
+
+ categoryViewModels.Add(categoryVm);
+ }
+
+ foreach (var category in categoryViewModels)
+ {
+ foreach (var feature in category.Features)
+ {
+ _ = feature.LoadStateAsync();
+ }
+ }
+
+ Categories = categoryViewModels;
+ IsLoading = false;
+ }
+
+ partial void OnSearchTextChanged(string value)
+ {
+ foreach (var category in Categories)
+ {
+ category.FilterFeatures(value);
+ }
+ }
+}
+
+public partial class CategoryViewModel : ObservableObject
+{
+ [ObservableProperty]
+ private string _name = string.Empty;
+
+ [ObservableProperty]
+ private ObservableCollection<FeatureViewModel> _features = [];
+
+ [ObservableProperty]
+ private bool _hasVisibleFeatures = true;
+
+ public void FilterFeatures(string searchText)
+ {
+ var searchLower = searchText.ToLowerInvariant();
+
+ foreach (var feature in Features)
+ {
+ feature.IsVisible = string.IsNullOrEmpty(searchText) ||
+ feature.Name.ToLowerInvariant().Contains(searchLower) ||
+ feature.Description.ToLowerInvariant().Contains(searchLower);
+ }
+
+ HasVisibleFeatures = Features.Any(f => f.IsVisible);
+ }
+}
+
+public partial class FeatureViewModel : ObservableObject
+{
+ private readonly IToggleFeature _feature;
+
+ [ObservableProperty]
+ private string _name = string.Empty;
+
+ [ObservableProperty]
+ private string _description = string.Empty;
+
+ [ObservableProperty]
+ private bool _isEnabled;
+
+ [ObservableProperty]
+ private bool _isVisible = true;
+
+ [ObservableProperty]
+ private bool _isLoading;
+
+ public FeatureViewModel(IToggleFeature feature)
+ {
+ _feature = feature;
+ _name = feature.Name;
+ _description = feature.Description;
+ }
+
+ public async Task LoadStateAsync()
+ {
+ try
+ {
+ IsEnabled = await _feature.GetStateAsync();
+ }
+ catch
+ {
+ IsEnabled = false;
+ }
}
[RelayCommand]
- private void NavigateToCategory(ToggleFeatureCategory category)
+ private async Task ToggleAsync()
{
- if (category.PageType != null)
+ if (IsLoading)
+ return;
+
+ IsLoading = true;
+ try
+ {
+ if (IsEnabled)
+ {
+ await _feature.DisableAsync();
+ IsEnabled = false;
+ }
+ else
+ {
+ await _feature.EnableAsync();
+ IsEnabled = true;
+ }
+ }
+ finally
{
- _navigationService.Navigate(category.PageType);
+ IsLoading = false;
}
}
}
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/LocConverter.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/LocConverter.cs
deleted file mode 100644
index 4dbaedc..0000000
--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/LocConverter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Globalization;
-using System.Windows.Data;
-using optimizerDuck.Services.Managers;
-
-namespace optimizerDuck.UI.Views.Pages.ToggleFeatures;
-
-public class LocConverter : IValueConverter
-{
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- if (value is string key)
- {
- return Loc.Instance[key];
- }
- return value?.ToString() ?? string.Empty;
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotImplementedException();
- }
-}
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml
index 12ae81a..87a5078 100644
--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml
@@ -1,26 +1,27 @@
<Page
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Margin="0,32,0,0"
- ScrollViewer.CanContentScroll="False"
- Title="ToggleFeatures"
- d:DataContext="{d:DesignInstance toggleFeatures:ToggleFeaturesPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.ToggleFeatures.ToggleFeaturesPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"
- xmlns:toggleFeatures="clr-namespace:optimizerDuck.UI.Views.Pages.ToggleFeatures"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ xmlns:vm="clr-namespace:optimizerDuck.UI.ViewModels.Pages"
+ Title="ToggleFeatures"
+ Margin="0,32,0,0"
+ d:DataContext="{d:DesignInstance vm:ToggleFeaturesViewModel}"
+ d:DesignHeight="650"
+ d:DesignWidth="800"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ ScrollViewer.CanContentScroll="False"
+ mc:Ignorable="d">
<Page.Resources>
- <toggleFeatures:LocConverter x:Key="LocConverter" />
+ <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+ <converters:InverseBooleanToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
</Page.Resources>
<Grid>
@@ -29,53 +30,95 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
- <!-- Category Cards -->
+ <Grid Grid.Row="0" Margin="42,0,42,16">
+ <ui:TextBox
+ MinWidth="300"
+ HorizontalAlignment="Left"
+ VerticalAlignment="Center"
+ Icon="{ui:SymbolIcon Search24}"
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
+ </Grid>
+
<ScrollViewer
Grid.Row="1"
HorizontalScrollBarVisibility="Disabled"
Margin="42,0,42,0"
VerticalScrollBarVisibility="Auto">
- <ItemsControl ItemsSource="{Binding ViewModel.Categories}">
+ <ItemsControl ItemsSource="{Binding Categories}">
<ItemsControl.ItemTemplate>
<DataTemplate>
- <ui:CardAction
- Command="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"
- CommandParameter="{Binding}"
- Cursor="Hand"
- HorizontalAlignment="Stretch"
- Margin="8"
- Padding="20"
- VerticalAlignment="Stretch">
- <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
+ <StackPanel Visibility="{Binding HasVisibleFeatures, Converter={StaticResource BoolToVisibilityConverter}}">
+ <ui:TextBlock
+ Margin="0,16,0,8"
+ FontTypography="Subtitle"
+ Text="{Binding Name}"
+ TextWrapping="Wrap" />
- <ui:SymbolIcon
- FontSize="32"
- Grid.Column="0"
- Margin="0,0,16,0"
- Symbol="{Binding Icon}" />
+ <Border
+ Margin="0,0,0,16"
+ Background="{DynamicResource CardBackground}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="5">
+ <ItemsControl ItemsSource="{Binding Features}">
+ <ItemsControl.ItemTemplate>
+ <DataTemplate>
+ <Border
+ Padding="16,12"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="0,0,0,1"
+ Visibility="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}">
+ <Grid ColumnDefinitions="*,Auto">
+ <StackPanel Grid.Column="0" VerticalAlignment="Center">
+ <ui:TextBlock
+ FontTypography="Body"
+ Text="{Binding Name}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Margin="0,4,0,0"
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Text="{Binding Description}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+ </StackPanel>
- <StackPanel Grid.Column="1" VerticalAlignment="Center">
- <ui:TextBlock
- FontTypography="Subtitle"
- Text="{Binding Name, Converter={StaticResource LocConverter}}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Caption"
- Margin="0,4,0,0"
- Text="{Binding Description, Converter={StaticResource LocConverter}}"
- TextWrapping="Wrap" />
- </StackPanel>
- </Grid>
- </ui:CardAction>
+ <ui:ToggleSwitch
+ Grid.Column="1"
+ Margin="16,0,0,0"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Center"
+ Command="{Binding ToggleCommand}"
+ IsChecked="{Binding IsEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+ </Grid>
+ </Border>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </Border>
+ </StackPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
- </Grid>
+ <Border
+ Grid.Row="1"
+ Visibility="{Binding IsLoading, Converter={StaticResource BoolToVisibilityConverter}}">
+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+ <ui:ProgressRing
+ Width="48"
+ Height="48"
+ Margin="0,0,0,16"
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ IsIndeterminate="True" />
+ <ui:TextBlock
+ HorizontalAlignment="Center"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc ToggleFeatures.Loading}" />
+ </StackPanel>
+ </Border>
+ </Grid>
</Page>
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml.cs
index 9955749..e4d6636 100644
--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml.cs
+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml.cs
@@ -14,6 +14,6 @@ public partial class ToggleFeaturesPage : INavigableView<ToggleFeaturesViewModel
InitializeComponent();
- Loaded += (_, _) => ViewModel.Initialize();
+ Loaded += async (_, _) => await ViewModel.InitializeAsync();
}
}