Skip to content

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

refactor: converters & add feature recommendation system

fatDuck8148d2c9ffba
diff --git a/optimizerDuck.Test/optimizerDuck.Test.csproj b/optimizerDuck.Test/optimizerDuck.Test.csproj
index 9821ec1..ae27618 100644
--- a/optimizerDuck.Test/optimizerDuck.Test.csproj
+++ b/optimizerDuck.Test/optimizerDuck.Test.csproj
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>net10.0-windows</TargetFramework>
+ <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
diff --git a/optimizerDuck/Common/Converters/GreaterThanNumberToVisibilityConverter.cs b/optimizerDuck/Common/Converters/GreaterThanNumberToVisibilityConverter.cs
deleted file mode 100644
index 4b27309..0000000
--- a/optimizerDuck/Common/Converters/GreaterThanNumberToVisibilityConverter.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace optimizerDuck.Common.Converters;
-
-public class GreaterThanNumberToVisibilityConverter : IValueConverter
-{
- public int Threshold { get; set; } = 1;
-
- public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- if (value is not int intValue)
- return Visibility.Collapsed;
-
- return intValue > Threshold ? Visibility.Visible : Visibility.Collapsed;
- }
-
- public object ConvertBack(
- object? value,
- Type targetType,
- object? parameter,
- CultureInfo culture
- )
- {
- throw new NotSupportedException();
- }
-}
diff --git a/optimizerDuck/Common/Converters/GreaterThanZeroToVisibilityConverter.cs b/optimizerDuck/Common/Converters/GreaterThanZeroToVisibilityConverter.cs
deleted file mode 100644
index 2d471b7..0000000
--- a/optimizerDuck/Common/Converters/GreaterThanZeroToVisibilityConverter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace optimizerDuck.Common.Converters;
-
-public class GreaterThanZeroToVisibilityConverter : IValueConverter
-{
- public Visibility True { get; set; } = Visibility.Visible;
- public Visibility False { get; set; } = Visibility.Collapsed;
-
- public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- return value is > 0 ? True : False;
- }
-
- public object ConvertBack(
- object? value,
- Type targetType,
- object? parameter,
- CultureInfo culture
- )
- {
- throw new NotSupportedException();
- }
-}
diff --git a/optimizerDuck/Common/Converters/InverseBooleanConverter.cs b/optimizerDuck/Common/Converters/InverseBooleanConverter.cs
index 86ef8ab..8dfe0b1 100644
--- a/optimizerDuck/Common/Converters/InverseBooleanConverter.cs
+++ b/optimizerDuck/Common/Converters/InverseBooleanConverter.cs
@@ -1,23 +1,3 @@
-using System.Globalization;
-using System.Windows.Data;
+namespace optimizerDuck.Common.Converters;
-namespace optimizerDuck.Common.Converters;
-
-public class InverseBooleanConverter : IValueConverter
-{
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- if (value is bool b)
- return !b;
-
- return value;
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- if (value is bool b)
- return !b;
-
- return value;
- }
-}
+public sealed class InverseBooleanConverter() : BooleanConverter<bool>(false, true);
diff --git a/optimizerDuck/Common/Converters/NullToVisibilityConverter.cs b/optimizerDuck/Common/Converters/NullToVisibilityConverter.cs
deleted file mode 100644
index 69699e1..0000000
--- a/optimizerDuck/Common/Converters/NullToVisibilityConverter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace optimizerDuck.Common.Converters;
-
-public class NullToVisibilityConverter : IValueConverter
-{
- public Visibility True { get; set; } = Visibility.Visible;
- public Visibility False { get; set; } = Visibility.Collapsed;
-
- public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- return value is null ? True : False;
- }
-
- public object? ConvertBack(
- object? value,
- Type targetType,
- object? parameter,
- CultureInfo culture
- )
- {
- throw new NotImplementedException();
- }
-}
diff --git a/optimizerDuck/Common/Converters/NumericComparisonToVisibilityConverter.cs b/optimizerDuck/Common/Converters/NumericComparisonToVisibilityConverter.cs
new file mode 100644
index 0000000..0277eef
--- /dev/null
+++ b/optimizerDuck/Common/Converters/NumericComparisonToVisibilityConverter.cs
@@ -0,0 +1,55 @@
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace optimizerDuck.Common.Converters;
+
+public enum NumericComparisonType
+{
+ GreaterThan,
+ GreaterThanOrEqual,
+ LessThan,
+ LessThanOrEqual,
+ Equal,
+ NotEqual
+}
+
+public class NumericComparisonToVisibilityConverter : IValueConverter
+{
+ public NumericComparisonType ComparisonType { get; set; } = NumericComparisonType.GreaterThan;
+
+ public int Threshold { get; set; } = 0;
+
+ public Visibility True { get; set; } = Visibility.Visible;
+
+ public Visibility False { get; set; } = Visibility.Collapsed;
+
+ public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ if (value is not int intValue)
+ return False;
+
+ bool result = ComparisonType switch
+ {
+ NumericComparisonType.GreaterThan => intValue > Threshold,
+ NumericComparisonType.GreaterThanOrEqual => intValue >= Threshold,
+ NumericComparisonType.LessThan => intValue < Threshold,
+ NumericComparisonType.LessThanOrEqual => intValue <= Threshold,
+ NumericComparisonType.Equal => intValue == Threshold,
+ NumericComparisonType.NotEqual => intValue != Threshold,
+ _ => false,
+ };
+
+ return result ? True : False;
+ }
+
+ public object ConvertBack(
+ object? value,
+ Type targetType,
+ object? parameter,
+ CultureInfo culture
+ )
+ {
+ throw new NotSupportedException();
+ }
+}
diff --git a/optimizerDuck/Common/Converters/ValueConditionToVisibilityConverter.cs b/optimizerDuck/Common/Converters/ValueConditionToVisibilityConverter.cs
new file mode 100644
index 0000000..50221a9
--- /dev/null
+++ b/optimizerDuck/Common/Converters/ValueConditionToVisibilityConverter.cs
@@ -0,0 +1,50 @@
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace optimizerDuck.Common.Converters;
+
+public enum ValueConditionType
+{
+ IsNull,
+ IsNotNull,
+ IsZero,
+ IsNotZero,
+ IsGreaterThanZero,
+ IsLessThanZero
+}
+
+public class ValueConditionToVisibilityConverter : IValueConverter
+{
+ public ValueConditionType ConditionType { get; set; } = ValueConditionType.IsNull;
+
+ public Visibility True { get; set; } = Visibility.Visible;
+
+ public Visibility False { get; set; } = Visibility.Collapsed;
+
+ public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+ {
+ bool result = ConditionType switch
+ {
+ ValueConditionType.IsNull => value is null,
+ ValueConditionType.IsNotNull => value is not null,
+ ValueConditionType.IsZero => value is 0,
+ ValueConditionType.IsNotZero => value is not 0,
+ ValueConditionType.IsGreaterThanZero => value is > 0,
+ ValueConditionType.IsLessThanZero => value is < 0,
+ _ => false,
+ };
+
+ return result ? True : False;
+ }
+
+ public object ConvertBack(
+ object? value,
+ Type targetType,
+ object? parameter,
+ CultureInfo culture
+ )
+ {
+ throw new NotSupportedException();
+ }
+}
diff --git a/optimizerDuck/Common/Converters/ZeroToVisibilityConverter.cs b/optimizerDuck/Common/Converters/ZeroToVisibilityConverter.cs
deleted file mode 100644
index 0a59aac..0000000
--- a/optimizerDuck/Common/Converters/ZeroToVisibilityConverter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace optimizerDuck.Common.Converters;
-
-public class ZeroToVisibilityConverter : IValueConverter
-{
- public Visibility True { get; set; } = Visibility.Visible;
- public Visibility False { get; set; } = Visibility.Collapsed;
-
- public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
- {
- return value is 0 ? True : False;
- }
-
- public object ConvertBack(
- object? value,
- Type targetType,
- object? parameter,
- CultureInfo culture
- )
- {
- throw new NotSupportedException();
- }
-}
diff --git a/optimizerDuck/Domain/Abstractions/IFeature.cs b/optimizerDuck/Domain/Abstractions/IFeature.cs
index d2cabf3..3061ef3 100644
--- a/optimizerDuck/Domain/Abstractions/IFeature.cs
+++ b/optimizerDuck/Domain/Abstractions/IFeature.cs
@@ -1,4 +1,5 @@
-using Wpf.Ui.Controls;
+using optimizerDuck.Domain.Features.Models;
+using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Abstractions;
@@ -10,6 +11,8 @@ public interface IFeature
public SymbolRegular Icon { get; }
string FeatureKey { get; }
+ FeatureRecommendationResult? GetRecommendation();
+
Task<bool> GetStateAsync();
Task EnableAsync();
Task DisableAsync();
diff --git a/optimizerDuck/Domain/Attributes/FeatureAttribute.cs b/optimizerDuck/Domain/Attributes/FeatureAttribute.cs
index 68f22ba..5e5bcfe 100644
--- a/optimizerDuck/Domain/Attributes/FeatureAttribute.cs
+++ b/optimizerDuck/Domain/Attributes/FeatureAttribute.cs
@@ -1,4 +1,5 @@
-using Wpf.Ui.Controls;
+using optimizerDuck.Domain.Features.Models;
+using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Attributes;
@@ -7,6 +8,7 @@ public sealed class FeatureAttribute : Attribute
{
public object? Section { get; init; }
public required SymbolRegular Icon { get; init; }
+ public RecommendationState Recommendation { get; init; } = RecommendationState.None;
public string GetSectionName()
{
diff --git a/optimizerDuck/Domain/Features/Categories/Gaming.cs b/optimizerDuck/Domain/Features/Categories/Gaming.cs
index eda723a..db2def6 100644
--- a/optimizerDuck/Domain/Features/Categories/Gaming.cs
+++ b/optimizerDuck/Domain/Features/Categories/Gaming.cs
@@ -51,7 +51,7 @@ public class Gaming : IFeatureCategory
];
}
- [Feature(Section = nameof(Sections.GameSettings), Icon = SymbolRegular.XboxConsole24)]
+ [Feature(Section = nameof(Sections.GameSettings), Icon = SymbolRegular.XboxConsole24, Recommendation = RecommendationState.Off)]
public class GameBar : BaseFeature
{
protected override IEnumerable<RegistryToggle> RegistryToggles =>
@@ -139,7 +139,7 @@ public class Gaming : IFeatureCategory
];
}
- [Feature(Section = nameof(Sections.Input), Icon = SymbolRegular.Cursor24)]
+ [Feature(Section = nameof(Sections.Input), Icon = SymbolRegular.Cursor24, Recommendation = RecommendationState.Off)]
public class MouseAcceleration : BaseFeature
{
private const string Path = @"HKCU\Control Panel\Mouse";
diff --git a/optimizerDuck/Domain/Features/Categories/Preferences.cs b/optimizerDuck/Domain/Features/Categories/Preferences.cs
index 4ed997b..effa153 100644
--- a/optimizerDuck/Domain/Features/Categories/Preferences.cs
+++ b/optimizerDuck/Domain/Features/Categories/Preferences.cs
@@ -352,7 +352,7 @@ public class Preferences : IFeatureCategory
];
}
- [Feature(Section = nameof(Sections.Taskbar), Icon = SymbolRegular.Search24)]
+ [Feature(Section = nameof(Sections.Taskbar), Icon = SymbolRegular.Search24, Recommendation = RecommendationState.Off)]
public class BingSearch : BaseFeature
{
protected override bool NeedsPostAction => true;
@@ -370,7 +370,7 @@ public class Preferences : IFeatureCategory
];
}
- [Feature(Section = nameof(Sections.Explorer), Icon = SymbolRegular.CursorClick24)]
+ [Feature(Section = nameof(Sections.Explorer), Icon = SymbolRegular.CursorClick24, Recommendation = RecommendationState.On)]
public class ClassicContextMenu : BaseFeature
{
private const string BasePath =
diff --git a/optimizerDuck/Domain/Features/Models/BaseFeature.cs b/optimizerDuck/Domain/Features/Models/BaseFeature.cs
index 9a611b4..f494a01 100644
--- a/optimizerDuck/Domain/Features/Models/BaseFeature.cs
+++ b/optimizerDuck/Domain/Features/Models/BaseFeature.cs
@@ -44,6 +44,18 @@ public abstract class BaseFeature : IFeature
public SymbolRegular Icon => Meta.Icon;
+ public string RecommendationPrefix =>
+ $"Features.{OwnerKey}.{FeatureKey}.Recommendation";
+
+ public virtual FeatureRecommendationResult? GetRecommendation()
+ {
+ var state = Meta.Recommendation;
+ if (state == RecommendationState.None)
+ return null;
+
+ return new FeatureRecommendationResult(state, $"{RecommendationPrefix}.Reason");
+ }
+
public virtual Task<bool> GetStateAsync()
{
return Task.FromResult(RegistryToggles.All(t => t.GetState()));
diff --git a/optimizerDuck/Domain/Features/Models/FeatureRecommendationResult.cs b/optimizerDuck/Domain/Features/Models/FeatureRecommendationResult.cs
new file mode 100644
index 0000000..630fee4
--- /dev/null
+++ b/optimizerDuck/Domain/Features/Models/FeatureRecommendationResult.cs
@@ -0,0 +1,5 @@
+namespace optimizerDuck.Domain.Features.Models;
+
+public sealed record FeatureRecommendationResult(
+ RecommendationState State,
+ string ReasonTranslationKey);
diff --git a/optimizerDuck/Domain/Features/Models/RecommendationState.cs b/optimizerDuck/Domain/Features/Models/RecommendationState.cs
new file mode 100644
index 0000000..4f8cea2
--- /dev/null
+++ b/optimizerDuck/Domain/Features/Models/RecommendationState.cs
@@ -0,0 +1,10 @@
+namespace optimizerDuck.Domain.Features.Models;
+
+public enum RecommendationState
+{
+ None,
+ On,
+ Off,
+ Experimental,
+ Depends,
+}
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.cs
index 6641f5e..d146ddf 100644
--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs
+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs
@@ -402,6 +402,42 @@ namespace optimizerDuck.Resources.Languages {
}
}
+ /// <summary>
+ /// Looks up a localized string similar to Depends.
+ /// </summary>
+ internal static string Common_Recommendation_Depends {
+ get {
+ return ResourceManager.GetString("Common.Recommendation.Depends", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Experimental.
+ /// </summary>
+ internal static string Common_Recommendation_Experimental {
+ get {
+ return ResourceManager.GetString("Common.Recommendation.Experimental", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Not Recommended.
+ /// </summary>
+ internal static string Common_Recommendation_Off {
+ get {
+ return ResourceManager.GetString("Common.Recommendation.Off", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Recommended.
+ /// </summary>
+ internal static string Common_Recommendation_On {
+ get {
+ return ResourceManager.GetString("Common.Recommendation.On", resourceCulture);
+ }
+ }
+
/// <summary>
/// Looks up a localized string similar to Search....
/// </summary>
@@ -1907,29 +1943,29 @@ namespace optimizerDuck.Resources.Languages {
}
/// <summary>
- /// Looks up a localized string similar to Turn NumLock on or off at the Windows login screen.
+ /// Looks up a localized string similar to System.
/// </summary>
- internal static string Features_SystemFeatures_EnableNumLockOnBoot_Description {
+ internal static string Features_SystemFeatures_Name {
get {
- return ResourceManager.GetString("Features.SystemFeatures.EnableNumLockOnBoot.Description", resourceCulture);
+ return ResourceManager.GetString("Features.SystemFeatures.Name", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to NumLock on Boot.
+ /// Looks up a localized string similar to Turn NumLock on or off at the Windows login screen.
/// </summary>
- internal static string Features_SystemFeatures_EnableNumLockOnBoot_Name {
+ internal static string Features_SystemFeatures_NumLockOnBoot_Description {
get {
- return ResourceManager.GetString("Features.SystemFeatures.EnableNumLockOnBoot.Name", resourceCulture);
+ return ResourceManager.GetString("Features.SystemFeatures.NumLockOnBoot.Description", resourceCulture);
}
}
/// <summary>
- /// Looks up a localized string similar to System.
+ /// Looks up a localized string similar to NumLock on Boot.
/// </summary>
- internal static string Features_SystemFeatures_Name {
+ internal static string Features_SystemFeatures_NumLockOnBoot_Name {
get {
- return ResourceManager.GetString("Features.SystemFeatures.Name", resourceCulture);
+ return ResourceManager.GetString("Features.SystemFeatures.NumLockOnBoot.Name", resourceCulture);
}
}
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index 58b965a..9021fa1 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -538,6 +538,18 @@
<data name="Common.Unknown" xml:space="preserve">
<value>Unknown</value>
</data>
+ <data name="Common.Recommendation.On" xml:space="preserve">
+ <value>Recommended</value>
+ </data>
+ <data name="Common.Recommendation.Off" xml:space="preserve">
+ <value>Not Recommended</value>
+ </data>
+ <data name="Common.Recommendation.Experimental" xml:space="preserve">
+ <value>Experimental</value>
+ </data>
+ <data name="Common.Recommendation.Depends" xml:space="preserve">
+ <value>Depends</value>
+ </data>
<data name="Optimizer.UI.Tags.Security" xml:space="preserve">
<value>Security</value>
</data>
@@ -1572,10 +1584,10 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Features.SystemFeatures.Section.Input" xml:space="preserve">
<value>Input Settings</value>
</data>
- <data name="Features.SystemFeatures.EnableNumLockOnBoot.Name" xml:space="preserve">
+ <data name="Features.SystemFeatures.NumLockOnBoot.Name" xml:space="preserve">
<value>NumLock on Boot</value>
</data>
- <data name="Features.SystemFeatures.EnableNumLockOnBoot.Description" xml:space="preserve">
+ <data name="Features.SystemFeatures.NumLockOnBoot.Description" xml:space="preserve">
<value>Turn NumLock on or off at the Windows login screen</value>
</data>
<data name="Features.Desktop.Name" xml:space="preserve">
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index c3b2a6e..9af4bb5 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -1564,10 +1564,10 @@ Cập nhật ngay để trải nghiệm các tính năng mới, cải tiến và
<data name="Features.SystemFeatures.Section.Input" xml:space="preserve">
<value>Đầu vào</value>
</data>
- <data name="Features.SystemFeatures.EnableNumLockOnBoot.Name" xml:space="preserve">
+ <data name="Features.SystemFeatures.NumLockOnBoot.Name" xml:space="preserve">
<value>NumLock khi khởi động</value>
</data>
- <data name="Features.SystemFeatures.EnableNumLockOnBoot.Description" xml:space="preserve">
+ <data name="Features.SystemFeatures.NumLockOnBoot.Description" xml:space="preserve">
<value>Bật hoặc tắt NumLock tại màn hình đăng nhập Windows</value>
</data>
<data name="Features.Desktop.Name" xml:space="preserve">
diff --git a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx b/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
index d846c6a..c4fd515 100644
--- a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
+++ b/optimizerDuck/Resources/Languages/Translations.zh-TW.resx
@@ -1531,10 +1531,10 @@
<data name="Features.SystemFeatures.Section.Input" xml:space="preserve">
<value>輸入設定</value>
</data>
- <data name="Features.SystemFeatures.EnableNumLockOnBoot.Name" xml:space="preserve">
+ <data name="Features.SystemFeatures.NumLockOnBoot.Name" xml:space="preserve">
<value>開機時的 NumLock</value>
</data>
- <data name="Features.SystemFeatures.EnableNumLockOnBoot.Description" xml:space="preserve">
+ <data name="Features.SystemFeatures.NumLockOnBoot.Description" xml:space="preserve">
<value>在 Windows 登入畫面啟用或停用 NumLock</value>
</data>
<data name="Features.Desktop.Name" xml:space="preserve">
diff --git a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
index c1e170b..def3b53 100644
--- a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml
@@ -12,7 +12,10 @@
d:DesignWidth="900"
mc:Ignorable="d">
<UserControl.Resources>
- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="GreaterThanZeroToVisibilityConverter"
+ ComparisonType="GreaterThan"
+ Threshold="0" />
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
</UserControl.Resources>
diff --git a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
index c58de95..d89f655 100644
--- a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml
@@ -2,6 +2,7 @@
x:Class="optimizerDuck.UI.Dialogs.OptimizationDetailsDialog"
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"
@@ -10,6 +11,13 @@
d:DesignWidth="760"
ScrollViewer.CanContentScroll="False"
mc:Ignorable="d">
+ <UserControl.Resources>
+ <converters:ValueConditionToVisibilityConverter
+ x:Key="NullToVisibilityConverter"
+ ConditionType="IsNull"
+ False="Visible"
+ True="Collapsed" />
+ </UserControl.Resources>
<StackPanel>
<Border
Margin="0,0,0,12"
diff --git a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
index 4adc41d..1572df6 100644
--- a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml
@@ -11,8 +11,9 @@
d:DesignWidth="800"
mc:Ignorable="d">
<UserControl.Resources>
- <converters:NullToVisibilityConverter
+ <converters:ValueConditionToVisibilityConverter
x:Key="NullToVisibilityConverter"
+ ConditionType="IsNull"
False="Visible"
True="Collapsed" />
</UserControl.Resources>
diff --git a/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml
index c6e7139..62bee2a 100644
--- a/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml
+++ b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml
@@ -1,24 +1,26 @@
<UserControl
- d:DesignHeight="450"
- d:DesignWidth="800"
- mc:Ignorable="d"
x:Class="optimizerDuck.UI.Dialogs.ProcessingDialog"
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:extensions="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
+ d:DesignHeight="450"
+ d:DesignWidth="800"
+ mc:Ignorable="d">
<UserControl.Resources>
- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="GreaterThanZeroToVisibilityConverter"
+ ComparisonType="GreaterThan"
+ Threshold="0" />
</UserControl.Resources>
<StackPanel MinWidth="420">
<ui:TextBlock
- HorizontalAlignment="Center"
Margin="0,0,0,12"
+ HorizontalAlignment="Center"
FontTypography="BodyStrong"
Text="{Binding Message}"
TextAlignment="Center"
@@ -29,18 +31,16 @@
IsIndeterminate="{Binding IsIndeterminate}"
Maximum="{Binding Total}"
Minimum="0"
- Value="{Binding Value}"
Visibility="{Binding Total, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"
- />
+ Value="{Binding Value}" />
<ui:TextBlock
+ Margin="0,16,0,0"
+ HorizontalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- HorizontalAlignment="Center"
- Margin="0,16,0,0"
Text="{extensions:Loc ProcessingOptimizationDialog.Warning.DontCloseAppOrRestart}"
TextAlignment="Center"
- TextWrapping="Wrap"
- />
+ TextWrapping="Wrap" />
</StackPanel>
</UserControl>
diff --git a/optimizerDuck/UI/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/BloatwarePage.xaml
index 01788a2..67ecb68 100644
--- a/optimizerDuck/UI/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Pages/BloatwarePage.xaml
@@ -19,8 +19,14 @@
Style="{StaticResource PageRootStyle}"
mc:Ignorable="d">
<Page.Resources>
- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
- <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="GreaterThanZeroToVisibilityConverter"
+ ComparisonType="GreaterThan"
+ Threshold="0" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="ZeroToVisibilityConverter"
+ ComparisonType="Equal"
+ Threshold="0" />
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
</Page.Resources>
diff --git a/optimizerDuck/UI/Pages/DashboardPage.xaml b/optimizerDuck/UI/Pages/DashboardPage.xaml
index a6d08f6..5ecec48 100644
--- a/optimizerDuck/UI/Pages/DashboardPage.xaml
+++ b/optimizerDuck/UI/Pages/DashboardPage.xaml
@@ -20,9 +20,17 @@
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
<converters:MBToGBConverter x:Key="MBToGBConverter" />
- <converters:GreaterThanNumberToVisibilityConverter x:Key="GreaterThanOneToVisibilityConverter" Threshold="1" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="GreaterThanOneToVisibilityConverter"
+ ComparisonType="GreaterThan"
+ Threshold="1" />
<converters:MinusNumberConverter x:Key="MinusOneConverter" NumberToMinus="1" />
<converters:ThemeToGitHubIconConverter x:Key="ThemeToGitHubIconConverter" />
+ <converters:ValueConditionToVisibilityConverter
+ x:Key="NullToVisibilityConverter"
+ ConditionType="IsNull"
+ False="Visible"
+ True="Collapsed" />
</Page.Resources>
<Grid RowDefinitions="Auto,Auto,*">
diff --git a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
index ad23a8f..c075b7b 100644
--- a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml
@@ -7,6 +7,7 @@
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:features="clr-namespace:optimizerDuck.UI.Pages.Features"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:models="clr-namespace:optimizerDuck.Domain.Features.Models"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="{Binding ViewModel.CategoryName}"
d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"
@@ -111,10 +112,108 @@
</ui:CardControl.Icon>
<ui:CardControl.Header>
<StackPanel VerticalAlignment="Center">
- <ui:TextBlock
- FontTypography="Body"
- Text="{Binding Name}"
- TextWrapping="Wrap" />
+ <StackPanel Orientation="Horizontal">
+ <ui:TextBlock
+ Margin="0,0,10,0"
+ FontTypography="Body"
+ Text="{Binding Name}"
+ TextWrapping="Wrap" />
+ <Border
+ Padding="6,2"
+ HorizontalAlignment="Left"
+ CornerRadius="{StaticResource CornerRadiusSmall}"
+ ToolTip="{Binding RecommendationReason}"
+ ToolTipService.HasDropShadow="True"
+ ToolTipService.InitialShowDelay="50"
+ ToolTipService.Placement="Top"
+ Visibility="{Binding HasRecommendation, Converter={StaticResource BoolToVisibilityConverter}}">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Recommendation.State}" Value="{x:Static models:RecommendationState.On}">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Recommendation.State}" Value="{x:Static models:RecommendationState.Off}">
+ <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Recommendation.State}" Value="{x:Static models:RecommendationState.Experimental}">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Recommendation.State}" Value="{x:Static models:RecommendationState.Depends}">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorAttentionBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+ <StackPanel Orientation="Horizontal">
+ <StackPanel.Resources>
+ <SolidColorBrush x:Key="RecommendationBrush" Color="White" />
+ </StackPanel.Resources>
+
+ <ui:TextBlock
+ Margin="0,0,5,0"
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ FontTypography="Caption"
+ Text="{Binding RecommendationStateDisplay}"
+ TextWrapping="Wrap">
+
+ <ui:TextBlock.Style>
+ <Style TargetType="ui:TextBlock">
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorInverseBrush}" />
+
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Recommendation.State}" Value="{x:Static models:RecommendationState.Off}">
+
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ui:TextBlock.Style>
+ </ui:TextBlock>
+
+ <ui:SymbolIcon
+ Margin="0,0,4,0"
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ Symbol="{Binding RecommendationIcon}">
+
+ <ui:SymbolIcon.Style>
+ <Style TargetType="ui:SymbolIcon">
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorInverseBrush}" />
+
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Recommendation.State}" Value="{x:Static models:RecommendationState.Off}">
+
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ui:SymbolIcon.Style>
+ </ui:SymbolIcon>
+
+ <ui:SymbolIcon
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ Symbol="QuestionCircle24">
+
+ <ui:SymbolIcon.Style>
+ <Style TargetType="ui:SymbolIcon">
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorInverseBrush}" />
+
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Recommendation.State}" Value="{x:Static models:RecommendationState.Off}">
+
+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </ui:SymbolIcon.Style>
+ </ui:SymbolIcon>
+ </StackPanel>
+ </Border>
+ </StackPanel>
<ui:TextBlock
Margin="0,4,0,0"
FontTypography="Caption"
diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
index 38bfad6..23585df 100644
--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml
@@ -20,15 +20,22 @@
mc:Ignorable="d">
<Page.Resources>
<converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />
- <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="ZeroToVisibilityConverter"
+ ComparisonType="Equal"
+ Threshold="0" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="GreaterThanZeroToVisibilityConverter"
+ ComparisonType="GreaterThan"
+ Threshold="0" />
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<converters:BooleanToVisibilityConverter
x:Key="InverseBooleanToVisibilityConverter"
False="Visible"
True="Collapsed" />
- <converters:NullToVisibilityConverter
+ <converters:ValueConditionToVisibilityConverter
x:Key="NullToVisibilityConverter"
+ ConditionType="IsNull"
False="Visible"
True="Collapsed" />
</Page.Resources>
diff --git a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
index e1d7391..370d655 100644
--- a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
+++ b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml
@@ -21,8 +21,14 @@
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<BooleanToVisibilityConverter x:Key="WpfBoolToVis" />
- <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="ZeroToVisibilityConverter"
+ ComparisonType="Equal"
+ Threshold="0" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="GreaterThanZeroToVisibilityConverter"
+ ComparisonType="GreaterThan"
+ Threshold="0" />
</Page.Resources>
<Grid RowDefinitions="Auto, *">
diff --git a/optimizerDuck/UI/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Pages/StartupManagerPage.xaml
index 4b6a4e6..77eaf42 100644
--- a/optimizerDuck/UI/Pages/StartupManagerPage.xaml
+++ b/optimizerDuck/UI/Pages/StartupManagerPage.xaml
@@ -20,7 +20,10 @@
mc:Ignorable="d">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
- <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
+ <converters:NumericComparisonToVisibilityConverter
+ x:Key="GreaterThanZeroToVisibilityConverter"
+ ComparisonType="GreaterThan"
+ Threshold="0" />
<converters:EmptyWhileNotLoadingConverter x:Key="EmptyWhileNotLoadingConverter" />
</Page.Resources>
diff --git a/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
index d3d62b4..df6b3b7 100644
--- a/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Features/FeatureViewModel.cs
@@ -4,6 +4,8 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Features.Models;
+using optimizerDuck.Services.Managers;
using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Features;
@@ -33,6 +35,35 @@ public partial class FeatureViewModel(IFeature feature, ILoggerFactory loggerFac
public SymbolRegular Icon => feature.Icon;
+ public FeatureRecommendationResult? Recommendation => feature.GetRecommendation();
+
+ public bool HasRecommendation => Recommendation != null;
+
+ public string? RecommendationStateDisplay =>
+ Recommendation?.State switch
+ {
+ RecommendationState.On => Loc.Instance["Common.Recommendation.On"],
+ RecommendationState.Off => Loc.Instance["Common.Recommendation.Off"],
+ RecommendationState.Experimental => Loc.Instance["Common.Recommendation.Experimental"],
+ RecommendationState.Depends => Loc.Instance["Common.Recommendation.Depends"],
+ _ => null,
+ };
+
+ public SymbolRegular RecommendationIcon =>
+ Recommendation?.State switch
+ {
+ RecommendationState.On => SymbolRegular.Checkmark24,
+ RecommendationState.Off => SymbolRegular.Dismiss24,
+ RecommendationState.Experimental => SymbolRegular.Beaker24,
+ RecommendationState.Depends => SymbolRegular.QuestionCircle24,
+ _ => SymbolRegular.QuestionCircle24,
+ };
+
+ public string? RecommendationReason =>
+ Recommendation != null
+ ? Loc.Instance[Recommendation.ReasonTranslationKey]
+ : null;
+
public async Task LoadStateAsync()
{
try
diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csproj
index 63d0cd4..d3c9f3e 100644
--- a/optimizerDuck/optimizerDuck.csproj
+++ b/optimizerDuck/optimizerDuck.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
- <TargetFramework>net10.0-windows</TargetFramework>
+ <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>