Skip to content

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

feat: add loading view to optimizationpage when loading

fatDuck98be8293379a
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index 38e17ac..4941031 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -1396,4 +1396,10 @@ Update now to enjoy the latest features, improvements, and bug fixes.</value>
<data name="Settings.Optimize.ShowSnackbarNotificationAfterAppliedSuccessfully.Description" xml:space="preserve">
<value>Displays a notification when optimizations have been successfully applied.</value>
</data>
+ <data name="Optimizations.Loading" xml:space="preserve">
+ <value>Loading optimizations...</value>
+ </data>
+ <data name="Optimizations.Loading.Hint" xml:space="preserve">
+ <value>Please wait...</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
index 477e8f9..c9fc80b 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx
@@ -1388,4 +1388,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="Settings.Optimize.ShowSnackbarNotificationAfterAppliedSuccessfully.Description" xml:space="preserve">
<value>Hiển thị thông báo sau khi quá trình áp dụng tối ưu hóa hoàn tất thành công.</value>
</data>
+ <data name="Optimizations.Loading" xml:space="preserve">
+ <value>Đang tải danh sách tối ưu hóa...</value>
+ </data>
+ <data name="Optimizations.Loading.Hint" xml:space="preserve">
+ <value>Vui lòng đợi...</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Services/OptimizationService.cs b/optimizerDuck/Services/OptimizationService.cs
index fd5d546..5df3364 100644
--- a/optimizerDuck/Services/OptimizationService.cs
+++ b/optimizerDuck/Services/OptimizationService.cs
@@ -57,7 +57,7 @@ public class OptimizationService(
var result = await ShellService.PowerShellAsync(
$"Checkpoint-Computer -Description \"{Shared.RestorePointName}\" -RestorePointType MODIFY_SETTINGS");
- if (result.Stderr.Contains("already been created within the past 1440 minutes",
+ if (result.Stderr.Contains("already been created within the past",
StringComparison.OrdinalIgnoreCase))
{
_logger.LogWarning("Restore point creation skipped: frequency limit reached.");
@@ -89,7 +89,7 @@ public class OptimizationService(
result = await ShellService.PowerShellAsync(
$"Checkpoint-Computer -Description \"{Shared.RestorePointName}\" -RestorePointType MODIFY_SETTINGS");
- if (result.Stderr.Contains("already been created within the past 1440 minutes", StringComparison.OrdinalIgnoreCase))
+ if (result.Stderr.Contains("already been created within the past", StringComparison.OrdinalIgnoreCase))
return RestorePointResult.FrequencyLimitReached;
return result.ExitCode == 0 ? RestorePointResult.Success : RestorePointResult.Failed;
@@ -122,8 +122,12 @@ public class OptimizationService(
Message = applyResult.Message,
FailedSteps = scope.FailedSteps.Select(s => new OperationStepResult
{
- Index = s.Index, Name = s.Name, Description = s.Description,
- Success = s.Success, Error = s.Error, RetryAction = s.RetryAction
+ Index = s.Index,
+ Name = s.Name,
+ Description = s.Description,
+ Success = s.Success,
+ Error = s.Error,
+ RetryAction = s.RetryAction
}).ToList()
};
}
@@ -141,8 +145,12 @@ public class OptimizationService(
{
var failedSteps = scope.FailedSteps.Select(s => new OperationStepResult
{
- Index = s.Index, Name = s.Name, Description = s.Description,
- Success = s.Success, Error = s.Error, RetryAction = s.RetryAction
+ Index = s.Index,
+ Name = s.Name,
+ Description = s.Description,
+ Success = s.Success,
+ Error = s.Error,
+ RetryAction = s.RetryAction
}).ToList();
var status = scope.HasSuccessfulSteps ? OptimizationSuccessResult.PartialSuccess : OptimizationSuccessResult.Failed;
@@ -200,7 +208,9 @@ public class OptimizationService(
progress?.Report(new ProcessingProgress
{
Message = string.Format(Translations.Optimization_RetryStep_Processing, step.Name, step.Index, total),
- IsIndeterminate = false, Value = step.Index, Total = total
+ IsIndeterminate = false,
+ Value = step.Index,
+ Total = total
});
if (step.RetryAction == null) { stillFailed.Add(step); continue; }
diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
index d60fb77..c28c80e 100644
--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
@@ -30,7 +30,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
private static readonly ConcurrentDictionary<string, (string Content, DateTime FetchedAt)> _sourceCache = new();
private static readonly TimeSpan SourceCacheTtl = TimeSpan.FromMinutes(5);
- private readonly ObservableCollection<IOptimization> _allOptimizations = [];
+ private readonly List<IOptimization> _allOptimizations = [];
private readonly IOptimizationCategory _category;
private readonly IContentDialogService _contentDialogService;
private readonly ILogger<OptimizationCategoryViewModel> _logger;
@@ -52,6 +52,8 @@ public partial class OptimizationCategoryViewModel : ViewModel
[ObservableProperty] [NotifyCanExecuteChangedFor(nameof(ToggleOptimizationCommand))]
private bool _isProcessing;
+ [ObservableProperty] private bool _isLoading;
+
public OptimizationCategoryViewModel(
IOptimizationCategory category,
OptimizationService optimizationService,
@@ -343,18 +345,28 @@ public partial class OptimizationCategoryViewModel : ViewModel
{
if (_allOptimizations.Count > 0) return;
- foreach (var optimization in _category.Optimizations)
+ IsLoading = true;
+ try
{
- optimization.State.PropertyChanged += (_, e) =>
+ // Allow UI to render loading ring
+ await Task.Delay(1);
+
+ foreach (var optimization in _category.Optimizations)
{
- if (e.PropertyName == nameof(OptimizationState.IsApplied))
- OnPropertyChanged(nameof(HasAppliedOptimizations));
- };
- _allOptimizations.Add(optimization);
- await Task.Delay(10);
- }
+ optimization.State.PropertyChanged += (_, e) =>
+ {
+ if (e.PropertyName == nameof(OptimizationState.IsApplied))
+ OnPropertyChanged(nameof(HasAppliedOptimizations));
+ };
+ _allOptimizations.Add(optimization);
+ }
- ApplyFilter();
+ ApplyFilter();
+ }
+ finally
+ {
+ IsLoading = false;
+ }
}
/// <summary>
diff --git a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
index e085eaa..dde772b 100644
--- a/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/Optimizations/OptimizationPage.xaml
@@ -1,16 +1,7 @@
<Page
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- Margin="0,32,0,0"
- ScrollViewer.CanContentScroll="False"
- Title="OptimizationPage"
- d:DataContext="{d:DesignInstance optimizations:OptimizationPage}"
- d:DesignHeight="650"
- d:DesignWidth="800"
- mc:Ignorable="d"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.Optimizations.OptimizationPage"
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"
@@ -18,357 +9,395 @@
xmlns:optimizations="clr-namespace:optimizerDuck.UI.Views.Pages.Optimizations"
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">
+ Title="OptimizationPage"
+ Margin="0,32,0,0"
+ 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>
<converters:WidthToColumnConverter x:Key="WidthToColumnConverter" />
<converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+ <converters:BooleanToVisibilityConverter
+ x:Key="InverseBooleanToVisibilityConverter"
+ False="Visible"
+ True="Collapsed" />
<converters:NullToVisibilityConverter
+ x:Key="NullToVisibilityConverter"
False="Visible"
- True="Collapsed"
- x:Key="NullToVisibilityConverter" />
+ True="Collapsed" />
</Page.Resources>
- <Grid RowDefinitions="Auto,*">
-
- <!-- Toolbar -->
- <WrapPanel
- Grid.Row="0"
- Margin="5,0,5,10"
- Orientation="Horizontal"
- VerticalAlignment="Center">
+ <Grid>
+ <!-- Main Content -->
+ <Grid RowDefinitions="Auto,*" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
+ <!-- Toolbar -->
+ <WrapPanel
+ Grid.Row="0"
+ Margin="5,0,5,10"
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
- <!-- Search -->
- <ui:TextBox
- Icon="{ui:SymbolIcon Search24}"
- Margin="0,0,8,0"
- MinWidth="200"
- PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
- VerticalAlignment="Center" />
+ <!-- Search -->
+ <ui:TextBox
+ MinWidth="200"
+ Margin="0,0,8,0"
+ VerticalAlignment="Center"
+ Icon="{ui:SymbolIcon Search24}"
+ PlaceholderText="{ext:Loc Common.Search.Placeholder}"
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
- <!-- Filter by Risk -->
- <ComboBox
- Margin="0,0,8,0"
- SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
- ToolTip="{ext:Loc Common.Filter}"
- ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top"
- VerticalAlignment="Center">
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
- <ui:SymbolIcon
- HorizontalAlignment="Left"
- Margin="0,0,6,0"
- Symbol="Filter24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.Filter.All}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
- <ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorSuccessBrush}"
- Margin="0,0,6,0"
- Symbol="ShieldCheckmark24" />
- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
- <ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCautionBrush}"
- Margin="0,0,6,0"
- Symbol="Warning24" />
- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
- <ui:SymbolIcon
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- Margin="0,0,6,0"
- Symbol="ShieldError24" />
- <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
+ <!-- Filter by Risk -->
+ <ComboBox
+ Margin="0,0,8,0"
+ VerticalAlignment="Center"
+ SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
+ ToolTip="{ext:Loc Common.Filter}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top">
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Filter24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.Filter.All}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource SystemFillColorSuccessBrush}"
+ Symbol="ShieldCheckmark24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ Symbol="Warning24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ Symbol="ShieldError24" />
+ <TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Risky}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
- <!-- Sort By -->
- <ComboBox
- Margin="0,0,8,0"
- SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
- ToolTip="{ext:Loc Common.SortBy}"
- ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top"
- VerticalAlignment="Center">
+ <!-- Sort By -->
+ <ComboBox
+ Margin="0,0,8,0"
+ VerticalAlignment="Center"
+ SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
+ ToolTip="{ext:Loc Common.SortBy}"
+ ToolTipService.BetweenShowDelay="160"
+ ToolTipService.Placement="Top">
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
- <ui:SymbolIcon
- HorizontalAlignment="Left"
- Margin="0,0,6,0"
- Symbol="Filter24" />
- <TextBlock Grid.Column="1" HorizontalAlignment="Left">
- <Run Text="{ext:Loc Common.SortBy.Risk}" />
- <Run Text=" &amp; " />
- <Run Text="{ext:Loc Common.SortBy.Status}" />
- </TextBlock>
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
- <ui:SymbolIcon
- HorizontalAlignment="Left"
- Margin="0,0,6,0"
- Symbol="TextSortAscending24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Name}" />
- </Grid>
- </ComboBoxItem>
- <ComboBoxItem HorizontalContentAlignment="Left">
- <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
- <ui:SymbolIcon
- HorizontalAlignment="Left"
- Margin="0,0,6,0"
- Symbol="Shield24" />
- <TextBlock
- Grid.Column="1"
- HorizontalAlignment="Left"
- Text="{ext:Loc Common.SortBy.Risk}" />
- </Grid>
- </ComboBoxItem>
- </ComboBox>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Filter24" />
+ <TextBlock Grid.Column="1" HorizontalAlignment="Left">
+ <Run Text="{ext:Loc Common.SortBy.Risk}" />
+ <Run Text=" &amp; " />
+ <Run Text="{ext:Loc Common.SortBy.Status}" />
+ </TextBlock>
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="TextSortAscending24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Name}" />
+ </Grid>
+ </ComboBoxItem>
+ <ComboBoxItem HorizontalContentAlignment="Left">
+ <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <ui:SymbolIcon
+ Margin="0,0,6,0"
+ HorizontalAlignment="Left"
+ Symbol="Shield24" />
+ <TextBlock
+ Grid.Column="1"
+ HorizontalAlignment="Left"
+ Text="{ext:Loc Common.SortBy.Risk}" />
+ </Grid>
+ </ComboBoxItem>
+ </ComboBox>
- <!-- Hide Applied toggle -->
- <ToggleButton
- IsChecked="{Binding ViewModel.HideApplied}"
- Margin="0,0,0,0"
- VerticalAlignment="Stretch"
- Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}">
- <StackPanel Orientation="Horizontal">
- <ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />
- <TextBlock Text="{ext:Loc Optimizer.Menu.HideApplied}" />
- </StackPanel>
- </ToggleButton>
- </WrapPanel>
+ <!-- Hide Applied toggle -->
+ <ToggleButton
+ Margin="0,0,0,0"
+ VerticalAlignment="Stretch"
+ IsChecked="{Binding ViewModel.HideApplied}"
+ Visibility="{Binding ViewModel.HasAppliedOptimizations, Converter={StaticResource BooleanToVisibilityConverter}}">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon Margin="0,0,6,0" Symbol="EyeOff24" />
+ <TextBlock Text="{ext:Loc Optimizer.Menu.HideApplied}" />
+ </StackPanel>
+ </ToggleButton>
+ </WrapPanel>
- <!-- No search results -->
- <StackPanel
- Grid.Row="1"
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
- Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
- <ui:SymbolIcon
- FontSize="36"
- Foreground="{DynamicResource SystemFillColorCriticalBrush}"
- HorizontalAlignment="Center"
- Margin="0,0,0,10"
- Symbol="SearchInfo24" />
- <ui:TextBlock
- Appearance="Secondary"
- FontTypography="Body"
+ <!-- No search results -->
+ <StackPanel
+ Grid.Row="1"
HorizontalAlignment="Center"
- Text="{ext:Loc Bloatware.Search.NoResults}" />
- </StackPanel>
+ VerticalAlignment="Center"
+ Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
+ <ui:SymbolIcon
+ Margin="0,0,0,10"
+ HorizontalAlignment="Center"
+ FontSize="36"
+ Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ Symbol="SearchInfo24" />
+ <ui:TextBlock
+ HorizontalAlignment="Center"
+ Appearance="Secondary"
+ FontTypography="Body"
+ Text="{ext:Loc Bloatware.Search.NoResults}" />
+ </StackPanel>
+
+ <!-- Optimization Cards -->
+ <ui:VirtualizingItemsControl
+ Grid.Row="1"
+ ItemsSource="{Binding ViewModel.Optimizations}"
+ Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
+ <ui:VirtualizingItemsControl.Template>
+ <ControlTemplate TargetType="ItemsControl">
+ <ScrollViewer HorizontalScrollBarVisibility="Disabled">
+ <ItemsPresenter />
+ </ScrollViewer>
+ </ControlTemplate>
+ </ui:VirtualizingItemsControl.Template>
+ <ui:VirtualizingItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <UniformGrid VerticalAlignment="Top" Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" />
+ </ItemsPanelTemplate>
+ </ui:VirtualizingItemsControl.ItemsPanel>
+ <ui:VirtualizingItemsControl.ItemContainerStyle>
+ <Style TargetType="ContentPresenter">
+ <Setter Property="Margin" Value="5" />
+ <Setter Property="HorizontalAlignment" Value="Stretch" />
+ </Style>
+ </ui:VirtualizingItemsControl.ItemContainerStyle>
- <!-- Optimization Cards -->
- <ui:VirtualizingItemsControl
- Grid.Row="1"
- ItemsSource="{Binding ViewModel.Optimizations}"
- Visibility="{Binding ViewModel.Optimizations.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
- <ui:VirtualizingItemsControl.Template>
- <ControlTemplate TargetType="ItemsControl">
- <ScrollViewer HorizontalScrollBarVisibility="Disabled">
- <ItemsPresenter />
- </ScrollViewer>
- </ControlTemplate>
- </ui:VirtualizingItemsControl.Template>
- <ui:VirtualizingItemsControl.ItemsPanel>
- <ItemsPanelTemplate>
- <UniformGrid Columns="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=ScrollViewer}, Converter={StaticResource WidthToColumnConverter}}" VerticalAlignment="Top" />
- </ItemsPanelTemplate>
- </ui:VirtualizingItemsControl.ItemsPanel>
- <ui:VirtualizingItemsControl.ItemContainerStyle>
- <Style TargetType="ContentPresenter">
- <Setter Property="Margin" Value="5" />
- <Setter Property="HorizontalAlignment" Value="Stretch" />
- </Style>
- </ui:VirtualizingItemsControl.ItemContainerStyle>
+ <ui:VirtualizingItemsControl.ItemTemplate>
+ <DataTemplate DataType="{x:Type optimizers:BaseOptimization}">
+ <Border
+ Padding="20,10"
+ Background="{DynamicResource CardBackground}"
+ BorderBrush="{DynamicResource CardBorderBrush}"
+ BorderThickness="1"
+ CornerRadius="5">
+ <Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
+ <ui:TextBlock
+ Grid.Row="0"
+ Appearance="Disabled"
+ FontTypography="Caption"
+ Text="{Binding Id}"
+ TextWrapping="Wrap" />
+ <ui:TextBlock
+ Grid.Row="1"
+ FontTypography="Subtitle"
+ Text="{Binding Name}"
+ TextWrapping="Wrap" />
- <ui:VirtualizingItemsControl.ItemTemplate>
- <DataTemplate DataType="{x:Type optimizers:BaseOptimization}">
- <Border
- Background="{DynamicResource CardBackground}"
- BorderBrush="{DynamicResource CardBorderBrush}"
- BorderThickness="1"
- CornerRadius="5"
- Padding="20,10">
- <Grid RowDefinitions="Auto,Auto,Auto,Auto,*">
- <ui:TextBlock
- Appearance="Disabled"
- FontTypography="Caption"
- Grid.Row="0"
- Text="{Binding Id}"
- TextWrapping="Wrap" />
- <ui:TextBlock
- FontTypography="Subtitle"
- Grid.Row="1"
- Text="{Binding Name}"
- TextWrapping="Wrap" />
+ <ui:VirtualizingItemsControl
+ Grid.Row="2"
+ Margin="0,2,0,2"
+ ItemsSource="{Binding TagDisplays}">
+ <ui:VirtualizingItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
+ </ItemsPanelTemplate>
+ </ui:VirtualizingItemsControl.ItemsPanel>
+ <ui:VirtualizingItemsControl.ItemContainerStyle>
+ <Style TargetType="ContentPresenter">
+ <Setter Property="Margin" Value="0,0,2,2" />
+ <Setter Property="HorizontalAlignment" Value="Left" />
+ </Style>
+ </ui:VirtualizingItemsControl.ItemContainerStyle>
+ <ui:VirtualizingItemsControl.ItemTemplate>
+ <DataTemplate>
+ <Border
+ Padding="4,2"
+ HorizontalAlignment="Left"
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5">
+ <StackPanel Orientation="Horizontal">
+ <ui:SymbolIcon
+ Margin="0,0,5,0"
+ Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ Symbol="{Binding Icon}" />
- <ui:VirtualizingItemsControl
- Grid.Row="2"
- ItemsSource="{Binding TagDisplays}"
- Margin="0,2,0,2">
- <ui:VirtualizingItemsControl.ItemsPanel>
- <ItemsPanelTemplate>
- <WrapPanel HorizontalAlignment="Left" VerticalAlignment="Top" />
- </ItemsPanelTemplate>
- </ui:VirtualizingItemsControl.ItemsPanel>
- <ui:VirtualizingItemsControl.ItemContainerStyle>
- <Style TargetType="ContentPresenter">
- <Setter Property="Margin" Value="0,0,2,2" />
- <Setter Property="HorizontalAlignment" Value="Left" />
- </Style>
- </ui:VirtualizingItemsControl.ItemContainerStyle>
- <ui:VirtualizingItemsControl.ItemTemplate>
- <DataTemplate>
+ <ui:TextBlock
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Text="{Binding Display}"
+ TextWrapping="Wrap" />
+ </StackPanel>
+ </Border>
+ </DataTemplate>
+ </ui:VirtualizingItemsControl.ItemTemplate>
+ </ui:VirtualizingItemsControl>
+
+ <ui:TextBlock
+ Grid.Row="3"
+ Margin="0,10,0,0"
+ FontTypography="Body"
+ Text="{Binding ShortDescription}"
+ TextTrimming="WordEllipsis"
+ TextWrapping="Wrap" />
+
+ <Grid
+ Grid.Row="4"
+ Margin="0,10,0,0"
+ VerticalAlignment="Bottom"
+ ColumnDefinitions="*,Auto">
+ <Grid RowDefinitions="Auto,Auto">
<Border
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5"
+ Padding="4,2"
HorizontalAlignment="Left"
- Padding="4,2">
+ CornerRadius="5">
+ <Border.Style>
+ <Style TargetType="Border">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Risk}" Value="Moderate">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Risk}" Value="Risky">
+ <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorSecondaryBrush}"
Margin="0,0,5,0"
- Symbol="{Binding Icon}" />
+ Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Symbol="{Binding RiskVisual.Icon}" />
<ui:TextBlock
- Appearance="Secondary"
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- HorizontalAlignment="Center"
- Text="{Binding Display}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
+ Text="{Binding RiskVisual.Display}"
+ TextWrapping="Wrap" />
</StackPanel>
</Border>
- </DataTemplate>
- </ui:VirtualizingItemsControl.ItemTemplate>
- </ui:VirtualizingItemsControl>
-
- <ui:TextBlock
- FontTypography="Body"
- Grid.Row="3"
- Margin="0,10,0,0"
- Text="{Binding ShortDescription}"
- TextTrimming="WordEllipsis"
- TextWrapping="Wrap" />
-
- <Grid
- ColumnDefinitions="*,Auto"
- Grid.Row="4"
- Margin="0,10,0,0"
- VerticalAlignment="Bottom">
- <Grid RowDefinitions="Auto,Auto">
- <Border
- CornerRadius="5"
- HorizontalAlignment="Left"
- Padding="4,2">
- <Border.Style>
- <Style TargetType="Border">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorSuccessBrush}" />
- <Style.Triggers>
- <DataTrigger Binding="{Binding Risk}" Value="Moderate">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorCautionBrush}" />
- </DataTrigger>
- <DataTrigger Binding="{Binding Risk}" Value="Risky">
- <Setter Property="Background" Value="{DynamicResource SystemFillColorCriticalBrush}" />
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </Border.Style>
- <StackPanel Orientation="Horizontal">
- <ui:SymbolIcon
- Foreground="{DynamicResource TextFillColorInverseBrush}"
- Margin="0,0,5,0"
- Symbol="{Binding RiskVisual.Icon}" />
+ <Border
+ Grid.Row="1"
+ Margin="0,5,0,0"
+ Padding="4,2"
+ HorizontalAlignment="Left"
+ Background="{DynamicResource CardBackgroundDisabled}"
+ CornerRadius="5"
+ ToolTip="{Binding State.AppliedAt}"
+ ToolTipService.InitialShowDelay="150"
+ ToolTipService.Placement="Top"
+ Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
<ui:TextBlock
- FontTypography="Caption"
- Foreground="{DynamicResource TextFillColorInverseBrush}"
HorizontalAlignment="Center"
- Text="{Binding RiskVisual.Display}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </StackPanel>
- </Border>
+ VerticalAlignment="Center"
+ FontTypography="Caption"
+ Text="{Binding State.RelativeTime}"
+ TextWrapping="Wrap" />
+ </Border>
+ </Grid>
- <Border
- Background="{DynamicResource CardBackgroundDisabled}"
- CornerRadius="5"
- Grid.Row="1"
- HorizontalAlignment="Left"
- Margin="0,5,0,0"
- Padding="4,2"
- ToolTip="{Binding State.AppliedAt}"
- ToolTipService.InitialShowDelay="150"
- ToolTipService.Placement="Top"
- Visibility="{Binding State.AppliedAt, Converter={StaticResource NullToVisibilityConverter}}">
- <ui:TextBlock
- FontTypography="Caption"
- HorizontalAlignment="Center"
- Text="{Binding State.RelativeTime}"
- TextWrapping="Wrap"
- VerticalAlignment="Center" />
- </Border>
+ <StackPanel
+ Grid.Column="1"
+ Margin="10,0,0,0"
+ VerticalAlignment="Bottom"
+ Orientation="Horizontal">
+ <ui:ToggleSwitch
+ Margin="0,0,5,0"
+ HorizontalAlignment="Right"
+ VerticalAlignment="Center"
+ Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"
+ CommandParameter="{Binding}"
+ Cursor="Hand"
+ IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+ <ui:Button
+ HorizontalAlignment="Right"
+ VerticalAlignment="Bottom"
+ Background="Transparent"
+ BorderBrush="Transparent"
+ Command="{Binding DataContext.ViewModel.ViewSourceOnGitHubCommand, RelativeSource={RelativeSource AncestorType=Page}}"
+ CommandParameter="{Binding}"
+ Cursor="Hand"
+ Icon="{ui:SymbolIcon Open24}"
+ ToolTip="{ext:Loc Optimizer.Menu.ViewSource}" />
+ <ui:Button
+ HorizontalAlignment="Right"
+ VerticalAlignment="Bottom"
+ Background="Transparent"
+ BorderBrush="Transparent"
+ Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"
+ CommandParameter="{Binding}"
+ Cursor="Hand"
+ Icon="{ui:SymbolIcon MoreVertical24}" />
+ </StackPanel>
</Grid>
-
- <StackPanel
- Grid.Column="1"
- Margin="10,0,0,0"
- Orientation="Horizontal"
- VerticalAlignment="Bottom">
- <ui:ToggleSwitch
- Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"
- CommandParameter="{Binding}"
- Cursor="Hand"
- HorizontalAlignment="Right"
- IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
- Margin="0,0,5,0"
- VerticalAlignment="Center" />
- <ui:Button
- Background="Transparent"
- BorderBrush="Transparent"
- Command="{Binding DataContext.ViewModel.ViewSourceOnGitHubCommand, RelativeSource={RelativeSource AncestorType=Page}}"
- CommandParameter="{Binding}"
- Cursor="Hand"
- HorizontalAlignment="Right"
- Icon="{ui:SymbolIcon Open24}"
- ToolTip="{ext:Loc Optimizer.Menu.ViewSource}"
- VerticalAlignment="Bottom" />
- <ui:Button
- Background="Transparent"
- BorderBrush="Transparent"
- Command="{Binding DataContext.ViewModel.ShowDetailsCommand, RelativeSource={RelativeSource AncestorType=Page}}"
- CommandParameter="{Binding}"
- Cursor="Hand"
- HorizontalAlignment="Right"
- Icon="{ui:SymbolIcon MoreVertical24}"
- VerticalAlignment="Bottom" />
- </StackPanel>
</Grid>
- </Grid>
- </Border>
- </DataTemplate>
- </ui:VirtualizingItemsControl.ItemTemplate>
- </ui:VirtualizingItemsControl>
+ </Border>
+ </DataTemplate>
+ </ui:VirtualizingItemsControl.ItemTemplate>
+ </ui:VirtualizingItemsControl>
+ </Grid>
+
+ <!-- Loading Indicator -->
+ <Border Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+ <ui:ProgressRing
+ Width="48"
+ Height="48"
+ Margin="0,0,0,16"
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ IsIndeterminate="True" />
+ <ui:TextBlock
+ HorizontalAlignment="Center"
+ FontTypography="BodyStrong"
+ Text="{ext:Loc Optimizations.Loading}" />
+ <ui:TextBlock
+ Margin="0,4,0,0"
+ HorizontalAlignment="Center"
+ Appearance="Secondary"
+ FontTypography="Caption"
+ Text="{ext:Loc Optimizations.Loading.Hint}" />
+ </StackPanel>
+ </Border>
</Grid>
</Page>
\ No newline at end of file