Skip to content

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

feat: change navigation style for toggle features page

fatDuck9eafe47ff33f
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.cs
index 0975af0..9a2ecf4 100644
--- a/optimizerDuck/App.xaml.cs
+++ b/optimizerDuck/App.xaml.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
+using optimizerDuck.Common.Extensions;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Core.Models.Config;
using optimizerDuck.Services;
@@ -107,7 +108,7 @@ public partial class App : Application
protected override async void OnStartup(StartupEventArgs e)
{
base.OnStartup(e);
-
+
try
{
// Create the required directories if they don't exist
@@ -173,6 +174,8 @@ public partial class App : Application
services.AddSingleton<ToggleFeaturesViewModel>();
services.AddSingleton<ToggleFeaturesPage>();
+ services.AddAllToggleFeatureCategoryPages();
+
// Optimizations
services.AddAllOptimizationPages();
@@ -182,6 +185,7 @@ public partial class App : Application
// Services
services.AddSingleton<OptimizationRegistry>();
+ services.AddSingleton<ToggleFeaturesRegistry>();
services.AddSingleton<OptimizationService>();
services.AddSingleton<BloatwareService>();
services.AddSingleton<DiskCleanupService>();
diff --git a/optimizerDuck/Services/OptimizationPageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
similarity index 96%
rename from optimizerDuck/Services/OptimizationPageRegistryExtensions.cs
rename to optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
index a01270c..a2f9ea1 100644
--- a/optimizerDuck/Services/OptimizationPageRegistryExtensions.cs
+++ b/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
@@ -6,11 +6,12 @@ using optimizerDuck.Common.Helpers;
using optimizerDuck.Core.Interfaces;
using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.Config;
+using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
using Wpf.Ui;
using OptimizationCategoryViewModel = optimizerDuck.UI.ViewModels.Optimizer.OptimizationCategoryViewModel;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Common.Extensions;
public static class OptimizationPageRegistryExtensions
{
diff --git a/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs
new file mode 100644
index 0000000..9904d4e
--- /dev/null
+++ b/optimizerDuck/Common/Extensions/ToggleFeaturesCategoryPageRegistryExtensions.cs
@@ -0,0 +1,43 @@
+using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
+using optimizerDuck.Common.Helpers;
+using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Core.Models.Attributes;
+using optimizerDuck.Services;
+using optimizerDuck.UI.ViewModels.Pages;
+using Wpf.Ui;
+
+namespace optimizerDuck.Common.Extensions;
+
+public static class ToggleFeaturesCategoryPageRegistryExtensions
+{
+ public static void AddAllToggleFeatureCategoryPages(this IServiceCollection services)
+ {
+ var categoryTypes = ReflectionHelper
+ .FindImplementationsInLoadedAssemblies<IToggleFeatureCategory>()
+ .ToList();
+
+ foreach (var categoryType in categoryTypes)
+ {
+ var attr = categoryType.GetCustomAttribute<ToggleFeatureCategoryAttribute>();
+ if (attr?.PageType != null)
+ {
+ var pageType = attr.PageType;
+ services.AddSingleton(pageType, sp => CreatePage(sp, categoryType, pageType));
+ }
+ }
+ }
+
+ private static object CreatePage(
+ IServiceProvider serviceProvider,
+ Type categoryType,
+ Type pageType)
+ {
+ var registry = serviceProvider.GetRequiredService<ToggleFeaturesRegistry>();
+ var category = registry.Categories.First(c => c.GetType() == categoryType);
+
+ var viewModel = new ToggleFeatureCategoryViewModel(category);
+
+ return Activator.CreateInstance(pageType, viewModel)!;
+ }
+}
\ No newline at end of file
diff --git a/optimizerDuck/Core/Interfaces/IToggleFeature.cs b/optimizerDuck/Core/Interfaces/IToggleFeature.cs
index 7b31f0b..fd1211c 100644
--- a/optimizerDuck/Core/Interfaces/IToggleFeature.cs
+++ b/optimizerDuck/Core/Interfaces/IToggleFeature.cs
@@ -6,9 +6,6 @@ public interface IToggleFeature
{
string Name { get; }
string Description { get; }
- OptimizationRisk Risk { get; }
- Guid Id { get; }
- ToggleFeatureType Type { get; }
Task<bool> GetStateAsync();
Task EnableAsync();
diff --git a/optimizerDuck/Core/Interfaces/IToggleFeatureCategory.cs b/optimizerDuck/Core/Interfaces/IToggleFeatureCategory.cs
index 483638c..1f3ec68 100644
--- a/optimizerDuck/Core/Interfaces/IToggleFeatureCategory.cs
+++ b/optimizerDuck/Core/Interfaces/IToggleFeatureCategory.cs
@@ -1,11 +1,14 @@
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; }
}
diff --git a/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs b/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs
index 9c56c91..8b18273 100644
--- a/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs
+++ b/optimizerDuck/Core/Models/Attributes/ToggleFeatureAttribute.cs
@@ -5,13 +5,4 @@ namespace optimizerDuck.Core.Models.Attributes;
[AttributeUsage(AttributeTargets.Class, Inherited = false)]
public sealed class ToggleFeatureAttribute : Attribute
{
- public required string Id { get; init; }
- public required OptimizationRisk Risk { get; init; }
- public ToggleFeatureType Type { get; init; } = ToggleFeatureType.Registry;
-}
-
-[AttributeUsage(AttributeTargets.Class, Inherited = false)]
-public class ToggleFeatureCategoryAttribute : Attribute
-{
- public Type? PageType { get; init; }
-}
+}
\ No newline at end of file
diff --git a/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs b/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs
new file mode 100644
index 0000000..4df9083
--- /dev/null
+++ b/optimizerDuck/Core/Models/Attributes/ToggleFeatureCategoryAttribute.cs
@@ -0,0 +1,5 @@
+[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+public class ToggleFeatureCategoryAttribute : Attribute
+{
+ public Type? PageType { get; init; }
+}
\ No newline at end of file
diff --git a/optimizerDuck/Core/Models/UI/OptimizationTags.cs b/optimizerDuck/Core/Models/UI/OptimizationTags.cs
index 8493ee3..9906183 100644
--- a/optimizerDuck/Core/Models/UI/OptimizationTags.cs
+++ b/optimizerDuck/Core/Models/UI/OptimizationTags.cs
@@ -174,14 +174,6 @@ public static class OptimizationTagsToDisplay
}
}
-public enum ToggleFeatureType
-{
- Registry,
- Service,
- ScheduledTask,
- PowerShell
-}
-
/// <summary>
/// Represents the UI display data for an optimization tag.
/// </summary>
diff --git a/optimizerDuck/Core/ToggleFeatures/AI/AIToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/AI/AIToggleFeatures.cs
deleted file mode 100644
index 862ba7f..0000000
--- a/optimizerDuck/Core/ToggleFeatures/AI/AIToggleFeatures.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.UI;
-using optimizerDuck.Core.ToggleFeatures;
-using optimizerDuck.Services.Managers;
-
-namespace optimizerDuck.Core.ToggleFeatures.AI;
-
-[ToggleFeatureCategory]
-public class AI : IToggleFeatureCategory
-{
- public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.AI.Name"];
- public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.AI;
- public ObservableCollection<IToggleFeature> Features { get; init; } = [];
-
- [ToggleFeature(Id = "TF-AI-001", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableWindowsCopilot : RegistryToggleFeature
- {
- public RegistryToggle Toggle { get; } = new()
- {
- Path = @"HKCU\Software\Policies\Microsoft\Windows\Windows Copilot",
- Name = "TurnOffWindowsCopilot",
- OnValue = 1,
- OffValue = 0,
- DefaultValue = 0
- };
- }
-
- [ToggleFeature(Id = "TF-AI-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableBingInWindowsSearch : RegistryToggleFeature
- {
- public RegistryToggle Toggle { get; } = new()
- {
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Search",
- Name = "BingSearchEnabled",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
- }
-
- [ToggleFeature(Id = "TF-AI-003", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableSuggestionsInStart : RegistryToggleFeature
- {
- public RegistryToggle Toggle { get; } = new()
- {
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager",
- Name = "SubscribedContent-338389Enabled",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
- }
-
- [ToggleFeature(Id = "TF-AI-004", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableTailoredExperiences : RegistryToggleFeature
- {
- public RegistryToggle Toggle { get; } = new()
- {
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Privacy",
- Name = "TailoredExperiencesWithDiagnosticDataEnabled",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
- }
-}
diff --git a/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs b/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs
index 0ffb15f..45326c8 100644
--- a/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs
+++ b/optimizerDuck/Core/ToggleFeatures/BaseToggleFeature.cs
@@ -23,10 +23,6 @@ public abstract class BaseToggleFeature : IToggleFeature
?? throw new InvalidOperationException(
$"{GetType().Name} has no owner assigned");
- public Guid Id => Guid.Parse(Meta.Id);
- public OptimizationRisk Risk => Meta.Risk;
- public ToggleFeatureType Type => Meta.Type;
-
public string FeatureKey => GetType().Name;
public string Name => Loc.Instance[$"ToggleFeature.{FeatureKey}.Name"];
diff --git a/optimizerDuck/Core/ToggleFeatures/Privacy/PrivacyToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/Privacy/PrivacyToggleFeatures.cs
deleted file mode 100644
index 5b582f5..0000000
--- a/optimizerDuck/Core/ToggleFeatures/Privacy/PrivacyToggleFeatures.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.Attributes;
-using optimizerDuck.Core.Models.UI;
-using optimizerDuck.Core.ToggleFeatures;
-using optimizerDuck.Services.Managers;
-
-namespace optimizerDuck.Core.ToggleFeatures.Privacy;
-
-[ToggleFeatureCategory]
-public class Privacy : IToggleFeatureCategory
-{
- public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.Privacy.Name"];
- public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.Privacy;
- public ObservableCollection<IToggleFeature> Features { get; init; } = [];
-
- [ToggleFeature(Id = "TF-Privacy-001", Risk = OptimizationRisk.Moderate, Type = ToggleFeatureType.Registry)]
- public class DisableTelemetry : RegistryToggleFeature
- {
- public RegistryToggle Toggle { get; } = new()
- {
- Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\DataCollection",
- Name = "AllowTelemetry",
- OnValue = 0,
- OffValue = 3,
- DefaultValue = 3
- };
- }
-
- [ToggleFeature(Id = "TF-Privacy-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableDiagnosticData : RegistryToggleFeature
- {
- public RegistryToggle Toggle { get; } = new()
- {
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack",
- Name = "ShowedToastAtLevel",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
- }
-
- [ToggleFeature(Id = "TF-Privacy-003", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableFeedbackNotifications : RegistryToggleFeature
- {
- public RegistryToggle Toggle { get; } = new()
- {
- Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\FeedbackHub\Privacy",
- Name = "FeedbackStorageAllowed",
- OnValue = 0,
- OffValue = 1,
- DefaultValue = 1
- };
- }
-}
diff --git a/optimizerDuck/Core/ToggleFeatures/RegistryToggleFeature.cs b/optimizerDuck/Core/ToggleFeatures/RegistryToggleFeature.cs
index 3621787..7f28114 100644
--- a/optimizerDuck/Core/ToggleFeatures/RegistryToggleFeature.cs
+++ b/optimizerDuck/Core/ToggleFeatures/RegistryToggleFeature.cs
@@ -5,41 +5,34 @@ namespace optimizerDuck.Core.ToggleFeatures;
public abstract class RegistryToggleFeature : BaseToggleFeature
{
- private RegistryToggle? _toggle;
-
- protected RegistryToggle GetToggle()
- {
- if (_toggle != null)
- return _toggle;
-
- var toggleProperty = GetType().GetProperty("Toggle", BindingFlags.Public | BindingFlags.Instance);
- if (toggleProperty?.PropertyType == typeof(RegistryToggle))
- {
- _toggle = (RegistryToggle?)toggleProperty.GetValue(this);
- }
-
- return _toggle!;
- }
+ public abstract IEnumerable<RegistryToggle> GetToggles();
public override Task<bool> GetStateAsync()
{
- var toggle = GetToggle();
- if (toggle == null)
+ var toggles = GetToggles().ToList();
+ if (toggles.Count == 0)
return Task.FromResult(false);
- return Task.FromResult(toggle.GetState());
+
+ // Feature is considered ON if ALL toggles are ON
+ bool allOn = toggles.All(t => t.GetState());
+ return Task.FromResult(allOn);
}
public override Task EnableAsync()
{
- var toggle = GetToggle();
- toggle?.SetState(true);
+ foreach (var toggle in GetToggles())
+ {
+ toggle.SetState(true);
+ }
return Task.CompletedTask;
}
public override Task DisableAsync()
{
- var toggle = GetToggle();
- toggle?.SetState(false);
+ foreach (var toggle in GetToggles())
+ {
+ toggle.SetState(false);
+ }
return Task.CompletedTask;
}
}
diff --git a/optimizerDuck/Core/ToggleFeatures/SingleRegistryToggleFeature.cs b/optimizerDuck/Core/ToggleFeatures/SingleRegistryToggleFeature.cs
new file mode 100644
index 0000000..8d62eda
--- /dev/null
+++ b/optimizerDuck/Core/ToggleFeatures/SingleRegistryToggleFeature.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace optimizerDuck.Core.ToggleFeatures;
+
+public abstract class SingleRegistryToggleFeature : RegistryToggleFeature
+{
+ public abstract RegistryToggle Toggle { get; }
+
+ public override IEnumerable<RegistryToggle> GetToggles()
+ {
+ yield return Toggle;
+ }
+}
diff --git a/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs
index 6690d93..95fb84f 100644
--- a/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs
+++ b/optimizerDuck/Core/ToggleFeatures/System/SystemToggleFeatures.cs
@@ -4,20 +4,23 @@ using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Core.ToggleFeatures;
using optimizerDuck.Services.Managers;
+using Wpf.Ui.Controls;
namespace optimizerDuck.Core.ToggleFeatures.System;
-[ToggleFeatureCategory]
+[ToggleFeatureCategory(PageType = typeof(SystemToggleFeaturesCategory))]
public class System : IToggleFeatureCategory
{
public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.System.Name"];
+ public string Description { get; init; } = Loc.Instance["ToggleFeature.Category.System.Description"];
+ public SymbolRegular Icon { get; init; } = SymbolRegular.Desktop24;
public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.System;
public ObservableCollection<IToggleFeature> Features { get; init; } = [];
- [ToggleFeature(Id = "TF-System-001", Risk = OptimizationRisk.Risky, Type = ToggleFeatureType.Registry)]
- public class DisableAutomaticWindowsUpdate : RegistryToggleFeature
+ [ToggleFeature]
+ public class DisableAutomaticWindowsUpdate : SingleRegistryToggleFeature
{
- public RegistryToggle Toggle { get; } = new()
+ public override RegistryToggle Toggle { get; } = new()
{
Path = @"HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU",
Name = "NoAutoUpdate",
@@ -27,10 +30,10 @@ public class System : IToggleFeatureCategory
};
}
- [ToggleFeature(Id = "TF-System-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableStorageSense : RegistryToggleFeature
+ [ToggleFeature]
+ public class DisableStorageSense : SingleRegistryToggleFeature
{
- public RegistryToggle Toggle { get; } = new()
+ public override RegistryToggle Toggle { get; } = new()
{
Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\StorageSense",
Name = "StorageSenseStatus",
@@ -39,4 +42,4 @@ public class System : IToggleFeatureCategory
DefaultValue = 1
};
}
-}
+}
\ No newline at end of file
diff --git a/optimizerDuck/Core/ToggleFeatures/ToggleFeatureCategory.cs b/optimizerDuck/Core/ToggleFeatures/ToggleFeatureCategory.cs
deleted file mode 100644
index a8e5fcc..0000000
--- a/optimizerDuck/Core/ToggleFeatures/ToggleFeatureCategory.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.ObjectModel;
-using optimizerDuck.Core.Interfaces;
-using optimizerDuck.Core.Models.UI;
-
-namespace optimizerDuck.Core.ToggleFeatures;
-
-public class ToggleFeatureCategory : IToggleFeatureCategory
-{
- public required string Name { get; init; }
- public ToggleFeatureCategoryOrder Order { get; init; }
- public ObservableCollection<IToggleFeature> Features { get; init; } = [];
-}
diff --git a/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs b/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs
index 3be8d28..e007194 100644
--- a/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs
+++ b/optimizerDuck/Core/ToggleFeatures/UserExperience/UserExperienceToggleFeatures.cs
@@ -4,20 +4,23 @@ using optimizerDuck.Core.Models.Attributes;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Core.ToggleFeatures;
using optimizerDuck.Services.Managers;
+using Wpf.Ui.Controls;
namespace optimizerDuck.Core.ToggleFeatures.UserExperience;
-[ToggleFeatureCategory]
+[ToggleFeatureCategory(PageType = typeof(UserExperienceToggleFeaturesCategory))]
public class UserExperience : IToggleFeatureCategory
{
public string Name { get; init; } = Loc.Instance["ToggleFeature.Category.UserExperience.Name"];
+ public string Description { get; init; } = Loc.Instance["ToggleFeature.Category.UserExperience.Description"];
+ public SymbolRegular Icon { get; init; } = SymbolRegular.Color24;
public ToggleFeatureCategoryOrder Order { get; init; } = ToggleFeatureCategoryOrder.UserExperience;
public ObservableCollection<IToggleFeature> Features { get; init; } = [];
- [ToggleFeature(Id = "TF-UX-001", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableTaskbarNewsAndInterests : RegistryToggleFeature
+ [ToggleFeature]
+ public class DisableTaskbarNewsAndInterests : SingleRegistryToggleFeature
{
- public RegistryToggle Toggle { get; } = new()
+ public override RegistryToggle Toggle { get; } = new()
{
Path = @"HKLM\SOFTWARE\Policies\Microsoft\Dsh",
Name = "AllowNewsAndInterests",
@@ -27,10 +30,10 @@ public class UserExperience : IToggleFeatureCategory
};
}
- [ToggleFeature(Id = "TF-UX-002", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class EnableDarkMode : RegistryToggleFeature
+ [ToggleFeature]
+ public class EnableDarkMode : SingleRegistryToggleFeature
{
- public RegistryToggle Toggle { get; } = new()
+ public override RegistryToggle Toggle { get; } = new()
{
Path = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize",
Name = "AppsUseLightTheme",
@@ -40,10 +43,10 @@ public class UserExperience : IToggleFeatureCategory
};
}
- [ToggleFeature(Id = "TF-UX-003", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class DisableVisualEffects : RegistryToggleFeature
+ [ToggleFeature]
+ public class DisableVisualEffects : SingleRegistryToggleFeature
{
- public RegistryToggle Toggle { get; } = new()
+ public override RegistryToggle Toggle { get; } = new()
{
Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
Name = "TaskbarAnimations",
@@ -53,10 +56,10 @@ public class UserExperience : IToggleFeatureCategory
};
}
- [ToggleFeature(Id = "TF-UX-004", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class ShowSecondsInSystemClock : RegistryToggleFeature
+ [ToggleFeature]
+ public class ShowSecondsInSystemClock : SingleRegistryToggleFeature
{
- public RegistryToggle Toggle { get; } = new()
+ public override RegistryToggle Toggle { get; } = new()
{
Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
Name = "ShowSecondsInSystemClock",
@@ -66,10 +69,10 @@ public class UserExperience : IToggleFeatureCategory
};
}
- [ToggleFeature(Id = "TF-UX-005", Risk = OptimizationRisk.Safe, Type = ToggleFeatureType.Registry)]
- public class EnableClassicContextMenu : RegistryToggleFeature
+ [ToggleFeature]
+ public class EnableClassicContextMenu : SingleRegistryToggleFeature
{
- public RegistryToggle Toggle { get; } = new()
+ public override RegistryToggle Toggle { get; } = new()
{
Path = @"HKCU\SOFTWARE\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32",
Name = "",
@@ -79,4 +82,4 @@ public class UserExperience : IToggleFeatureCategory
CheckKeyExists = true
};
}
-}
+}
\ No newline at end of file
diff --git a/optimizerDuck/Services/ToggleFeaturesRegistry.cs b/optimizerDuck/Services/ToggleFeaturesRegistry.cs
index 3a91c9c..a930b90 100644
--- a/optimizerDuck/Services/ToggleFeaturesRegistry.cs
+++ b/optimizerDuck/Services/ToggleFeaturesRegistry.cs
@@ -1,15 +1,15 @@
+using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Reflection;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Core.Models.Attributes;
+using Wpf.Ui.Controls;
namespace optimizerDuck.Services;
public class ToggleFeaturesRegistry
{
- private static ToggleFeaturesRegistry? _instance;
- public static ToggleFeaturesRegistry Instance => _instance ??= new ToggleFeaturesRegistry();
-
public IToggleFeatureCategory[] Categories { get; private set; } = [];
public void RegisterCategories()
@@ -53,4 +53,19 @@ public class ToggleFeaturesRegistry
{
return Categories.FirstOrDefault(c => c.GetType() == type);
}
-}
+
+ public IEnumerable<NavigationViewItem> GetNavigationItems()
+ {
+ if (Categories.Length == 0)
+ {
+ RegisterCategories();
+ }
+
+ return Categories.Select(c => new NavigationViewItem
+ {
+ Content = c.Name,
+ TargetPageType = c.GetType().GetCustomAttribute<ToggleFeatureCategoryAttribute>()?.PageType,
+ TargetPageTag = c.GetType().Name
+ }).Where(item => item.TargetPageType != null);
+ }
+}
\ No newline at end of file
diff --git a/optimizerDuck/UI/ViewModels/Pages/FeatureViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/FeatureViewModel.cs
new file mode 100644
index 0000000..1f07bac
--- /dev/null
+++ b/optimizerDuck/UI/ViewModels/Pages/FeatureViewModel.cs
@@ -0,0 +1,71 @@
+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 : ObservableObject
+{
+ private readonly IToggleFeature _feature;
+
+ [ObservableProperty]
+ private string _name = string.Empty;
+
+ [ObservableProperty]
+ private string _description = string.Empty;
+
+ [ObservableProperty]
+ private bool _isEnabled;
+
+ [ObservableProperty]
+ private bool _isVisible = true;
+
+ [ObservableProperty]
+ private bool _isLoading;
+
+ public FeatureViewModel(IToggleFeature feature)
+ {
+ _feature = feature;
+ _name = feature.Name;
+ _description = feature.Description;
+ }
+
+ public async Task LoadStateAsync()
+ {
+ try
+ {
+ IsEnabled = await _feature.GetStateAsync();
+ }
+ catch
+ {
+ IsEnabled = false;
+ }
+ }
+
+ [RelayCommand]
+ private 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/ToggleFeatureCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ToggleFeatureCategoryViewModel.cs
new file mode 100644
index 0000000..ecaadad
--- /dev/null
+++ b/optimizerDuck/UI/ViewModels/Pages/ToggleFeatureCategoryViewModel.cs
@@ -0,0 +1,91 @@
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Services;
+using Wpf.Ui;
+using Wpf.Ui.Controls;
+
+namespace optimizerDuck.UI.ViewModels.Pages;
+
+public partial class ToggleFeatureCategoryViewModel : ViewModel
+{
+ [ObservableProperty] private string _categoryName = string.Empty;
+ [ObservableProperty] private string _categoryDescription = string.Empty;
+ [ObservableProperty] private SymbolRegular _categoryIcon;
+ [ObservableProperty] private ObservableCollection<FeatureViewModel> _features = [];
+ [ObservableProperty] private string _searchText = string.Empty;
+ [ObservableProperty] private int _selectedSortByIndex;
+ [ObservableProperty] private bool _isLoading = true;
+
+ private IToggleFeatureCategory? _currentCategory;
+ private List<FeatureViewModel> _allFeatures = [];
+
+ public ToggleFeatureCategoryViewModel(IToggleFeatureCategory category)
+ {
+ _currentCategory = category;
+
+ CategoryName = _currentCategory.Name;
+ CategoryDescription = _currentCategory.Description;
+ CategoryIcon = _currentCategory.Icon;
+
+ _allFeatures.Clear();
+ foreach (var feature in _currentCategory.Features)
+ {
+ _allFeatures.Add(new FeatureViewModel(feature));
+ }
+
+ foreach (var feature in _allFeatures)
+ {
+ _ = feature.LoadStateAsync();
+ }
+
+ ApplyFilters();
+ IsLoading = false;
+ }
+
+ public override async Task OnNavigatedToAsync()
+ {
+ await base.OnNavigatedToAsync();
+ }
+
+ partial void OnSearchTextChanged(string value)
+ {
+ ApplyFilters();
+ }
+
+ partial void OnSelectedSortByIndexChanged(int value)
+ {
+ ApplyFilters();
+ }
+
+ private void ApplyFilters()
+ {
+ if (_currentCategory == null) return;
+
+ var filtered = _allFeatures.AsEnumerable();
+
+ if (!string.IsNullOrWhiteSpace(SearchText))
+ {
+ var search = SearchText.ToLowerInvariant();
+ filtered = filtered.Where(f =>
+ f.Name.ToLowerInvariant().Contains(search) ||
+ f.Description.ToLowerInvariant().Contains(search));
+ }
+
+ // 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);
+ }
+
+ Features = new ObservableCollection<FeatureViewModel>(filtered);
+
+ foreach (var feature in Features)
+ {
+ feature.IsVisible = true;
+ }
+ }
+}
diff --git a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs
index f634e7a..ce939a4 100644
--- a/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/ToggleFeaturesViewModel.cs
@@ -1,10 +1,14 @@
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Runtime.CompilerServices;
+using System.Reflection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using optimizerDuck.Core.Interfaces;
using optimizerDuck.Services;
+using optimizerDuck.UI.Views.Pages.ToggleFeatures;
+using Wpf.Ui;
+using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Pages;
@@ -19,147 +23,59 @@ public partial class ToggleFeaturesViewModel : ObservableObject
[ObservableProperty]
private bool _isLoading = true;
- public ToggleFeaturesViewModel()
+ private readonly INavigationService _navigationService;
+ private readonly ToggleFeaturesRegistry _registry;
+
+ public ToggleFeaturesViewModel(INavigationService navigationService, ToggleFeaturesRegistry registry)
{
+ _navigationService = navigationService;
+ _registry = registry;
}
public async Task InitializeAsync()
{
IsLoading = true;
- var registry = ToggleFeaturesRegistry.Instance;
- if (registry.Categories.Length == 0)
+ if (_registry.Categories.Length == 0)
{
- registry.RegisterCategories();
+ _registry.RegisterCategories();
}
var categoryViewModels = new ObservableCollection<CategoryViewModel>();
- foreach (var category in registry.Categories)
- {
- var categoryVm = new CategoryViewModel
- {
- Name = category.Name,
- Features = new ObservableCollection<FeatureViewModel>()
- };
-
- foreach (var feature in category.Features)
- {
- var featureVm = new FeatureViewModel(feature);
- categoryVm.Features.Add(featureVm);
- }
-
- categoryViewModels.Add(categoryVm);
- }
-
- foreach (var category in categoryViewModels)
+ foreach (var category in _registry.Categories)
+ {
+ categoryViewModels.Add(new CategoryViewModel
{
- foreach (var feature in category.Features)
- {
- _ = feature.LoadStateAsync();
- }
- }
+ Name = category.Name,
+ Description = category.Description,
+ Icon = category.Icon,
+ CategoryType = category.GetType(),
+ PageType = category.GetType().GetCustomAttribute<ToggleFeatureCategoryAttribute>()?.PageType
+ });
+ }
Categories = categoryViewModels;
IsLoading = false;
- }
- partial void OnSearchTextChanged(string value)
- {
- foreach (var category in Categories)
- {
- category.FilterFeatures(value);
- }
+ await Task.CompletedTask;
}
-}
-
-public partial class CategoryViewModel : ObservableObject
-{
- [ObservableProperty]
- private string _name = string.Empty;
-
- [ObservableProperty]
- private ObservableCollection<FeatureViewModel> _features = [];
- [ObservableProperty]
- private bool _hasVisibleFeatures = true;
-
- public void FilterFeatures(string searchText)
+ [RelayCommand]
+ private void NavigateToCategory(CategoryViewModel category)
{
- var searchLower = searchText.ToLowerInvariant();
-
- foreach (var feature in Features)
+ if (category.PageType != null)
{
- feature.IsVisible = string.IsNullOrEmpty(searchText) ||
- feature.Name.ToLowerInvariant().Contains(searchLower) ||
- feature.Description.ToLowerInvariant().Contains(searchLower);
+ _navigationService.Navigate(category.PageType);
}
-
- HasVisibleFeatures = Features.Any(f => f.IsVisible);
}
}
-public partial class FeatureViewModel : ObservableObject
+public partial class CategoryViewModel : ObservableObject
{
- private readonly IToggleFeature _feature;
-
- [ObservableProperty]
- private string _name = string.Empty;
-
- [ObservableProperty]
- private string _description = string.Empty;
-
- [ObservableProperty]
- private bool _isEnabled;
-
- [ObservableProperty]
- private bool _isVisible = true;
-
- [ObservableProperty]
- private bool _isLoading;
-
- public FeatureViewModel(IToggleFeature feature)
- {
- _feature = feature;
- _name = feature.Name;
- _description = feature.Description;
- }
-
- public async Task LoadStateAsync()
- {
- try
- {
- IsEnabled = await _feature.GetStateAsync();
- }
- catch
- {
- IsEnabled = false;
- }
- }
-
- [RelayCommand]
- private 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;
- }
- }
-}
+ [ObservableProperty] private string _name = string.Empty;
+ [ObservableProperty] private string _description = string.Empty;
+ [ObservableProperty] private SymbolRegular _icon;
+ [ObservableProperty] private Type? _categoryType;
+ [ObservableProperty] private Type? _pageType;
+}
\ No newline at end of file
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml
new file mode 100644
index 0000000..5a432a2
--- /dev/null
+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml
@@ -0,0 +1,114 @@
+<Page
+ x:Class="optimizerDuck.UI.Views.Pages.ToggleFeatures.ToggleFeaturesCategoryPage"
+ 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="{Binding ViewModel.CategoryName}"
+ Margin="0,32,0,0"
+ d:DataContext="{d:DesignInstance vm:ToggleFeatureCategoryViewModel}"
+ d:DesignHeight="650"
+ d:DesignWidth="800"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ ScrollViewer.CanContentScroll="False"
+ mc:Ignorable="d">
+
+ <Page.Resources>
+ <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+ <converters:InverseBooleanToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
+ </Page.Resources>
+
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <StackPanel Grid.Row="0" Margin="42,0,42,16">
+ <StackPanel Orientation="Horizontal" Margin="0,0,0,8">
+ <ui:SymbolIcon Symbol="{Binding ViewModel.CategoryIcon}" FontSize="24" Margin="0,0,12,0" VerticalAlignment="Center" />
+ <ui:TextBlock FontTypography="Title" Text="{Binding ViewModel.CategoryName}" VerticalAlignment="Center" />
+ </StackPanel>
+ <ui:TextBlock Appearance="Secondary" Text="{Binding ViewModel.CategoryDescription}" TextWrapping="Wrap" />
+ </StackPanel>
+
+ <WrapPanel Grid.Row="1" Margin="42,0,42,16" Orientation="Horizontal">
+ <ui:TextBox
+ MinWidth="300"
+ Margin="0,0,8,0"
+ HorizontalAlignment="Left"
+ VerticalAlignment="Center"
+ Icon="{ui:SymbolIcon Search24}"
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
+
+ <ComboBox
+ VerticalAlignment="Center"
+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}">
+ <ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
+ </ComboBox>
+ </WrapPanel>
+
+ <ScrollViewer
+ Grid.Row="2"
+ HorizontalScrollBarVisibility="Disabled"
+ Margin="42,0,42,0"
+ VerticalScrollBarVisibility="Auto">
+
+ <!-- Feature Cards -->
+ <ItemsControl ItemsSource="{Binding ViewModel.Features}" 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
+ Margin="0,4,0,0"
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Text="{Binding Description}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </ui:CardControl.Header>
+ <ui:ToggleSwitch
+ HorizontalAlignment="Right"
+ VerticalAlignment="Center"
+ Command="{Binding ToggleCommand}"
+ IsChecked="{Binding IsEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+ </ui:CardControl>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </ScrollViewer>
+
+ <Border
+ Grid.Row="2"
+ 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"
+ VerticalAlignment="Center"
+ IsIndeterminate="True" />
+ <ui:TextBlock
+ HorizontalAlignment="Center"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc ToggleFeatures.Loading}" />
+ </StackPanel>
+ </Border>
+ </Grid>
+</Page>
\ No newline at end of file
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs
new file mode 100644
index 0000000..79ad46c
--- /dev/null
+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPage.xaml.cs
@@ -0,0 +1,17 @@
+using System.Windows.Controls;
+using optimizerDuck.UI.ViewModels.Pages;
+using Wpf.Ui.Abstractions.Controls;
+
+namespace optimizerDuck.UI.Views.Pages.ToggleFeatures;
+
+public partial class ToggleFeaturesCategoryPage : INavigableView<ToggleFeatureCategoryViewModel>
+{
+ public ToggleFeatureCategoryViewModel ViewModel { get; }
+
+ public ToggleFeaturesCategoryPage(ToggleFeatureCategoryViewModel viewModel)
+ {
+ ViewModel = viewModel;
+ DataContext = this;
+ InitializeComponent();
+ }
+}
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs
new file mode 100644
index 0000000..66f7598
--- /dev/null
+++ b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesCategoryPages.cs
@@ -0,0 +1,20 @@
+using optimizerDuck.UI.ViewModels.Optimizer;
+using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.Views.Pages.Optimizations;
+using optimizerDuck.UI.Views.Pages.ToggleFeatures;
+
+public sealed class UserExperienceToggleFeaturesCategory : ToggleFeaturesCategoryPage
+{
+ public UserExperienceToggleFeaturesCategory(ToggleFeatureCategoryViewModel viewModel) : base(viewModel)
+ {
+ InitializeComponent();
+ }
+}
+
+public sealed class SystemToggleFeaturesCategory : ToggleFeaturesCategoryPage
+{
+ public SystemToggleFeaturesCategory(ToggleFeatureCategoryViewModel viewModel) : base(viewModel)
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml b/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml
deleted file mode 100644
index 87a5078..0000000
--- a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml
+++ /dev/null
@@ -1,124 +0,0 @@
-<Page
- x:Class="optimizerDuck.UI.Views.Pages.ToggleFeatures.ToggleFeaturesPage"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns: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">
-
- <Page.Resources>
- <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
- <converters:InverseBooleanToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
- </Page.Resources>
-
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
- </Grid.RowDefinitions>
-
- <Grid Grid.Row="0" Margin="42,0,42,16">
- <ui:TextBox
- MinWidth="300"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
- Icon="{ui:SymbolIcon Search24}"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" />
- </Grid>
-
- <ScrollViewer
- Grid.Row="1"
- HorizontalScrollBarVisibility="Disabled"
- Margin="42,0,42,0"
- VerticalScrollBarVisibility="Auto">
- <ItemsControl ItemsSource="{Binding Categories}">
- <ItemsControl.ItemTemplate>
- <DataTemplate>
- <StackPanel Visibility="{Binding HasVisibleFeatures, Converter={StaticResource BoolToVisibilityConverter}}">
- <ui:TextBlock
- Margin="0,16,0,8"
- FontTypography="Subtitle"
- Text="{Binding Name}"
- TextWrapping="Wrap" />
-
- <Border
- Margin="0,0,0,16"
- Background="{DynamicResource CardBackground}"
- BorderBrush="{DynamicResource CardBorderBrush}"
- BorderThickness="1"
- CornerRadius="5">
- <ItemsControl ItemsSource="{Binding Features}">
- <ItemsControl.ItemTemplate>
- <DataTemplate>
- <Border
- Padding="16,12"
- BorderBrush="{DynamicResource CardBorderBrush}"
- BorderThickness="0,0,0,1"
- Visibility="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}">
- <Grid ColumnDefinitions="*,Auto">
- <StackPanel Grid.Column="0" VerticalAlignment="Center">
- <ui:TextBlock
- FontTypography="Body"
- Text="{Binding Name}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- Margin="0,4,0,0"
- Appearance="Secondary"
- FontTypography="Caption"
- Text="{Binding Description}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
- </StackPanel>
-
- <ui:ToggleSwitch
- Grid.Column="1"
- Margin="16,0,0,0"
- HorizontalAlignment="Right"
- VerticalAlignment="Center"
- Command="{Binding ToggleCommand}"
- IsChecked="{Binding IsEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
- </Grid>
- </Border>
- </DataTemplate>
- </ItemsControl.ItemTemplate>
- </ItemsControl>
- </Border>
- </StackPanel>
- </DataTemplate>
- </ItemsControl.ItemTemplate>
- </ItemsControl>
- </ScrollViewer>
-
- <Border
- Grid.Row="1"
- Visibility="{Binding IsLoading, Converter={StaticResource BoolToVisibilityConverter}}">
- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
- <ui:ProgressRing
- Width="48"
- Height="48"
- Margin="0,0,0,16"
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
- IsIndeterminate="True" />
- <ui:TextBlock
- HorizontalAlignment="Center"
- FontTypography="BodyStrong"
- Text="{ext:Loc ToggleFeatures.Loading}" />
- </StackPanel>
- </Border>
- </Grid>
-</Page>
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml b/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml
new file mode 100644
index 0000000..5e39283
--- /dev/null
+++ b/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml
@@ -0,0 +1,116 @@
+<Page
+ x:Class="optimizerDuck.UI.Views.Pages.ToggleFeatures.ToggleFeaturesPage"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns: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">
+
+ <Page.Resources>
+ <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+ <converters:InverseBooleanToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" />
+ <converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />
+ </Page.Resources>
+
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </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" />
+ </StackPanel>
+
+ <ui:VirtualizingItemsControl
+ Grid.Row="1"
+ Margin="42,0,42,0"
+ ItemsSource="{Binding ViewModel.Categories}">
+ <ui:VirtualizingItemsControl.Template>
+ <ControlTemplate TargetType="ItemsControl">
+ <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+ <ItemsPresenter />
+ </ScrollViewer>
+ </ControlTemplate>
+ </ui:VirtualizingItemsControl.Template>
+
+ <ui:VirtualizingItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <UniformGrid VerticalAlignment="Top" Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" />
+ </ItemsPanelTemplate>
+ </ui:VirtualizingItemsControl.ItemsPanel>
+
+ <ui:VirtualizingItemsControl.ItemContainerStyle>
+ <Style TargetType="ContentPresenter">
+ <Setter Property="Margin" Value="5" />
+ <Setter Property="HorizontalAlignment" Value="Stretch" />
+ </Style>
+ </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">
+ <Grid RowDefinitions="Auto,Auto,Auto">
+ <ui:SymbolIcon
+ Grid.Row="0"
+ Margin="0,0,0,12"
+ HorizontalAlignment="Left"
+ FontSize="32"
+ Symbol="{Binding Icon}" />
+
+ <ui:TextBlock
+ Grid.Row="1"
+ Margin="0,0,0,6"
+ FontTypography="Subtitle"
+ Text="{Binding Name}"
+ TextWrapping="Wrap" />
+
+ <ui:TextBlock
+ Grid.Row="2"
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{Binding Description}"
+ TextWrapping="Wrap" />
+ </Grid>
+ </ui:CardAction>
+ </DataTemplate>
+ </ui:VirtualizingItemsControl.ItemTemplate>
+ </ui:VirtualizingItemsControl>
+
+ <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"
+ VerticalAlignment="Center"
+ IsIndeterminate="True" />
+ <ui:TextBlock
+ HorizontalAlignment="Center"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc ToggleFeatures.Loading}" />
+ </StackPanel>
+ </Border>
+ </Grid>
+</Page>
\ No newline at end of file
diff --git a/optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml.cs b/optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.cs
similarity index 100%
rename from optimizerDuck/UI/Views/Pages/ToggleFeatures/ToggleFeaturesPage.xaml.cs
rename to optimizerDuck/UI/Views/Pages/ToggleFeaturesPage.xaml.cs
diff --git a/optimizerDuck/UI/Views/Windows/MainWindow.xaml b/optimizerDuck/UI/Views/Windows/MainWindow.xaml
index 0ea8525..83d606e 100644
--- a/optimizerDuck/UI/Views/Windows/MainWindow.xaml
+++ b/optimizerDuck/UI/Views/Windows/MainWindow.xaml
@@ -1,20 +1,7 @@
<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"
@@ -22,19 +9,32 @@
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"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ 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">
<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}"
- x:Name="RootNavigation">
+ TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}">
<ui:NavigationView.MenuItems>
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Dashboard}"
@@ -48,10 +48,12 @@
Icon="{ui:SymbolIcon Rocket24}"
TargetPageType="{x:Type pages:OptimizePage}" />
- <controls:FilledNavigationViewItem
+ <ui:NavigationViewItem
+ x:Name="ToggleFeaturesMenuItem"
Content="{extensions:Loc Sidebar.ToggleFeatures}"
Icon="{ui:SymbolIcon ToggleLeft24}"
- TargetPageType="{x:Type pages:ToggleFeatures.ToggleFeaturesPage}" />
+ TargetPageType="{x:Type pages:ToggleFeatures.ToggleFeaturesPage}">
+ </ui:NavigationViewItem>
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Bloatware}"
@@ -91,7 +93,7 @@
</ui:NavigationView.ContentOverlay>
</ui:NavigationView>
- <ui:TitleBar Title="optimizerDuck" x:Name="TitleBar">
+ <ui:TitleBar x:Name="TitleBar" Title="optimizerDuck">
<ui:TitleBar.Icon>
<ui:ImageIcon Source="pack://application:,,,/Resources/Images/Duck.png" />
</ui:TitleBar.Icon>
diff --git a/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs b/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs
index d958496..840b408 100644
--- a/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs
+++ b/optimizerDuck/UI/Views/Windows/MainWindow.xaml.cs
@@ -1,6 +1,8 @@
using System.Windows;
using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Services;
using optimizerDuck.UI.Views.Pages;
+using optimizerDuck.UI.Views.Pages.ToggleFeatures;
using Wpf.Ui;
using Wpf.Ui.Abstractions;
@@ -9,7 +11,7 @@ namespace optimizerDuck.UI.Views.Windows;
public partial class MainWindow : IWindow
{
public MainWindow(INavigationService navigationService, IContentDialogService contentDialogService,
- INavigationViewPageProvider pageProvider, ISnackbarService snackbarService)
+ INavigationViewPageProvider pageProvider, ISnackbarService snackbarService, ToggleFeaturesRegistry toggleFeaturesRegistry)
{
InitializeComponent();
@@ -19,6 +21,12 @@ public partial class MainWindow : IWindow
RootNavigation.SetPageProviderService(pageProvider);
+ var toggleItems = toggleFeaturesRegistry.GetNavigationItems();
+ foreach (var item in toggleItems)
+ {
+ ToggleFeaturesMenuItem.MenuItems.Add(item);
+ }
+
RootNavigation.Loaded += OnRootNavigationLoaded;
}