Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
feat: simply code
itsfatduckada7244800a9
diff --git a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.csindex 9813044..fb35022 100644--- a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs+++ b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs@@ -108,7 +108,7 @@ public class ExecutionScopeTests{var logger = NullLogger.Instance;- using var scope = ExecutionScope.Begin(logger);+ using var scope = ExecutionScope.BeginForLogging(logger);ExecutionScope.RecordStep("TestStep", "Description", true);diff --git a/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.csindex 9904d4e..96819f9 100644--- a/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs+++ b/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs@@ -1,11 +1,14 @@using System.Reflection;using Microsoft.Extensions.DependencyInjection;+using Microsoft.Extensions.Logging;using optimizerDuck.Common.Helpers;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;using optimizerDuck.Services;using optimizerDuck.UI.ViewModels.Pages;+using optimizerDuck.UI.ViewModels.ToggleFeatures;using Wpf.Ui;+using ToggleFeaturesCategoryViewModel = optimizerDuck.UI.ViewModels.ToggleFeatures.ToggleFeaturesCategoryViewModel;namespace optimizerDuck.Common.Extensions;@@ -14,7 +17,7 @@ public static class ToggleFeaturesCategoryPageRegistryExtensionspublic static void AddAllToggleFeatureCategoryPages(this IServiceCollection services){var categoryTypes = ReflectionHelper- .FindImplementationsInLoadedAssemblies<IToggleFeatureCategory>()+ .FindImplementationsInLoadedAssemblies<IToggleFeaturesCategory>().ToList();foreach (var categoryType in categoryTypes)@@ -34,9 +37,10 @@ public static class ToggleFeaturesCategoryPageRegistryExtensionsType pageType){var registry = serviceProvider.GetRequiredService<ToggleFeaturesRegistry>();+ var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();var category = registry.Categories.First(c => c.GetType() == categoryType);- var viewModel = new ToggleFeatureCategoryViewModel(category);+ var viewModel = new ToggleFeaturesCategoryViewModel(category, loggerFactory);return Activator.CreateInstance(pageType, viewModel)!;}diff --git a/optimizerDuck/Core/Interfaces/IOptimizationCategory.cs b/optimizerDuck/Core/Interfaces/IOptimizationCategory.csindex d4e801a..59176a9 100644--- a/optimizerDuck/Core/Interfaces/IOptimizationCategory.cs+++ b/optimizerDuck/Core/Interfaces/IOptimizationCategory.cs@@ -11,7 +11,7 @@ public interface IOptimizationCategory/// <summary>/// The localized display name of the category./// </summary>- public string Name { get; init; }+ public string Name { get; }/// <summary>/// The display order of this category in the UI.diff --git a/optimizerDuck/Core/Interfaces/IToggleFeature.cs b/optimizerDuck/Core/Interfaces/IToggleFeature.csindex fd1211c..8bce9a0 100644--- a/optimizerDuck/Core/Interfaces/IToggleFeature.cs+++ b/optimizerDuck/Core/Interfaces/IToggleFeature.cs@@ -6,6 +6,8 @@ public interface IToggleFeature{string Name { get; }string Description { get; }+ string Section { get; }+ string FeatureKey { get; }Task<bool> GetStateAsync();Task EnableAsync();diff --git a/optimizerDuck/Core/Interfaces/IToggleFeatureCategory.cs b/optimizerDuck/Core/Interfaces/IToggleFeatureCategory.csdeleted file mode 100644index 1f3ec68..0000000--- a/optimizerDuck/Core/Interfaces/IToggleFeatureCategory.cs+++ /dev/null@@ -1,22 +0,0 @@-using System.Collections.ObjectModel;-using optimizerDuck.Core.Models.UI;-using Wpf.Ui.Controls;--namespace optimizerDuck.Core.Interfaces;--public interface IToggleFeatureCategory-{- public string Name { get; init; }- public string Description { get; init; }- public SymbolRegular Icon { get; init; }- public ToggleFeatureCategoryOrder Order { get; init; }- public ObservableCollection<IToggleFeature> Features { get; init; }-}--public enum ToggleFeatureCategoryOrder-{- Privacy = 0,- System = 1,- AI = 2,- UserExperience = 3-}diff --git a/optimizerDuck/Core/Interfaces/IToggleFeaturesCategory.cs b/optimizerDuck/Core/Interfaces/IToggleFeaturesCategory.csnew file mode 100644index 0000000..bcb9a88--- /dev/null+++ b/optimizerDuck/Core/Interfaces/IToggleFeaturesCategory.cs@@ -0,0 +1,14 @@+using System.Collections.ObjectModel;+using optimizerDuck.Core.Models.UI;+using Wpf.Ui.Controls;++namespace optimizerDuck.Core.Interfaces;++public interface IToggleFeaturesCategory+{+ public string Name { get; }+ public string Description { get; }+ public SymbolRegular Icon { get; init; }+ public ToggleFeaturesCategoryOrder Order { get; init; }+ public ObservableCollection<IToggleFeature> Features { get; init; }+}\ No newline at end of filediff --git a/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs b/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.csindex 8b18273..4ee8a15 100644--- a/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs+++ b/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs@@ -5,4 +5,15 @@ namespace optimizerDuck.Core.Models.Attributes;[AttributeUsage(AttributeTargets.Class, Inherited = false)]public sealed class ToggleFeatureAttribute : Attribute{+ public object? Section { get; init; }++ public string GetSectionName()+ {+ if (Section == null)+ return string.Empty;++ return Section is Enum e+ ? Enum.GetName(e.GetType(), e) ?? string.Empty+ : Section.ToString() ?? string.Empty;+ }}\ No newline at end of filediff --git a/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs b/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.csindex 4df9083..749994e 100644--- a/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs+++ b/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs@@ -1,3 +1,5 @@+namespace optimizerDuck.Core.Models.Attributes;+[AttributeUsage(AttributeTargets.Class, Inherited = false)]public class ToggleFeatureCategoryAttribute : Attribute{diff --git a/optimizerDuck/Core/Models/Execution/ExecutionScope.cs b/optimizerDuck/Core/Models/Execution/ExecutionScope.csindex 804b465..fc9869b 100644--- a/optimizerDuck/Core/Models/Execution/ExecutionScope.cs+++ b/optimizerDuck/Core/Models/Execution/ExecutionScope.cs@@ -14,29 +14,20 @@ public sealed class ExecutionScope : IDisposableprivate readonly List<ExecutedStep> _executedSteps = [];private readonly ConcurrentDictionary<string, Stats> _stats = new();- private readonly Stopwatch _stopwatch;+ private readonly Stopwatch _stopwatch = Stopwatch.StartNew();private bool _disposed;private int _stepIndex;- private ExecutionScope(Guid optimizationId, string optimizationKey, string optimizationName, ILogger logger, bool loggingOnly = false)- {- OptimizationId = optimizationId;- OptimizationKey = optimizationKey;- OptimizationName = optimizationName;- Logger = logger;- LoggingOnly = loggingOnly;- _stopwatch = Stopwatch.StartNew();- }public static ExecutionScope? Current => _current.Value;- public Guid OptimizationId { get; }+ public Guid? OptimizationId { get; private init; }- public string OptimizationKey { get; }+ public string? OptimizationKey { get; private init; }- public string OptimizationName { get; }+ public string? OptimizationName { get; init; }- public ILogger Logger { get; }+ public required ILogger Logger { get; init; }public IReadOnlyList<ExecutedStep> ExecutedSteps => _executedSteps.AsReadOnly();@@ -59,8 +50,7 @@ public sealed class ExecutionScope : IDisposableif (_stats.IsEmpty){Logger.LogInformation(- "[{Key}] Completed in {Time} (no operations tracked)",- OptimizationKey,+ "Completed in {Time} (no operations tracked)",_stopwatch.Elapsed.ToString(@"mm\:ss\.fff"));}else@@ -69,19 +59,18 @@ public sealed class ExecutionScope : IDisposable$"{kv.Key}: +({kv.Value.Success}) -({kv.Value.Fail})"));Logger.LogInformation(- "[{Key}] Completed in {Time} | {Summary}",- OptimizationKey,+ "Completed in {Time} | {Summary}",_stopwatch.Elapsed.ToString(@"mm\:ss\.fff"),summary);}- Logger.LogInformation(- "[{Key}] Steps: {Total} ({Success} success, {Failed} failed)",- OptimizationKey,- _executedSteps.Count,- SuccessfulSteps.Count,- FailedSteps.Count- );+ if (!LoggingOnly)+ Logger.LogInformation(+ "Steps: {Total} ({Success} success, {Failed} failed)",+ _executedSteps.Count,+ SuccessfulSteps.Count,+ FailedSteps.Count+ );_current.Value = null;}@@ -91,18 +80,26 @@ public sealed class ExecutionScope : IDisposableif (_current.Value != null)throw new InvalidOperationException("An execution scope is already active in the current context.");- var scope = new ExecutionScope(optimization.Id, optimization.OptimizationKey, optimization.Name, logger);+ var scope = new ExecutionScope+ {+ OptimizationId = optimization.Id, OptimizationKey = optimization.OptimizationKey,+ OptimizationName = optimization.Name, Logger = logger+ };_current.Value = scope;logger.LogDebug("Execution scope started for {Key} (ID: {Id})", optimization.OptimizationKey, optimization.Id);return scope;}- public static ExecutionScope Begin(ILogger logger)+ public static ExecutionScope BeginForLogging(ILogger logger){if (_current.Value != null)throw new InvalidOperationException("An execution scope is already active in the current context.");- var scope = new ExecutionScope(Guid.Empty, string.Empty, string.Empty, logger);+ var scope = new ExecutionScope+ {+ OptimizationId = Guid.Empty, OptimizationKey = string.Empty, OptimizationName = string.Empty,+ Logger = logger, LoggingOnly = true+ };_current.Value = scope;logger.LogDebug("Execution scope started");return scope;@@ -113,13 +110,17 @@ public sealed class ExecutionScope : IDisposableif (_current.Value != null)throw new InvalidOperationException("An execution scope is already active in the current context.");- var scope = new ExecutionScope(optimizationId, optimizationKey, string.Empty, logger, loggingOnly: true);+ var scope = new ExecutionScope+ {+ OptimizationId = optimizationId, OptimizationKey = optimizationKey, OptimizationName = string.Empty,+ Logger = logger, LoggingOnly = true+ };_current.Value = scope;logger.LogDebug("Execution scope started for {Key} (logging only)", optimizationKey);return scope;}- public bool LoggingOnly { get; private set; }+ private bool LoggingOnly { get; init; }public static ExecutedStep? RecordStep(string name,diff --git a/optimizerDuck/Core/Optimizers/BaseOptimization.cs b/optimizerDuck/Core/Models/Optimization/BaseOptimization.cssimilarity index 96%rename from optimizerDuck/Core/Optimizers/BaseOptimization.csrename to optimizerDuck/Core/Models/Optimization/BaseOptimization.csindex 53ecee6..c50f19f 100644--- a/optimizerDuck/Core/Optimizers/BaseOptimization.cs+++ b/optimizerDuck/Core/Models/Optimization/BaseOptimization.cs@@ -1,15 +1,13 @@using System.Reflection;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;-using optimizerDuck.Core.Models.Execution;-using optimizerDuck.Core.Models.Optimization;using optimizerDuck.Core.Models.UI;using optimizerDuck.Resources.Languages;using optimizerDuck.Services.Managers;using Wpf.Ui.Controls;using OptimizationState = optimizerDuck.Core.Models.UI.OptimizationState;-namespace optimizerDuck.Core.Optimizers;+namespace optimizerDuck.Core.Models.Optimization;public abstract class BaseOptimization : IOptimization{diff --git a/optimizerDuck/Core/Models/Optimization/Bloatware/AppXPackage.cs b/optimizerDuck/Core/Models/Optimization/Bloatware/AppXPackage.csindex 002501e..8f8c2c4 100644--- a/optimizerDuck/Core/Models/Optimization/Bloatware/AppXPackage.cs+++ b/optimizerDuck/Core/Models/Optimization/Bloatware/AppXPackage.cs@@ -3,7 +3,7 @@ using optimizerDuck.Core.Models.UI;using optimizerDuck.Resources.Languages;using Wpf.Ui.Controls;-namespace optimizerDuck.Core.Models.Bloatware;+namespace optimizerDuck.Core.Models.Optimization.Bloatware;/// <summary>/// Specifies the risk level of removing a bloatware app.diff --git a/optimizerDuck/Core/Models/Optimization/Cleanup/CleanupItem.cs b/optimizerDuck/Core/Models/Optimization/Cleanup/CleanupItem.csindex 8a842e7..767877f 100644--- a/optimizerDuck/Core/Models/Optimization/Cleanup/CleanupItem.cs+++ b/optimizerDuck/Core/Models/Optimization/Cleanup/CleanupItem.cs@@ -1,7 +1,7 @@using CommunityToolkit.Mvvm.ComponentModel;using Wpf.Ui.Controls;-namespace optimizerDuck.Core.Models.Cleanup;+namespace optimizerDuck.Core.Models.Optimization.Cleanup;/// <summary>/// Represents a disk cleanup item (e.g., temp files, Windows Update cache).diff --git a/optimizerDuck/Core/Models/Optimization/ScheduledTask/ScheduledTaskModel.cs b/optimizerDuck/Core/Models/Optimization/ScheduledTask/ScheduledTaskModel.csindex 80cb93d..f777cef 100644--- a/optimizerDuck/Core/Models/Optimization/ScheduledTask/ScheduledTaskModel.cs+++ b/optimizerDuck/Core/Models/Optimization/ScheduledTask/ScheduledTaskModel.cs@@ -2,7 +2,7 @@ using System.Collections.ObjectModel;using System.Windows.Media;using CommunityToolkit.Mvvm.ComponentModel;-namespace optimizerDuck.Core.Models.ScheduledTask;+namespace optimizerDuck.Core.Models.Optimization.ScheduledTask;/// <summary>/// Represents a Windows Scheduled Task.diff --git a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupApp.cs b/optimizerDuck/Core/Models/Optimization/StartupManager/StartupApp.csindex 483e890..531faa9 100644--- a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupApp.cs+++ b/optimizerDuck/Core/Models/Optimization/StartupManager/StartupApp.cs@@ -2,7 +2,7 @@ using System.IO;using System.Windows.Media;using CommunityToolkit.Mvvm.ComponentModel;-namespace optimizerDuck.Core.Models.StartupManager;+namespace optimizerDuck.Core.Models.Optimization.StartupManager;/// <summary>/// Specifies the location of a startup application.diff --git a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupTask.cs b/optimizerDuck/Core/Models/Optimization/StartupManager/StartupTask.csindex 32c20c2..3c16e28 100644--- a/optimizerDuck/Core/Models/Optimization/StartupManager/StartupTask.cs+++ b/optimizerDuck/Core/Models/Optimization/StartupManager/StartupTask.cs@@ -1,7 +1,7 @@using System.Windows.Media;using CommunityToolkit.Mvvm.ComponentModel;-namespace optimizerDuck.Core.Models.StartupManager;+namespace optimizerDuck.Core.Models.Optimization.StartupManager;/// <summary>/// Represents a scheduled task that runs at startup.diff --git a/optimizerDuck/Core/Models/ToggleFeatures/BaseToggleFeature.cs b/optimizerDuck/Core/Models/ToggleFeatures/BaseToggleFeature.csnew file mode 100644index 0000000..937395b--- /dev/null+++ b/optimizerDuck/Core/Models/ToggleFeatures/BaseToggleFeature.cs@@ -0,0 +1,57 @@+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/FeatureSection.cs b/optimizerDuck/Core/Models/ToggleFeatures/FeatureSection.csnew file mode 100644index 0000000..350fefd--- /dev/null+++ b/optimizerDuck/Core/Models/ToggleFeatures/FeatureSection.cs@@ -0,0 +1,14 @@+using System.Collections.ObjectModel;+using CommunityToolkit.Mvvm.ComponentModel;+using optimizerDuck.UI.ViewModels.ToggleFeatures;++namespace optimizerDuck.Core.Models.ToggleFeatures;++public partial class FeatureSection : ObservableObject+{+ [ObservableProperty]+ private string _name = string.Empty;++ [ObservableProperty]+ private ObservableCollection<FeatureViewModel> _features = [];+}diff --git a/optimizerDuck/Core/Models/ToggleFeatures/RegistryToggle.cs b/optimizerDuck/Core/Models/ToggleFeatures/RegistryToggle.csnew file mode 100644index 0000000..c6b97e5--- /dev/null+++ b/optimizerDuck/Core/Models/ToggleFeatures/RegistryToggle.cs@@ -0,0 +1,44 @@+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/ToggleFeaturesCategoryOrder.csnew file mode 100644index 0000000..7a3856e--- /dev/null+++ b/optimizerDuck/Core/Models/UI/ToggleFeaturesCategoryOrder.cs@@ -0,0 +1,7 @@+namespace optimizerDuck.Core.Models.UI;++public enum ToggleFeaturesCategoryOrder+{+ System,+ UserExperience,+}diff --git a/optimizerDuck/Core/Optimizers/BloatwareAndServices.cs b/optimizerDuck/Core/Optimizers/BloatwareAndServices.csindex c76adcf..391486d 100644--- a/optimizerDuck/Core/Optimizers/BloatwareAndServices.cs+++ b/optimizerDuck/Core/Optimizers/BloatwareAndServices.cs@@ -14,7 +14,7 @@ namespace optimizerDuck.Core.Optimizers;[OptimizationCategory(typeof(BloatwareAndServicesOptimizerPage))]public class BloatwareAndServices : IOptimizationCategory{- public string Name { get; init; } = Loc.Instance[$"Optimizer.{nameof(BloatwareAndServices)}"];+ public string Name => Loc.Instance[$"Optimizer.{nameof(BloatwareAndServices)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.BloatwareAndServices;public ObservableCollection<IOptimization> Optimizations { get; init; } = [];diff --git a/optimizerDuck/Core/Optimizers/Gpu.cs b/optimizerDuck/Core/Optimizers/Gpu.csindex 8d1b5fc..91b6df8 100644--- a/optimizerDuck/Core/Optimizers/Gpu.cs+++ b/optimizerDuck/Core/Optimizers/Gpu.cs@@ -43,7 +43,7 @@ public abstract class GpuRegistryOptimization : BaseOptimization[OptimizationCategory(typeof(GpuOptimizerPage))]public class Gpu : IOptimizationCategory{- public string Name { get; init; } = Loc.Instance[$"Optimizer.{nameof(Gpu)}"];+ public string Name => Loc.Instance[$"Optimizer.{nameof(Gpu)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.Gpu;public ObservableCollection<IOptimization> Optimizations { get; init; } = [];diff --git a/optimizerDuck/Core/Optimizers/Performance.cs b/optimizerDuck/Core/Optimizers/Performance.csindex 9142f24..6b86dff 100644--- a/optimizerDuck/Core/Optimizers/Performance.cs+++ b/optimizerDuck/Core/Optimizers/Performance.cs@@ -15,7 +15,7 @@ namespace optimizerDuck.Core.Optimizers;[OptimizationCategory(typeof(PerformanceOptimizerPage))]public class Performance : IOptimizationCategory{- public string Name { get; init; } = Loc.Instance[$"Optimizer.{nameof(Performance)}"];+ public string Name => Loc.Instance[$"Optimizer.{nameof(Performance)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.Performance;public ObservableCollection<IOptimization> Optimizations { get; init; } = [];diff --git a/optimizerDuck/Core/Optimizers/PowerManagement.cs b/optimizerDuck/Core/Optimizers/PowerManagement.csindex 9be854a..485357a 100644--- a/optimizerDuck/Core/Optimizers/PowerManagement.cs+++ b/optimizerDuck/Core/Optimizers/PowerManagement.cs@@ -16,7 +16,7 @@ namespace optimizerDuck.Core.Optimizers;[OptimizationCategory(typeof(PowerManagementOptimizerPage))]public class PowerManagement : IOptimizationCategory{- public string Name { get; init; } = Loc.Instance[$"Optimizer.{nameof(PowerManagement)}"];+ public string Name => Loc.Instance[$"Optimizer.{nameof(PowerManagement)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.Power;public ObservableCollection<IOptimization> Optimizations { get; init; } = [];diff --git a/optimizerDuck/Core/Optimizers/SecurityAndPrivacy.cs b/optimizerDuck/Core/Optimizers/SecurityAndPrivacy.csindex 76e4529..88691fd 100644--- a/optimizerDuck/Core/Optimizers/SecurityAndPrivacy.cs+++ b/optimizerDuck/Core/Optimizers/SecurityAndPrivacy.cs@@ -14,7 +14,7 @@ namespace optimizerDuck.Core.Optimizers;[OptimizationCategory(typeof(SecurityAndPrivacyOptimizerPage))]public class SecurityAndPrivacy : IOptimizationCategory{- public string Name { get; init; } = Loc.Instance[$"Optimizer.{nameof(SecurityAndPrivacy)}"];+ public string Name => Loc.Instance[$"Optimizer.{nameof(SecurityAndPrivacy)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.SecurityAndPrivacy;public ObservableCollection<IOptimization> Optimizations { get; init; } = [];diff --git a/optimizerDuck/Core/Optimizers/UserExperience.cs b/optimizerDuck/Core/Optimizers/UserExperience.csindex dba3ff3..0fc946c 100644--- a/optimizerDuck/Core/Optimizers/UserExperience.cs+++ b/optimizerDuck/Core/Optimizers/UserExperience.cs@@ -14,7 +14,7 @@ namespace optimizerDuck.Core.Optimizers;[OptimizationCategory(typeof(UserExperienceOptimizerPage))]public class UserExperience : IOptimizationCategory{- public string Name { get; init; } = Loc.Instance[$"Optimizer.{nameof(UserExperience)}"];+ public string Name => Loc.Instance[$"Optimizer.{nameof(UserExperience)}"];public OptimizationCategoryOrder Order { get; init; } = OptimizationCategoryOrder.UserExperience;public ObservableCollection<IOptimization> Optimizations { get; init; } = [];diff --git a/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs b/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.csdeleted file mode 100644index faf4ae3..0000000--- a/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs+++ /dev/null@@ -1,64 +0,0 @@-using System.Reflection;-using optimizerDuck.Core.Interfaces;-using optimizerDuck.Core.Models.Attributes;-using optimizerDuck.Services.Managers;--namespace optimizerDuck.Core.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 OwnerKey =>- OwnerType?.Name- ?? throw new InvalidOperationException(- $"{GetType().Name} has no owner assigned");-- public string FeatureKey => GetType().Name;-- public string Name => Loc.Instance[$"ToggleFeature.{FeatureKey}.Name"];- public string Description => Loc.Instance[$"ToggleFeature.{FeatureKey}.Description"];-- public virtual IEnumerable<RegistryToggle>? RegistryToggles => null;-- public virtual Task<bool> GetStateAsync()- {- var toggles = RegistryToggles?.ToList() ?? GetToggles()?.ToList();- if (toggles == null || toggles.Count == 0)- return Task.FromResult(false);-- bool allOn = toggles.All(t => t.GetState());- return Task.FromResult(allOn);- }-- public virtual Task EnableAsync()- {- var toggles = RegistryToggles?.ToList() ?? GetToggles()?.ToList();- if (toggles == null) return Task.CompletedTask;-- foreach (var toggle in toggles)- toggle.SetState(true);-- return Task.CompletedTask;- }-- public virtual Task DisableAsync()- {- var toggles = RegistryToggles?.ToList() ?? GetToggles()?.ToList();- if (toggles == null) return Task.CompletedTask;-- foreach (var toggle in toggles)- toggle.SetState(false);-- return Task.CompletedTask;- }-- protected virtual IEnumerable<RegistryToggle>? GetToggles() => null;-}diff --git a/optimizerDuck/Core/ToggleFeatures/RegistryToggle.cs b/optimizerDuck/Core/ToggleFeatures/RegistryToggle.csdeleted file mode 100644index c4368c5..0000000--- a/optimizerDuck/Core/ToggleFeatures/RegistryToggle.cs+++ /dev/null@@ -1,62 +0,0 @@-using Microsoft.Win32;-using optimizerDuck.Core.Models.Optimization.Services;-using optimizerDuck.Services.OptimizationServices;--namespace optimizerDuck.Core.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 rawValue = GetRawValue();- return CompareValues(rawValue);- }-- private object? GetRawValue()- {- try- {- var item = new RegistryItem(Path, Name);- var value = RegistryService.Read<object?>(item);-- if (value == null)- return CheckKeyExists ? null : DefaultValue;-- return value;- }- catch- {- return CheckKeyExists ? null : 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)- {- var item = new RegistryItem(Path, Name, isOn ? OnValue : OffValue, ValueKind);- RegistryService.Write(item);- }-}diff --git a/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/SystemToggleFeatures.cssimilarity index 57%rename from optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.csrename to optimizerDuck/Core/ToggleFeatures/SystemToggleFeatures.csindex 45c9746..8880ed0 100644--- a/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs+++ b/optimizerDuck/Core/ToggleFeatures/SystemToggleFeatures.cs@@ -1,28 +1,35 @@using System.Collections.ObjectModel;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;+using optimizerDuck.Core.Models.ToggleFeatures;using optimizerDuck.Core.Models.UI;-using optimizerDuck.Core.ToggleFeatures;using optimizerDuck.Services.Managers;+using optimizerDuck.UI.Views.Pages.ToggleFeatures;using Wpf.Ui.Controls;-namespace optimizerDuck.Core.ToggleFeatures.System;+namespace optimizerDuck.Core.ToggleFeatures;[ToggleFeatureCategory(PageType = typeof(SystemToggleFeaturesCategory))]-public class System : IToggleFeatureCategory+public class System : IToggleFeaturesCategory{- public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.System.Name"];- public string Description { get; init; } = Loc.Instance["ToggleFeature.Category.System.Description"];+ public string Name => Loc.Instance[$"ToggleFeature.Category.{nameof(System)}"];+ public string Description => Loc.Instance[$"ToggleFeature.Category.{nameof(System)}.Description"];public SymbolRegular Icon { get; init; } = SymbolRegular.Desktop24;- public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.System;+ public ToggleFeaturesCategoryOrder Order { get; init; } = ToggleFeaturesCategoryOrder.System;public ObservableCollection<IToggleFeature> Features { get; init; } = [];- [ToggleFeature]+ public enum Sections+ {+ WindowsUpdate,+ Storage+ }++ [ToggleFeature(Section = nameof(Sections.WindowsUpdate))]public class DisableAutomaticWindowsUpdate : BaseToggleFeature{- public override IEnumerable<RegistryToggle> RegistryToggles =>+ protected override IEnumerable<RegistryToggle> RegistryToggles =>[- new RegistryToggle+ new(){Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU",Name = "NoAutoUpdate",@@ -33,12 +40,12 @@ public class System : IToggleFeatureCategory];}- [ToggleFeature]+ [ToggleFeature(Section = nameof(Sections.Storage))]public class DisableStorageSense : BaseToggleFeature{- public override IEnumerable<RegistryToggle> RegistryToggles =>+ protected override IEnumerable<RegistryToggle> RegistryToggles =>[- new RegistryToggle+ new(){Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\StorageSense",Name = "StorageSenseStatus",diff --git a/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/UserExperienceToggleFeatures.cssimilarity index 65%rename from optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.csrename to optimizerDuck/Core/ToggleFeatures/UserExperienceToggleFeatures.csindex 2fa346f..75f99d9 100644--- a/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs+++ b/optimizerDuck/Core/ToggleFeatures/UserExperienceToggleFeatures.cs@@ -1,26 +1,35 @@using System.Collections.ObjectModel;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;+using optimizerDuck.Core.Models.ToggleFeatures;using optimizerDuck.Core.Models.UI;-using optimizerDuck.Core.ToggleFeatures;using optimizerDuck.Services.Managers;+using optimizerDuck.UI.Views.Pages.ToggleFeatures;using Wpf.Ui.Controls;-namespace optimizerDuck.Core.ToggleFeatures.UserExperience;+namespace optimizerDuck.Core.ToggleFeatures;[ToggleFeatureCategory(PageType = typeof(UserExperienceToggleFeaturesCategory))]-public class UserExperience : IToggleFeatureCategory+public class UserExperience : IToggleFeaturesCategory{- public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.UserExperience.Name"];- public string Description { get; init; } = Loc.Instance["ToggleFeature.Category.UserExperience.Description"];+ public string Name => Loc.Instance[$"ToggleFeature.Category.{nameof(UserExperience)}"];+ public string Description => Loc.Instance[$"ToggleFeature.Category.{nameof(UserExperience)}.Description"];public SymbolRegular Icon { get; init; } = SymbolRegular.Color24;- public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.UserExperience;+ public ToggleFeaturesCategoryOrder Order { get; init; } = ToggleFeaturesCategoryOrder.UserExperience;public ObservableCollection<IToggleFeature> Features { get; init; } = [];- [ToggleFeature]+ public enum Sections+ {+ Taskbar,+ Appearance,+ SystemTray,+ Explorer+ }++ [ToggleFeature(Section = nameof(Sections.Taskbar))]public class DisableTaskbarNewsAndInterests : BaseToggleFeature{- public override IEnumerable<RegistryToggle> RegistryToggles =>+ protected override IEnumerable<RegistryToggle> RegistryToggles =>[new RegistryToggle{@@ -33,10 +42,10 @@ public class UserExperience : IToggleFeatureCategory];}- [ToggleFeature]+ [ToggleFeature(Section = nameof(Sections.Appearance))]public class EnableDarkMode : BaseToggleFeature{- public override IEnumerable<RegistryToggle> RegistryToggles =>+ protected override IEnumerable<RegistryToggle> RegistryToggles =>[new RegistryToggle{@@ -49,10 +58,10 @@ public class UserExperience : IToggleFeatureCategory];}- [ToggleFeature]+ [ToggleFeature(Section = nameof(Sections.Taskbar))]public class DisableVisualEffects : BaseToggleFeature{- public override IEnumerable<RegistryToggle> RegistryToggles =>+ protected override IEnumerable<RegistryToggle> RegistryToggles =>[new RegistryToggle{@@ -65,10 +74,10 @@ public class UserExperience : IToggleFeatureCategory];}- [ToggleFeature]+ [ToggleFeature(Section = nameof(Sections.SystemTray))]public class ShowSecondsInSystemClock : BaseToggleFeature{- public override IEnumerable<RegistryToggle> RegistryToggles =>+ protected override IEnumerable<RegistryToggle> RegistryToggles =>[new RegistryToggle{@@ -81,10 +90,10 @@ public class UserExperience : IToggleFeatureCategory];}- [ToggleFeature]+ [ToggleFeature(Section = nameof(Sections.Explorer))]public class EnableClassicContextMenu : BaseToggleFeature{- public override IEnumerable<RegistryToggle> RegistryToggles =>+ protected override IEnumerable<RegistryToggle> RegistryToggles =>[new RegistryToggle{diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.csindex 4c2803a..5193e0e 100644--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs@@ -1,7 +1,6 @@//------------------------------------------------------------------------------// <auto-generated>// This code was generated by a tool.-// Runtime Version:4.0.30319.42000//// Changes to this file may cause incorrect behavior and will be lost if// the code is regenerated.@@ -366,6 +365,15 @@ namespace optimizerDuck.Resources.Languages {}}+ /// <summary>+ /// Looks up a localized string similar to Other.+ /// </summary>+ internal static string Common_Other {+ get {+ return ResourceManager.GetString("Common.Other", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to Search..../// </summary>@@ -1371,8 +1379,8 @@ namespace optimizerDuck.Resources.Languages {/// </summary>internal static string Optimizer_BloatwareAndServices_ConfigureServices_Progress_ChangeServiceStartupType {get {- return ResourceManager.GetString("Optimizer.BloatwareAndServices.ConfigureServices.Progress.ChangeServiceStartupTyp" +- "e", resourceCulture);+ return ResourceManager.GetString(("Optimizer.BloatwareAndServices.ConfigureServices.Progress.ChangeServiceStartupTyp" ++ "e"), resourceCulture);}}@@ -1921,8 +1929,8 @@ namespace optimizerDuck.Resources.Languages {/// </summary>internal static string Optimizer_PowerManagement_InstallOptimizerDuckPowerPlan_Error_DetectActivePlanFailed {get {- return ResourceManager.GetString("Optimizer.PowerManagement.InstallOptimizerDuckPowerPlan.Error.DetectActivePlanFai" +- "led", resourceCulture);+ return ResourceManager.GetString(("Optimizer.PowerManagement.InstallOptimizerDuckPowerPlan.Error.DetectActivePlanFai" ++ "led"), resourceCulture);}}@@ -3738,6 +3746,15 @@ namespace optimizerDuck.Resources.Languages {}}+ /// <summary>+ /// Looks up a localized string similar to Toggle Features.+ /// </summary>+ internal static string Sidebar_ToggleFeatures {+ get {+ return ResourceManager.GetString("Sidebar.ToggleFeatures", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to An error occurred while opening the folder or file. Please check the log../// </summary>@@ -3872,5 +3889,338 @@ namespace optimizerDuck.Resources.Languages {return ResourceManager.GetString("StartupManager.Tasks.Title", resourceCulture);}}++ /// <summary>+ /// Looks up a localized string similar to Control AI and smart features in Windows.+ /// </summary>+ internal static string ToggleFeature_Category_AI_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.AI.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to AI.+ /// </summary>+ internal static string ToggleFeature_Category_AI_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.AI.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Control data collection and privacy settings.+ /// </summary>+ internal static string ToggleFeature_Category_Privacy_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.Privacy.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Privacy.+ /// </summary>+ internal static string ToggleFeature_Category_Privacy_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.Privacy.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to System and update settings.+ /// </summary>+ internal static string ToggleFeature_Category_System_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.System.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to System.+ /// </summary>+ internal static string ToggleFeature_Category_System_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.System.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Customize visual and interaction settings.+ /// </summary>+ internal static string ToggleFeature_Category_UserExperience_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.UserExperience.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to User Experience.+ /// </summary>+ internal static string ToggleFeature_Category_UserExperience_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.Category.UserExperience.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off automatic Windows updates.+ /// </summary>+ internal static string ToggleFeature_DisableAutomaticWindowsUpdate_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableAutomaticWindowsUpdate.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Automatic Updates.+ /// </summary>+ internal static string ToggleFeature_DisableAutomaticWindowsUpdate_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableAutomaticWindowsUpdate.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Remove Bing search results from Windows search.+ /// </summary>+ internal static string ToggleFeature_DisableBingInWindowsSearch_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableBingInWindowsSearch.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Bing in Windows Search.+ /// </summary>+ internal static string ToggleFeature_DisableBingInWindowsSearch_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableBingInWindowsSearch.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off diagnostic data collection.+ /// </summary>+ internal static string ToggleFeature_DisableDiagnosticData_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableDiagnosticData.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Diagnostic Data.+ /// </summary>+ internal static string ToggleFeature_DisableDiagnosticData_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableDiagnosticData.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off feedback notifications.+ /// </summary>+ internal static string ToggleFeature_DisableFeedbackNotifications_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableFeedbackNotifications.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Feedback.+ /// </summary>+ internal static string ToggleFeature_DisableFeedbackNotifications_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableFeedbackNotifications.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off automatic disk cleanup.+ /// </summary>+ internal static string ToggleFeature_DisableStorageSense_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableStorageSense.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Storage Sense.+ /// </summary>+ internal static string ToggleFeature_DisableStorageSense_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableStorageSense.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off suggested content in Start menu.+ /// </summary>+ internal static string ToggleFeature_DisableSuggestionsInStart_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableSuggestionsInStart.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Suggestions in Start.+ /// </summary>+ internal static string ToggleFeature_DisableSuggestionsInStart_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableSuggestionsInStart.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off personalized tips and recommendations.+ /// </summary>+ internal static string ToggleFeature_DisableTailoredExperiences_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableTailoredExperiences.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Tailored Experiences.+ /// </summary>+ internal static string ToggleFeature_DisableTailoredExperiences_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableTailoredExperiences.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off news and interests in taskbar.+ /// </summary>+ internal static string ToggleFeature_DisableTaskbarNewsAndInterests_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableTaskbarNewsAndInterests.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Taskbar News.+ /// </summary>+ internal static string ToggleFeature_DisableTaskbarNewsAndInterests_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableTaskbarNewsAndInterests.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Reduce diagnostic data sent to Microsoft.+ /// </summary>+ internal static string ToggleFeature_DisableTelemetry_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableTelemetry.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Telemetry.+ /// </summary>+ internal static string ToggleFeature_DisableTelemetry_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableTelemetry.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off animations and visual effects.+ /// </summary>+ internal static string ToggleFeature_DisableVisualEffects_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableVisualEffects.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Visual Effects.+ /// </summary>+ internal static string ToggleFeature_DisableVisualEffects_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableVisualEffects.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Turn off the AI assistant in Windows.+ /// </summary>+ internal static string ToggleFeature_DisableWindowsCopilot_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableWindowsCopilot.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Disable Windows Copilot.+ /// </summary>+ internal static string ToggleFeature_DisableWindowsCopilot_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.DisableWindowsCopilot.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Use classic right-click menu instead of modern.+ /// </summary>+ internal static string ToggleFeature_EnableClassicContextMenu_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.EnableClassicContextMenu.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Enable Classic Context Menu.+ /// </summary>+ internal static string ToggleFeature_EnableClassicContextMenu_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.EnableClassicContextMenu.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Use dark theme for apps and Windows.+ /// </summary>+ internal static string ToggleFeature_EnableDarkMode_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.EnableDarkMode.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Enable Dark Mode.+ /// </summary>+ internal static string ToggleFeature_EnableDarkMode_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.EnableDarkMode.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Display seconds in system tray clock.+ /// </summary>+ internal static string ToggleFeature_ShowSecondsInSystemClock_Description {+ get {+ return ResourceManager.GetString("ToggleFeature.ShowSecondsInSystemClock.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Show Seconds in Clock.+ /// </summary>+ internal static string ToggleFeature_ShowSecondsInSystemClock_Name {+ get {+ return ResourceManager.GetString("ToggleFeature.ShowSecondsInSystemClock.Name", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Enable or disable continuous Windows features.+ /// </summary>+ internal static string ToggleFeatures_Description {+ get {+ return ResourceManager.GetString("ToggleFeatures.Description", resourceCulture);+ }+ }}}diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resxindex ef25d4e..8909faf 100644--- a/optimizerDuck/Resources/Languages/Translations.resx+++ b/optimizerDuck/Resources/Languages/Translations.resx@@ -1516,4 +1516,7 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value><data name="Optimizations.Loading.Hint" xml:space="preserve"><value>Please wait...</value></data>+ <data name="Common.Other" xml:space="preserve">+ <value>Other</value>+ </data></root>\ No newline at end of filediff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resxindex 31c99c9..c92679b 100644--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx@@ -1508,4 +1508,7 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và<data name="Optimizations.Loading.Hint" xml:space="preserve"><value>Vui lòng đợi...</value></data>+ <data name="Common.Other" xml:space="preserve">+ <value>Khác</value>+ </data></root>\ No newline at end of filediff --git a/optimizerDuck/Services/BloatwareService.cs b/optimizerDuck/Services/BloatwareService.csindex 927fa2e..f51c980 100644--- a/optimizerDuck/Services/BloatwareService.cs+++ b/optimizerDuck/Services/BloatwareService.cs@@ -6,10 +6,11 @@ using System.Xml.Linq;using Microsoft.Extensions.Logging;using Microsoft.Extensions.Options;using optimizerDuck.Common.Helpers;-using optimizerDuck.Core.Models.Bloatware;+using optimizerDuck.Core.Models.Optimization.Bloatware;using optimizerDuck.Core.Models.Config;using optimizerDuck.Core.Models.Execution;using optimizerDuck.Services.OptimizationServices;+using AppXPackage = optimizerDuck.Core.Models.Optimization.Bloatware.AppXPackage;using JsonSerializer = System.Text.Json.JsonSerializer;namespace optimizerDuck.Services;@@ -98,7 +99,7 @@ public class BloatwareService(ILogger<BloatwareService> logger, IOptionsMonitor</// <param name="appXPackage">The package to remove.</param>public async Task RemoveAppXPackage(AppXPackage appXPackage){- using var scope = ExecutionScope.Begin(logger);+ using var scope = ExecutionScope.BeginForLogging(logger);try{if (string.IsNullOrWhiteSpace(appXPackage.PackageFullName))diff --git a/optimizerDuck/Services/DiskCleanupService.cs b/optimizerDuck/Services/DiskCleanupService.csindex 9c7ee38..529cba5 100644--- a/optimizerDuck/Services/DiskCleanupService.cs+++ b/optimizerDuck/Services/DiskCleanupService.cs@@ -1,9 +1,10 @@using System.IO;using Microsoft.Extensions.Logging;-using optimizerDuck.Core.Models.Cleanup;+using optimizerDuck.Core.Models.Optimization.Cleanup;using optimizerDuck.Resources.Languages;using optimizerDuck.Services.OptimizationServices;using Wpf.Ui.Controls;+using CleanupItem = optimizerDuck.Core.Models.Optimization.Cleanup.CleanupItem;namespace optimizerDuck.Services;diff --git a/optimizerDuck/Services/Managers/RevertManager.cs b/optimizerDuck/Services/Managers/RevertManager.csindex 25f35b6..207b487 100644--- a/optimizerDuck/Services/Managers/RevertManager.cs+++ b/optimizerDuck/Services/Managers/RevertManager.cs@@ -23,30 +23,18 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerF{var steps = scope.SuccessfulSteps.Where(s => s.RevertStep != null)- .Select(s => new RevertStepData- {- Type = s.RevertStep!.Type,- Data = s.RevertStep.ToData()- })+ .Select(s => new RevertStepData { Type = s.RevertStep!.Type, Data = s.RevertStep.ToData() }).ToList();- if (steps.Count == 0)- {- logger.LogWarning("No revert steps to save for {Key}", scope.OptimizationKey);- return;- }+ if (steps.Count == 0) return;- var filePath = GetFilePath(scope.OptimizationId);- var payload = new RevertData+ await WriteJsonAsync(GetFilePath(scope.OptimizationId!.Value), new RevertData{- OptimizationId = scope.OptimizationId,- OptimizationName = scope.OptimizationKey,+ OptimizationId = scope.OptimizationId!.Value,+ OptimizationName = scope.OptimizationKey!,AppliedAt = DateTime.Now,Steps = steps- };-- await WriteJsonAsync(filePath, payload);- logger.LogInformation("Saved {Count} revert steps for {Name}", steps.Count, scope.OptimizationKey);+ });}public async Task<RevertResult> RevertAsync(IOptimization opt, IProgress<ProcessingProgress>? progress = null)@@ -58,58 +46,33 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFif (steps.Count == 0)return new RevertResult { Success = false, Message = string.Format(Translations.Revert_Error_NoDataFound, opt.Name) };- logger.LogInformation("Reverting {Key} ({Count} steps)", opt.OptimizationKey, steps.Count);-var failed = new List<OperationStepResult>();var total = steps.Count;- for (var i = steps.Count - 1; i >= 0; i--)+ for (var i = total - 1; i >= 0; i--){var (idx, step) = steps[i];- progress?.Report(new ProcessingProgress- {- Message = string.Format(Translations.Optimization_Revert_ExecutingStep, idx, total, step.Type),- IsIndeterminate = false,- Value = idx,- Total = total- });-- var success = false;- Exception? error = null;-- try { success = await step.ExecuteAsync(); }- catch (Exception ex) { error = ex; }+ progress?.Report(new ProcessingProgress { Message = string.Format(Translations.Optimization_Revert_ExecutingStep, idx, total, step.Type), Value = idx, Total = total });- if (!success)+ try+ {+ if (!await step.ExecuteAsync()) throw new Exception(Translations.Revert_Error_StepFailed);+ }+ catch (Exception ex){- var msg = error?.Message ?? Translations.Revert_Error_StepFailed;- logger.LogError(error, "Revert step {Idx} ({Type}) failed", idx, step.Type);- failed.Add(new OperationStepResult- {- Index = idx,- Name = step.Type,- Description = step.Description,- Success = false,- Error = msg,- RetryAction = () => step.ExecuteAsync()- });+ failed.Add(new OperationStepResult { Index = idx, Name = step.Type, Description = step.Description, Success = false, Error = ex.Message, RetryAction = () => step.ExecuteAsync() });}}- var failedCount = failed.Count;- var allFailed = failedCount == total;-- if (!allFailed) Remove(opt.Id);+ if (failed.Count < total) Remove(opt.Id);return new RevertResult{- Success = failedCount == 0,- IsCompleteFailure = allFailed,- Message = allFailed- ? string.Format(Translations.Optimization_Revert_Error_Failed, opt.Name)- : failedCount > 0- ? string.Format(Translations.Optimization_Revert_Error_FailedWithSteps, opt.Name, failedCount)- : string.Format(Translations.Optimization_Revert_Success, opt.Name),+ Success = failed.Count == 0,+ IsCompleteFailure = failed.Count == total,+ Message = failed.Count == total ? string.Format(Translations.Optimization_Revert_Error_Failed, opt.Name) :+ failed.Count > 0 ? string.Format(Translations.Optimization_Revert_Error_FailedWithSteps, opt.Name, failed.Count) :+ string.Format(Translations.Optimization_Revert_Success, opt.Name),FailedStepDetails = failed};}@@ -152,31 +115,14 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFprivate static async Task<RevertData?> LoadAsync(string path){if (!File.Exists(path)) return null;-- try- {- var content = await File.ReadAllTextAsync(path);- if (string.IsNullOrWhiteSpace(content))- return null;-- return JsonConvert.DeserializeObject<RevertData>(content);- }- catch (JsonException)- {- return null;- }- catch (IOException)- {- return null;- }+ try { return JsonConvert.DeserializeObject<RevertData>(await File.ReadAllTextAsync(path)); }+ catch { return null; }}private static async Task WriteJsonAsync(string path, RevertData data){Directory.CreateDirectory(Path.GetDirectoryName(path)!);- var json = JsonConvert.SerializeObject(data, Formatting.Indented);- await File.WriteAllTextAsync(path + ".tmp", json);- File.Move(path + ".tmp", path, true);+ await File.WriteAllTextAsync(path, JsonConvert.SerializeObject(data, Formatting.Indented));}private async Task<List<(int Index, IRevertStep Step)>> LoadStepsAsync(Guid id)@@ -210,20 +156,16 @@ public class RevertManager(ILogger<RevertManager> logger, ILoggerFactory loggerFprivate static Dictionary<string, Func<JObject, IRevertStep>> BuildStepRegistry(){var dict = new Dictionary<string, Func<JObject, IRevertStep>>();-foreach (var type in ReflectionHelper.FindImplementationsInLoadedAssemblies<IRevertStep>()){try{var instance = (IRevertStep)Activator.CreateInstance(type)!;- var key = instance.Type;var method = type.GetMethod("FromData", BindingFlags.Static | BindingFlags.Public);- if (method != null)- dict[key] = data => (IRevertStep)method.Invoke(null, [data])!;+ if (method != null) dict[instance.Type] = data => (IRevertStep)method.Invoke(null, [data])!;}catch { }}-return dict;}diff --git a/optimizerDuck/Services/OptimizationRegistry.cs b/optimizerDuck/Services/OptimizationRegistry.csindex ed28bc3..3c0d764 100644--- a/optimizerDuck/Services/OptimizationRegistry.cs+++ b/optimizerDuck/Services/OptimizationRegistry.cs@@ -3,6 +3,7 @@ using System.Reflection;using Microsoft.Extensions.Logging;using optimizerDuck.Common.Helpers;using optimizerDuck.Core.Interfaces;+using optimizerDuck.Core.Models.Optimization;using optimizerDuck.Core.Optimizers;namespace optimizerDuck.Services;diff --git a/optimizerDuck/Services/OptimizationService.cs b/optimizerDuck/Services/OptimizationService.csindex 5df3364..5444d15 100644--- a/optimizerDuck/Services/OptimizationService.cs+++ b/optimizerDuck/Services/OptimizationService.cs@@ -52,7 +52,7 @@ public class OptimizationService(IsIndeterminate = true});- using var scope = ExecutionScope.Begin(_logger);+ using var scope = ExecutionScope.BeginForLogging(_logger);var result = await ShellService.PowerShellAsync($"Checkpoint-Computer -Description \"{Shared.RestorePointName}\" -RestorePointType MODIFY_SETTINGS");diff --git a/optimizerDuck/Services/OptimizationServices/RegistryService.cs b/optimizerDuck/Services/OptimizationServices/RegistryService.csindex 4dde78d..f2af78a 100644--- a/optimizerDuck/Services/OptimizationServices/RegistryService.cs+++ b/optimizerDuck/Services/OptimizationServices/RegistryService.cs@@ -47,9 +47,9 @@ public static class RegistryServicereturn false;}- var parts = fullPath.AsSpan();- var idx = parts.IndexOf('\\');- var rootToken = idx > 0 ? parts[..idx].ToString() : parts.ToString();+ var pathSpan = fullPath.AsSpan();+ var idx = pathSpan.IndexOf('\\');+ var rootToken = (idx > 0 ? pathSpan[..idx] : pathSpan).ToString();if (!RootKeysMap.TryGetValue(rootToken, out rootKey)){@@ -58,7 +58,7 @@ public static class RegistryServicereturn false;}- subPath = idx > 0 ? parts[(idx + 1)..].ToString() : string.Empty;+ subPath = idx > 0 ? pathSpan[(idx + 1)..].ToString() : string.Empty;return true;}@@ -82,9 +82,7 @@ public static class RegistryServicetry{- var opened = writable- ? rootKey.OpenSubKey(subPath, true)- : rootKey.OpenSubKey(subPath);+ var opened = rootKey.OpenSubKey(subPath, writable);if (opened == null && writable && createIfMissing)opened = createdSubKeys != null@@ -102,32 +100,17 @@ public static class RegistryService}catch (SecurityException ex){- TrackRegistryError(- Translations.Service_Registry_Error_AccessDeniedProtectedHive,- "Access denied (protected hive)",- rootKey,- subPath,- ex);+ TrackRegistryError(Translations.Service_Registry_Error_AccessDeniedProtectedHive, "Access denied (protected hive)", rootKey, subPath, ex);return false;}catch (UnauthorizedAccessException ex){- TrackRegistryError(- Translations.Service_Registry_Error_UnauthorizedAccess,- "Unauthorized access",- rootKey,- subPath,- ex);+ TrackRegistryError(Translations.Service_Registry_Error_UnauthorizedAccess, "Unauthorized access", rootKey, subPath, ex);return false;}catch (Exception ex){- TrackRegistryError(- Translations.Service_Registry_Error_CreateOrOpenSubkeyFailed,- "Failed to create/open subkey",- rootKey,- subPath,- ex);+ TrackRegistryError(Translations.Service_Registry_Error_CreateOrOpenSubkeyFailed, "Failed to create/open subkey", rootKey, subPath, ex);return false;}}@@ -138,16 +121,12 @@ public static class RegistryServiceif (!TryParsePath(item.Path, out var rootKey, out var subPath))return default;- if (!TryOpenSubKey(rootKey, subPath, out var subKey, out var shouldDispose, writable, createIfMissing,- createdSubKeys))- return default;-- if (subKey is null)+ if (!TryOpenSubKey(rootKey, subPath, out var subKey, out var shouldDispose, writable, createIfMissing, createdSubKeys))return default;try{- return action(subKey);+ return subKey == null ? default : action(subKey);}finally{@@ -160,24 +139,18 @@ public static class RegistryService{return WithKey(item, key =>{- object? value = null;try{- value = key.GetValue(item.Name, RegistryValueOptions.DoNotExpandEnvironmentNames);+ var value = key.GetValue(item.Name, null, RegistryValueOptions.DoNotExpandEnvironmentNames);if (value is null) return default;var result = ConvertRegistryValue<T>(value);-- ExecutionScope.LogInfo("Read registry {Path}:{Name} = {Value}",- item.Path, item.Name!, result?.ToString() ?? "<null>");-+ ExecutionScope.LogInfo("Read registry {Path}:{Name} = {Value}", item.Path, item.Name!, result?.ToString() ?? "<null>");return result;}catch (Exception ex){- ExecutionScope.LogError(ex, "Failed to read registry {Path}:{Name}",- item.Path, item.Name!);-+ ExecutionScope.LogError(ex, "Failed to read registry {Path}:{Name}", item.Path, item.Name!);return default;}});@@ -187,8 +160,7 @@ public static class RegistryService{if (item.Value == null){- ExecutionScope.LogError(null, "Value can't be null when writing {Path}:{Name}",- item.Path, item.Name!);+ ExecutionScope.LogError(null, "Value can't be null when writing {Path}:{Name}", item.Path, item.Name!);ExecutionScope.Track(nameof(Write), false);return false;}@@ -200,81 +172,39 @@ public static class RegistryServicevar description = string.Format(Translations.Service_Registry_Description_Write, item.Path, item.Name);try{- object? backupValue = null;- RegistryValueKind? backupKind = null;- var valueExists = false;-- // Detect value existence correctly:- // - backupValue == null does NOT mean value does not exist- // - must check value names explicitly- try- {- backupValue = key.GetValue(item.Name, null,- RegistryValueOptions.DoNotExpandEnvironmentNames);-- // Value does not exist if backupValue is null and name not found- if (backupValue == null &&- !key.GetValueNames().Contains(item.Name))- {- backupKind = null;- valueExists = false; // value does not exist- }- else- {- backupKind = key.GetValueKind(item.Name);- valueExists = true; // value exists- }- }- catch- {- backupValue = null;- backupKind = null;- valueExists = false;- }+ var backupValue = key.GetValue(item.Name, null, RegistryValueOptions.DoNotExpandEnvironmentNames);+ var valueExists = backupValue != null || key.GetValueNames().Contains(item.Name, StringComparer.OrdinalIgnoreCase);+ var backupKind = valueExists ? key.GetValueKind(item.Name) : RegistryValueKind.Unknown;key.SetValue(item.Name, item.Value, item.Kind);- var revertStep = valueExists- ? new RegistryRevertStep- {- Action = RevertAction.RestorePrevious,- Path = item.Path,- Name = item.Name,- Value = backupValue,- Kind = backupKind ?? RegistryValueKind.Unknown,- CreatedSubKeys = createdSubKeys- }- : new RegistryRevertStep- {- Action = RevertAction.NoPreviousValue,- Path = item.Path,- Name = item.Name,- CreatedSubKeys = createdSubKeys- };-- ExecutionScope.LogInfo("Wrote {Path}:{Name}[{Kind}] = {Value}",- item.Path, item.Name!, item.Kind, item.Value);+ var revertStep = new RegistryRevertStep+ {+ Action = valueExists ? RevertAction.RestorePrevious : RevertAction.NoPreviousValue,+ Path = item.Path,+ Name = item.Name,+ Value = backupValue,+ Kind = backupKind,+ CreatedSubKeys = createdSubKeys+ };++ ExecutionScope.LogInfo("Wrote {Path}:{Name}[{Kind}] = {Value}", item.Path, item.Name!, item.Kind, item.Value);ExecutionScope.Track(nameof(Write), true);ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true, revertStep);return true;}catch (UnauthorizedAccessException){- ExecutionScope.LogError(null, "Access denied writing {Path}:{Name}",- item.Path, item.Name!);+ ExecutionScope.LogError(null, "Access denied writing {Path}:{Name}", item.Path, item.Name!);ExecutionScope.Track(nameof(Write), false);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null,- Translations.Service_Common_Error_AccessDenied,- () => Task.FromResult(Write(item)));+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null, Translations.Service_Common_Error_AccessDenied, () => Task.FromResult(Write(item)));return false;}catch (Exception ex){- ExecutionScope.LogError(ex, "Failed to write registry {Path}:{Name}",- item.Path, item.Name!);+ ExecutionScope.LogError(ex, "Failed to write registry {Path}:{Name}", item.Path, item.Name!);ExecutionScope.Track(nameof(Write), false);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null, ex.Message,- () => Task.FromResult(Write(item)));+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null, ex.Message, () => Task.FromResult(Write(item)));return false;}}, true, true, createdSubKeys);@@ -282,87 +212,52 @@ public static class RegistryServicepublic static bool DeleteValue(RegistryItem item){- if (!TryParsePath(item.Path, out var rootKey, out var subPath))- return false;-- RegistryKey? key = null;- var shouldDispose = false;-- try+ return WithKey(item, key =>{var description = string.Format(Translations.Service_Registry_Description_Delete, item.Path, item.Name);- if (string.IsNullOrEmpty(subPath))- {- key = rootKey;- }- else+ try{- key = rootKey.OpenSubKey(subPath, true);- if (key == null)+ var backupValue = key.GetValue(item.Name, null, RegistryValueOptions.DoNotExpandEnvironmentNames);+ if (backupValue == null && !key.GetValueNames().Contains(item.Name, StringComparer.OrdinalIgnoreCase)){- // Missing subkey means there's nothing to delete; treat as success for revert.- ExecutionScope.LogInfo("Skip delete registry {Path}:{Name} (subkey missing)",- item.Path, item.Name!);+ ExecutionScope.LogInfo("Skip delete registry {Path}:{Name} (not found)", item.Path, item.Name!);ExecutionScope.Track(nameof(DeleteValue), true);ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true);return true;}- shouldDispose = true;- }+ var backupKind = key.GetValueKind(item.Name);+ key.DeleteValue(item.Name!, false);- // Key does not exist, treat as success for revert- if (key.GetValue(item.Name) == null)- {+ var revertStep = new RegistryRevertStep+ {+ Action = RevertAction.RestorePrevious,+ Path = item.Path,+ Name = item.Name,+ Value = backupValue,+ Kind = backupKind+ };++ ExecutionScope.LogInfo("Deleted registry {Path}:{Name}", item.Path, item.Name!);ExecutionScope.Track(nameof(DeleteValue), true);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true);+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true, revertStep);return true;}-- var backupValue = key.GetValue(item.Name);- var backupKind = key.GetValueKind(item.Name);-- key.DeleteValue(item.Name!, false);-- // Record revert: key existed before deletion- var revertStep = new RegistryRevertStep+ catch (UnauthorizedAccessException){- Action = RevertAction.RestorePrevious,- Path = item.Path,- Name = item.Name,- Value = backupValue,- Kind = backupKind- };-- ExecutionScope.LogInfo("Deleted registry {Path}:{Name}", item.Path, item.Name!);- ExecutionScope.Track(nameof(DeleteValue), true);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, true, revertStep);- return true;- }- catch (UnauthorizedAccessException)- {- ExecutionScope.LogError(null, "Access denied deleting {Path}:{Name}",- item.Path, item.Name!);- ExecutionScope.Track(nameof(DeleteValue), false);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, $"{item.Path}:{item.Name}", false, null,- Translations.Service_Common_Error_AccessDenied,- () => Task.FromResult(DeleteValue(item)));- return false;- }- catch (Exception ex)- {- ExecutionScope.LogError(ex, "Failed to delete registry {Path}:{Name}",- item.Path, item.Name!);- ExecutionScope.Track(nameof(DeleteValue), false);- ExecutionScope.RecordStep(Translations.Service_Registry_Name, $"{item.Path}:{item.Name}", false, null, ex.Message,- () => Task.FromResult(DeleteValue(item)));- return false;- }- finally- {- if (shouldDispose)- key?.Dispose();- }+ ExecutionScope.LogError(null, "Access denied deleting {Path}:{Name}", item.Path, item.Name!);+ ExecutionScope.Track(nameof(DeleteValue), false);+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null, Translations.Service_Common_Error_AccessDenied, () => Task.FromResult(DeleteValue(item)));+ return false;+ }+ catch (Exception ex)+ {+ ExecutionScope.LogError(ex, "Failed to delete registry {Path}:{Name}", item.Path, item.Name!);+ ExecutionScope.Track(nameof(DeleteValue), false);+ ExecutionScope.RecordStep(Translations.Service_Registry_Name, description, false, null, ex.Message, () => Task.FromResult(DeleteValue(item)));+ return false;+ }+ }, true);}public static void Write(params RegistryItem[] items)diff --git a/optimizerDuck/Services/OptimizationServices/ScheduledTaskService.cs b/optimizerDuck/Services/OptimizationServices/ScheduledTaskService.csindex d3b6049..53adec3 100644--- a/optimizerDuck/Services/OptimizationServices/ScheduledTaskService.cs+++ b/optimizerDuck/Services/OptimizationServices/ScheduledTaskService.cs@@ -2,8 +2,9 @@ using System.Collections.ObjectModel;using Microsoft.Win32.TaskScheduler;using optimizerDuck.Core.Models.Execution;using optimizerDuck.Core.Models.Revert.Steps;-using optimizerDuck.Core.Models.ScheduledTask;+using optimizerDuck.Core.Models.Optimization.ScheduledTask;using optimizerDuck.Resources.Languages;+using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;using Task = Microsoft.Win32.TaskScheduler.Task;namespace optimizerDuck.Services.OptimizationServices;diff --git a/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs b/optimizerDuck/Services/OptimizationServices/ServiceProcessService.csindex 6f360d5..d1230f6 100644--- a/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs+++ b/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs@@ -15,25 +15,23 @@ public static class ServiceProcessService/// <summary>/// Get current startup type of a service/// </summary>- private static ServiceStartupType? GetStartupType(string serviceName, ManagementObject service)+ private static ServiceStartupType? GetStartupType(string serviceName){try{- var startMode = service["StartMode"]?.ToString();+ var serviceKey = $@"HKLM\SYSTEM\CurrentControlSet\Services\{serviceName}";+ var start = RegistryService.Read<int>(new RegistryItem(serviceKey, "Start"));- if (startMode is "Automatic" or "Auto")+ if (start == 2){- var isDelayed = RegistryService.Read<int>(new RegistryItem(- $@"HKLM\SYSTEM\CurrentControlSet\Services\{serviceName}", "DelayedAutoStart"));- if (isDelayed == 1)- return ServiceStartupType.AutomaticDelayedStart;+ var isDelayed = RegistryService.Read<int>(new RegistryItem(serviceKey, "DelayedAutoStart"));+ return isDelayed == 1 ? ServiceStartupType.AutomaticDelayedStart : ServiceStartupType.Automatic;}- return startMode switch+ return start switch{- "Auto" or "Automatic" => ServiceStartupType.Automatic,- "Manual" => ServiceStartupType.Manual,- "Disabled" => ServiceStartupType.Disabled,+ 3 => ServiceStartupType.Manual,+ 4 => ServiceStartupType.Disabled,_ => null};}@@ -47,125 +45,75 @@ public static class ServiceProcessServicepublic static bool ChangeServiceStartupType(ServiceItem item){var description = string.Format(Translations.Service_Service_Description_Change, item.Name, item.StartupType);+ var sw = Stopwatch.StartNew();+try{- if (!Scope.IsConnected)- Scope.Connect();-- using var searcher = new ManagementObjectSearcher(Scope,- new ObjectQuery($"SELECT * FROM Win32_Service WHERE Name='{item.Name.Replace("'", "''")}'"));-- using var results = searcher.Get();- using var service = results.OfType<ManagementObject>().FirstOrDefault();+ var originalStartupType = GetStartupType(item.Name);++ // Map ServiceStartupType to Registry 'Start' value+ var startValue = item.StartupType switch+ {+ ServiceStartupType.Automatic or ServiceStartupType.AutomaticDelayedStart => 2,+ ServiceStartupType.Manual => 3,+ ServiceStartupType.Disabled => 4,+ _ => 3+ };- if (service == null)+ var serviceKey = $@"HKLM\SYSTEM\CurrentControlSet\Services\{item.Name}";++ // 1. Change the main 'Start' value+ var mainSuccess = RegistryService.Write(new RegistryItem(serviceKey, "Start", startValue));++ // 2. Handle 'DelayedAutoStart' if necessary+ var delayedSuccess = true;+ if (item.StartupType == ServiceStartupType.AutomaticDelayedStart){- ExecutionScope.LogInfo(- "[SERVICE][{Name}][OK][NOT_FOUND][D=0ms] startup -> {StartupType}",- item.Name,- item.StartupType- );- ExecutionScope.Track(nameof(ChangeServiceStartupType), true);- ExecutionScope.RecordStep(- Translations.Service_Service_Name,- description,- true,- null,- null);- return true;+ delayedSuccess = RegistryService.Write(new RegistryItem(serviceKey, "DelayedAutoStart", 1));}-- // Record revert: backup current startup type- var originalStartupType = GetStartupType(item.Name, service);-- var sw = Stopwatch.StartNew();-- using var inParams = service.GetMethodParameters("ChangeStartMode");- inParams["StartMode"] = item.StartupType switch+ else{- ServiceStartupType.Automatic or ServiceStartupType.AutomaticDelayedStart => "Automatic",- ServiceStartupType.Manual => "Manual",- ServiceStartupType.Disabled => "Disabled",- _ => "Manual"- };+ // Always try to delete for consistency, but don't fail if it doesn't exist+ RegistryService.DeleteValue(new RegistryItem(serviceKey, "DelayedAutoStart"));+ }- using var outParams = service.InvokeMethod("ChangeStartMode", inParams, null);- var resultCode = outParams?["ReturnValue"] is uint val ? val : 1;+ var success = mainSuccess && delayedSuccess;+ sw.Stop();- if (resultCode == 0)+ if (success){ServiceRevertStep? revertStep = null;if (originalStartupType.HasValue && originalStartupType.Value != item.StartupType)+ {revertStep = new ServiceRevertStep{ServiceName = item.Name,OriginalStartupType = originalStartupType.Value};-- // Handle delayed auto start registry key- var registrySuccess = item.StartupType == ServiceStartupType.AutomaticDelayedStart- ? RegistryService.Write(new RegistryItem(- $@"HKLM\SYSTEM\CurrentControlSet\Services\{item.Name}",- "DelayedAutoStart", 1))- // always delete to ensure consistency- : RegistryService.DeleteValue(new RegistryItem(- $@"HKLM\SYSTEM\CurrentControlSet\Services\{item.Name}",- "DelayedAutoStart"));-- sw.Stop();+ }ExecutionScope.LogInfo(- "[SERVICE][{Name}][OK][CODE=0][D={Duration}] startup -> {StartupType}",+ "[SERVICE][{Name}][OK][D={Duration}] startup -> {StartupType}",item.Name,sw.Elapsed.FormatTime(),item.StartupType);- ExecutionScope.Track(nameof(ChangeServiceStartupType), registrySuccess);- ExecutionScope.RecordStep(- Translations.Service_Service_Name,- description,- registrySuccess,- registrySuccess ? revertStep : null,- registrySuccess ? null : Translations.Service_Service_Error_UpdateRegistryForStartupTypeFailed,- registrySuccess ? null : () => Task.FromResult(ChangeServiceStartupType(item)));- return registrySuccess;+ ExecutionScope.Track(nameof(ChangeServiceStartupType), true);+ ExecutionScope.RecordStep(Translations.Service_Service_Name, description, true, revertStep);+ return true;}- ExecutionScope.LogInfo(- "[SERVICE][{Name}][FAIL][CODE={Code}][D={Duration}] startup -> {StartupType}",- item.Name,- resultCode,- sw.Elapsed.FormatTime(),- item.StartupType- );-+ ExecutionScope.LogInfo("[SERVICE][{Name}][FAIL][D={Duration}] startup -> {StartupType}", item.Name, sw.Elapsed.FormatTime(), item.StartupType);ExecutionScope.Track(nameof(ChangeServiceStartupType), false);- ExecutionScope.RecordStep(- Translations.Service_Service_Name,- description,- false,- null,- string.Format(Translations.Service_Service_Error_ChangeStartModeFailedWithCode, resultCode),- () => Task.FromResult(ChangeServiceStartupType(item)));+ ExecutionScope.RecordStep(Translations.Service_Service_Name, description, false, null, Translations.Service_Service_Error_UpdateRegistryForStartupTypeFailed, () => Task.FromResult(ChangeServiceStartupType(item)));return false;}catch (Exception ex){- ExecutionScope.LogError(- ex,- "[SERVICE][{Name}][FAIL][EXCEPTION] startup -> {StartupType}",- item.Name,- item.StartupType- );+ ExecutionScope.LogError(ex, "[SERVICE][{Name}][FAIL][EXCEPTION] startup -> {StartupType}", item.Name, item.StartupType);ExecutionScope.Track(nameof(ChangeServiceStartupType), false);- ExecutionScope.RecordStep(- Translations.Service_Service_Name,- description,- false,- null,- string.Format(Translations.Service_Service_Error_ExceptionOccurred, item.Name, ex.Message),- () => Task.FromResult(ChangeServiceStartupType(item)));+ ExecutionScope.RecordStep(Translations.Service_Service_Name, description, false, null, string.Format(Translations.Service_Service_Error_ExceptionOccurred, item.Name, ex.Message), () => Task.FromResult(ChangeServiceStartupType(item)));return false;}}diff --git a/optimizerDuck/Services/StartupManagerService.cs b/optimizerDuck/Services/StartupManagerService.csindex 52d51a4..f13d167 100644--- a/optimizerDuck/Services/StartupManagerService.cs+++ b/optimizerDuck/Services/StartupManagerService.cs@@ -6,8 +6,11 @@ using System.Windows.Interop;using System.Windows.Media.Imaging;using Microsoft.Extensions.Logging;using Microsoft.Win32;-using optimizerDuck.Core.Models.StartupManager;+using optimizerDuck.Core.Models.Optimization.StartupManager;+using optimizerDuck.Core.Models.Optimization.StartupManager;using optimizerDuck.Services.OptimizationServices;+using StartupApp = optimizerDuck.Core.Models.Optimization.StartupManager.StartupApp;+using StartupTask = optimizerDuck.Core.Models.Optimization.StartupManager.StartupTask;namespace optimizerDuck.Services;@@ -127,8 +130,7 @@ public class StartupManagerService(ILogger<StartupManagerService> logger)? Registry.LocalMachine: Registry.CurrentUser;- var approvedSubKeyPath =- @"Software\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\StartupFolder";+ const string approvedSubKeyPath = @"Software\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\StartupFolder";using var approvedKey = rootKey.OpenSubKey(approvedSubKeyPath);foreach (var file in Directory.GetFiles(dirPath))diff --git a/optimizerDuck/Services/ToggleFeaturesRegistry.cs b/optimizerDuck/Services/ToggleFeaturesRegistry.csindex 00b37ef..1e30109 100644--- a/optimizerDuck/Services/ToggleFeaturesRegistry.cs+++ b/optimizerDuck/Services/ToggleFeaturesRegistry.cs@@ -4,19 +4,19 @@ using System.Reflection;using optimizerDuck.Common.Helpers;using optimizerDuck.Core.Interfaces;using optimizerDuck.Core.Models.Attributes;-using optimizerDuck.Core.ToggleFeatures;+using optimizerDuck.Core.Models.ToggleFeatures;using Wpf.Ui.Controls;namespace optimizerDuck.Services;public class ToggleFeaturesRegistry{- public IToggleFeatureCategory[] Categories { get; private set; } = [];+ public IToggleFeaturesCategory[] Categories { get; private set; } = [];public void RegisterCategories(){var categories = ReflectionHelper- .FindImplementationsInLoadedAssemblies<IToggleFeatureCategory>()+ .FindImplementationsInLoadedAssemblies<IToggleFeaturesCategory>().Select(t =>{var featureTypes = t.GetNestedTypes(BindingFlags.Public)@@ -37,9 +37,9 @@ public class ToggleFeaturesRegistryvar features = new ObservableCollection<IToggleFeature>(featureTypes);- var instance = (IToggleFeatureCategory)Activator.CreateInstance(t)!;+ var instance = (IToggleFeaturesCategory)Activator.CreateInstance(t)!;- var featuresProp = t.GetProperty(nameof(IToggleFeatureCategory.Features),+ var featuresProp = t.GetProperty(nameof(IToggleFeaturesCategory.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<IToggleFeatureCategory>()+ .Cast<IToggleFeaturesCategory>().OrderBy(c => c.Order).ToArray();diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.csindex eef829d..cd95830 100644--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;using optimizerDuck.Common.Helpers;using optimizerDuck.Core.Interfaces;+using optimizerDuck.Core.Models.Optimization;using optimizerDuck.Core.Optimizers;using optimizerDuck.Resources.Languages;using optimizerDuck.Services.Managers;diff --git a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.csindex ccbac7f..cad8c31 100644--- a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs@@ -3,7 +3,7 @@ using System.ComponentModel;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;-using optimizerDuck.Core.Models.Bloatware;+using optimizerDuck.Core.Models.Optimization.Bloatware;using optimizerDuck.Core.Models.UI;using optimizerDuck.Resources.Languages;using optimizerDuck.Services;@@ -11,6 +11,7 @@ using optimizerDuck.UI.ViewModels.Dialogs;using optimizerDuck.UI.Views.Dialogs;using Wpf.Ui;using Wpf.Ui.Controls;+using AppXPackage = optimizerDuck.Core.Models.Optimization.Bloatware.AppXPackage;namespace optimizerDuck.UI.ViewModels.Pages;diff --git a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.csindex 5b401fe..31de472 100644--- a/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/DiskCleanupViewModel.cs@@ -3,11 +3,12 @@ using System.Diagnostics;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;-using optimizerDuck.Core.Models.Cleanup;+using optimizerDuck.Core.Models.Optimization.Cleanup;using optimizerDuck.Resources.Languages;using optimizerDuck.Services;using Wpf.Ui;using Wpf.Ui.Controls;+using CleanupItem = optimizerDuck.Core.Models.Optimization.Cleanup.CleanupItem;namespace optimizerDuck.UI.ViewModels.Pages;diff --git a/optimizerDuck/UI/ViewModels/Pages/FeatureViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/FeatureViewModel.csdeleted file mode 100644index 9002dbc..0000000--- a/optimizerDuck/UI/ViewModels/Pages/FeatureViewModel.cs+++ /dev/null@@ -1,62 +0,0 @@-using System.Threading.Tasks;-using CommunityToolkit.Mvvm.ComponentModel;-using CommunityToolkit.Mvvm.Input;-using optimizerDuck.Core.Interfaces;--namespace optimizerDuck.UI.ViewModels.Pages;--public partial class FeatureViewModel(IToggleFeature feature) : ObservableObject-{- [ObservableProperty]- private string _name = feature.Name;-- [ObservableProperty]- private string _description = feature.Description;-- [ObservableProperty]- private bool _isEnabled;-- [ObservableProperty]- private bool _isVisible = true;-- [ObservableProperty]- private bool _isLoading;-- public async Task LoadStateAsync()- {- try- {- IsEnabled = await feature.GetStateAsync();- }- catch- {- IsEnabled = false;- }- }-- [RelayCommand]- private async Task ToggleAsync()- {- if (IsLoading)- return;-- IsLoading = true;- try- {- if (IsEnabled)- {- await feature.DisableAsync();- IsEnabled = false;- }- else- {- await feature.EnableAsync();- IsEnabled = true;- }- }- finally- {- IsLoading = false;- }- }-}diff --git a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.csindex c299d31..156b9ff 100644--- a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs@@ -4,12 +4,13 @@ using System.Diagnostics;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;-using optimizerDuck.Core.Models.ScheduledTask;+using optimizerDuck.Core.Models.Optimization.ScheduledTask;using optimizerDuck.Resources.Languages;using optimizerDuck.Services.OptimizationServices;using optimizerDuck.UI.Views.Dialogs;using Wpf.Ui;using Wpf.Ui.Controls;+using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;namespace optimizerDuck.UI.ViewModels.Pages;diff --git a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.csindex 7c82c7c..b8fd6eb 100644--- a/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/StartupManagerViewModel.cs@@ -4,12 +4,14 @@ using System.Diagnostics;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using Microsoft.Extensions.Logging;-using optimizerDuck.Core.Models.StartupManager;+using optimizerDuck.Core.Models.Optimization.StartupManager;using optimizerDuck.Resources.Languages;using optimizerDuck.Services;using optimizerDuck.UI.Views.Dialogs;using Wpf.Ui;using Wpf.Ui.Controls;+using StartupApp = optimizerDuck.Core.Models.Optimization.StartupManager.StartupApp;+using StartupTask = optimizerDuck.Core.Models.Optimization.StartupManager.StartupTask;namespace optimizerDuck.UI.ViewModels.Pages;diff --git a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.csindex ce939a4..990a3ca 100644--- a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs@@ -5,6 +5,7 @@ using System.Reflection;using CommunityToolkit.Mvvm.ComponentModel;using CommunityToolkit.Mvvm.Input;using optimizerDuck.Core.Interfaces;+using optimizerDuck.Core.Models.Attributes;using optimizerDuck.Services;using optimizerDuck.UI.Views.Pages.ToggleFeatures;using Wpf.Ui;@@ -15,7 +16,7 @@ namespace optimizerDuck.UI.ViewModels.Pages;public partial class ToggleFeaturesViewModel : ObservableObject{[ObservableProperty]- private ObservableCollection<CategoryViewModel> _categories = [];+ private ObservableCollection<ToggleFeaturesCategoryViewModel> _categories = [];[ObservableProperty]private string _searchText = string.Empty;@@ -41,11 +42,11 @@ public partial class ToggleFeaturesViewModel : ObservableObject_registry.RegisterCategories();}- var categoryViewModels = new ObservableCollection<CategoryViewModel>();+ var categoryViewModels = new ObservableCollection<ToggleFeaturesCategoryViewModel>();foreach (var category in _registry.Categories){- categoryViewModels.Add(new CategoryViewModel+ categoryViewModels.Add(new ToggleFeaturesCategoryViewModel{Name = category.Name,Description = category.Description,@@ -62,16 +63,16 @@ public partial class ToggleFeaturesViewModel : ObservableObject}[RelayCommand]- private void NavigateToCategory(CategoryViewModel category)+ private void NavigateToCategory(ToggleFeaturesCategoryViewModel toggleFeaturesCategory){- if (category.PageType != null)+ if (toggleFeaturesCategory.PageType != null){- _navigationService.Navigate(category.PageType);+ _navigationService.Navigate(toggleFeaturesCategory.PageType);}}}-public partial class CategoryViewModel : ObservableObject+public partial class ToggleFeaturesCategoryViewModel : ObservableObject{[ObservableProperty] private string _name = string.Empty;[ObservableProperty] private string _description = string.Empty;diff --git a/optimizerDuck/UI/ViewModels/ToggleFeatures/FeatureViewModel.cs b/optimizerDuck/UI/ViewModels/ToggleFeatures/FeatureViewModel.csnew file mode 100644index 0000000..c357e8b--- /dev/null+++ b/optimizerDuck/UI/ViewModels/ToggleFeatures/FeatureViewModel.cs@@ -0,0 +1,91 @@+using CommunityToolkit.Mvvm.ComponentModel;+using CommunityToolkit.Mvvm.Input;+using Microsoft.Extensions.Logging;+using optimizerDuck.Core.Interfaces;+using optimizerDuck.Core.Models.Execution;++namespace optimizerDuck.UI.ViewModels.ToggleFeatures;++public partial class FeatureViewModel(IToggleFeature feature, ILoggerFactory loggerFactory) : ObservableObject+{+ private readonly ILogger<FeatureViewModel> _logger = loggerFactory.CreateLogger<FeatureViewModel>();++ [ObservableProperty]+ private string _name = feature.Name;++ [ObservableProperty]+ private string _description = feature.Description;++ [ObservableProperty]+ private string _section = feature.Section;++ [ObservableProperty]+ private bool _isEnabled;++ [ObservableProperty]+ private bool _isVisible = true;++ [ObservableProperty]+ private bool _isLoading;++ public async Task LoadStateAsync()+ {+ try+ {+ IsEnabled = await feature.GetStateAsync();+ }+ catch+ {+ IsEnabled = false;+ }+ }++ [RelayCommand]+ private async Task ToggleAsync()+ {+ if (IsLoading)+ return;++ var isEnabling = !IsEnabled;++ _logger.LogInformation(+ "===== START {Action} toggle feature {FeatureName} ({FeatureKey}) =====",+ isEnabling ? "enabling" : "disabling",+ feature.Name,+ feature.FeatureKey);++ var scope = ExecutionScope.BeginForLogging(_logger);++ IsLoading = true;+ try+ {+ if (isEnabling)+ {+ await feature.EnableAsync();+ IsEnabled = true;+ }+ else+ {+ await feature.DisableAsync();+ IsEnabled = false;+ }++ scope.Dispose();++ _logger.LogInformation(+ "===== END {Action} toggle feature {FeatureName} ({FeatureKey}) =====",+ isEnabling ? "enabling" : "disabling",+ feature.Name,+ feature.FeatureKey);+ }+ catch (Exception ex)+ {+ _logger.LogError(ex, "Failed to toggle feature {FeatureName}", feature.Name);+ throw;+ }+ finally+ {+ IsLoading = false;+ }+ }+}diff --git a/optimizerDuck/UI/ViewModels/Pages/ToggleFeatureCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/ToggleFeatures/ToggleFeaturesCategoryViewModel.cssimilarity index 50%rename from optimizerDuck/UI/ViewModels/Pages/ToggleFeatureCategoryViewModel.csrename to optimizerDuck/UI/ViewModels/ToggleFeatures/ToggleFeaturesCategoryViewModel.csindex ecaadad..40be759 100644--- a/optimizerDuck/UI/ViewModels/Pages/ToggleFeatureCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/ToggleFeatures/ToggleFeaturesCategoryViewModel.cs@@ -1,26 +1,27 @@using System.Collections.ObjectModel;using CommunityToolkit.Mvvm.ComponentModel;+using Microsoft.Extensions.Logging;using optimizerDuck.Core.Interfaces;-using optimizerDuck.Services;-using Wpf.Ui;+using optimizerDuck.Core.Models.ToggleFeatures;+using optimizerDuck.Resources.Languages;using Wpf.Ui.Controls;-namespace optimizerDuck.UI.ViewModels.Pages;+namespace optimizerDuck.UI.ViewModels.ToggleFeatures;-public partial class ToggleFeatureCategoryViewModel : ViewModel+public partial class ToggleFeaturesCategoryViewModel : ViewModel{[ObservableProperty] private string _categoryName = string.Empty;[ObservableProperty] private string _categoryDescription = string.Empty;[ObservableProperty] private SymbolRegular _categoryIcon;- [ObservableProperty] private ObservableCollection<FeatureViewModel> _features = [];+ [ObservableProperty] private ObservableCollection<FeatureSection> _sections = [];[ObservableProperty] private string _searchText = string.Empty;[ObservableProperty] private int _selectedSortByIndex;[ObservableProperty] private bool _isLoading = true;- private IToggleFeatureCategory? _currentCategory;- private List<FeatureViewModel> _allFeatures = [];+ private readonly IToggleFeaturesCategory? _currentCategory;+ private readonly List<FeatureViewModel> _allFeatures = [];- public ToggleFeatureCategoryViewModel(IToggleFeatureCategory category)+ public ToggleFeaturesCategoryViewModel(IToggleFeaturesCategory category, ILoggerFactory loggerFactory){_currentCategory = category;@@ -31,7 +32,7 @@ public partial class ToggleFeatureCategoryViewModel : ViewModel_allFeatures.Clear();foreach (var feature in _currentCategory.Features){- _allFeatures.Add(new FeatureViewModel(feature));+ _allFeatures.Add(new FeatureViewModel(feature, loggerFactory));}foreach (var feature in _allFeatures)@@ -68,24 +69,33 @@ public partial class ToggleFeatureCategoryViewModel : ViewModel{var search = SearchText.ToLowerInvariant();filtered = filtered.Where(f =>- f.Name.ToLowerInvariant().Contains(search) ||- f.Description.ToLowerInvariant().Contains(search));+ f.Name.Contains(search, StringComparison.InvariantCultureIgnoreCase) ||+ f.Description.Contains(search, StringComparison.InvariantCultureIgnoreCase));}- // Apply sorting- // 0 = Name (A-Z)- // 1 = Name (Z-A)- // We can match what DiskCleanup or other pages do, but simple for now- if (SelectedSortByIndex == 0) // Default: Name- {- filtered = filtered.OrderBy(f => f.Name);- }+ var sortedFeatures = filtered.OrderBy(f => f.Name).ToList();- Features = new ObservableCollection<FeatureViewModel>(filtered);-- foreach (var feature in Features)+ var grouped = sortedFeatures+ .GroupBy(f => string.IsNullOrEmpty(f.Section) ? Translations.Common_Other : f.Section)+ .OrderBy(g => g.Key == Translations.Common_Other ? 1 : 0)+ .ThenBy(g => g.Key);++ var sections = new ObservableCollection<FeatureSection>();+ foreach (var group in grouped){- feature.IsVisible = true;+ var section = new FeatureSection+ {+ Name = group.Key,+ Features = new ObservableCollection<FeatureViewModel>(group.ToList())+ };+ sections.Add(section);++ foreach (var feature in section.Features)+ {+ feature.IsVisible = true;+ }}++ Sections = sections;}}diff --git a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml.cs b/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml.csindex f43f75d..8f83138 100644--- a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml.cs+++ b/optimizerDuck/UI/Views/Dialogs/ScheduledTaskCreateDialog.xaml.cs@@ -1,5 +1,6 @@using System.Windows.Controls;-using optimizerDuck.Core.Models.ScheduledTask;+using optimizerDuck.Core.Models.Optimization.ScheduledTask;+using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;namespace optimizerDuck.UI.Views.Dialogs;diff --git a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml.cs b/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml.csindex 4a28908..1a38534 100644--- a/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml.cs+++ b/optimizerDuck/UI/Views/Dialogs/ScheduledTaskDetailsDialog.xaml.cs@@ -1,6 +1,7 @@using System.Windows.Controls;using System.Windows.Media;-using optimizerDuck.Core.Models.ScheduledTask;+using optimizerDuck.Core.Models.Optimization.ScheduledTask;+using ScheduledTaskModel = optimizerDuck.Core.Models.Optimization.ScheduledTask.ScheduledTaskModel;namespace optimizerDuck.UI.Views.Dialogs;diff --git a/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml.cs b/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml.csindex b63dfd1..16f4562 100644--- a/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml.cs+++ b/optimizerDuck/UI/Views/Dialogs/StartupTaskDetailsPanel.xaml.cs@@ -1,5 +1,6 @@using System.Windows.Controls;-using optimizerDuck.Core.Models.StartupManager;+using optimizerDuck.Core.Models.Optimization.StartupManager;+using StartupTask = optimizerDuck.Core.Models.Optimization.StartupManager.StartupTask;namespace optimizerDuck.UI.Views.Dialogs;diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Views/Pages/BloatwarePage.xamlindex 10b7685..5687588 100644--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml+++ b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml@@ -11,7 +11,8 @@ui:Design.Foreground="White"x:Class="optimizerDuck.UI.Views.Pages.BloatwarePage"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:bloatware="clr-namespace:optimizerDuck.Core.Models.Bloatware"+ xmlns:bloatware="clr-namespace:optimizerDuck.Core.Models.Optimization.Bloatware"+ xmlns:bloatware1="clr-namespace:optimizerDuck.Core.Models.Optimization.Bloatware"xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"@@ -304,7 +305,7 @@<!-- Item template --><ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type bloatware:AppXPackage}">+ <DataTemplate DataType="{x:Type bloatware1:AppXPackage}"><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"CornerRadius="6"diff --git a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xamlindex 138c2c5..196e7c7 100644--- a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml+++ b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml@@ -11,7 +11,8 @@ui:Design.Foreground="White"x:Class="optimizerDuck.UI.Views.Pages.DiskCleanupPage"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:cleanup="clr-namespace:optimizerDuck.Core.Models.Cleanup"+ xmlns:cleanup="clr-namespace:optimizerDuck.Core.Models.Optimization.Cleanup"+ xmlns:cleanup1="clr-namespace:optimizerDuck.Core.Models.Optimization.Cleanup"xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"@@ -257,7 +258,7 @@</ItemsControl.ItemsPanel><ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type cleanup:CleanupItem}">+ <DataTemplate DataType="{x:Type cleanup1:CleanupItem}"><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"CornerRadius="8"diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xamlindex dde772b..37b32bb 100644--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml+++ b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml@@ -1,37 +1,38 @@<Page+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Margin="0,32,0,0"+ ScrollViewer.CanContentScroll="False"+ Title="OptimizationPage"+ d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ mc:Ignorable="d"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"x:Class="optimizerDuck.UI.Views.Pages.Optimizations.OptimizationPage"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:optimization="clr-namespace:optimizerDuck.Core.Models.Optimization"xmlns:optimizations="clr-namespace:optimizerDuck.UI.Views.Pages.Optimizations"xmlns:optimizers="clr-namespace:optimizerDuck.Core.Optimizers"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"- Title="OptimizationPage"- Margin="0,32,0,0"- d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"- d:DesignHeight="650"- d:DesignWidth="800"- ui:Design.Background="Black"- ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- ScrollViewer.CanContentScroll="False"- mc:Ignorable="d">+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"><Page.Resources><converters:WidthToColumnConverter x:Key="WidthToColumnConverter" /><converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" /><converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" /><converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" /><converters:BooleanToVisibilityConverter- x:Key="InverseBooleanToVisibilityConverter"False="Visible"- True="Collapsed" />+ True="Collapsed"+ x:Key="InverseBooleanToVisibilityConverter" /><converters:NullToVisibilityConverter- x:Key="NullToVisibilityConverter"False="Visible"- True="Collapsed" />+ True="Collapsed"+ x:Key="NullToVisibilityConverter" /></Page.Resources><Grid>@@ -41,31 +42,31 @@<WrapPanelGrid.Row="0"Margin="5,0,5,10"- VerticalAlignment="Center"- Orientation="Horizontal">+ Orientation="Horizontal"+ VerticalAlignment="Center"><!-- Search --><ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"Icon="{ui:SymbolIcon Search24}"+ Margin="0,0,8,0"+ MinWidth="200"PlaceholderText="{ext:Loc Common.Search.Placeholder}"- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"+ VerticalAlignment="Center" /><!-- Filter by Risk --><ComboBoxMargin="0,0,8,0"- VerticalAlignment="Center"SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"ToolTip="{ext:Loc Common.Filter}"ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top">+ ToolTipService.Placement="Top"+ VerticalAlignment="Center"><ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left"><ui:SymbolIcon- Margin="0,0,6,0"HorizontalAlignment="Left"+ Margin="0,0,6,0"Symbol="Filter24" /><TextBlockGrid.Column="1"@@ -74,28 +75,28 @@</Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left"><ui:SymbolIcon- Margin="0,0,6,0"Foreground="{DynamicResource SystemFillColorSuccessBrush}"+ Margin="0,0,6,0"Symbol="ShieldCheckmark24" /><TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" /></Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left"><ui:SymbolIcon- Margin="0,0,6,0"Foreground="{DynamicResource SystemFillColorCautionBrush}"+ Margin="0,0,6,0"Symbol="Warning24" /><TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" /></Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left"><ui:SymbolIcon- Margin="0,0,6,0"Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Margin="0,0,6,0"Symbol="ShieldError24" /><TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" /></Grid>@@ -105,17 +106,17 @@<!-- Sort By --><ComboBoxMargin="0,0,8,0"- VerticalAlignment="Center"SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"ToolTip="{ext:Loc Common.SortBy}"ToolTipService.BetweenShowDelay="160"- ToolTipService.Placement="Top">+ ToolTipService.Placement="Top"+ VerticalAlignment="Center"><ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left"><ui:SymbolIcon- Margin="0,0,6,0"HorizontalAlignment="Left"+ Margin="0,0,6,0"Symbol="Filter24" /><TextBlock Grid.Column="1" HorizontalAlignment="Left"><Run Text="{ext:Loc Common.SortBy.Risk}" />@@ -125,10 +126,10 @@</Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left"><ui:SymbolIcon- Margin="0,0,6,0"HorizontalAlignment="Left"+ Margin="0,0,6,0"Symbol="TextSortAscending24" /><TextBlockGrid.Column="1"@@ -137,10 +138,10 @@</Grid></ComboBoxItem><ComboBoxItem HorizontalContentAlignment="Left">- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left"><ui:SymbolIcon- Margin="0,0,6,0"HorizontalAlignment="Left"+ Margin="0,0,6,0"Symbol="Shield24" /><TextBlockGrid.Column="1"@@ -152,9 +153,9 @@<!-- Hide Applied toggle --><ToggleButton+ IsChecked="{Binding ViewModel.HideApplied}"Margin="0,0,0,0"VerticalAlignment="Stretch"- IsChecked="{Binding ViewModel.HideApplied}"Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}"><StackPanel Orientation="Horizontal"><ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />@@ -170,15 +171,15 @@VerticalAlignment="Center"Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}"><ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"FontSize="36"Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ HorizontalAlignment="Center"+ Margin="0,0,0,10"Symbol="SearchInfo24" /><ui:TextBlock- HorizontalAlignment="Center"Appearance="Secondary"FontTypography="Body"+ HorizontalAlignment="Center"Text="{ext:Loc Bloatware.Search.NoResults}" /></StackPanel>@@ -196,7 +197,7 @@</ui:VirtualizingItemsControl.Template><ui:VirtualizingItemsControl.ItemsPanel><ItemsPanelTemplate>- <UniformGrid VerticalAlignment="Top" Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" />+ <UniformGrid Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" VerticalAlignment="Top" /></ItemsPanelTemplate></ui:VirtualizingItemsControl.ItemsPanel><ui:VirtualizingItemsControl.ItemContainerStyle>@@ -207,30 +208,30 @@</ui:VirtualizingItemsControl.ItemContainerStyle><ui:VirtualizingItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type optimizers:BaseOptimization}">+ <DataTemplate DataType="{x:Type optimization:BaseOptimization}"><Border- Padding="20,10"Background="{DynamicResource CardBackground}"BorderBrush="{DynamicResource CardBorderBrush}"BorderThickness="1"- CornerRadius="5">+ CornerRadius="5"+ Padding="20,10"><Grid RowDefinitions="Auto,Auto,Auto,Auto,*"><ui:TextBlock- Grid.Row="0"Appearance="Disabled"FontTypography="Caption"+ Grid.Row="0"Text="{Binding Id}"TextWrapping="Wrap" /><ui:TextBlock- Grid.Row="1"FontTypography="Subtitle"+ Grid.Row="1"Text="{Binding Name}"TextWrapping="Wrap" /><ui:VirtualizingItemsControlGrid.Row="2"- Margin="0,2,0,2"- ItemsSource="{Binding TagDisplays}">+ ItemsSource="{Binding TagDisplays}"+ Margin="0,2,0,2"><ui:VirtualizingItemsControl.ItemsPanel><ItemsPanelTemplate><WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />@@ -245,24 +246,24 @@<ui:VirtualizingItemsControl.ItemTemplate><DataTemplate><Border- Padding="4,2"- HorizontalAlignment="Left"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5">+ CornerRadius="5"+ HorizontalAlignment="Left"+ Padding="4,2"><StackPanel Orientation="Horizontal"><ui:SymbolIcon- Margin="0,0,5,0"Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Margin="0,0,5,0"Symbol="{Binding Icon}" /><ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"Appearance="Secondary"FontTypography="Caption"Foreground="{DynamicResource TextFillColorInverseBrush}"+ HorizontalAlignment="Center"Text="{Binding Display}"- TextWrapping="Wrap" />+ TextWrapping="Wrap"+ VerticalAlignment="Center" /></StackPanel></Border></DataTemplate>@@ -270,23 +271,23 @@</ui:VirtualizingItemsControl><ui:TextBlock+ FontTypography="Body"Grid.Row="3"Margin="0,10,0,0"- FontTypography="Body"Text="{Binding ShortDescription}"TextTrimming="WordEllipsis"TextWrapping="Wrap" /><Grid+ ColumnDefinitions="*,Auto"Grid.Row="4"Margin="0,10,0,0"- VerticalAlignment="Bottom"- ColumnDefinitions="*,Auto">+ VerticalAlignment="Bottom"><Grid RowDefinitions="Auto,Auto"><Border- Padding="4,2"+ CornerRadius="5"HorizontalAlignment="Left"- CornerRadius="5">+ Padding="4,2"><Border.Style><Style TargetType="Border"><Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />@@ -302,72 +303,72 @@</Border.Style><StackPanel Orientation="Horizontal"><ui:SymbolIcon- Margin="0,0,5,0"Foreground="{DynamicResource TextFillColorInverseBrush}"+ Margin="0,0,5,0"Symbol="{Binding RiskVisual.Icon}" /><ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"FontTypography="Caption"Foreground="{DynamicResource TextFillColorInverseBrush}"+ HorizontalAlignment="Center"Text="{Binding RiskVisual.Display}"- TextWrapping="Wrap" />+ TextWrapping="Wrap"+ VerticalAlignment="Center" /></StackPanel></Border><Border+ Background="{DynamicResource CardBackgroundDisabled}"+ CornerRadius="5"Grid.Row="1"+ HorizontalAlignment="Left"Margin="0,5,0,0"Padding="4,2"- HorizontalAlignment="Left"- Background="{DynamicResource CardBackgroundDisabled}"- CornerRadius="5"ToolTip="{Binding State.AppliedAt}"ToolTipService.InitialShowDelay="150"ToolTipService.Placement="Top"Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}"><ui:TextBlock- HorizontalAlignment="Center"- VerticalAlignment="Center"FontTypography="Caption"+ HorizontalAlignment="Center"Text="{Binding State.RelativeTime}"- TextWrapping="Wrap" />+ TextWrapping="Wrap"+ VerticalAlignment="Center" /></Border></Grid><StackPanelGrid.Column="1"Margin="10,0,0,0"- VerticalAlignment="Bottom"- Orientation="Horizontal">+ Orientation="Horizontal"+ VerticalAlignment="Bottom"><ui:ToggleSwitch- Margin="0,0,5,0"- HorizontalAlignment="Right"- VerticalAlignment="Center"Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"Cursor="Hand"- IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />- <ui:ButtonHorizontalAlignment="Right"- VerticalAlignment="Bottom"+ IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"+ Margin="0,0,5,0"+ VerticalAlignment="Center" />+ <ui:ButtonBackground="Transparent"BorderBrush="Transparent"Command="{Binding DataContext.ViewModel.ViewSourceOnGitHubCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"Cursor="Hand"+ HorizontalAlignment="Right"Icon="{ui:SymbolIcon Open24}"- ToolTip="{ext:Loc Optimizer.Menu.ViewSource}" />+ ToolTip="{ext:Loc Optimizer.Menu.ViewSource}"+ VerticalAlignment="Bottom" /><ui:Button- HorizontalAlignment="Right"- VerticalAlignment="Bottom"Background="Transparent"BorderBrush="Transparent"Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"Cursor="Hand"- Icon="{ui:SymbolIcon MoreVertical24}" />+ HorizontalAlignment="Right"+ Icon="{ui:SymbolIcon MoreVertical24}"+ VerticalAlignment="Bottom" /></StackPanel></Grid></Grid>@@ -381,21 +382,21 @@<Border Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}"><StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"><ui:ProgressRing- Width="48"Height="48"- Margin="0,0,0,16"HorizontalAlignment="Center"+ IsIndeterminate="True"+ Margin="0,0,0,16"VerticalAlignment="Center"- IsIndeterminate="True" />+ Width="48" /><ui:TextBlock- HorizontalAlignment="Center"FontTypography="BodyStrong"+ HorizontalAlignment="Center"Text="{ext:Loc Optimizations.Loading}" /><ui:TextBlock- Margin="0,4,0,0"- HorizontalAlignment="Center"Appearance="Secondary"FontTypography="Caption"+ HorizontalAlignment="Center"+ Margin="0,4,0,0"Text="{ext:Loc Optimizations.Loading.Hint}" /></StackPanel></Border>diff --git a/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xamlindex b6fa22c..ff86717 100644--- a/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml+++ b/optimizerDuck/UI/Views/Pages/ScheduledTasksPage.xaml@@ -16,7 +16,8 @@xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:models="clr-namespace:optimizerDuck.Core.Models.ScheduledTask"+ xmlns:models="clr-namespace:optimizerDuck.Core.Models.Optimization.ScheduledTask"+ xmlns:scheduledTask="clr-namespace:optimizerDuck.Core.Models.Optimization.ScheduledTask"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">@@ -212,7 +213,7 @@<ScrollViewer Grid.Row="1" Margin="0,0,16,0"><ItemsControl ItemsSource="{Binding ViewModel.Tasks}" Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"><ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type models:ScheduledTaskModel}">+ <DataTemplate DataType="{x:Type scheduledTask:ScheduledTaskModel}"><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"CornerRadius="6"diff --git a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xamlindex 689b0a0..c53d07d 100644--- a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml+++ b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml@@ -16,7 +16,8 @@xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"- xmlns:models="clr-namespace:optimizerDuck.Core.Models.StartupManager"+ xmlns:models="clr-namespace:optimizerDuck.Core.Models.Optimization.StartupManager"+ xmlns:startupManager="clr-namespace:optimizerDuck.Core.Models.Optimization.StartupManager"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">@@ -244,7 +245,7 @@<!-- Apps List --><ItemsControl ItemsSource="{Binding ViewModel.Apps}" Visibility="{Binding ViewModel.Apps.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"><ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type models:StartupApp}">+ <DataTemplate DataType="{x:Type startupManager:StartupApp}"><Grid><ui:CardActionCommand="{Binding DataContext.ViewModel.OpenLocationCommand, RelativeSource={RelativeSource AncestorType=Page}}"@@ -437,7 +438,7 @@<!-- Tasks List --><ItemsControl ItemsSource="{Binding ViewModel.Tasks}" Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"><ItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type models:StartupTask}">+ <DataTemplate DataType="{x:Type startupManager:StartupTask}"><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"CornerRadius="6"diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xamlindex 3856872..08f3cb6 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml@@ -17,12 +17,10 @@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:vm="clr-namespace:optimizerDuck.UI.ViewModels.Pages"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"><Page.Resources><converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />- <converters:InverseBooleanToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" /></Page.Resources><Grid>@@ -74,32 +72,44 @@Margin="42,0,42,0"VerticalScrollBarVisibility="Auto">- <!-- Feature Cards -->- <ItemsControl ItemsSource="{Binding ViewModel.Features}" Margin="0,0,0,16">+ <!-- Sections -->+ <ItemsControl ItemsSource="{Binding ViewModel.Sections}" Margin="0,0,0,16"><ItemsControl.ItemTemplate><DataTemplate>- <ui:CardControl Margin="0,0,0,8" Visibility="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}">- <ui:CardControl.Header>- <StackPanel VerticalAlignment="Center">- <ui:TextBlock- FontTypography="Body"- Text="{Binding Name}"- TextWrapping="Wrap" />- <ui:TextBlock- Appearance="Secondary"- FontTypography="Caption"- Margin="0,4,0,0"- Text="{Binding Description}"- TextTrimming="WordEllipsis"- TextWrapping="Wrap" />- </StackPanel>- </ui:CardControl.Header>- <ui:ToggleSwitch- Command="{Binding ToggleCommand}"- HorizontalAlignment="Right"- IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"- VerticalAlignment="Center" />- </ui:CardControl>+ <StackPanel Margin="0,0,0,24">+ <ui:TextBlock+ FontTypography="Subtitle"+ Margin="0,0,0,12"+ Text="{Binding Name}" />+ <ItemsControl ItemsSource="{Binding Features}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <ui:CardControl Margin="0,0,0,8" Visibility="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}">+ <ui:CardControl.Header>+ <StackPanel VerticalAlignment="Center">+ <ui:TextBlock+ FontTypography="Body"+ Text="{Binding Name}"+ TextWrapping="Wrap" />+ <ui:TextBlock+ Appearance="Secondary"+ FontTypography="Caption"+ Margin="0,4,0,0"+ Text="{Binding Description}"+ TextTrimming="WordEllipsis"+ TextWrapping="Wrap" />+ </StackPanel>+ </ui:CardControl.Header>+ <ui:ToggleSwitch+ Command="{Binding ToggleCommand}"+ HorizontalAlignment="Right"+ IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"+ VerticalAlignment="Center" />+ </ui:CardControl>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </StackPanel></DataTemplate></ItemsControl.ItemTemplate></ItemsControl>diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.csindex 79ad46c..4f86c54 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs@@ -1,14 +1,15 @@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<ToggleFeatureCategoryViewModel>+public partial class ToggleFeaturesCategoryPage : INavigableView<ToggleFeaturesCategoryViewModel>{- public ToggleFeatureCategoryViewModel ViewModel { get; }+ public ToggleFeaturesCategoryViewModel ViewModel { get; }- public ToggleFeaturesCategoryPage(ToggleFeatureCategoryViewModel viewModel)+ public ToggleFeaturesCategoryPage(ToggleFeaturesCategoryViewModel viewModel){ViewModel = viewModel;DataContext = this;diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.csindex 66f7598..7fe65ee 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs@@ -1,11 +1,10 @@-using optimizerDuck.UI.ViewModels.Optimizer;-using optimizerDuck.UI.ViewModels.Pages;-using optimizerDuck.UI.Views.Pages.Optimizations;-using optimizerDuck.UI.Views.Pages.ToggleFeatures;+using optimizerDuck.UI.ViewModels.ToggleFeatures;++namespace optimizerDuck.UI.Views.Pages.ToggleFeatures;public sealed class UserExperienceToggleFeaturesCategory : ToggleFeaturesCategoryPage{- public UserExperienceToggleFeaturesCategory(ToggleFeatureCategoryViewModel viewModel) : base(viewModel)+ public UserExperienceToggleFeaturesCategory(ToggleFeaturesCategoryViewModel viewModel) : base(viewModel){InitializeComponent();}@@ -13,7 +12,7 @@ public sealed class UserExperienceToggleFeaturesCategory : ToggleFeaturesCategorpublic sealed class SystemToggleFeaturesCategory : ToggleFeaturesCategoryPage{- public SystemToggleFeaturesCategory(ToggleFeatureCategoryViewModel viewModel) : base(viewModel)+ public SystemToggleFeaturesCategory(ToggleFeaturesCategoryViewModel viewModel) : base(viewModel){InitializeComponent();}diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml b/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xamlindex 5e39283..4badb55 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml+++ b/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml@@ -1,23 +1,23 @@<Page- x:Class="optimizerDuck.UI.Views.Pages.ToggleFeatures.ToggleFeaturesPage"+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"+ Margin="0,32,0,0"+ ScrollViewer.CanContentScroll="False"+ Title="ToggleFeatures"+ d:DataContext="{d:DesignInstance vm:ToggleFeaturesViewModel}"+ d:DesignHeight="650"+ d:DesignWidth="800"+ mc:Ignorable="d"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"+ x:Class="optimizerDuck.UI.Views.Pages.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:ui="http://schemas.lepo.co/wpfui/2022/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">+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"><Page.Resources><converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />@@ -32,14 +32,20 @@</Grid.RowDefinitions><StackPanel Grid.Row="0" Margin="42,0,42,16">- <ui:TextBlock FontTypography="Title" Text="{ext:Loc ToggleFeatures.Title}" Margin="0,0,0,8" />- <ui:TextBlock Appearance="Secondary" Text="{ext:Loc ToggleFeatures.Description}" TextWrapping="Wrap" />+ <ui:TextBlock+ FontTypography="Title"+ Margin="0,0,0,8"+ Text="{ext:Loc ToggleFeatures.Title}" />+ <ui:TextBlock+ Appearance="Secondary"+ Text="{ext:Loc ToggleFeatures.Description}"+ TextWrapping="Wrap" /></StackPanel><ui:VirtualizingItemsControlGrid.Row="1"- Margin="42,0,42,0"- ItemsSource="{Binding ViewModel.Categories}">+ ItemsSource="{Binding ViewModel.Categories}"+ Margin="42,0,42,0"><ui:VirtualizingItemsControl.Template><ControlTemplate TargetType="ItemsControl"><ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">@@ -47,10 +53,10 @@</ScrollViewer></ControlTemplate></ui:VirtualizingItemsControl.Template>-+<ui:VirtualizingItemsControl.ItemsPanel><ItemsPanelTemplate>- <UniformGrid VerticalAlignment="Top" Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" />+ <UniformGrid Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" VerticalAlignment="Top" /></ItemsPanelTemplate></ui:VirtualizingItemsControl.ItemsPanel>@@ -62,31 +68,31 @@</ui:VirtualizingItemsControl.ItemContainerStyle><ui:VirtualizingItemsControl.ItemTemplate>- <DataTemplate DataType="{x:Type vm:CategoryViewModel}">- <ui:CardAction- Padding="20,16"- Command="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"- CommandParameter="{Binding}"- IsChevronVisible="False">+ <DataTemplate DataType="{x:Type vm:ToggleFeaturesCategoryViewModel}">+ <ui:CardAction+ Command="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"+ CommandParameter="{Binding}"+ IsChevronVisible="False"+ Padding="20,16"><Grid RowDefinitions="Auto,Auto,Auto"><ui:SymbolIcon+ FontSize="32"Grid.Row="0"- Margin="0,0,0,12"HorizontalAlignment="Left"- FontSize="32"+ Margin="0,0,0,12"Symbol="{Binding Icon}" /><ui:TextBlock+ FontTypography="Subtitle"Grid.Row="1"Margin="0,0,0,6"- FontTypography="Subtitle"Text="{Binding Name}"TextWrapping="Wrap" /><ui:TextBlock- Grid.Row="2"Appearance="Secondary"FontTypography="Body"+ Grid.Row="2"Text="{Binding Description}"TextWrapping="Wrap" /></Grid>@@ -95,22 +101,20 @@</ui:VirtualizingItemsControl.ItemTemplate></ui:VirtualizingItemsControl>- <Border- Grid.Row="1"- Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}">+ <Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BoolToVisibilityConverter}}"><StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"><ui:ProgressRing- Width="48"Height="48"- Margin="0,0,0,16"HorizontalAlignment="Center"+ IsIndeterminate="True"+ Margin="0,0,0,16"VerticalAlignment="Center"- IsIndeterminate="True" />+ Width="48" /><ui:TextBlock- HorizontalAlignment="Center"FontTypography="BodyStrong"+ HorizontalAlignment="Center"Text="{ext:Loc ToggleFeatures.Loading}" /></StackPanel></Border></Grid>-</Page>\ No newline at end of file+</Page>diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.cs b/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.csindex e4d6636..e835b9a 100644--- a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.cs+++ b/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.cs@@ -1,7 +1,7 @@using optimizerDuck.UI.ViewModels.Pages;using Wpf.Ui.Abstractions.Controls;-namespace optimizerDuck.UI.Views.Pages.ToggleFeatures;+namespace optimizerDuck.UI.Views.Pages;public partial class ToggleFeaturesPage : INavigableView<ToggleFeaturesViewModel>{diff --git a/optimizerDuck/UI/Views/Windows/MainWindow.xaml b/optimizerDuck/UI/Views/Windows/MainWindow.xamlindex 83d606e..d9d275b 100644--- a/optimizerDuck/UI/Views/Windows/MainWindow.xaml+++ b/optimizerDuck/UI/Views/Windows/MainWindow.xaml@@ -1,7 +1,20 @@<ui:FluentWindow+ ExtendsContentIntoTitleBar="True"+ Height="800"+ SnapsToDevicePixels="True"+ TextOptions.TextRenderingMode="ClearType"+ Title="optimizerDuck"+ UseLayoutRounding="True"+ Width="1350"+ WindowBackdropType="Mica"+ WindowCornerPreference="Round"+ WindowStartupLocation="CenterScreen"+ d:DataContext="{d:DesignInstance windows:MainWindow}"+ mc:Ignorable="d"+ ui:Design.Background="Black"+ ui:Design.Foreground="White"x:Class="optimizerDuck.UI.Views.Windows.MainWindow"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:controls="clr-namespace:optimizerDuck.UI.Controls"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"xmlns:extensions="clr-namespace:optimizerDuck.Common.Extensions"@@ -9,32 +22,19 @@xmlns:pages="clr-namespace:optimizerDuck.UI.Views.Pages"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"xmlns:windows="clr-namespace:optimizerDuck.UI.Views.Windows"- Title="optimizerDuck"- Width="1350"- Height="800"- d:DataContext="{d:DesignInstance windows:MainWindow}"- ui:Design.Background="Black"- ui:Design.Foreground="White"- ExtendsContentIntoTitleBar="True"- SnapsToDevicePixels="True"- TextOptions.TextRenderingMode="ClearType"- UseLayoutRounding="True"- WindowBackdropType="Mica"- WindowCornerPreference="Round"- WindowStartupLocation="CenterScreen"- mc:Ignorable="d">+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"><Grid><ui:NavigationView- x:Name="RootNavigation"- Margin="0"- Padding="42,0,42,0"FrameMargin="0"IsFooterSeparatorVisible="False"IsPaneToggleVisible="True"IsTopSeparatorVisible="False"+ Margin="0"OpenPaneLength="180"+ Padding="42,0,42,0"PaneDisplayMode="Left"- TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}">+ TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}"+ x:Name="RootNavigation"><ui:NavigationView.MenuItems><controls:FilledNavigationViewItemContent="{extensions:Loc Sidebar.Dashboard}"@@ -49,11 +49,10 @@TargetPageType="{x:Type pages:OptimizePage}" /><ui:NavigationViewItem- x:Name="ToggleFeaturesMenuItem"Content="{extensions:Loc Sidebar.ToggleFeatures}"Icon="{ui:SymbolIcon ToggleLeft24}"- TargetPageType="{x:Type pages:ToggleFeatures.ToggleFeaturesPage}">- </ui:NavigationViewItem>+ TargetPageType="{x:Type pages:ToggleFeaturesPage}"+ x:Name="ToggleFeaturesMenuItem" /><controls:FilledNavigationViewItemContent="{extensions:Loc Sidebar.Bloatware}"@@ -93,7 +92,7 @@</ui:NavigationView.ContentOverlay></ui:NavigationView>- <ui:TitleBar x:Name="TitleBar" Title="optimizerDuck">+ <ui:TitleBar Title="optimizerDuck" x:Name="TitleBar"><ui:TitleBar.Icon><ui:ImageIcon Source="pack://application:,,,/Resources/Images/Duck.png" /></ui:TitleBar.Icon>diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csprojindex 6d5a23a..f7f736e 100644--- a/optimizerDuck/optimizerDuck.csproj+++ b/optimizerDuck/optimizerDuck.csproj@@ -35,6 +35,10 @@<XamlRuntime>Wpf</XamlRuntime><SubType>Designer</SubType></Page>+ <Page Update="UI\Views\Pages\ToggleFeaturesPage.xaml">+ <XamlRuntime>Wpf</XamlRuntime>+ <SubType>Designer</SubType>+ </Page></ItemGroup><ItemGroup>@@ -74,4 +78,8 @@</Compile></ItemGroup>+ <ItemGroup>+ <Folder Include="Services\SystemInfoProviders\" />+ </ItemGroup>+</Project>