Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
feat: add BloatwareWarningDialog with rich list view and WpfUi controls
fatDuck58ff68f6b2b2
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.csindex f0a74a5..970a41d 100644--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs@@ -214,20 +214,29 @@ namespace optimizerDuck.Resources.Languages {}/// <summary>- /// Looks up a localized string similar to Warning: Unusual Package Name.+ /// Looks up a localized string similar to The following package(s) have unusual identifiers or unverified name formats. Removing packages with unusual names might cause errors or remove unintended files. Please review carefully before proceeding../// </summary>- internal static string BloatwareDialog_UnusualWarning_Title {+ internal static string BloatwareDialog_UnusualWarning_Description {get {- return ResourceManager.GetString("BloatwareDialog.UnusualWarning.Title", resourceCulture);+ return ResourceManager.GetString("BloatwareDialog.UnusualWarning.Description", resourceCulture);+ }+ }++ /// <summary>+ /// Looks up a localized string similar to Unusual package(s) detected.+ /// </summary>+ internal static string BloatwareDialog_UnusualWarning_SelectedList {+ get {+ return ResourceManager.GetString("BloatwareDialog.UnusualWarning.SelectedList", resourceCulture);}}/// <summary>- /// Looks up a localized string similar to The following package has an unusual name or format:...+ /// Looks up a localized string similar to Warning: Unusual Package Name./// </summary>- internal static string BloatwareDialog_UnusualWarning_Message {+ internal static string BloatwareDialog_UnusualWarning_Title {get {- return ResourceManager.GetString("BloatwareDialog.UnusualWarning.Message", resourceCulture);+ return ResourceManager.GetString("BloatwareDialog.UnusualWarning.Title", resourceCulture);}}diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resxindex 4a7f4a4..8757845 100644--- a/optimizerDuck/Resources/Languages/Translations.resx+++ b/optimizerDuck/Resources/Languages/Translations.resx@@ -1194,13 +1194,11 @@ This ensures you can always go back if anything goes wrong.</value><data name="BloatwareDialog.UnusualWarning.Title" xml:space="preserve"><value>Warning: Unusual Package Name</value></data>- <data name="BloatwareDialog.UnusualWarning.Message" xml:space="preserve">- <value>The following package has an unusual name or format:-{0}--Removing packages with unusual names might cause errors or remove unintended files.--Do you want to continue removing this package?</value>+ <data name="BloatwareDialog.UnusualWarning.Description" xml:space="preserve">+ <value>The following package(s) have unusual identifiers or unverified name formats. Removing packages with unusual names might cause errors or remove unintended files. Please review carefully before proceeding.</value>+ </data>+ <data name="BloatwareDialog.UnusualWarning.SelectedList" xml:space="preserve">+ <value>Unusual package(s) detected</value></data><data name="Settings.Bloatware.Header" xml:space="preserve"><value>Bloatware</value>diff --git a/optimizerDuck/Services/UI/BloatwareService.cs b/optimizerDuck/Services/UI/BloatwareService.csindex 5f0be4a..ab0652d 100644--- a/optimizerDuck/Services/UI/BloatwareService.cs+++ b/optimizerDuck/Services/UI/BloatwareService.cs@@ -9,6 +9,7 @@ using Microsoft.Extensions.Options;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Configuration;using optimizerDuck.Domain.Execution;+using optimizerDuck.Domain.Optimizations.Models.Bloatware;using optimizerDuck.Services.Optimization.Providers;using AppXPackage = optimizerDuck.Domain.Optimizations.Models.Bloatware.AppXPackage;using JsonSerializer = System.Text.Json.JsonSerializer;diff --git a/optimizerDuck/UI/Dialogs/BloatwareWarningDialog.xaml b/optimizerDuck/UI/Dialogs/BloatwareWarningDialog.xamlnew file mode 100644index 0000000..e89571d--- /dev/null+++ b/optimizerDuck/UI/Dialogs/BloatwareWarningDialog.xaml@@ -0,0 +1,170 @@+<UserControl+ x:Class="optimizerDuck.UI.Dialogs.BloatwareWarningDialog"+ 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:dialogVm="clr-namespace:optimizerDuck.UI.ViewModels.Dialogs"+ 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"+ d:DataContext="{d:DesignInstance Type=dialogVm:BloatwareConfirmationDialogViewModel}"+ d:DesignHeight="520"+ d:DesignWidth="900"+ mc:Ignorable="d">+ <UserControl.Resources>+ <converters:NumericComparisonToVisibilityConverter+ x:Key="GreaterThanZeroToVisibilityConverter"+ ComparisonType="GreaterThan"+ Threshold="0" />+ <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ </UserControl.Resources>++ <Grid MinWidth="720">+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto" />+ <RowDefinition Height="Auto" />+ <RowDefinition Height="*" />+ </Grid.RowDefinitions>++ <ui:InfoBar+ Grid.Row="0"+ Margin="0,0,0,12"+ IsClosable="False"+ IsOpen="True"+ Message="{ext:Loc BloatwareDialog.UnusualWarning.Description}"+ Severity="Caution" />++ <ui:TextBlock+ Grid.Row="1"+ Margin="0,0,0,6"+ FontTypography="BodyStrong"+ Text="{ext:Loc BloatwareDialog.UnusualWarning.SelectedList}"+ TextWrapping="Wrap" />++ <ScrollViewer+ Grid.Row="2"+ MaxHeight="420"+ VerticalScrollBarVisibility="Auto">+ <ItemsControl ItemsSource="{Binding Items}" Visibility="{Binding Items.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <VirtualizingStackPanel />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>++ <ItemsControl.ItemTemplate>+ <DataTemplate DataType="{x:Type dialogVm:BloatwareConfirmationItemViewModel}">+ <Border Style="{StaticResource ListRowStyle}">+ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="Auto" />+ <ColumnDefinition Width="*" />+ </Grid.ColumnDefinitions>++ <Border+ Grid.Column="0"+ MinWidth="34"+ Margin="0,0,12,0"+ Padding="6,2"+ VerticalAlignment="Top"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="{StaticResource CornerRadiusSmall}">+ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding Index, StringFormat=#{0}}" />+ </Border>++ <Image+ Grid.Column="1"+ Width="36"+ Height="36"+ Margin="0,0,12,0"+ VerticalAlignment="Top"+ Source="{Binding Package.LogoImage}"+ Stretch="UniformToFill" />++ <StackPanel Grid.Column="2">+ <DockPanel LastChildFill="False">+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Package.Name}" />++ <Border+ Margin="8,0,0,0"+ Padding="4,1"+ HorizontalAlignment="Left"+ VerticalAlignment="Center"+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"+ CornerRadius="{StaticResource CornerRadiusSmall}">+ <ui:TextBlock+ VerticalAlignment="Center"+ Appearance="Tertiary"+ FontTypography="Body"+ Text="{Binding Package.Version}" />+ </Border>++ <Border+ Margin="8,0,0,0"+ Padding="6,2"+ HorizontalAlignment="Left"+ CornerRadius="{StaticResource CornerRadiusSmall}"+ Visibility="{Binding Package.ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />+ <Style.Triggers>+ <DataTrigger Binding="{Binding Package.Risk}" Value="Caution">+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ <StackPanel Orientation="Horizontal">+ <ui:SymbolIcon+ Margin="0,0,8,0"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Symbol="{Binding Package.RiskVisual.Icon}" />++ <ui:TextBlock+ HorizontalAlignment="Center"+ VerticalAlignment="Center"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorInverseBrush}"+ Text="{Binding Package.RiskVisual.Display}"+ TextWrapping="Wrap" />+ </StackPanel>+ </Border>+ </DockPanel>++ <ui:TextBlock+ Margin="0,2,0,0"+ FontTypography="Body"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ Text="{Binding Package.Publisher}"+ TextTrimming="CharacterEllipsis" />++ <ui:TextBlock+ Margin="0,2,0,0"+ FontTypography="Body"+ Foreground="{DynamicResource TextFillColorDisabledBrush}"+ Text="{Binding Package.InstallLocation}"+ TextTrimming="CharacterEllipsis" />++ <ui:TextBlock+ Margin="0,4,0,0"+ FontTypography="Caption"+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Text="{Binding Package.PackageFullName}"+ TextTrimming="CharacterEllipsis" />+ </StackPanel>+ </Grid>+ </Border>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </ScrollViewer>+ </Grid>+</UserControl>diff --git a/optimizerDuck/UI/Dialogs/BloatwareWarningDialog.xaml.cs b/optimizerDuck/UI/Dialogs/BloatwareWarningDialog.xaml.csnew file mode 100644index 0000000..efeaf1d--- /dev/null+++ b/optimizerDuck/UI/Dialogs/BloatwareWarningDialog.xaml.cs@@ -0,0 +1,11 @@+using System.Windows.Controls;++namespace optimizerDuck.UI.Dialogs;++public partial class BloatwareWarningDialog : UserControl+{+ public BloatwareWarningDialog()+ {+ InitializeComponent();+ }+}diff --git a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.csindex 976a67e..24e8a3b 100644--- a/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/BloatwareViewModel.cs@@ -216,22 +216,11 @@ public partial class BloatwareViewModel : ViewModelvar unusualPackages = toRemove.Where(p => !BloatwareService.IsValidPackage(p)).ToList();if (unusualPackages.Count > 0){- var packageNames = string.Join(- "\n",- unusualPackages.Select(p => $"• {p.Name ?? p.PackageFullName}")- );+ var warningViewModel = new BloatwareConfirmationDialogViewModel(unusualPackages);var warningDialog = new ContentDialog{Title = Translations.BloatwareDialog_UnusualWarning_Title,- Content = new System.Windows.Controls.TextBlock- {- Text = string.Format(- Translations.BloatwareDialog_UnusualWarning_Message,- packageNames- ),- TextWrapping = System.Windows.TextWrapping.Wrap,- Margin = new System.Windows.Thickness(0, 8, 0, 8),- },+ Content = new BloatwareWarningDialog { DataContext = warningViewModel },PrimaryButtonText = Translations.Button_Ok,CloseButtonText = Translations.Button_Cancel,};