Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
feat: redesign WPF UI with Fluent system
Devin AI979a672c0724
diff --git a/optimizerDuck/App.xaml b/optimizerDuck/App.xamlindex 822d88c..67347cd 100644--- a/optimizerDuck/App.xaml+++ b/optimizerDuck/App.xaml@@ -9,6 +9,7 @@<ResourceDictionary.MergedDictionaries><ui:ThemesDictionary Theme="Dark" /><ui:ControlsDictionary />+ <ResourceDictionary Source="pack://application:,,,/UI/Styles/FluentDesign.xaml" /></ResourceDictionary.MergedDictionaries><Style TargetType="Image">diff --git a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xamlindex 1897f50..989eff0 100644--- a/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml+++ b/optimizerDuck/UI/Dialogs/BloatwareConfirmationDialog.xaml@@ -1,4 +1,4 @@-<UserControl+<UserControlx:Class="optimizerDuck.UI.Dialogs.BloatwareConfirmationDialog"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"@@ -17,7 +17,7 @@<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" /></UserControl.Resources>- <Grid>+ <Grid MinWidth="720"><Grid.RowDefinitions><RowDefinition Height="Auto" /><RowDefinition Height="Auto" />@@ -36,7 +36,6 @@<ui:TextBlockGrid.Row="1"Margin="0,0,0,6"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"FontTypography="BodyStrong"Text="{ext:Loc BloatwareDialog.Confirmation.SelectedList}"TextWrapping="Wrap"@@ -55,10 +54,7 @@<ItemsControl.ItemTemplate><DataTemplate DataType="{x:Type dialogVm:BloatwareConfirmationItemViewModel}"><Border- Margin="0,0,0,6"- Padding="12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"+ Style="{StaticResource DuckListRowStyle}"><Grid><Grid.ColumnDefinitions>@@ -74,7 +70,7 @@Padding="6,2"VerticalAlignment="Top"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"><ui:TextBlockHorizontalAlignment="Center"@@ -103,12 +99,12 @@/><Border- Margin="5,0,0,0"+ Margin="8,0,0,0"Padding="4,1"HorizontalAlignment="Left"VerticalAlignment="Center"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"><ui:TextBlockVerticalAlignment="Center"@@ -119,10 +115,10 @@</Border><Border- Margin="5,0,0,0"- Padding="4,2"+ Margin="8,0,0,0"+ Padding="6,2"HorizontalAlignment="Left"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Visibility="{Binding Package.ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"><Border.Style>@@ -146,7 +142,7 @@</Border.Style><StackPanel Orientation="Horizontal"><ui:SymbolIcon- Margin="0,0,5,0"+ Margin="0,0,8,0"Foreground="{DynamicResource TextFillColorInverseBrush}"Symbol="{Binding Package.RiskVisual.Icon}"/>diff --git a/optimizerDuck/UI/Dialogs/LegalDialog.xaml b/optimizerDuck/UI/Dialogs/LegalDialog.xamlindex e9c5855..e548918 100644--- a/optimizerDuck/UI/Dialogs/LegalDialog.xaml+++ b/optimizerDuck/UI/Dialogs/LegalDialog.xaml@@ -10,7 +10,7 @@d:DesignWidth="520"mc:Ignorable="d">- <Grid>+ <Grid Style="{StaticResource DuckDialogRootStyle}"><Grid.RowDefinitions><RowDefinition Height="Auto" /><RowDefinition Height="*" />@@ -24,20 +24,21 @@TextWrapping="Wrap"/><ui:TextBlock- Margin="0,3,0,0"+ Margin="0,8,0,0"FontTypography="Body"Text="{ext:Loc LegalDialog.Intro.Safety}"TextWrapping="Wrap"/><ui:TextBlock- Margin="0,1,0,0"+ Margin="0,4,0,0"FontTypography="Body"Text="{ext:Loc LegalDialog.Intro.Review}"TextWrapping="Wrap"/></StackPanel>- <StackPanel Grid.Row="1" Margin="0,6,0,6">+ <Border Grid.Row="1" Margin="0,12,0,12" Style="{StaticResource DuckToolbarSurfaceStyle}">+ <StackPanel><ui:HyperlinkButtonContent="{ext:Loc Key=LegalDialog.Link.TermsOfService}"Icon="{ui:SymbolIcon DocumentText24}"@@ -58,6 +59,7 @@NavigateUri="https://github.com/itsfatduck/optimizerDuck/blob/master/DISCLAIMER.md"/></StackPanel>+ </Border><ui:InfoBarTitle="{ext:Loc Key=LegalDialog.Warning.Title}"diff --git a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xamlindex 4f94727..7b7068f 100644--- a/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml+++ b/optimizerDuck/UI/Dialogs/OptimizationDetailsDialog.xaml@@ -16,9 +16,9 @@Margin="0,0,0,12"Padding="16"Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"><Grid RowDefinitions="Auto,Auto,Auto,Auto"><ui:TextBlock@@ -53,9 +53,9 @@<ui:VirtualizingItemsControl.ItemTemplate><DataTemplate><Border- Padding="6,3"+ Padding="6,2"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"><StackPanel Orientation="Horizontal"><ui:SymbolIcon@@ -76,7 +76,7 @@</ui:VirtualizingItemsControl><Grid Grid.Row="3" Margin="0,4,0,0" ColumnDefinitions="Auto,Auto,*">- <Border Padding="6,4" HorizontalAlignment="Left" CornerRadius="5">+ <Border Padding="6,4" HorizontalAlignment="Left" CornerRadius="{StaticResource DuckCornerRadiusSmall}"><Border.Style><Style TargetType="Border"><Setter@@ -126,7 +126,7 @@Padding="6,4"HorizontalAlignment="Left"Background="{DynamicResource CardBackgroundDisabled}"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"ToolTip="{Binding Optimization.State.AppliedAt}"ToolTipService.InitialShowDelay="150"ToolTipService.Placement="Top"@@ -149,9 +149,9 @@Margin="0,0,0,12"Padding="16"Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"><StackPanel><ui:TextBlock@@ -172,9 +172,9 @@Margin="0,0,0,12"Padding="0"Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"><StackPanel><Grid Margin="16">diff --git a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xamlindex 8482be4..4138745 100644--- a/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml+++ b/optimizerDuck/UI/Dialogs/OptimizationResultDialog.xaml@@ -18,7 +18,7 @@x:Key="NullToVisibilityConverter"/></UserControl.Resources>- <StackPanel>+ <StackPanel MinWidth="560"><!-- Header with failed count summary --><StackPanel Orientation="Horizontal" Margin="0,0,0,4"><ui:SymbolIcon@@ -102,7 +102,7 @@<BorderBorderBrush="{DynamicResource SystemFillColorCriticalBrush}"BorderThickness="1"- CornerRadius="6"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"HorizontalAlignment="Left"Margin="0,4,0,0"Padding="8,6"diff --git a/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml b/optimizerDuck/UI/Dialogs/ProcessingDialog.xamlindex 3dc240f..c6e7139 100644--- a/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ProcessingDialog.xaml@@ -4,28 +4,43 @@mc:Ignorable="d"x:Class="optimizerDuck.UI.Dialogs.ProcessingDialog"xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ 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">- <StackPanel>- <TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" Text="{Binding Message}" />+ <UserControl.Resources>+ <converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />+ </UserControl.Resources>++ <StackPanel MinWidth="420">+ <ui:TextBlock+ HorizontalAlignment="Center"+ Margin="0,0,0,12"+ FontTypography="BodyStrong"+ Text="{Binding Message}"+ TextAlignment="Center"+ TextWrapping="Wrap" /><ProgressBar+ Height="6"IsIndeterminate="{Binding IsIndeterminate}"Maximum="{Binding Total}"Minimum="0"Value="{Binding Value}"+ Visibility="{Binding Total, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}"/><ui:TextBlock- FontTypography="Body"+ FontTypography="Caption"Foreground="{DynamicResource SystemFillColorCriticalBrush}"HorizontalAlignment="Center"- Margin="0,25,0,0"+ Margin="0,16,0,0"Text="{extensions:Loc ProcessingOptimizationDialog.Warning.DontCloseAppOrRestart}"+ TextAlignment="Center"+ TextWrapping="Wrap"/></StackPanel></UserControl>diff --git a/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml b/optimizerDuck/UI/Dialogs/RestorePointDialog.xamlindex 70fa4c9..eee8310 100644--- a/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml+++ b/optimizerDuck/UI/Dialogs/RestorePointDialog.xaml@@ -10,11 +10,13 @@xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">- <Grid>- <StackPanel>- <ui:SymbolIcon FontSize="48" Symbol="DatabaseLightning20" />+ <Grid Style="{StaticResource DuckDialogRootStyle}">+ <StackPanel Style="{StaticResource DuckDialogContentStackStyle}">+ <ui:SymbolIcon+ Style="{StaticResource DuckDialogIconStyle}"+ Symbol="DatabaseLightning20" /><ui:TextBlock- FontTypography="Body"+ FontTypography="BodyStrong"HorizontalAlignment="Center"Text="{ext:Loc RestorePointDialog.Description}"TextAlignment="Center"@@ -24,7 +26,7 @@<ui:InfoBarIsClosable="False"IsOpen="True"- Margin="0,15,0,0"+ Margin="0,16,0,0"Message="{ext:Loc RestorePointDialog.Help}"Severity="Success"/>diff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xamlindex 4ec61d3..411dd0b 100644--- a/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskCreateDialog.xaml@@ -10,7 +10,7 @@xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">- <Grid MinWidth="480">+ <Grid MinWidth="560"><Grid.RowDefinitions><RowDefinition Height="Auto" /><RowDefinition Height="Auto" />@@ -89,9 +89,11 @@/><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="4"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"+ BorderThickness="1"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"Margin="0,0,0,12"- Padding="12"+ Padding="{StaticResource DuckCardPadding}"><StackPanel><CheckBox@@ -137,9 +139,11 @@<ui:TextBlock FontTypography="Caption" Margin="0,0,0,4" Text="Settings" /><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="4"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"+ BorderThickness="1"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"Margin="0,0,0,12"- Padding="12"+ Padding="{StaticResource DuckCardPadding}"><StackPanel><CheckBoxdiff --git a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xamlindex 04e5618..066fafe 100644--- a/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml+++ b/optimizerDuck/UI/Dialogs/ScheduledTaskDetailsDialog.xaml@@ -14,11 +14,11 @@<StackPanel MinWidth="620" x:Name="RootPanel"><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"Margin="0,0,0,12"- Padding="16,12"+ Padding="{StaticResource DuckCardPadding}"><Grid><Grid.ColumnDefinitions>@@ -137,9 +137,9 @@<BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"Margin="0,0,0,12"Padding="0">@@ -234,9 +234,9 @@<BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"Padding="0"><StackPanel>diff --git a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xamlindex ec6a876..6e47187 100644--- a/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml+++ b/optimizerDuck/UI/Dialogs/StartupTaskDetailsPanel.xaml@@ -14,11 +14,11 @@<StackPanel MinWidth="540"><BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"Margin="0,0,0,12"- Padding="16,12"+ Padding="{StaticResource DuckCardPadding}"><Grid><Grid.ColumnDefinitions>@@ -130,9 +130,9 @@<BorderBackground="{DynamicResource CardBackgroundFillColorDefaultBrush}"- BorderBrush="{DynamicResource CardBorderBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="8"+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"Padding="0"><StackPanel>diff --git a/optimizerDuck/UI/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/BloatwarePage.xamlindex 2db661b..d722540 100644--- a/optimizerDuck/UI/Pages/BloatwarePage.xaml+++ b/optimizerDuck/UI/Pages/BloatwarePage.xaml@@ -10,13 +10,12 @@xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"Title="BloatwarePage"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"d:DataContext="{d:DesignInstance local:BloatwarePage}"d:DesignHeight="1200"d:DesignWidth="800"ui:Design.Background="Black"ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"ScrollViewer.CanContentScroll="False"mc:Ignorable="d">@@ -27,18 +26,14 @@</Page.Resources><Grid RowDefinitions="Auto *">- <StackPanel Margin="0,0,0,20">+ <StackPanel Style="{StaticResource DuckPageHeaderStyle}"><ui:TextBlock- FontTypography="Title"+ Style="{StaticResource DuckPageTitleStyle}"Text="{ext:Loc Bloatware.Header.Title}"- TextWrapping="Wrap"/><ui:TextBlock- Margin="0,4,0,0"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- FontTypography="Body"+ Style="{StaticResource DuckPageDescriptionStyle}"Text="{ext:Loc Bloatware.Header.Description}"- TextWrapping="Wrap"/></StackPanel>@@ -59,12 +54,9 @@</Style></Border.Style>- <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">+ <StackPanel Style="{StaticResource DuckEmptyStatePanelStyle}"><ui:SymbolIcon- Margin="0,0,0,15"- HorizontalAlignment="Center"- FontSize="46"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Style="{StaticResource DuckEmptyStateIconStyle}"Symbol="DeleteOff24"/><ui:TextBlock@@ -73,10 +65,9 @@Text="{ext:Loc Bloatware.Empty.Title}"/><ui:TextBlock- Margin="0,0,0,10"+ Margin="0,4,0,16"HorizontalAlignment="Center"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- FontTypography="Body"+ Style="{StaticResource DuckSecondaryTextStyle}"Text="{ext:Loc Bloatware.Empty.Description}"/><ui:Button@@ -121,26 +112,22 @@<BorderGrid.Row="1"- CornerRadius="6"Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"><Grid RowDefinitions="Auto,Auto,*"><!-- Search / Filter / Sort toolbar -->- <WrapPanel Grid.Row="0" Margin="0,0,0,5" Orientation="Horizontal">+ <Border Grid.Row="0" Style="{StaticResource DuckToolbarSurfaceStyle}">+ <WrapPanel Orientation="Horizontal"><!-- Search --><ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"+ Style="{StaticResource DuckSearchBoxStyle}"PlaceholderText="{ext:Loc Common.Search.Placeholder}"Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"/><!-- Filter by Risk --><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"ToolTip="{ext:Loc Common.Filter}"ToolTipService.BetweenShowDelay="160"@@ -191,8 +178,7 @@</ComboBox><!-- Sort By --><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"ToolTip="{ext:Loc Common.SortBy}"ToolTipService.BetweenShowDelay="160"@@ -242,9 +228,10 @@</ComboBoxItem></ComboBox></WrapPanel>+ </Border><!-- Action buttons -->- <StackPanel Grid.Row="1" Margin="0,0,0,8" Orientation="Horizontal">+ <StackPanel Grid.Row="1" Margin="0,0,0,12" Orientation="Horizontal"><ui:ButtonAppearance="Danger"Command="{Binding ViewModel.RemoveSelectedCommand}"@@ -255,7 +242,7 @@/><Separator- Margin="3,0,3,0"+ Margin="8,0,8,0"Visibility="{Binding ViewModel.HasSafePackages, Converter={StaticResource BooleanToVisibilityConverter}}"/>@@ -302,7 +289,7 @@</ui:Button.Style></ui:Button>- <Separator Margin="3,0,3,0" />+ <Separator Margin="8,0,8,0" /><ui:ButtonAppearance="Primary"@@ -316,15 +303,11 @@<!-- No search results --><StackPanelGrid.Row="2"- HorizontalAlignment="Center"- VerticalAlignment="Center"+ Style="{StaticResource DuckEmptyStatePanelStyle}"Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}"><ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"- FontSize="36"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Style="{StaticResource DuckEmptyStateIconStyle}"Symbol="SearchInfo24"/><ui:TextBlock@@ -358,10 +341,7 @@<ItemsControl.ItemTemplate><DataTemplate DataType="{x:Type bloatware1:AppXPackage}"><Border- Margin="0,0,16,4"- Padding="12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"+ Style="{StaticResource DuckListRowStyle}"><Grid><Grid.ColumnDefinitions>@@ -401,12 +381,12 @@/><Border- Margin="5,0,0,0"+ Margin="8,0,0,0"Padding="4,1"HorizontalAlignment="Left"VerticalAlignment="Center"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"><!-- Version --><ui:TextBlock@@ -418,10 +398,10 @@</Border><Border- Margin="5,0,0,0"- Padding="4,2"+ Margin="8,0,0,0"+ Padding="6,2"HorizontalAlignment="Left"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}"><Border.Style>@@ -445,7 +425,7 @@</Border.Style><StackPanel Orientation="Horizontal"><ui:SymbolIcon- Margin="0,0,5,0"+ Margin="0,0,8,0"Foreground="{DynamicResource TextFillColorInverseBrush}"Symbol="{Binding RiskVisual.Icon}"/>diff --git a/optimizerDuck/UI/Pages/DashboardPage.xaml b/optimizerDuck/UI/Pages/DashboardPage.xamlindex 0ae3e3e..37f239b 100644--- a/optimizerDuck/UI/Pages/DashboardPage.xaml+++ b/optimizerDuck/UI/Pages/DashboardPage.xaml@@ -1,6 +1,5 @@<Page- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"ScrollViewer.CanContentScroll="False"Title="Dashboard"d:DataContext="{d:DesignInstance pages:DashboardPage}"@@ -51,60 +50,44 @@</Grid><!-- Header -->- <StackPanel Margin="0,0,0,20">+ <StackPanel Style="{StaticResource DuckPageHeaderStyle}"><ui:InfoBarIsOpen="{Binding ViewModel.IsUpdateInfoOpen, Mode=TwoWay}"- Margin="0,0,0,10"+ Margin="0,0,0,12"Message="{ext:Loc Dashboard.UpdateInfoBar.Message,{Binding ViewModel.LatestVersion}}"Severity="Warning"/><Grid ColumnDefinitions="*,Auto"><ui:TextBlock- FontTypography="Title"+ Style="{StaticResource DuckPageTitleStyle}"Text="{ext:Loc Dashboard.Header.Title}"- TextWrapping="Wrap"/>- <Menu Grid.Column="1">- <ui:MenuItem Header="{ext:Loc Dashboard.Header.Menu.Header.Options}">- <ui:MenuItem- Header="{ext:Loc Dashboard.Header.Menu.Header.Run}"- Icon="{ui:SymbolIcon Apps24}"- >- <ui:MenuItem- Command="{Binding ViewModel.RunCommand}"- CommandParameter="Settings"- Header="{ext:Loc Dashboard.Header.Menu.RunSettings}"- />- <ui:MenuItem- Command="{Binding ViewModel.RunCommand}"- CommandParameter="TaskManager"- Header="{ext:Loc Dashboard.Header.Menu.RunTaskManager}"- />- <ui:MenuItem- Command="{Binding ViewModel.RunCommand}"- CommandParameter="ControlPanel"- Header="{ext:Loc Dashboard.Header.Menu.RunControlPanel}"- />- </ui:MenuItem>- <Separator />- <ui:MenuItem- Command="{Binding ViewModel.RefreshCommand}"- Header="{ext:Loc Dashboard.Header.Menu.Refresh}"- Icon="{ui:SymbolIcon ArrowClockwise24}"- />- </ui:MenuItem>- </Menu>+ <WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">+ <ui:Button+ Margin="0,0,8,0"+ Appearance="Secondary"+ Command="{Binding ViewModel.RunCommand}"+ CommandParameter="TaskManager"+ Content="{ext:Loc Dashboard.Header.Menu.RunTaskManager}"+ Icon="{ui:SymbolIcon Apps24}" />+ <ui:Button+ Appearance="Primary"+ Command="{Binding ViewModel.RefreshCommand}"+ Content="{ext:Loc Dashboard.Header.Menu.Refresh}"+ Icon="{ui:SymbolIcon ArrowClockwise24}" />+ </WrapPanel></Grid></StackPanel><!-- Action Cards -->- <UniformGrid Columns="3" Grid.Row="1" Margin="0,0,0,20">+ <UniformGrid Columns="3" Grid.Row="1" Margin="0,0,0,24"><ui:CardActionCommand="{Binding ViewModel.OpenActionCommand}"CommandParameter="Discord"- Margin="0,0,5,0"+ Margin="0,0,12,0"+ Padding="16,14"VerticalAlignment="Stretch"><ui:CardAction.Icon>@@ -130,7 +113,8 @@<ui:CardActionCommand="{Binding ViewModel.OpenActionCommand}"CommandParameter="GitHub"- Margin="5,0,5,0"+ Margin="0,0,12,0"+ Padding="16,14"VerticalAlignment="Stretch"><ui:CardAction.Icon>@@ -157,7 +141,8 @@BorderThickness="1"Command="{Binding ViewModel.OpenActionCommand}"CommandParameter="Contribute"- Margin="5,0,0,0"+ Margin="0"+ Padding="16,14"VerticalAlignment="Stretch"><ui:CardAction.Icon>@@ -186,7 +171,7 @@<ScrollViewerGrid.Row="2"HorizontalScrollBarVisibility="Disabled"- Padding="20,0"+ Padding="0"VerticalScrollBarVisibility="Auto"><StackPanel>@@ -195,7 +180,7 @@<!-- Operating System --><ui:CardControlIcon="{ui:SymbolIcon Tv24}"- Margin="0,0,5,5"+ Margin="0,0,12,12"VerticalAlignment="Stretch"><ui:CardControl.Header>@@ -223,9 +208,9 @@<WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal"><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlockFontTypography="Caption"@@ -234,9 +219,9 @@</Border><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlockFontTypography="Caption"@@ -245,9 +230,9 @@</Border><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlockFontTypography="Caption"@@ -262,7 +247,7 @@<!-- CPU --><ui:CardControlIcon="{ui:SymbolIcon DeveloperBoard24}"- Margin="5,0,0,5"+ Margin="0,0,0,12"VerticalAlignment="Stretch"><ui:CardControl.Header>@@ -293,9 +278,9 @@<WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal"><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlock FontTypography="Caption"><Run Text="{Binding ViewModel.SystemInfo.Cpu.CurrentClockMHz}" />@@ -304,9 +289,9 @@</Border><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlock FontTypography="Caption"><Run Text="L2:" />@@ -316,9 +301,9 @@</Border><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlock FontTypography="Caption"><Run Text="L3:" />@@ -334,7 +319,7 @@<!-- RAM --><ui:CardControlIcon="{ui:SymbolIcon Memory16}"- Margin="0,5,5,0"+ Margin="0,0,12,0"VerticalAlignment="Stretch"><ui:CardControl.Header>@@ -371,8 +356,8 @@<WrapPanel Grid.Row="2" Margin="0,8,0,0" Orientation="Horizontal"><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"- Padding="6,3"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"+ Padding="6,2"><ui:TextBlock FontTypography="Caption"><Run Text="{ext:Loc Dashboard.SystemInfo.Ram.Modules, {Binding ViewModel.RuntimeRam.Modules.Count, Mode=OneWay}}" />@@ -386,7 +371,7 @@<!-- GPU --><ui:CardControlIcon="{ui:SymbolIcon NetworkAdapter16}"- Margin="5,5,0,0"+ Margin="0"VerticalAlignment="Stretch"><ui:CardControl.Header>@@ -412,9 +397,9 @@<WrapPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal"><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlock FontTypography="Caption"><Run Text="{Binding ViewModel.SystemInfo.PrimaryGpu.MemoryMB, Converter={StaticResource MBToGBConverter}}" />@@ -423,9 +408,9 @@</Border><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"><ui:TextBlockFontTypography="Caption"@@ -435,9 +420,9 @@</Border><BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,4"- Padding="6,3"+ Padding="6,2"Visibility="{Binding ViewModel.SystemInfo.Gpus.Count, Converter={StaticResource GreaterThanOneToVisibilityConverter}}"><ui:TextBlock FontTypography="Caption">@@ -493,20 +478,20 @@<StackPanel Grid.Row="0" Orientation="Horizontal"><ui:TextBlockFontTypography="BodyStrong"- Margin="0,0,5,0"+ Margin="0,0,8,0"Text="{Binding DriveLetter, StringFormat='({0})'}"/><ui:TextBlockFontTypography="Caption"- Margin="0,0,5,0"+ Margin="0,0,8,0"Text="{Binding VolumeLabel}"VerticalAlignment="Center"/><BorderBackground="{DynamicResource SystemFillColorAttentionBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,0"Padding="5,2"VerticalAlignment="Center"@@ -521,7 +506,7 @@<BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Margin="0,0,4,0"Padding="5,2"VerticalAlignment="Center"@@ -559,7 +544,7 @@<BorderBackground="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="4"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"Padding="5,2"VerticalAlignment="Center">diff --git a/optimizerDuck/UI/Pages/DiskCleanupPage.xaml b/optimizerDuck/UI/Pages/DiskCleanupPage.xamlindex 8c0d37d..189575d 100644--- a/optimizerDuck/UI/Pages/DiskCleanupPage.xaml+++ b/optimizerDuck/UI/Pages/DiskCleanupPage.xaml@@ -10,13 +10,12 @@xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"Title="DiskCleanupPage"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"d:DataContext="{d:DesignInstance local:DiskCleanupPage}"d:DesignHeight="1200"d:DesignWidth="800"ui:Design.Background="Black"ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"ScrollViewer.CanContentScroll="False"mc:Ignorable="d"><Page.Resources>@@ -27,16 +26,6 @@True="Collapsed" /><converters:SizeToBrushConverter x:Key="SizeToBrushConverter" />- <!-- Modern Card Style -->- <Style x:Key="CleanupItemCardStyle" TargetType="Border">- <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />- <Setter Property="CornerRadius" Value="8" />- <Setter Property="Padding" Value="16,12" />- <Setter Property="Margin" Value="0,0,0,6" />- <Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />- <Setter Property="BorderThickness" Value="1" />- </Style>-<!-- Clickable Name Style --><Stylex:Key="ClickableNameStyle"@@ -62,17 +51,15 @@<Grid RowDefinitions="Auto,*"><!-- Header -->- <StackPanel Margin="0,0,0,20">+ <StackPanel Style="{StaticResource DuckPageHeaderStyle}"><ui:TextBlock- FontTypography="Title"+ Style="{StaticResource DuckPageTitleStyle}"Text="{ext:Loc DiskCleanup.Header.Title}"- TextWrapping="Wrap" />+ /><ui:TextBlock- Margin="0,4,0,0"- FontTypography="Body"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Style="{StaticResource DuckPageDescriptionStyle}"Text="{ext:Loc DiskCleanup.Header.Description}"- TextWrapping="Wrap" />+ /></StackPanel><!-- Loading State -->@@ -102,11 +89,7 @@RowDefinitions="Auto,*"Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}"><!-- Toolbar Card -->- <Border- Margin="0,0,0,12"- Padding="16"- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="8">+ <Border Style="{StaticResource DuckToolbarSurfaceStyle}"><Grid ColumnDefinitions="Auto,*,Auto"><!-- Summary Info --><StackPanel Grid.Column="0" VerticalAlignment="Center">@@ -128,8 +111,7 @@Orientation="Horizontal"><!-- Sort Dropdown --><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"ToolTip="{ext:Loc Common.SortBy}"><ComboBoxItem HorizontalContentAlignment="Left">@@ -206,7 +188,7 @@<ItemsControl.ItemTemplate><DataTemplate DataType="{x:Type cleanup1:CleanupItem}">- <Border Style="{StaticResource CleanupItemCardStyle}">+ <Border Style="{StaticResource DuckListRowStyle}"><Grid><Grid.ColumnDefinitions><ColumnDefinition Width="Auto" />@@ -251,7 +233,7 @@<StackPanel Orientation="Horizontal"><TextBlock- Margin="0,0,5,0"+ Margin="0,0,8,0"VerticalAlignment="Center"Text="{Binding Name}" /><ui:SymbolIcon@@ -284,7 +266,7 @@<BorderMargin="0,6,0,0"HorizontalAlignment="Left"- CornerRadius="6">+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"><Border.Style><Style TargetType="Border"><Setter Property="Padding" Value="8,3" />diff --git a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xamlindex 7208a1b..988dec7 100644--- a/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml+++ b/optimizerDuck/UI/Pages/Features/Categories/FeatureCategoryPage.xaml@@ -9,13 +9,12 @@xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"Title="{Binding ViewModel.CategoryName}"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"d:DataContext="{d:DesignInstance features:FeatureCategoryPage}"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>@@ -29,40 +28,37 @@<RowDefinition Height="*" /></Grid.RowDefinitions>- <StackPanel Grid.Row="0" Margin="0,0,0,16">+ <StackPanel Grid.Row="0" Style="{StaticResource DuckPageHeaderStyle}"><StackPanel Margin="0,0,0,8" Orientation="Horizontal"><ui:SymbolIconMargin="0,0,12,0"VerticalAlignment="Center"FontSize="24"+ Foreground="{DynamicResource DuckAccentYellowBrush}"Symbol="{Binding ViewModel.CategoryIcon}" /><ui:TextBlockVerticalAlignment="Center"- FontTypography="Title"+ Style="{StaticResource DuckPageTitleStyle}"Text="{Binding ViewModel.CategoryName}" /></StackPanel><ui:TextBlock- Foreground="{DynamicResource TextFillColorSecondaryBrush}"+ Style="{StaticResource DuckPageDescriptionStyle}"Text="{Binding ViewModel.CategoryDescription}"- TextWrapping="Wrap" />+ Margin="0" /></StackPanel>- <WrapPanel+ <BorderGrid.Row="1"- Margin="0,0,0,16"- Orientation="Horizontal">+ Style="{StaticResource DuckToolbarSurfaceStyle}">+ <WrapPanel Orientation="Horizontal"><ui:TextBox- MinWidth="200"- Margin="0,0,8,0"+ Style="{StaticResource DuckSearchBoxStyle}"HorizontalAlignment="Left"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"PlaceholderText="{ext:Loc Common.Search.Placeholder}"Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" /><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"ToolTip="{ext:Loc Common.SortBy}"ToolTipService.BetweenShowDelay="160"@@ -93,24 +89,24 @@</ComboBoxItem></ComboBox></WrapPanel>+ </Border><ScrollViewerGrid.Row="2"HorizontalScrollBarVisibility="Disabled"VerticalScrollBarVisibility="Auto"><!-- Sections -->- <ItemsControl Margin="0,0,16,0" ItemsSource="{Binding ViewModel.Sections}">+ <ItemsControl Style="{x:Null}" Margin="0" ItemsSource="{Binding ViewModel.Sections}"><ItemsControl.ItemTemplate><DataTemplate>- <StackPanel Margin="0,0,0,10">+ <StackPanel Margin="0,0,0,20"><ui:TextBlock- Margin="0,0,0,6"- FontTypography="BodyStrong"+ Style="{StaticResource DuckSectionHeaderStyle}"Text="{Binding Name}" /><ItemsControl ItemsSource="{Binding Features}"><ItemsControl.ItemTemplate><DataTemplate>- <ui:CardControl Margin="0,0,0,4">+ <ui:CardControl Margin="0,0,0,8"><ui:CardControl.Icon><ui:SymbolIcon Symbol="{Binding Icon}" /></ui:CardControl.Icon>@@ -134,7 +130,7 @@HorizontalAlignment="Right"Orientation="Horizontal"><ui:ToggleSwitch- VerticalAlignment="Center"+ Style="{StaticResource DuckToggleSwitchStyle}"Command="{Binding ToggleCommand}"Cursor="Hand"IsChecked="{Binding IsEnabled, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"diff --git a/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml b/optimizerDuck/UI/Pages/Features/FeaturesPage.xamlindex 5646601..deed1e0 100644--- a/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml+++ b/optimizerDuck/UI/Pages/Features/FeaturesPage.xaml@@ -1,6 +1,5 @@<Page- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"ScrollViewer.CanContentScroll="False"Title="Features"d:DataContext="{d:DesignInstance pages:FeaturesPage}"@@ -31,19 +30,18 @@<RowDefinition Height="*" /></Grid.RowDefinitions>- <StackPanel Grid.Row="0" Margin="42,0,42,16">- <ui:TextBlock FontTypography="Title" Margin="0,0,0,8" Text="{ext:Loc Features.Title}" />+ <StackPanel Grid.Row="0" Style="{StaticResource DuckPageHeaderStyle}">+ <ui:TextBlock Style="{StaticResource DuckPageTitleStyle}" Text="{ext:Loc Features.Title}" /><ui:TextBlock- Appearance="Secondary"+ Style="{StaticResource DuckPageDescriptionStyle}"Text="{ext:Loc Features.Description}"- TextWrapping="Wrap"/></StackPanel><ui:VirtualizingItemsControlGrid.Row="1"ItemsSource="{Binding ViewModel.Categories}"- Margin="42,0,42,0"+ Margin="0"><ui:VirtualizingItemsControl.Template><ControlTemplate TargetType="ItemsControl">@@ -67,7 +65,7 @@<ui:VirtualizingItemsControl.ItemContainerStyle><Style TargetType="ContentPresenter">- <Setter Property="Margin" Value="5" />+ <Setter Property="Margin" Value="0,0,12,12" /><Setter Property="HorizontalAlignment" Value="Stretch" /></Style></ui:VirtualizingItemsControl.ItemContainerStyle>@@ -78,7 +76,7 @@Command="{Binding DataContext.ViewModel.NavigateToCategoryCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"IsChevronVisible="False"- Padding="20,16"+ Padding="20,18"><Grid RowDefinitions="Auto,Auto,Auto"><ui:SymbolIcon@@ -86,6 +84,7 @@Grid.Row="0"HorizontalAlignment="Left"Margin="0,0,0,12"+ Foreground="{DynamicResource DuckAccentYellowBrush}"Symbol="{Binding Icon}"/>diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xamlindex ebf8d95..2b5b742 100644--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml@@ -10,13 +10,12 @@xmlns:optimizations="clr-namespace:optimizerDuck.UI.Pages.Optimizations"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"Title="OptimizationPage"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"d:DesignHeight="650"d:DesignWidth="800"ui:Design.Background="Black"ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"ScrollViewer.CanContentScroll="False"mc:Ignorable="d"><Page.Resources>@@ -38,24 +37,19 @@<!-- Main Content --><Grid RowDefinitions="Auto,*" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}"><!-- Toolbar -->+ <Border Grid.Row="0" Style="{StaticResource DuckToolbarSurfaceStyle}"><WrapPanel- Grid.Row="0"- Margin="5,0,5,10"VerticalAlignment="Center"Orientation="Horizontal"><!-- Search --><ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"+ Style="{StaticResource DuckSearchBoxStyle}"PlaceholderText="{ext:Loc Common.Search.Placeholder}"Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" /><!-- Filter by Risk --><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"ToolTip="{ext:Loc Common.Filter}"ToolTipService.BetweenShowDelay="160"@@ -103,8 +97,7 @@<!-- Sort By --><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"ToolTip="{ext:Loc Common.SortBy}"ToolTipService.BetweenShowDelay="160"@@ -172,6 +165,7 @@</StackPanel></ToggleButton></WrapPanel>+ </Border><!-- No search results --><StackPanel@@ -200,7 +194,7 @@<ui:VirtualizingItemsControl.Template><ControlTemplate TargetType="ItemsControl"><ScrollViewer HorizontalScrollBarVisibility="Disabled">- <ItemsPresenter Margin="0,0,7,0" />+ <ItemsPresenter /></ScrollViewer></ControlTemplate></ui:VirtualizingItemsControl.Template>@@ -211,7 +205,7 @@</ui:VirtualizingItemsControl.ItemsPanel><ui:VirtualizingItemsControl.ItemContainerStyle><Style TargetType="ContentPresenter">- <Setter Property="Margin" Value="5" />+ <Setter Property="Margin" Value="0,0,12,12" /><Setter Property="HorizontalAlignment" Value="Stretch" /></Style></ui:VirtualizingItemsControl.ItemContainerStyle>@@ -219,11 +213,11 @@<ui:VirtualizingItemsControl.ItemTemplate><DataTemplate DataType="{x:Type optimization:BaseOptimization}"><Border- Padding="20,10"- Background="{DynamicResource CardBackground}"- BorderBrush="{DynamicResource CardBorderBrush}"+ Padding="20,14"+ Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"+ BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"BorderThickness="1"- CornerRadius="5">+ CornerRadius="{StaticResource DuckCornerRadiusMedium}"><Grid RowDefinitions="Auto,Auto,Auto,Auto,*"><ui:TextBlockGrid.Row="0"@@ -255,13 +249,13 @@<ui:VirtualizingItemsControl.ItemTemplate><DataTemplate><Border- Padding="4,2"+ Padding="6,2"HorizontalAlignment="Left"Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"- CornerRadius="5">+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"><StackPanel Orientation="Horizontal"><ui:SymbolIcon- Margin="0,0,5,0"+ Margin="0,0,6,0"Foreground="{DynamicResource TextFillColorSecondaryBrush}"Symbol="{Binding Icon}" />@@ -293,9 +287,9 @@ColumnDefinitions="*,Auto"><Grid RowDefinitions="Auto,Auto"><Border- Padding="4,2"+ Padding="6,2"HorizontalAlignment="Left"- CornerRadius="5">+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"><Border.Style><Style TargetType="Border"><Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />@@ -311,7 +305,7 @@</Border.Style><StackPanel Orientation="Horizontal"><ui:SymbolIcon- Margin="0,0,5,0"+ Margin="0,0,6,0"Foreground="{DynamicResource TextFillColorInverseBrush}"Symbol="{Binding RiskVisual.Icon}" />@@ -327,11 +321,11 @@<BorderGrid.Row="1"- Margin="0,5,0,0"- Padding="4,2"+ Margin="0,8,0,0"+ Padding="6,2"HorizontalAlignment="Left"Background="{DynamicResource CardBackgroundDisabled}"- CornerRadius="5"+ CornerRadius="{StaticResource DuckCornerRadiusSmall}"ToolTip="{Binding State.AppliedAt}"ToolTipService.InitialShowDelay="150"ToolTipService.Placement="Top"@@ -354,9 +348,8 @@VerticalAlignment="Bottom"Orientation="Horizontal"><ui:ToggleSwitch- Margin="0,0,5,0"+ Style="{StaticResource DuckToggleSwitchStyle}"HorizontalAlignment="Right"- VerticalAlignment="Center"Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"Cursor="Hand"diff --git a/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xamlindex ba94ebc..f12d1e8 100644--- a/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml+++ b/optimizerDuck/UI/Pages/Optimize/OptimizePage.xaml@@ -1,6 +1,5 @@<Page- Foreground="{DynamicResource TextFillColorPrimaryBrush}"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"ScrollViewer.CanContentScroll="False"Title="OptimizerPage"d:DataContext="{d:DesignInstance pages:OptimizePage}"@@ -26,7 +25,7 @@IsTopSeparatorVisible="False"Margin="0"MenuItemsSource="{Binding ViewModel.OptimizationCategories}"- Padding="42,0,42,0"+ Padding="0"PaneDisplayMode="Top"x:Name="RootNavigation"/>diff --git a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml b/optimizerDuck/UI/Pages/ScheduledTasksPage.xamlindex 9ce3a04..56964e7 100644--- a/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml+++ b/optimizerDuck/UI/Pages/ScheduledTasksPage.xaml@@ -10,13 +10,12 @@xmlns:scheduledTask="clr-namespace:optimizerDuck.Domain.Optimizations.Models.ScheduledTask"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"Title="ScheduledTasksPage"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"d:DataContext="{d:DesignInstance local:ScheduledTasksPage}"d:DesignHeight="1200"d:DesignWidth="800"ui:Design.Background="Black"ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"ScrollViewer.CanContentScroll="False"mc:Ignorable="d">@@ -29,7 +28,7 @@<Grid RowDefinitions="Auto, *"><!-- Header -->- <StackPanel Margin="0,0,0,20">+ <StackPanel Style="{StaticResource DuckPageHeaderStyle}"><Grid><Grid.ColumnDefinitions><ColumnDefinition Width="*" />@@ -37,15 +36,12 @@</Grid.ColumnDefinitions><StackPanel Grid.Column="0"><ui:TextBlock- FontTypography="Title"+ Style="{StaticResource DuckPageTitleStyle}"Text="{ext:Loc ScheduledTasks.Header.Title}"/><ui:TextBlock- Margin="0,4,0,0"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- FontTypography="Body"+ Style="{StaticResource DuckPageDescriptionStyle}"Text="{ext:Loc ScheduledTasks.Header.Description}"- TextWrapping="Wrap"/></StackPanel><WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">@@ -122,21 +118,18 @@<RowDefinition Height="*" /></Grid.RowDefinitions><!-- Toolbar -->- <WrapPanel Grid.Row="0" Margin="0,0,16,12" Orientation="Horizontal">+ <Border Grid.Row="0" Style="{StaticResource DuckToolbarSurfaceStyle}">+ <WrapPanel Orientation="Horizontal"><!-- Search --><ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"+ Style="{StaticResource DuckSearchBoxStyle}"PlaceholderText="{ext:Loc Common.Search.Placeholder}"Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"/><!-- Sort By --><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.SortByIndex}"ToolTip="{ext:Loc Common.SortBy}">@@ -200,34 +193,27 @@<!-- Hide Microsoft --><ui:ToggleSwitch- Margin="0,0,8,0"- VerticalAlignment="Center"- Cursor="Hand"+ Style="{StaticResource DuckToggleSwitchStyle}"IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"OffContent="{ext:Loc ScheduledTasks.HideMicrosoft}"OnContent="{ext:Loc ScheduledTasks.HideMicrosoft}"/></WrapPanel>+ </Border><!-- No search results --><StackPanelGrid.Row="1"- Margin="0,64,0,32"- HorizontalAlignment="Center"- VerticalAlignment="Top"+ Style="{StaticResource DuckEmptyStatePanelStyle}"Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource ZeroToVisibilityConverter}}"><ui:SymbolIcon- Margin="0,0,0,10"- HorizontalAlignment="Center"- FontSize="36"- Foreground="{DynamicResource SystemFillColorCriticalBrush}"+ Style="{StaticResource DuckEmptyStateIconStyle}"Symbol="SearchInfo24"/><ui:TextBlockHorizontalAlignment="Center"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- FontTypography="Body"+ Style="{StaticResource DuckSecondaryTextStyle}"Text="{ext:Loc Bloatware.Search.NoResults}"/></StackPanel>@@ -241,10 +227,7 @@<ItemsControl.ItemTemplate><DataTemplate DataType="{x:Type scheduledTask:ScheduledTaskModel}"><Border- Margin="0,0,16,6"- Padding="16,12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"+ Style="{StaticResource DuckListRowStyle}"><Grid><Grid.ColumnDefinitions>@@ -522,8 +505,7 @@ToolTip="{ext:Loc ScheduledTasks.Action.Delete}"/><ui:ToggleSwitch- VerticalAlignment="Center"- Cursor="Hand"+ Style="{StaticResource DuckToggleSwitchStyle}"IsChecked="{Binding IsEnabled, Mode=TwoWay}"OffContent="{ext:Loc Common.Toggle.Off}"OnContent="{ext:Loc Common.Toggle.On}"diff --git a/optimizerDuck/UI/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/SettingsPage.xamlindex a068706..6fb8246 100644--- a/optimizerDuck/UI/Pages/SettingsPage.xaml+++ b/optimizerDuck/UI/Pages/SettingsPage.xaml@@ -9,13 +9,12 @@xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"Title="SettingsPage"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"d:DataContext="{d:DesignInstance pages:SettingsPage}"d:DesignHeight="1200"d:DesignWidth="800"ui:Design.Background="Black"ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"mc:Ignorable="d"><Page.Resources>@@ -24,24 +23,21 @@<StackPanel><ui:TextBlock- FontTypography="Title"+ Style="{StaticResource DuckPageTitleStyle}"Text="{ext:Loc Settings.Header.Title}"- TextWrapping="Wrap"/>- <StackPanel Margin="0,20,0,0">+ <StackPanel Style="{StaticResource DuckSettingsSectionStyle}"><ui:TextBlock- FontTypography="BodyStrong"+ Style="{StaticResource DuckSectionHeaderStyle}"Text="{ext:Loc Settings.Appearance.Header}"- TextWrapping="Wrap"/>- <ui:CardControl Icon="{ui:SymbolIcon Globe24}">+ <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon Globe24}"><ui:CardControl.Header><StackPanel><ui:TextBlockMargin="0"FontTypography="BodyStrong"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"Text="{ext:Loc Settings.Appearance.LanguageSelector.Title}"TextWrapping="Wrap"/>@@ -59,12 +55,11 @@SelectedValuePath="Culture.Name"/></ui:CardControl>- <ui:CardControl Icon="{ui:SymbolIcon Color24}">+ <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon Color24}"><ui:CardControl.Header><StackPanel><ui:TextBlockMargin="0"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"FontTypography="BodyStrong"Text="{ext:Loc Settings.Appearance.ThemeSelector.Title}"TextWrapping="Wrap"@@ -83,14 +78,13 @@</ComboBox></ui:CardControl>- <StackPanel Margin="0,20,0,0">+ <StackPanel Style="{StaticResource DuckSettingsSectionStyle}"><ui:TextBlock- FontTypography="BodyStrong"+ Style="{StaticResource DuckSectionHeaderStyle}"Text="{ext:Loc Settings.Optimize.Header}"- TextWrapping="Wrap"/>- <ui:CardControl>+ <ui:CardControl Margin="0,0,0,8"><ui:CardControl.Icon><ui:SymbolIconForeground="{DynamicResource SystemFillColorCriticalBrush}"@@ -126,7 +120,7 @@/></ui:CardControl>- <ui:CardControl Icon="{ui:SymbolIcon Alert24}">+ <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon Alert24}"><ui:CardControl.Header><StackPanel><ui:TextBlock@@ -151,14 +145,13 @@</ui:CardControl></StackPanel>- <StackPanel Margin="0,20,0,0">+ <StackPanel Style="{StaticResource DuckSettingsSectionStyle}"><ui:TextBlock- FontTypography="BodyStrong"+ Style="{StaticResource DuckSectionHeaderStyle}"Text="{ext:Loc Settings.Bloatware.Header}"- TextWrapping="Wrap"/>- <ui:CardControl Icon="{ui:SymbolIcon UninstallApp24}">+ <ui:CardControl Margin="0,0,0,8" Icon="{ui:SymbolIcon UninstallApp24}"><ui:CardControl.Header><StackPanel><ui:TextBlock@@ -183,14 +176,13 @@</ui:CardControl></StackPanel>- <StackPanel Margin="0,20,0,0">+ <StackPanel Style="{StaticResource DuckSettingsSectionStyle}"><ui:TextBlock- FontTypography="BodyStrong"+ Style="{StaticResource DuckSectionHeaderStyle}"Text="{ext:Loc Settings.Advanced.Header}"- TextWrapping="Wrap"/>- <ui:CardAction Command="{Binding ViewModel.ClearResourcesCommand}">+ <ui:CardAction Margin="0,0,0,8" Padding="16,14" Command="{Binding ViewModel.ClearResourcesCommand}"><ui:CardAction.Icon><ui:SymbolIconForeground="{DynamicResource SystemFillColorCriticalBrush}"@@ -200,7 +192,6 @@<StackPanel><ui:TextBlockMargin="0"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"FontTypography="BodyStrong"Text="{ext:Loc Settings.Advanced.ClearResources.Title}"TextWrapping="Wrap"@@ -213,7 +204,7 @@</StackPanel></ui:CardAction>- <ui:CardAction Command="{Binding ViewModel.ClearAllRevertDataCommand}">+ <ui:CardAction Margin="0,0,0,8" Padding="16,14" Command="{Binding ViewModel.ClearAllRevertDataCommand}"><ui:CardAction.Icon><ui:SymbolIconForeground="{DynamicResource SystemFillColorCriticalBrush}"@@ -223,7 +214,6 @@<StackPanel><ui:TextBlockMargin="0"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"FontTypography="BodyStrong"Text="{ext:Loc Settings.Advanced.ClearRevertDatas.Title}"TextWrapping="Wrap"@@ -237,6 +227,8 @@</ui:CardAction><ui:CardAction+ Margin="0,0,0,8"+ Padding="16,14"Command="{Binding ViewModel.OpenRootDirCommand}"Icon="{ui:SymbolIcon Folder24}"IsChevronVisible="False"@@ -261,14 +253,15 @@</ui:CardAction></StackPanel>- <StackPanel Margin="0,20,0,0">+ <StackPanel Style="{StaticResource DuckSettingsSectionStyle}"><ui:TextBlock- FontTypography="BodyStrong"+ Style="{StaticResource DuckSectionHeaderStyle}"Text="{ext:Loc Settings.About.Header}"- TextWrapping="Wrap"/><ui:CardAction+ Margin="0,0,0,8"+ Padding="16,14"Command="{Binding ViewModel.OpenWebsiteCommand}"CommandParameter="Web"IsChevronVisible="False"@@ -300,6 +293,8 @@</ui:CardAction><ui:CardAction+ Margin="0,0,0,8"+ Padding="16,14"Command="{Binding ViewModel.OpenWebsiteCommand}"CommandParameter="Help"Icon="{ui:SymbolIcon ChatBubblesQuestion24}"@@ -324,6 +319,8 @@</ui:CardAction><ui:CardAction+ Margin="0,0,0,8"+ Padding="16,14"VerticalAlignment="Stretch"Command="{Binding ViewModel.OpenAcknowledgementsCommand}"IsChevronVisible="False"@@ -352,26 +349,31 @@</ui:CardAction><ui:TextBlock- Margin="0,15,0,0"- FontTypography="Subtitle"+ Margin="0,16,0,8"+ FontTypography="BodyStrong"Text="{ext:Loc Settings.About.LearnMore}"TextTrimming="WordEllipsis"TextWrapping="Wrap"/>- <StackPanel Margin="7,0,0,0">+ <Border Style="{StaticResource DuckToolbarSurfaceStyle}">+ <WrapPanel><ui:HyperlinkButton+ Margin="0,0,8,0"Content="{ext:Loc Settings.About.LearnMore.Website}"NavigateUri="{Binding ViewModel.Website}"/><ui:HyperlinkButton+ Margin="0,0,8,0"Content="{ext:Loc Settings.About.LearnMore.Contribute}"NavigateUri="{Binding ViewModel.Contribute}"/><ui:HyperlinkButton+ Margin="0,0,8,0"Content="{ext:Loc Settings.About.LearnMore.Documentation}"NavigateUri="{Binding ViewModel.Documentation}"/><ui:HyperlinkButton+ Margin="0,0,8,0"Content="{ext:Loc Settings.About.LearnMore.Community}"NavigateUri="{Binding ViewModel.Community}"/>@@ -379,7 +381,8 @@Content="{ext:Loc Settings.About.LearnMore.Acknowledgements}"NavigateUri="{Binding ViewModel.Acknowledgements}"/>- </StackPanel>+ </WrapPanel>+ </Border></StackPanel></StackPanel></StackPanel>diff --git a/optimizerDuck/UI/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Pages/StartupManagerPage.xamlindex eb8728d..fb37155 100644--- a/optimizerDuck/UI/Pages/StartupManagerPage.xaml+++ b/optimizerDuck/UI/Pages/StartupManagerPage.xaml@@ -10,13 +10,12 @@xmlns:startupManager="clr-namespace:optimizerDuck.Domain.Optimizations.Models.StartupManager"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"Title="StartupManagerPage"- Margin="0,32,0,0"+ Style="{StaticResource DuckPageRootStyle}"d:DataContext="{d:DesignInstance local:StartupManagerPage}"d:DesignHeight="1200"d:DesignWidth="800"ui:Design.Background="Black"ui:Design.Foreground="White"- Foreground="{DynamicResource TextFillColorPrimaryBrush}"ScrollViewer.CanContentScroll="False"mc:Ignorable="d">@@ -28,7 +27,7 @@<Grid RowDefinitions="Auto, *"><!-- Header -->- <StackPanel Margin="0,0,0,20">+ <StackPanel Style="{StaticResource DuckPageHeaderStyle}"><Grid><Grid.ColumnDefinitions><ColumnDefinition Width="*" />@@ -36,15 +35,12 @@</Grid.ColumnDefinitions><StackPanel Grid.Column="0"><ui:TextBlock- FontTypography="Title"+ Style="{StaticResource DuckPageTitleStyle}"Text="{ext:Loc StartupManager.Header.Title}"/><ui:TextBlock- Margin="0,4,0,0"- Foreground="{DynamicResource TextFillColorSecondaryBrush}"- FontTypography="Body"+ Style="{StaticResource DuckPageDescriptionStyle}"Text="{ext:Loc StartupManager.Header.Description}"- TextWrapping="Wrap"/></StackPanel><WrapPanel Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">@@ -108,7 +104,7 @@<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"><ui:SymbolIcon- Margin="0,0,0,15"+ Margin="0,0,0,16"HorizontalAlignment="Center"FontSize="46"Foreground="{DynamicResource SystemFillColorCriticalBrush}"@@ -187,18 +183,15 @@<StackPanel><!-- Apps Toolbar -->- <WrapPanel Margin="0,0,0,8" Orientation="Horizontal">+ <Border Style="{StaticResource DuckToolbarSurfaceStyle}">+ <WrapPanel Orientation="Horizontal"><ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"+ Style="{StaticResource DuckSearchBoxStyle}"PlaceholderText="{ext:Loc Common.Search.Placeholder}"Text="{Binding ViewModel.AppSearchText, UpdateSourceTrigger=PropertyChanged}"/><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.AppSortByIndex}"ToolTip="{ext:Loc Common.SortBy}">@@ -264,12 +257,11 @@ToolTip="{ext:Loc StartupManager.Menu.OpenSettings}"/></WrapPanel>+ </Border><!-- No search results (Apps) --><StackPanel- Margin="0,32,0,32"- HorizontalAlignment="Center"- VerticalAlignment="Center"+ Style="{StaticResource DuckEmptyStatePanelStyle}"><StackPanel.Visibility><MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">@@ -302,8 +294,8 @@<Grid><ui:CardActionx:Name="ActionCard"- Margin="0,0,0,4"- Padding="12,10"+ Margin="0,0,0,8"+ Padding="16,12"Command="{Binding DataContext.ViewModel.OpenLocationCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"IsChevronVisible="False"@@ -366,9 +358,7 @@Orientation="Horizontal"><ui:ToggleSwitch- Margin="0,0,16,0"- VerticalAlignment="Center"- Cursor="Hand"+ Style="{StaticResource DuckToggleSwitchStyle}"IsChecked="{Binding IsEnabled, Mode=TwoWay}"OffContent="{ext:Loc Common.Toggle.Off}"OnContent="{ext:Loc Common.Toggle.On}"@@ -430,18 +420,15 @@<StackPanel><!-- Tasks Toolbar -->- <WrapPanel Margin="0,0,0,8" Orientation="Horizontal">+ <Border Style="{StaticResource DuckToolbarSurfaceStyle}">+ <WrapPanel Orientation="Horizontal"><ui:TextBox- MinWidth="200"- Margin="0,0,8,0"- VerticalAlignment="Center"- Icon="{ui:SymbolIcon Search24}"+ Style="{StaticResource DuckSearchBoxStyle}"PlaceholderText="{ext:Loc Common.Search.Placeholder}"Text="{Binding ViewModel.TaskSearchText, UpdateSourceTrigger=PropertyChanged}"/><ComboBox- Margin="0,0,8,0"- VerticalAlignment="Center"+ Style="{StaticResource DuckComboBoxStyle}"SelectedIndex="{Binding ViewModel.TaskSortByIndex}"ToolTip="{ext:Loc Common.SortBy}">@@ -498,9 +485,7 @@</ComboBoxItem></ComboBox><ui:ToggleSwitch- Margin="0,0,8,0"- VerticalAlignment="Center"- Cursor="Hand"+ Style="{StaticResource DuckToggleSwitchStyle}"IsChecked="{Binding ViewModel.HideMicrosoftTasks, Mode=TwoWay}"OffContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"OnContent="{ext:Loc StartupManager.Tasks.HideMicrosoft}"@@ -515,12 +500,11 @@ToolTip="{ext:Loc ScheduledTasks.Menu.OpenSettings}"/></WrapPanel>+ </Border><!-- No search results (Tasks) --><StackPanel- Margin="0,32,0,32"- HorizontalAlignment="Center"- VerticalAlignment="Center"+ Style="{StaticResource DuckEmptyStatePanelStyle}"><StackPanel.Visibility><MultiBinding Converter="{StaticResource EmptyWhileNotLoadingConverter}">@@ -551,10 +535,7 @@<ItemsControl.ItemTemplate><DataTemplate DataType="{x:Type startupManager:StartupTask}"><Border- Margin="0,0,0,6"- Padding="16,12"- Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"- CornerRadius="6"+ Style="{StaticResource DuckListRowStyle}"><Grid><Grid.ColumnDefinitions>@@ -655,8 +636,7 @@ToolTip="{ext:Loc ScheduledTasks.Action.Details}"/><ui:ToggleSwitch- VerticalAlignment="Center"- Cursor="Hand"+ Style="{StaticResource DuckToggleSwitchStyle}"IsChecked="{Binding IsEnabled, Mode=TwoWay}"OffContent="{ext:Loc Common.Toggle.Off}"OnContent="{ext:Loc Common.Toggle.On}"diff --git a/optimizerDuck/UI/Styles/FluentDesign.xaml b/optimizerDuck/UI/Styles/FluentDesign.xamlnew file mode 100644index 0000000..06081ce--- /dev/null+++ b/optimizerDuck/UI/Styles/FluentDesign.xaml@@ -0,0 +1,207 @@+<ResourceDictionary+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:sys="clr-namespace:System;assembly=mscorlib"+ xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">++ <sys:Double x:Key="DuckSpace4">4</sys:Double>+ <sys:Double x:Key="DuckSpace8">8</sys:Double>+ <sys:Double x:Key="DuckSpace12">12</sys:Double>+ <sys:Double x:Key="DuckSpace16">16</sys:Double>+ <sys:Double x:Key="DuckSpace20">20</sys:Double>+ <sys:Double x:Key="DuckSpace24">24</sys:Double>+ <sys:Double x:Key="DuckSpace32">32</sys:Double>+ <sys:Double x:Key="DuckSpace40">40</sys:Double>++ <CornerRadius x:Key="DuckCornerRadiusSmall">4</CornerRadius>+ <CornerRadius x:Key="DuckCornerRadiusMedium">8</CornerRadius>+ <CornerRadius x:Key="DuckCornerRadiusLarge">12</CornerRadius>+ <Thickness x:Key="DuckPageMargin">42,32,42,0</Thickness>+ <Thickness x:Key="DuckPageInnerMargin">0,0,16,0</Thickness>+ <Thickness x:Key="DuckSectionMargin">0,0,0,24</Thickness>+ <Thickness x:Key="DuckSectionTopMargin">0,24,0,0</Thickness>+ <Thickness x:Key="DuckCardPadding">16,14</Thickness>+ <Thickness x:Key="DuckListRowPadding">16,12</Thickness>+ <Thickness x:Key="DuckToolbarPadding">16,12</Thickness>+ <Thickness x:Key="DuckControlGap">0,0,8,0</Thickness>+ <Thickness x:Key="DuckRowGap">0,0,0,8</Thickness>++ <Color x:Key="DuckAccentYellowColor">#FFFFD114</Color>+ <SolidColorBrush x:Key="DuckAccentYellowBrush" Color="{StaticResource DuckAccentYellowColor}" />+ <SolidColorBrush x:Key="DuckAccentYellowMutedBrush" Color="#33FFD114" />++ <Style x:Key="DuckPageRootStyle" TargetType="Page">+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorPrimaryBrush}" />+ <Setter Property="Margin" Value="{StaticResource DuckPageMargin}" />+ <Setter Property="ScrollViewer.CanContentScroll" Value="False" />+ <Setter Property="UseLayoutRounding" Value="True" />+ <Setter Property="SnapsToDevicePixels" Value="True" />+ </Style>++ <Style x:Key="DuckPageHeaderStyle" TargetType="StackPanel">+ <Setter Property="Margin" Value="{StaticResource DuckSectionMargin}" />+ </Style>++ <Style x:Key="DuckPageTitleStyle" TargetType="ui:TextBlock">+ <Setter Property="FontTypography" Value="Title" />+ <Setter Property="TextWrapping" Value="Wrap" />+ </Style>++ <Style x:Key="DuckPageDescriptionStyle" TargetType="ui:TextBlock">+ <Setter Property="Margin" Value="0,4,0,0" />+ <Setter Property="Appearance" Value="Secondary" />+ <Setter Property="FontTypography" Value="Body" />+ <Setter Property="TextWrapping" Value="Wrap" />+ </Style>++ <Style x:Key="DuckSectionHeaderStyle" TargetType="ui:TextBlock">+ <Setter Property="Margin" Value="0,0,0,8" />+ <Setter Property="FontTypography" Value="BodyStrong" />+ <Setter Property="TextWrapping" Value="Wrap" />+ </Style>++ <Style x:Key="DuckSecondaryTextStyle" TargetType="ui:TextBlock">+ <Setter Property="Appearance" Value="Secondary" />+ <Setter Property="TextWrapping" Value="Wrap" />+ </Style>++ <Style x:Key="DuckCaptionTextStyle" TargetType="ui:TextBlock">+ <Setter Property="Appearance" Value="Secondary" />+ <Setter Property="FontTypography" Value="Caption" />+ <Setter Property="TextWrapping" Value="Wrap" />+ </Style>++ <Style x:Key="DuckToolbarSurfaceStyle" TargetType="Border">+ <Setter Property="Margin" Value="0,0,0,12" />+ <Setter Property="Padding" Value="{StaticResource DuckToolbarPadding}" />+ <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />+ <Setter Property="BorderThickness" Value="1" />+ <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusLarge}" />+ </Style>++ <Style x:Key="DuckCardSurfaceStyle" TargetType="Border">+ <Setter Property="Margin" Value="{StaticResource DuckRowGap}" />+ <Setter Property="Padding" Value="{StaticResource DuckCardPadding}" />+ <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />+ <Setter Property="BorderThickness" Value="1" />+ <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusMedium}" />+ <Setter Property="Opacity" Value="1" />+ <Style.Triggers>+ <EventTrigger RoutedEvent="Loaded">+ <BeginStoryboard>+ <Storyboard>+ <DoubleAnimation+ Storyboard.TargetProperty="Opacity"+ From="0"+ To="1"+ Duration="0:0:0.16" />+ </Storyboard>+ </BeginStoryboard>+ </EventTrigger>+ </Style.Triggers>+ </Style>++ <Style x:Key="DuckListRowStyle" TargetType="Border">+ <Setter Property="Margin" Value="{StaticResource DuckRowGap}" />+ <Setter Property="Padding" Value="{StaticResource DuckListRowPadding}" />+ <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorDefaultBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource CardStrokeColorDefaultBrush}" />+ <Setter Property="BorderThickness" Value="1" />+ <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusMedium}" />+ <Setter Property="Opacity" Value="1" />+ <Style.Triggers>+ <EventTrigger RoutedEvent="Loaded">+ <BeginStoryboard>+ <Storyboard>+ <DoubleAnimation+ Storyboard.TargetProperty="Opacity"+ From="0"+ To="1"+ Duration="0:0:0.12" />+ </Storyboard>+ </BeginStoryboard>+ </EventTrigger>+ </Style.Triggers>+ </Style>++ <Style x:Key="DuckSubtlePillStyle" TargetType="Border">+ <Setter Property="Padding" Value="6,2" />+ <Setter Property="Background" Value="{DynamicResource CardBackgroundFillColorSecondaryBrush}" />+ <Setter Property="CornerRadius" Value="{StaticResource DuckCornerRadiusSmall}" />+ </Style>++ <Style x:Key="DuckRoundIconSurfaceStyle" TargetType="Border">+ <Setter Property="Width" Value="40" />+ <Setter Property="Height" Value="40" />+ <Setter Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />+ <Setter Property="CornerRadius" Value="20" />+ </Style>++ <Style x:Key="DuckEmptyStatePanelStyle" TargetType="StackPanel">+ <Setter Property="Margin" Value="0,64,0,32" />+ <Setter Property="HorizontalAlignment" Value="Center" />+ <Setter Property="VerticalAlignment" Value="Center" />+ </Style>++ <Style x:Key="DuckEmptyStateIconStyle" TargetType="ui:SymbolIcon">+ <Setter Property="Margin" Value="0,0,0,12" />+ <Setter Property="HorizontalAlignment" Value="Center" />+ <Setter Property="FontSize" Value="40" />+ <Setter Property="Foreground" Value="{DynamicResource TextFillColorDisabledBrush}" />+ </Style>++ <Style x:Key="DuckSearchBoxStyle" TargetType="ui:TextBox">+ <Setter Property="MinWidth" Value="240" />+ <Setter Property="Margin" Value="{StaticResource DuckControlGap}" />+ <Setter Property="VerticalAlignment" Value="Center" />+ <Setter Property="Icon" Value="{ui:SymbolIcon Search24}" />+ </Style>++ <Style x:Key="DuckToggleSwitchStyle" TargetType="ui:ToggleSwitch">+ <Setter Property="Margin" Value="{StaticResource DuckControlGap}" />+ <Setter Property="VerticalAlignment" Value="Center" />+ <Setter Property="Cursor" Value="Hand" />+ </Style>++ <Style x:Key="DuckComboBoxStyle" TargetType="ComboBox">+ <Setter Property="Margin" Value="{StaticResource DuckControlGap}" />+ <Setter Property="VerticalAlignment" Value="Center" />+ <Setter Property="MinWidth" Value="150" />+ </Style>++ <Style x:Key="DuckSettingsSectionStyle" TargetType="StackPanel">+ <Setter Property="Margin" Value="{StaticResource DuckSectionTopMargin}" />+ </Style>++ <Style x:Key="DuckSettingsRowHeaderStyle" TargetType="StackPanel">+ <Setter Property="VerticalAlignment" Value="Center" />+ </Style>++ <Style x:Key="DuckDialogRootStyle" TargetType="Grid">+ <Setter Property="MinWidth" Value="420" />+ </Style>++ <Style x:Key="DuckDialogContentStackStyle" TargetType="StackPanel">+ <Setter Property="Margin" Value="0" />+ </Style>++ <Style x:Key="DuckDialogIconStyle" TargetType="ui:SymbolIcon">+ <Setter Property="Margin" Value="0,0,0,12" />+ <Setter Property="HorizontalAlignment" Value="Center" />+ <Setter Property="FontSize" Value="44" />+ <Setter Property="Foreground" Value="{DynamicResource DuckAccentYellowBrush}" />+ </Style>++ <Style x:Key="DuckContentPresenterGridItemStyle" TargetType="ContentPresenter">+ <Setter Property="Margin" Value="0,0,12,12" />+ <Setter Property="HorizontalAlignment" Value="Stretch" />+ </Style>++ <Style x:Key="DuckContentPresenterRowStyle" TargetType="ContentPresenter">+ <Setter Property="Margin" Value="0,0,0,8" />+ <Setter Property="HorizontalAlignment" Value="Stretch" />+ </Style>++</ResourceDictionary>diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.csindex 758255f..b765644 100644--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs@@ -30,7 +30,7 @@ public partial class OptimizationCategoryViewModel : ViewModelprivate static readonly HttpClient httpClient = new() { Timeout = TimeSpan.FromSeconds(5) };private static readonly ConcurrentDictionary<string,- (string Content, DateTime FetchedAt)+ Lazy<Task<(string Content, DateTime FetchedAt)>>> _sourceCache = new();private static readonly TimeSpan SourceCacheTtl = TimeSpan.FromMinutes(5);@@ -352,20 +352,18 @@ public partial class OptimizationCategoryViewModel : ViewModelvar rawUrl =$"https://raw.githubusercontent.com/itsfatduck/optimizerDuck/master/{relativePath}";- string source;- if (- _sourceCache.TryGetValue(rawUrl, out var cached)- && DateTime.UtcNow - cached.FetchedAt < SourceCacheTtl- )- {- source = cached.Content;- }- else+ var cached = _sourceCache.GetOrAdd(rawUrl, CreateSourceCacheEntry);++ var cachedSource = await cached.Value;+ if (DateTime.UtcNow - cachedSource.FetchedAt >= SourceCacheTtl){- source = await httpClient.GetStringAsync(rawUrl);- _sourceCache[rawUrl] = (source, DateTime.UtcNow);+ var refreshed = CreateSourceCacheEntry(rawUrl);+ _sourceCache[rawUrl] = refreshed;+ cachedSource = await refreshed.Value;}+ var source = cachedSource.Content;+var lines = source.Split('\n');for (var i = 0; i < lines.Length; i++)if (lines[i].Contains($"class {className} : {nameof(BaseOptimization)}", StringComparison.OrdinalIgnoreCase))@@ -433,6 +431,15 @@ public partial class OptimizationCategoryViewModel : ViewModel}}+ private static Lazy<Task<(string Content, DateTime FetchedAt)>> CreateSourceCacheEntry(+ string rawUrl+ )+ {+ return new Lazy<Task<(string Content, DateTime FetchedAt)>>(+ async () => (await httpClient.GetStringAsync(rawUrl), DateTime.UtcNow)+ );+ }+/// <summary>/// Apply current filters to the optimizations./// </summary>diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml b/optimizerDuck/UI/Windows/MainWindow.xamlindex 56dc021..c7fb489 100644--- a/optimizerDuck/UI/Windows/MainWindow.xaml+++ b/optimizerDuck/UI/Windows/MainWindow.xaml@@ -29,12 +29,12 @@<ui:NavigationViewx:Name="RootNavigation"Margin="0"- Padding="42,0,42,0"+ Padding="0"FrameMargin="0"IsFooterSeparatorVisible="False"IsPaneToggleVisible="True"IsTopSeparatorVisible="False"- OpenPaneLength="180"+ OpenPaneLength="220"PaneDisplayMode="Left"TitleBar="{Binding ElementName=TitleBar, Mode=OneWay}">@@ -111,20 +111,20 @@<ui:TitleBar x:Name="TitleBar"><ui:TitleBar.Header>- <StackPanel Margin="10,0,0,0" VerticalAlignment="Center" Orientation="Horizontal">+ <StackPanel Margin="12,0,0,0" VerticalAlignment="Center" Orientation="Horizontal"><ui:SymbolIcon- FontSize="16"+ FontSize="15"Foreground="{DynamicResource TextFillColorDisabledBrush}"Symbol="Shield24"/><ui:ImageIconHeight="25"- Margin="7,0,5,0"+ Margin="8,0,6,0"VerticalAlignment="Center"Source="pack://application:,,,/Resources/Images/Duck.png"/><ui:TextBlock- Margin="0,0,5,0"+ Margin="0,0,6,0"VerticalAlignment="Center"FontTypography="Body"Text="optimizerDuck"@@ -139,22 +139,20 @@</ui:TitleBar.Header><ui:TitleBar.TrailingContent>- <StackPanel VerticalAlignment="Center" Orientation="Horizontal">+ <StackPanel Margin="0,0,8,0" VerticalAlignment="Center" Orientation="Horizontal"><ui:Button- Margin="0,0,5,0"+ Margin="0,0,8,0"Appearance="Transparent"Command="{Binding OpenSupportLinkCommand}"Icon="{ui:SymbolIcon Heart24}"- >- Support the project- </ui:Button>+ ToolTip="Support the project"+ /><ui:ButtonAppearance="Transparent"Command="{Binding OpenDiscordLinkCommand}"Icon="{ui:SymbolIcon Link24}"- >- Join our Discord- </ui:Button>+ ToolTip="Join our Discord"+ /></StackPanel></ui:TitleBar.TrailingContent></ui:TitleBar>