Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
refactor: use Features instead of Toggle Features
itsfatduck612534cfeb0a
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.csindex 9a2ecf4..94c1b2d 100644--- a/optimizerDuck/App.xaml.cs+++ b/optimizerDuck/App.xaml.cs@@ -15,7 +15,7 @@ using optimizerDuck.Services.Managers;using optimizerDuck.Services.OptimizationServices;using optimizerDuck.UI.ViewModels.Pages;using optimizerDuck.UI.Views.Pages;-using optimizerDuck.UI.Views.Pages.ToggleFeatures;+using optimizerDuck.UI.Views.Pages.Features;using optimizerDuck.UI.Views.Windows;using Serilog;using Serilog.Events;@@ -171,10 +171,10 @@ public partial class App : Applicationservices.AddSingleton<ScheduledTasksPage>();// Toggle Features- services.AddSingleton<ToggleFeaturesViewModel>();- services.AddSingleton<ToggleFeaturesPage>();+ services.AddSingleton<FeaturesViewModel>();+ services.AddSingleton<FeaturesPage>();- services.AddAllToggleFeatureCategoryPages();+ services.AddAllFeaturesCategoryPages();// Optimizationsservices.AddAllOptimizationPages();@@ -185,7 +185,7 @@ public partial class App : Application// Servicesservices.AddSingleton<OptimizationRegistry>();- services.AddSingleton<ToggleFeaturesRegistry>();+ services.AddSingleton<FeatureRegistry>();services.AddSingleton<OptimizationService>();services.AddSingleton<BloatwareService>();services.AddSingleton<DiskCleanupService>();diff --git a/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/FeaturesCategoryPageRegistryExtensions.cssimilarity index 62%rename from optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.csrename to optimizerDuck/Common/Extensions/FeaturesCategoryPageRegistryExtensions.csindex 96819f9..207aab6 100644--- a/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs+++ b/optimizerDuck/Common/Extensions/FeaturesCategoryPageRegistryExtensions.cs@@ -6,23 +6,22 @@ using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;using optimizerDuck.Services;using optimizerDuck.UI.ViewModels.Pages;-using optimizerDuck.UI.ViewModels.ToggleFeatures;+using optimizerDuck.UI.ViewModels.Features;using Wpf.Ui;-using ToggleFeaturesCategoryViewModel = optimizerDuck.UI.ViewModels.ToggleFeatures.ToggleFeaturesCategoryViewModel;namespace optimizerDuck.Common.Extensions;-public static class ToggleFeaturesCategoryPageRegistryExtensions+public static class FeaturesCategoryPageRegistryExtensions{- public static void AddAllToggleFeatureCategoryPages(this IServiceCollection services)+ public static void AddAllFeaturesCategoryPages(this IServiceCollection services){var categoryTypes = ReflectionHelper- .FindImplementationsInLoadedAssemblies<IToggleFeaturesCategory>()+ .FindImplementationsInLoadedAssemblies<IFeatureCategory>().ToList();foreach (var categoryType in categoryTypes){- var attr = categoryType.GetCustomAttribute<ToggleFeatureCategoryAttribute>();+ var attr = categoryType.GetCustomAttribute<FeatureCategoryAttribute>();if (attr?.PageType != null){var pageType = attr.PageType;@@ -36,11 +35,11 @@ public static class ToggleFeaturesCategoryPageRegistryExtensionsType categoryType,Type pageType){- var registry = serviceProvider.GetRequiredService<ToggleFeaturesRegistry>();+ var registry = serviceProvider.GetRequiredService<FeatureRegistry>();var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();var category = registry.Categories.First(c => c.GetType() == categoryType);- var viewModel = new ToggleFeaturesCategoryViewModel(category, loggerFactory);+ var viewModel = new FeatureCategoryViewModel(category, loggerFactory);return Activator.CreateInstance(pageType, viewModel)!;}diff --git a/optimizerDuck/Core/ToggleFeatures/SystemToggleFeatures.cs b/optimizerDuck/Core/Features/System.cssimilarity index 56%rename from optimizerDuck/Core/ToggleFeatures/SystemToggleFeatures.csrename to optimizerDuck/Core/Features/System.csindex 8880ed0..1fce564 100644--- a/optimizerDuck/Core/ToggleFeatures/SystemToggleFeatures.cs+++ b/optimizerDuck/Core/Features/System.cs@@ -1,22 +1,22 @@using System.Collections.ObjectModel;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;-using optimizerDuck.Core.Models.ToggleFeatures;+using optimizerDuck.Core.Models.Features;using optimizerDuck.Core.Models.UI;using optimizerDuck.Services.Managers;-using optimizerDuck.UI.Views.Pages.ToggleFeatures;+using optimizerDuck.UI.Views.Pages.Features;using Wpf.Ui.Controls;-namespace optimizerDuck.Core.ToggleFeatures;+namespace optimizerDuck.Core.Features;-[ToggleFeatureCategory(PageType = typeof(SystemToggleFeaturesCategory))]-public class System : IToggleFeaturesCategory+[FeatureCategory(PageType = typeof(SystemFeatureCategory))]+public class System : IFeatureCategory{- public string Name => Loc.Instance[$"ToggleFeature.Category.{nameof(System)}"];- public string Description => Loc.Instance[$"ToggleFeature.Category.{nameof(System)}.Description"];+ public string Name => Loc.Instance[$"Features.{nameof(System)}"];+ public string Description => Loc.Instance[$"Features.{nameof(System)}.Description"];public SymbolRegular Icon { get; init; } = SymbolRegular.Desktop24;- public ToggleFeaturesCategoryOrder Order { get; init; } = ToggleFeaturesCategoryOrder.System;- public ObservableCollection<IToggleFeature> Features { get; init; } = [];+ public FeatureCategoryOrder Order { get; init; } = FeatureCategoryOrder.System;+ public ObservableCollection<IFeature> Features { get; init; } = [];public enum Sections{@@ -24,8 +24,8 @@ public class System : IToggleFeaturesCategoryStorage}- [ToggleFeature(Section = nameof(Sections.WindowsUpdate))]- public class DisableAutomaticWindowsUpdate : BaseToggleFeature+ [Feature(Section = nameof(Sections.WindowsUpdate))]+ public class DisableAutomaticWindowsUpdate : BaseFeature{protected override IEnumerable<RegistryToggle> RegistryToggles =>[@@ -40,8 +40,8 @@ public class System : IToggleFeaturesCategory];}- [ToggleFeature(Section = nameof(Sections.Storage))]- public class DisableStorageSense : BaseToggleFeature+ [Feature(Section = nameof(Sections.Storage))]+ public class DisableStorageSense : BaseFeature{protected override IEnumerable<RegistryToggle> RegistryToggles =>[diff --git a/optimizerDuck/Core/ToggleFeatures/UserExperienceToggleFeatures.cs b/optimizerDuck/Core/Features/UserExperience.cssimilarity index 64%rename from optimizerDuck/Core/ToggleFeatures/UserExperienceToggleFeatures.csrename to optimizerDuck/Core/Features/UserExperience.csindex 75f99d9..3c03b23 100644--- a/optimizerDuck/Core/ToggleFeatures/UserExperienceToggleFeatures.cs+++ b/optimizerDuck/Core/Features/UserExperience.cs@@ -1,22 +1,22 @@using System.Collections.ObjectModel;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;-using optimizerDuck.Core.Models.ToggleFeatures;+using optimizerDuck.Core.Models.Features;using optimizerDuck.Core.Models.UI;using optimizerDuck.Services.Managers;-using optimizerDuck.UI.Views.Pages.ToggleFeatures;+using optimizerDuck.UI.Views.Pages.Features;using Wpf.Ui.Controls;-namespace optimizerDuck.Core.ToggleFeatures;+namespace optimizerDuck.Core.Features;-[ToggleFeatureCategory(PageType = typeof(UserExperienceToggleFeaturesCategory))]-public class UserExperience : IToggleFeaturesCategory+[FeatureCategory(PageType = typeof(UserExperienceFeatureCategory))]+public class UserExperience : IFeatureCategory{- public string Name => Loc.Instance[$"ToggleFeature.Category.{nameof(UserExperience)}"];- public string Description => Loc.Instance[$"ToggleFeature.Category.{nameof(UserExperience)}.Description"];+ public string Name => Loc.Instance[$"ToggleFeature.{nameof(UserExperience)}"];+ public string Description => Loc.Instance[$"ToggleFeature.{nameof(UserExperience)}.Description"];public SymbolRegular Icon { get; init; } = SymbolRegular.Color24;- public ToggleFeaturesCategoryOrder Order { get; init; } = ToggleFeaturesCategoryOrder.UserExperience;- public ObservableCollection<IToggleFeature> Features { get; init; } = [];+ public FeatureCategoryOrder Order { get; init; } = FeatureCategoryOrder.UserExperience;+ public ObservableCollection<IFeature> Features { get; init; } = [];public enum Sections{@@ -26,8 +26,8 @@ public class UserExperience : IToggleFeaturesCategoryExplorer}- [ToggleFeature(Section = nameof(Sections.Taskbar))]- public class DisableTaskbarNewsAndInterests : BaseToggleFeature+ [Feature(Section = nameof(Sections.Taskbar))]+ public class DisableTaskbarNewsAndInterests : BaseFeature{protected override IEnumerable<RegistryToggle> RegistryToggles =>[@@ -42,8 +42,8 @@ public class UserExperience : IToggleFeaturesCategory];}- [ToggleFeature(Section = nameof(Sections.Appearance))]- public class EnableDarkMode : BaseToggleFeature+ [Feature(Section = nameof(Sections.Appearance))]+ public class EnableDarkMode : BaseFeature{protected override IEnumerable<RegistryToggle> RegistryToggles =>[@@ -58,8 +58,8 @@ public class UserExperience : IToggleFeaturesCategory];}- [ToggleFeature(Section = nameof(Sections.Taskbar))]- public class DisableVisualEffects : BaseToggleFeature+ [Feature(Section = nameof(Sections.Taskbar))]+ public class DisableVisualEffects : BaseFeature{protected override IEnumerable<RegistryToggle> RegistryToggles =>[@@ -74,8 +74,8 @@ public class UserExperience : IToggleFeaturesCategory];}- [ToggleFeature(Section = nameof(Sections.SystemTray))]- public class ShowSecondsInSystemClock : BaseToggleFeature+ [Feature(Section = nameof(Sections.SystemTray))]+ public class ShowSecondsInSystemClock : BaseFeature{protected override IEnumerable<RegistryToggle> RegistryToggles =>[@@ -90,8 +90,8 @@ public class UserExperience : IToggleFeaturesCategory];}- [ToggleFeature(Section = nameof(Sections.Explorer))]- public class EnableClassicContextMenu : BaseToggleFeature+ [Feature(Section = nameof(Sections.Explorer))]+ public class EnableClassicContextMenu : BaseFeature{protected override IEnumerable<RegistryToggle> RegistryToggles =>[@@ -102,7 +102,7 @@ public class UserExperience : IToggleFeaturesCategoryOnValue = 0,OffValue = 1,DefaultValue = 1,- CheckKeyExists = true+ TreatMissingAsDefault = true}];}diff --git a/optimizerDuck/Core/Interfaces/IToggleFeature.cs b/optimizerDuck/Core/Interfaces/IFeature.cssimilarity index 89%rename from optimizerDuck/Core/Interfaces/IToggleFeature.csrename to optimizerDuck/Core/Interfaces/IFeature.csindex 8bce9a0..afee9c5 100644--- a/optimizerDuck/Core/Interfaces/IToggleFeature.cs+++ b/optimizerDuck/Core/Interfaces/IFeature.cs@@ -2,7 +2,7 @@ using optimizerDuck.Core.Models.UI;namespace optimizerDuck.Core.Interfaces;-public interface IToggleFeature+public interface IFeature{string Name { get; }string Description { get; }diff --git a/optimizerDuck/Core/Interfaces/IToggleFeaturesCategory.cs b/optimizerDuck/Core/Interfaces/IFeatureCategory.cssimilarity index 59%rename from optimizerDuck/Core/Interfaces/IToggleFeaturesCategory.csrename to optimizerDuck/Core/Interfaces/IFeatureCategory.csindex bcb9a88..9318431 100644--- a/optimizerDuck/Core/Interfaces/IToggleFeaturesCategory.cs+++ b/optimizerDuck/Core/Interfaces/IFeatureCategory.cs@@ -4,11 +4,11 @@ using Wpf.Ui.Controls;namespace optimizerDuck.Core.Interfaces;-public interface IToggleFeaturesCategory+public interface IFeatureCategory{public string Name { get; }public string Description { get; }public SymbolRegular Icon { get; init; }- public ToggleFeaturesCategoryOrder Order { get; init; }- public ObservableCollection<IToggleFeature> Features { get; init; }+ public FeatureCategoryOrder Order { get; init; }+ public ObservableCollection<IFeature> Features { get; init; }}\ No newline at end of filediff --git a/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs b/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cssimilarity index 88%rename from optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.csrename to optimizerDuck/Core/Models/Attributes/FeatureAttribute.csindex 4ee8a15..57074bc 100644--- a/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs+++ b/optimizerDuck/Core/Models/Attributes/FeatureAttribute.cs@@ -3,7 +3,7 @@ using optimizerDuck.Core.Models.UI;namespace optimizerDuck.Core.Models.Attributes;[AttributeUsage(AttributeTargets.Class, Inherited = false)]-public sealed class ToggleFeatureAttribute : Attribute+public sealed class FeatureAttribute : Attribute{public object? Section { get; init; }diff --git a/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs b/optimizerDuck/Core/Models/Attributes/FeatureCategoryAttribute.cssimilarity index 72%rename from optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.csrename to optimizerDuck/Core/Models/Attributes/FeatureCategoryAttribute.csindex 749994e..25e857c 100644--- a/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs+++ b/optimizerDuck/Core/Models/Attributes/FeatureCategoryAttribute.cs@@ -1,7 +1,7 @@namespace optimizerDuck.Core.Models.Attributes;[AttributeUsage(AttributeTargets.Class, Inherited = false)]-public class ToggleFeatureCategoryAttribute : Attribute+public class FeatureCategoryAttribute : Attribute{public Type? PageType { get; init; }}\ No newline at end of filediff --git a/optimizerDuck/Core/Models/Features/BaseFeature.cs b/optimizerDuck/Core/Models/Features/BaseFeature.csnew file mode 100644index 0000000..f8270e2--- /dev/null+++ b/optimizerDuck/Core/Models/Features/BaseFeature.cs@@ -0,0 +1,56 @@+using System.Reflection;+using optimizerDuck.Core.Interfaces;+using optimizerDuck.Core.Models.Attributes;+using optimizerDuck.Services.Managers;++namespace optimizerDuck.Core.Models.Features;++public abstract class BaseFeature : IFeature+{+ private FeatureAttribute? _meta;++ private FeatureAttribute Meta =>+ _meta ??= GetType().GetCustomAttribute<FeatureAttribute>()+ ?? throw new InvalidOperationException(+ $"{GetType().Name} is missing [Feature] attribute");++ public Type? OwnerType { get; set; }++ public string OwnerKey =>+ OwnerType?.Name+ ?? throw new InvalidOperationException(+ $"{GetType().Name} has no owner assigned");++ public string FeatureKey => GetType().Name;++ public string Name => Loc.Instance[$"Features.{OwnerKey}.{FeatureKey}.Name"];+ public string Description => Loc.Instance[$"Features.{OwnerKey}.{FeatureKey}.Description"];+ public string Section+ {+ get+ {+ var section = Meta.GetSectionName();+ return string.IsNullOrEmpty(section) ? string.Empty : Loc.Instance[$"Features.{OwnerType?.Name}.Section.{section}"];+ }+ }++ protected virtual IEnumerable<RegistryToggle> RegistryToggles+ => [];++ public virtual Task<bool> GetStateAsync()+ {+ return Task.FromResult(RegistryToggles.All(t => t.GetState()));+ }++ public virtual Task EnableAsync() => SetTogglesState(true);++ public virtual Task DisableAsync() => SetTogglesState(false);++ private Task SetTogglesState(bool isOn)+ {+ foreach (var toggle in RegistryToggles)+ toggle.SetState(isOn);++ return Task.CompletedTask;+ }+}diff --git a/optimizerDuck/Core/Models/ToggleFeatures/FeatureSection.cs b/optimizerDuck/Core/Models/Features/FeatureSection.cssimilarity index 74%rename from optimizerDuck/Core/Models/ToggleFeatures/FeatureSection.csrename to optimizerDuck/Core/Models/Features/FeatureSection.csindex 350fefd..6751472 100644--- a/optimizerDuck/Core/Models/ToggleFeatures/FeatureSection.cs+++ b/optimizerDuck/Core/Models/Features/FeatureSection.cs@@ -1,8 +1,8 @@using System.Collections.ObjectModel;using CommunityToolkit.Mvvm.ComponentModel;-using optimizerDuck.UI.ViewModels.ToggleFeatures;+using optimizerDuck.UI.ViewModels.Features;-namespace optimizerDuck.Core.Models.ToggleFeatures;+namespace optimizerDuck.Core.Models.Features;public partial class FeatureSection : ObservableObject{diff --git a/optimizerDuck/Core/Models/Features/RegistryToggle.cs b/optimizerDuck/Core/Models/Features/RegistryToggle.csnew file mode 100644index 0000000..bb1a23a--- /dev/null+++ b/optimizerDuck/Core/Models/Features/RegistryToggle.cs@@ -0,0 +1,66 @@+using Microsoft.Win32;+using optimizerDuck.Core.Models.Optimization.Services;+using optimizerDuck.Services.OptimizationServices;++namespace optimizerDuck.Core.Models.Features;++public class RegistryToggle+{+ public required string Path { get; init; }+ public required string Name { get; init; }+ public required object? OnValue { get; init; } = 1;+ public required object? OffValue { get; init; } = 0;+ public required object? DefaultValue { get; init; } = 0;+ public bool TreatMissingAsDefault { get; init; } = false;+ public RegistryValueKind ValueKind { get; init; } = RegistryValueKind.DWord;+++ public bool GetState()+ {+ var value = GetRawValue();+ if (value == null)+ return OnValue == null;++ return AreEqual(value, OnValue);+ }++ private static bool AreEqual(object? a, object? b)+ {+ if (a == null && b == null)+ return true;++ if (a == null || b == null)+ return false;++ if (a is IConvertible && b is IConvertible)+ {+ var da = Convert.ToDecimal(a);+ var db = Convert.ToDecimal(b);+ return da == db;+ }++ return a.ToString()?.Equals(+ b.ToString(),+ StringComparison.OrdinalIgnoreCase+ ) == true;+ }++ private object? GetRawValue()+ {+ var value = RegistryService.Read<object?>(new RegistryItem(Path, Name));+ return value ?? (TreatMissingAsDefault ? null : DefaultValue);+ }++ public void SetState(bool isOn)+ {+ var targetValue = isOn ? OnValue : OffValue;+ if (targetValue == null)+ {+ RegistryService.DeleteValue(new RegistryItem(Path, Name));+ }+ else+ {+ RegistryService.Write(new RegistryItem(Path, Name, targetValue, ValueKind));+ }+ }+}diff --git a/optimizerDuck/Core/Models/ToggleFeatures/BaseToggleFeature.cs b/optimizerDuck/Core/Models/ToggleFeatures/BaseToggleFeature.csdeleted file mode 100644index 937395b..0000000--- a/optimizerDuck/Core/Models/ToggleFeatures/BaseToggleFeature.cs+++ /dev/null@@ -1,57 +0,0 @@-using System.Reflection;-using optimizerDuck.Core.Interfaces;-using optimizerDuck.Core.Models.Attributes;-using optimizerDuck.Services.Managers;--namespace optimizerDuck.Core.Models.ToggleFeatures;--public abstract class BaseToggleFeature : IToggleFeature-{- private ToggleFeatureAttribute? _meta;-- private ToggleFeatureAttribute Meta =>- _meta ??= GetType().GetCustomAttribute<ToggleFeatureAttribute>()- ?? throw new InvalidOperationException(- $"{GetType().Name} is missing [ToggleFeature] attribute");-- public Type? OwnerType { get; set; }-- public string FeatureKey => GetType().Name;-- public string Name => Loc.Instance[$"ToggleFeature.{FeatureKey}.Name"];- public string Description => Loc.Instance[$"ToggleFeature.{FeatureKey}.Description"];- public string Section- {- get- {- var section = Meta.GetSectionName();- return string.IsNullOrEmpty(section) ? string.Empty : Loc.Instance[$"ToggleFeature.Category.{OwnerType?.Name}.Section.{section}"];- }- }-- protected virtual IEnumerable<RegistryToggle>? RegistryToggles => null;-- public virtual Task<bool> GetStateAsync()- {- var toggles = RegistryToggles;- if (toggles == null)- return Task.FromResult(false);-- return Task.FromResult(toggles.All(t => t.GetState()));- }-- public virtual Task EnableAsync() => SetTogglesState(true);-- public virtual Task DisableAsync() => SetTogglesState(false);-- private Task SetTogglesState(bool isOn)- {- var toggles = RegistryToggles;- if (toggles != null)- {- foreach (var toggle in toggles)- toggle.SetState(isOn);- }- return Task.CompletedTask;- }-}diff --git a/optimizerDuck/Core/Models/ToggleFeatures/RegistryToggle.cs b/optimizerDuck/Core/Models/ToggleFeatures/RegistryToggle.csdeleted file mode 100644index c6b97e5..0000000--- a/optimizerDuck/Core/Models/ToggleFeatures/RegistryToggle.cs+++ /dev/null@@ -1,44 +0,0 @@-using Microsoft.Win32;-using optimizerDuck.Core.Models.Optimization.Services;-using optimizerDuck.Services.OptimizationServices;--namespace optimizerDuck.Core.Models.ToggleFeatures;--public class RegistryToggle-{- public string Path { get; init; } = string.Empty;- public string Name { get; init; } = string.Empty;- 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;-- public bool GetState()- {- var value = GetRawValue();- if (value == null)- return OnValue == null;-- // Unified comparison using string representation for cross-type compatibility (e.g. int vs long vs string)- var currentStr = value.ToString() ?? string.Empty;- var onStr = OnValue?.ToString() ?? string.Empty;-- return currentStr.Equals(onStr, StringComparison.OrdinalIgnoreCase);- }-- private object? GetRawValue()- {- var value = RegistryService.Read<object?>(new RegistryItem(Path, Name));- return value ?? (CheckKeyExists ? null : DefaultValue);- }-- public void SetState(bool isOn)- {- var targetValue = isOn ? OnValue : OffValue;- if (targetValue != null)- {- RegistryService.Write(new RegistryItem(Path, Name, targetValue, ValueKind));- }- }-}diff --git a/optimizerDuck/Core/Models/UI/ToggleFeaturesCategoryOrder.cs b/optimizerDuck/Core/Models/UI/FeatureCategoryOrder.cssimilarity index 65%rename from optimizerDuck/Core/Models/UI/ToggleFeaturesCategoryOrder.csrename to optimizerDuck/Core/Models/UI/FeatureCategoryOrder.csindex 7a3856e..6c4b0db 100644--- a/optimizerDuck/Core/Models/UI/ToggleFeaturesCategoryOrder.cs+++ b/optimizerDuck/Core/Models/UI/FeatureCategoryOrder.cs@@ -1,6 +1,6 @@namespace optimizerDuck.Core.Models.UI;-public enum ToggleFeaturesCategoryOrder+public enum FeatureCategoryOrder{System,UserExperience,diff --git a/optimizerDuck/Services/ToggleFeaturesRegistry.cs b/optimizerDuck/Services/FeatureRegistry.cssimilarity index 62%rename from optimizerDuck/Services/ToggleFeaturesRegistry.csrename to optimizerDuck/Services/FeatureRegistry.csindex 1e30109..0d856b8 100644--- a/optimizerDuck/Services/ToggleFeaturesRegistry.cs+++ b/optimizerDuck/Services/FeatureRegistry.cs@@ -4,28 +4,28 @@ using System.Reflection;using optimizerDuck.Common.Helpers;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;-using optimizerDuck.Core.Models.ToggleFeatures;+using optimizerDuck.Core.Models.Features;using Wpf.Ui.Controls;namespace optimizerDuck.Services;-public class ToggleFeaturesRegistry+public class FeatureRegistry{- public IToggleFeaturesCategory[] Categories { get; private set; } = [];+ public IFeatureCategory[] Categories { get; private set; } = [];public void RegisterCategories(){var categories = ReflectionHelper- .FindImplementationsInLoadedAssemblies<IToggleFeaturesCategory>()+ .FindImplementationsInLoadedAssemblies<IFeatureCategory>().Select(t =>{var featureTypes = t.GetNestedTypes(BindingFlags.Public)- .Where(nt => typeof(IToggleFeature).IsAssignableFrom(nt) && !nt.IsAbstract)+ .Where(nt => typeof(IFeature).IsAssignableFrom(nt) && !nt.IsAbstract).Select(nt =>{- var opt = (IToggleFeature)Activator.CreateInstance(nt)!;+ var opt = (IFeature)Activator.CreateInstance(nt)!;- if (opt is BaseToggleFeature bo)+ if (opt is BaseFeature bo)bo.OwnerType = t;return opt;@@ -35,11 +35,11 @@ public class ToggleFeaturesRegistryif (featureTypes.Count == 0)return null;- var features = new ObservableCollection<IToggleFeature>(featureTypes);+ var features = new ObservableCollection<IFeature>(featureTypes);- var instance = (IToggleFeaturesCategory)Activator.CreateInstance(t)!;+ var instance = (IFeatureCategory)Activator.CreateInstance(t)!;- var featuresProp = t.GetProperty(nameof(IToggleFeaturesCategory.Features),+ var featuresProp = t.GetProperty(nameof(IFeatureCategory.Features),BindingFlags.Public | BindingFlags.Instance);if (featuresProp != null && featuresProp.CanWrite)featuresProp.SetValue(instance, features);@@ -47,7 +47,7 @@ public class ToggleFeaturesRegistryreturn instance;}).Where(c => c != null)- .Cast<IToggleFeaturesCategory>()+ .Cast<IFeatureCategory>().OrderBy(c => c.Order).ToArray();@@ -64,7 +64,7 @@ public class ToggleFeaturesRegistryreturn Categories.Select(c => new NavigationViewItem{Content = c.Name,- TargetPageType = c.GetType().GetCustomAttribute<ToggleFeatureCategoryAttribute>()?.PageType,+ TargetPageType = c.GetType().GetCustomAttribute<FeatureCategoryAttribute>()?.PageType,TargetPageTag = c.GetType().Name}).Where(item => item.TargetPageType != null);}diff --git a/optimizerDuck/UI/ViewModels/ToggleFeatures/FeatureViewModel.cs b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cssimilarity index 93%rename from optimizerDuck/UI/ViewModels/ToggleFeatures/FeatureViewModel.csrename to optimizerDuck/UI/ViewModels/Features/FeatureViewModel.csindex c357e8b..db89f3a 100644--- a/optimizerDuck/UI/ViewModels/ToggleFeatures/FeatureViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs@@ -4,9 +4,9 @@ using Microsoft.Extensions.Logging;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Execution;-namespace optimizerDuck.UI.ViewModels.ToggleFeatures;+namespace optimizerDuck.UI.ViewModels.Features;-public partial class FeatureViewModel(IToggleFeature feature, ILoggerFactory loggerFactory) : ObservableObject+public partial class FeatureViewModel(IFeature feature, ILoggerFactory loggerFactory) : ObservableObject{private readonly ILogger<FeatureViewModel> _logger = loggerFactory.CreateLogger<FeatureViewModel>();diff --git a/optimizerDuck/UI/ViewModels/ToggleFeatures/ToggleFeaturesCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/FeatureCategoryViewModel.cssimilarity index 86%rename from optimizerDuck/UI/ViewModels/ToggleFeatures/ToggleFeaturesCategoryViewModel.csrename to optimizerDuck/UI/ViewModels/Pages/FeatureCategoryViewModel.csindex 40be759..7b30e18 100644--- a/optimizerDuck/UI/ViewModels/ToggleFeatures/ToggleFeaturesCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/FeatureCategoryViewModel.cs@@ -2,13 +2,14 @@ using System.Collections.ObjectModel;using CommunityToolkit.Mvvm.ComponentModel;using Microsoft.Extensions.Logging;using optimizerDuck.Core.Interfaces;-using optimizerDuck.Core.Models.ToggleFeatures;+using optimizerDuck.Core.Models.Features;using optimizerDuck.Resources.Languages;+using optimizerDuck.UI.ViewModels.Features;using Wpf.Ui.Controls;-namespace optimizerDuck.UI.ViewModels.ToggleFeatures;+namespace optimizerDuck.UI.ViewModels.Pages;-public partial class ToggleFeaturesCategoryViewModel : ViewModel+public partial class FeatureCategoryViewModel : ViewModel{[ObservableProperty] private string _categoryName = string.Empty;[ObservableProperty] private string _categoryDescription = string.Empty;@@ -18,10 +19,10 @@ public partial class ToggleFeaturesCategoryViewModel : ViewModel[ObservableProperty] private int _selectedSortByIndex;[ObservableProperty] private bool _isLoading = true;- private readonly IToggleFeaturesCategory? _currentCategory;+ private readonly IFeatureCategory? _currentCategory;private readonly List<FeatureViewModel> _allFeatures = [];- public ToggleFeaturesCategoryViewModel(IToggleFeaturesCategory category, ILoggerFactory loggerFactory)+ public FeatureCategoryViewModel(IFeatureCategory category, ILoggerFactory loggerFactory){_currentCategory = category;@@ -73,7 +74,7 @@ public partial class ToggleFeaturesCategoryViewModel : ViewModelf.Description.Contains(search, StringComparison.InvariantCultureIgnoreCase));}- var sortedFeatures = filtered.OrderBy(f => f.Name).ToList();+ var sortedFeatures = filtered.OrderBy<FeatureViewModel, string>(f => f.Name).ToList();var grouped = sortedFeatures.GroupBy(f => string.IsNullOrEmpty(f.Section) ? Translations.Common_Other : f.Section)diff --git a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/FeaturesViewModel.cssimilarity index 66%rename from optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.csrename to optimizerDuck/UI/ViewModels/Pages/FeaturesViewModel.csindex 990a3ca..ab3c183 100644--- a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/FeaturesViewModel.cs@@ -7,16 +7,16 @@ using CommunityToolkit.Mvvm.Input;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;using optimizerDuck.Services;-using optimizerDuck.UI.Views.Pages.ToggleFeatures;+using optimizerDuck.UI.Views.Pages.Features;using Wpf.Ui;using Wpf.Ui.Controls;namespace optimizerDuck.UI.ViewModels.Pages;-public partial class ToggleFeaturesViewModel : ObservableObject+public partial class FeaturesViewModel : ObservableObject{[ObservableProperty]- private ObservableCollection<ToggleFeaturesCategoryViewModel> _categories = [];+ private ObservableCollection<FeatureCategoryItemViewModel> _categories = [];[ObservableProperty]private string _searchText = string.Empty;@@ -25,9 +25,9 @@ public partial class ToggleFeaturesViewModel : ObservableObjectprivate bool _isLoading = true;private readonly INavigationService _navigationService;- private readonly ToggleFeaturesRegistry _registry;+ private readonly FeatureRegistry _registry;- public ToggleFeaturesViewModel(INavigationService navigationService, ToggleFeaturesRegistry registry)+ public FeaturesViewModel(INavigationService navigationService, FeatureRegistry registry){_navigationService = navigationService;_registry = registry;@@ -42,17 +42,17 @@ public partial class ToggleFeaturesViewModel : ObservableObject_registry.RegisterCategories();}- var categoryViewModels = new ObservableCollection<ToggleFeaturesCategoryViewModel>();+ var categoryViewModels = new ObservableCollection<FeatureCategoryItemViewModel>();foreach (var category in _registry.Categories){- categoryViewModels.Add(new ToggleFeaturesCategoryViewModel+ categoryViewModels.Add(new FeatureCategoryItemViewModel{Name = category.Name,Description = category.Description,Icon = category.Icon,CategoryType = category.GetType(),- PageType = category.GetType().GetCustomAttribute<ToggleFeatureCategoryAttribute>()?.PageType+ PageType = category.GetType().GetCustomAttribute<FeatureCategoryAttribute>()?.PageType});}@@ -63,16 +63,16 @@ public partial class ToggleFeaturesViewModel : ObservableObject}[RelayCommand]- private void NavigateToCategory(ToggleFeaturesCategoryViewModel toggleFeaturesCategory)+ private void NavigateToCategory(FeatureCategoryItemViewModel featureCategoryItem){- if (toggleFeaturesCategory.PageType != null)+ if (featureCategoryItem.PageType != null){- _navigationService.Navigate(toggleFeaturesCategory.PageType);+ _navigationService.Navigate(featureCategoryItem.PageType);}}}-public partial class ToggleFeaturesCategoryViewModel : ObservableObject+public partial class FeatureCategoryItemViewModel : ObservableObject{[ObservableProperty] private string _name = string.Empty;[ObservableProperty] private string _description = string.Empty;diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xamlsimilarity index 95%rename from optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xamlrename to optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xamlindex 08f3cb6..053afd5 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml+++ b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml@@ -3,19 +3,19 @@Margin="0,32,0,0"ScrollViewer.CanContentScroll="False"Title="{Binding ViewModel.CategoryName}"- d:DataContext="{d:DesignInstance toggleFeatures:ToggleFeaturesCategoryPage}"+ d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"d:DesignHeight="650"d:DesignWidth="800"mc:Ignorable="d"ui:Design.Background="Black"ui:Design.Foreground="White"- x:Class="optimizerDuck.UI.Views.Pages.ToggleFeatures.ToggleFeaturesCategoryPage"+ x:Class="optimizerDuck.UI.Views.Pages.Features.FeatureCategoryPage"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"+ xmlns:features="clr-namespace:optimizerDuck.UI.Views.Pages.Features"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- 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">@@ -127,7 +127,7 @@<ui:TextBlockFontTypography="BodyStrong"HorizontalAlignment="Center"- Text="{ext:Loc ToggleFeatures.Loading}" />+ Text="{ext:Loc Features.Loading}" /></StackPanel></Border></Grid>diff --git a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml.cs b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml.csnew file mode 100644index 0000000..34e99e6--- /dev/null+++ b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPage.xaml.cs@@ -0,0 +1,16 @@+using optimizerDuck.UI.ViewModels.Pages;+using Wpf.Ui.Abstractions.Controls;++namespace optimizerDuck.UI.Views.Pages.Features;++public partial class FeatureCategoryPage : INavigableView<FeatureCategoryViewModel>+{+ public FeatureCategoryViewModel ViewModel { get; }++ public FeatureCategoryPage(FeatureCategoryViewModel viewModel)+ {+ ViewModel = viewModel;+ DataContext = this;+ InitializeComponent();+ }+}diff --git a/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPages.cs b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPages.csnew file mode 100644index 0000000..e5e3c31--- /dev/null+++ b/optimizerDuck/UI/Views/Pages/Features/FeatureCategoryPages.cs@@ -0,0 +1,19 @@+using optimizerDuck.UI.ViewModels.Pages;++namespace optimizerDuck.UI.Views.Pages.Features;++public sealed class UserExperienceFeatureCategory : FeatureCategoryPage+{+ public UserExperienceFeatureCategory(FeatureCategoryViewModel viewModel) : base(viewModel)+ {+ InitializeComponent();+ }+}++public sealed class SystemFeatureCategory : FeatureCategoryPage+{+ public SystemFeatureCategory(FeatureCategoryViewModel viewModel) : base(viewModel)+ {+ InitializeComponent();+ }+}\ No newline at end of filediff --git a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml b/optimizerDuck/UI/Views/Pages/FeaturesPage.xamlsimilarity index 95%rename from optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xamlrename to optimizerDuck/UI/Views/Pages/FeaturesPage.xamlindex 4badb55..c5b4d48 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml+++ b/optimizerDuck/UI/Views/Pages/FeaturesPage.xaml@@ -2,14 +2,14 @@Foreground="{DynamicResource TextFillColorPrimaryBrush}"Margin="0,32,0,0"ScrollViewer.CanContentScroll="False"- Title="ToggleFeatures"- d:DataContext="{d:DesignInstance vm:ToggleFeaturesViewModel}"+ Title="Features"+ d:DataContext="{d:DesignInstance vm:FeaturesViewModel}"d:DesignHeight="650"d:DesignWidth="800"mc:Ignorable="d"ui:Design.Background="Black"ui:Design.Foreground="White"- x:Class="optimizerDuck.UI.Views.Pages.ToggleFeaturesPage"+ x:Class="optimizerDuck.UI.Views.Pages.FeaturesPage"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"@@ -68,7 +68,7 @@</ui:VirtualizingItemsControl.ItemContainerStyle><ui:VirtualizingItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type vm:ToggleFeaturesCategoryViewModel}">+ <DataTemplate DataType="{x:Type vm:FeatureCategoryItemViewModel}"><ui:CardActionCommand="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.cs b/optimizerDuck/UI/Views/Pages/FeaturesPage.xaml.cssimilarity index 59%rename from optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.csrename to optimizerDuck/UI/Views/Pages/FeaturesPage.xaml.csindex e835b9a..39dd0c7 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.cs+++ b/optimizerDuck/UI/Views/Pages/FeaturesPage.xaml.cs@@ -3,11 +3,11 @@ using Wpf.Ui.Abstractions.Controls;namespace optimizerDuck.UI.Views.Pages;-public partial class ToggleFeaturesPage : INavigableView<ToggleFeaturesViewModel>+public partial class FeaturesPage : INavigableView<FeaturesViewModel>{- public ToggleFeaturesViewModel ViewModel { get; }+ public FeaturesViewModel ViewModel { get; }- public ToggleFeaturesPage(ToggleFeaturesViewModel viewModel)+ public FeaturesPage(FeaturesViewModel viewModel){ViewModel = viewModel;DataContext = this;diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.csdeleted file mode 100644index 4f86c54..0000000--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs+++ /dev/null@@ -1,18 +0,0 @@-using System.Windows.Controls;-using optimizerDuck.UI.ViewModels.Pages;-using Wpf.Ui.Abstractions.Controls;-using ToggleFeaturesCategoryViewModel = optimizerDuck.UI.ViewModels.ToggleFeatures.ToggleFeaturesCategoryViewModel;--namespace optimizerDuck.UI.Views.Pages.ToggleFeatures;--public partial class ToggleFeaturesCategoryPage : INavigableView<ToggleFeaturesCategoryViewModel>-{- public ToggleFeaturesCategoryViewModel ViewModel { get; }-- public ToggleFeaturesCategoryPage(ToggleFeaturesCategoryViewModel viewModel)- {- ViewModel = viewModel;- DataContext = this;- InitializeComponent();- }-}diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.csdeleted file mode 100644index 7fe65ee..0000000--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs+++ /dev/null@@ -1,19 +0,0 @@-using optimizerDuck.UI.ViewModels.ToggleFeatures;--namespace optimizerDuck.UI.Views.Pages.ToggleFeatures;--public sealed class UserExperienceToggleFeaturesCategory : ToggleFeaturesCategoryPage-{- public UserExperienceToggleFeaturesCategory(ToggleFeaturesCategoryViewModel viewModel) : base(viewModel)- {- InitializeComponent();- }-}--public sealed class SystemToggleFeaturesCategory : ToggleFeaturesCategoryPage-{- public SystemToggleFeaturesCategory(ToggleFeaturesCategoryViewModel viewModel) : base(viewModel)- {- InitializeComponent();- }-}\ No newline at end of filediff --git a/optimizerDuck/UI/Views/Windows/MainWindow.xaml b/optimizerDuck/UI/Views/Windows/MainWindow.xamlindex d9d275b..ec92d5a 100644--- a/optimizerDuck/UI/Views/Windows/MainWindow.xaml+++ b/optimizerDuck/UI/Views/Windows/MainWindow.xaml@@ -49,10 +49,10 @@TargetPageType="{x:Type pages:OptimizePage}" /><ui:NavigationViewItem- Content="{extensions:Loc Sidebar.ToggleFeatures}"+ Content="{extensions:Loc Sidebar.Features}"Icon="{ui:SymbolIcon ToggleLeft24}"- TargetPageType="{x:Type pages:ToggleFeaturesPage}"- x:Name="ToggleFeaturesMenuItem" />+ TargetPageType="{x:Type pages:FeaturesPage}"+ x:Name="FeaturesMenuItem" /><controls:FilledNavigationViewItemContent="{extensions:Loc Sidebar.Bloatware}"diff --git a/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs b/optimizerDuck/UI/Views/Windows/MainWindow.xaml.csindex 840b408..50277cb 100644--- a/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs+++ b/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs@@ -2,7 +2,7 @@using optimizerDuck.Core.Interfaces;using optimizerDuck.Services;using optimizerDuck.UI.Views.Pages;-using optimizerDuck.UI.Views.Pages.ToggleFeatures;+using optimizerDuck.UI.Views.Pages.Features;using Wpf.Ui;using Wpf.Ui.Abstractions;@@ -11,7 +11,7 @@ namespace optimizerDuck.UI.Views.Windows;public partial class MainWindow : IWindow{public MainWindow(INavigationService navigationService, IContentDialogService contentDialogService,- INavigationViewPageProvider pageProvider, ISnackbarService snackbarService, ToggleFeaturesRegistry toggleFeaturesRegistry)+ INavigationViewPageProvider pageProvider, ISnackbarService snackbarService, FeatureRegistry featureRegistry){InitializeComponent();@@ -21,10 +21,10 @@ public partial class MainWindow : IWindowRootNavigation.SetPageProviderService(pageProvider);- var toggleItems = toggleFeaturesRegistry.GetNavigationItems();+ var toggleItems = featureRegistry.GetNavigationItems();foreach (var item in toggleItems){- ToggleFeaturesMenuItem.MenuItems.Add(item);+ FeaturesMenuItem.MenuItems.Add(item);}RootNavigation.Loaded += OnRootNavigationLoaded;diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csprojindex f7f736e..67e83bb 100644--- a/optimizerDuck/optimizerDuck.csproj+++ b/optimizerDuck/optimizerDuck.csproj@@ -35,7 +35,7 @@<XamlRuntime>Wpf</XamlRuntime><SubType>Designer</SubType></Page>- <Page Update="UI\Views\Pages\ToggleFeaturesPage.xaml">+ <Page Update="UI\Views\Pages\FeaturesPage.xaml"><XamlRuntime>Wpf</XamlRuntime><SubType>Designer</SubType></Page>@@ -78,8 +78,4 @@</Compile></ItemGroup>- <ItemGroup>- <Folder Include="Services\SystemInfoProviders\" />- </ItemGroup>-</Project>