Skip to content

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

fix: use itemscontrol

itsfatducka44124f9a263
diff --git a/optimizerDuck/Common/Helpers/Converters/InverseBooleanConverter.cs b/optimizerDuck/Common/Helpers/Converters/InverseBooleanConverter.cs
new file mode 100644
index 0000000..459f0c4
--- /dev/null
+++ b/optimizerDuck/Common/Helpers/Converters/InverseBooleanConverter.cs
@@ -0,0 +1,23 @@
+using System.Globalization;
+using System.Windows.Data;
+
+namespace optimizerDuck.Common.Helpers.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;
+ }
+}
\ No newline at end of file
diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
index 81f41d8..7d8f8cf 100644
--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
@@ -11,50 +11,135 @@
x:Class="optimizerDuck.UI.Views.Pages.BloatwarePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:bloatware="clr-namespace:optimizerDuck.Core.Models.Bloatware"
+ xmlns:converters="clr-namespace:optimizerDuck.Common.Helpers.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ <Page.Resources>
+ <converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
+ </Page.Resources>
+
+
<StackPanel>
<ui:TextBlock
FontTypography="Title"
+ Margin="0,0,0,20"
Text="{ext:Loc Bloatware.Header.Title}"
TextWrapping="Wrap" />
- <ui:ListView ItemsSource="{Binding ViewModel.AppxPackages}">
- <ui:ListView.View>
- <ui:GridView>
-
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="6"
+ Padding="8">
+ <ui:VirtualizingItemsControl ItemsSource="{Binding ViewModel.AppxPackages}" ScrollViewer.VerticalScrollBarVisibility="Auto">
+ <!-- Layout panel -->
+ <ui:VirtualizingItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <VirtualizingStackPanel />
+ </ItemsPanelTemplate>
+ </ui:VirtualizingItemsControl.ItemsPanel>
+
+ <!-- Item template -->
+ <ui:VirtualizingItemsControl.ItemTemplate>
+ <DataTemplate DataType="{x:Type bloatware:AppxPackage}">
+ <Border
+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+ CornerRadius="6"
+ Margin="0,0,0,8"
+ Padding="12">
+
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <!-- Checkbox -->
+ <CheckBox
+ Grid.Column="0"
+ IsChecked="{Binding IsSelected, Mode=TwoWay}"
+ IsEnabled="{Binding NonRemovable, Converter={StaticResource InverseBooleanConverter}}"
+ Margin="0,4,12,0"
+ VerticalAlignment="Top" />
+
+ <!-- Content -->
+ <StackPanel Grid.Column="1">
+
+ <!-- Top row -->
+ <DockPanel LastChildFill="False">
+
+ <!-- App Name -->
+ <ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
+
+ <!-- Version -->
+ <ui:TextBlock
+ Appearance="Tertiary"
+ FontTypography="Body"
+ Margin="5,0,0,0"
+ Text="{Binding Version, StringFormat=' v{0}'}"
+ VerticalAlignment="Center" />
- <!-- Checkbox -->
- <ui:GridViewColumn Width="40">
- <GridViewColumn.CellTemplate>
- <DataTemplate>
- <CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsSelected, Mode=TwoWay}" />
- </DataTemplate>
- </GridViewColumn.CellTemplate>
- </ui:GridViewColumn>
+ </DockPanel>
- <!-- App Name -->
- <ui:GridViewColumn
- DisplayMemberBinding="{Binding Name}"
- Header="App Name"
- Width="200" />
+ <!-- Publisher -->
+ <ui:TextBlock
+ Appearance="Secondary"
+ FontTypography="Body"
+ Margin="0,2,0,0"
+ Text="{Binding Publisher}"
+ TextTrimming="CharacterEllipsis" />
- <!-- Category -->
- <ui:GridViewColumn
- DisplayMemberBinding="{Binding Category}"
- Header="Category"
- Width="120" />
+ <!-- Install info -->
+ <ui:TextBlock
+ Appearance="Tertiary"
+ FontTypography="Body"
+ Margin="0,2,0,0">
+ <Run Text="Installed: " />
+ <Run Text="{Binding InstallDate, StringFormat='{}{0:yyyy-MM-dd}'}" />
+ </ui:TextBlock>
+ <!-- Install location -->
+ <ui:TextBlock
+ Appearance="Disabled"
+ FontTypography="Body"
+ Margin="0,2,0,0"
+ Text="{Binding InstallLocation}"
+ TextTrimming="CharacterEllipsis" />
+ <!-- Package full name (technical, nhỏ hơn) -->
+ <ui:TextBlock
+ Appearance="Disabled"
+ FontTypography="Caption"
+ Margin="0,4,0,0"
+ Text="{Binding PackageFullName}"
+ TextTrimming="CharacterEllipsis" />
+ </StackPanel>
+ <!-- NonRemovable Badge -->
+ <Border
+ Background="#AAFF3B30"
+ CornerRadius="12"
+ Grid.Column="2"
+ Padding="8,4"
+ VerticalAlignment="Top"
+ Visibility="{Binding NonRemovable, Converter={StaticResource BooleanToVisibilityConverter}}">
- </ui:GridView>
- </ui:ListView.View>
- </ui:ListView>
+ <TextBlock
+ FontSize="11"
+ FontWeight="SemiBold"
+ Foreground="White"
+ Text="System" />
+ </Border>
+ </Grid>
+ </Border>
+ </DataTemplate>
+ </ui:VirtualizingItemsControl.ItemTemplate>
+ </ui:VirtualizingItemsControl>
+ </Border>
</StackPanel>
</Page>
diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
index 465f93c..bf09212 100644
--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
@@ -13,6 +13,7 @@
xmlns:converters="clr-namespace:optimizerDuck.Common.Helpers.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:optimizers="clr-namespace:optimizerDuck.Core.Optimizers"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
@@ -45,7 +46,7 @@
</ui:VirtualizingItemsControl.ItemContainerStyle>
<ui:VirtualizingItemsControl.ItemTemplate>
- <DataTemplate>
+ <DataTemplate DataType="{x:Type optimizers:BaseOptimization}">
<Border
Background="{DynamicResource CardBackground}"
BorderBrush="{DynamicResource CardBorderBrush}"