- Replace sub-nav + HiddenTabsTabControl with 3-column Fluent card layout: PumpCommandsCard (vertical ME/FBKW/PreIn sliders) + DfiCalibrationCard / PumpLiveDataCard (KPI tiles + RPM rolling chart + redesigned status bytes) / PumpIdentificationCard + DtcCard - Add PumpTopStripView: pump selector, model badge, CAN + K-Line chips - Move immobilizer unlock to MainWindow bottom snackbar (UnlockSnackbarView): auto-close on success after 3 s, persist on failure with manual Dismiss - Redesign StatusDisplayView to 2×8 rounded 28px tiles with bit index + tooltip - Add NullToVisibilityConverter; add SnackbarShell, PumpCard, and related styles - Delete obsolete views: UnlockProgressDialog, UnlockPanelView, PumpIdentificationPanelView, PumpLiveDataView, DfiManageView, DtcListView, PumpControlView - PumpPageViewModel: remove PumpSubPage enum, add RpmChart wired to Root.PumpRpm Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
116 lines
6.2 KiB
XML
116 lines
6.2 KiB
XML
<UserControl x:Class="HC_APTBS.Views.UserControls.UnlockSnackbarView"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
|
|
mc:Ignorable="d"
|
|
d:DesignHeight="80" d:DesignWidth="700">
|
|
|
|
<!-- DataContext = UnlockProgressViewModel (may be null — NullToVis collapses the border) -->
|
|
<UserControl.Resources>
|
|
<BooleanToVisibilityConverter x:Key="BoolToVis"/>
|
|
</UserControl.Resources>
|
|
|
|
<Border Visibility="{Binding Converter={StaticResource NullToVis}}"
|
|
Style="{StaticResource SnackbarShell}"
|
|
HorizontalAlignment="Center" VerticalAlignment="Bottom"
|
|
MinWidth="560" MaxWidth="860">
|
|
|
|
<DockPanel LastChildFill="True" Margin="16,10">
|
|
|
|
<!-- ── Leading state icon ────────────────────────────────────── -->
|
|
<Grid DockPanel.Dock="Left" Width="30" Height="30" Margin="0,0,12,0">
|
|
|
|
<!-- In-progress spinner -->
|
|
<ui:ProgressRing IsIndeterminate="True" Width="24" Height="24">
|
|
<ui:ProgressRing.Style>
|
|
<Style TargetType="ui:ProgressRing">
|
|
<Setter Property="Visibility" Value="Visible"/>
|
|
<Style.Triggers>
|
|
<DataTrigger Binding="{Binding IsComplete}" Value="True">
|
|
<Setter Property="Visibility" Value="Collapsed"/>
|
|
</DataTrigger>
|
|
</Style.Triggers>
|
|
</Style>
|
|
</ui:ProgressRing.Style>
|
|
</ui:ProgressRing>
|
|
|
|
<!-- Success check -->
|
|
<ui:SymbolIcon Symbol="CheckmarkCircle24" FontSize="24"
|
|
Foreground="{DynamicResource SystemFillColorSuccessBrush}">
|
|
<ui:SymbolIcon.Style>
|
|
<Style TargetType="ui:SymbolIcon">
|
|
<Setter Property="Visibility" Value="Collapsed"/>
|
|
<Style.Triggers>
|
|
<DataTrigger Binding="{Binding IsSuccess}" Value="True">
|
|
<Setter Property="Visibility" Value="Visible"/>
|
|
</DataTrigger>
|
|
</Style.Triggers>
|
|
</Style>
|
|
</ui:SymbolIcon.Style>
|
|
</ui:SymbolIcon>
|
|
|
|
<!-- Failure/cancel X -->
|
|
<ui:SymbolIcon Symbol="DismissCircle24" FontSize="24"
|
|
Foreground="{DynamicResource SystemFillColorCriticalBrush}">
|
|
<ui:SymbolIcon.Style>
|
|
<Style TargetType="ui:SymbolIcon">
|
|
<Setter Property="Visibility" Value="Collapsed"/>
|
|
<Style.Triggers>
|
|
<MultiDataTrigger>
|
|
<MultiDataTrigger.Conditions>
|
|
<Condition Binding="{Binding IsComplete}" Value="True"/>
|
|
<Condition Binding="{Binding IsSuccess}" Value="False"/>
|
|
</MultiDataTrigger.Conditions>
|
|
<Setter Property="Visibility" Value="Visible"/>
|
|
</MultiDataTrigger>
|
|
</Style.Triggers>
|
|
</Style>
|
|
</ui:SymbolIcon.Style>
|
|
</ui:SymbolIcon>
|
|
</Grid>
|
|
|
|
<!-- ── Trailing buttons ───────────────────────────────────────── -->
|
|
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Center" Margin="12,0,0,0">
|
|
<TextBlock Text="{Binding Progress, StringFormat={}{0}%}"
|
|
FontFamily="Consolas" FontSize="13" FontWeight="SemiBold"
|
|
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
|
|
VerticalAlignment="Center" Margin="0,0,12,0"/>
|
|
|
|
<ui:Button Content="{DynamicResource Common.Cancel}"
|
|
Command="{Binding CancelCommand}"
|
|
Appearance="Caution"
|
|
Visibility="{Binding IsCancellable, Converter={StaticResource BoolToVis}}"
|
|
Height="30" Padding="12,4"/>
|
|
|
|
<ui:Button Content="{DynamicResource Common.Dismiss}"
|
|
Click="OnDismissClick"
|
|
Appearance="Secondary"
|
|
Visibility="{Binding IsComplete, Converter={StaticResource BoolToVis}}"
|
|
Height="30" Padding="12,4"/>
|
|
</StackPanel>
|
|
|
|
<!-- ── Middle: type + phase + progress bar ────────────────────── -->
|
|
<StackPanel VerticalAlignment="Center">
|
|
<DockPanel>
|
|
<TextBlock DockPanel.Dock="Left"
|
|
Text="{Binding UnlockTypeLabel}"
|
|
FontWeight="SemiBold" FontSize="12"
|
|
Foreground="{DynamicResource AccentTextFillColorPrimaryBrush}"
|
|
VerticalAlignment="Center" Margin="0,0,8,0"/>
|
|
<TextBlock Text="{Binding PhaseText}"
|
|
FontSize="12"
|
|
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
|
|
VerticalAlignment="Center"
|
|
TextTrimming="CharacterEllipsis"/>
|
|
</DockPanel>
|
|
<ProgressBar Value="{Binding Progress, Mode=OneWay}"
|
|
Minimum="0" Maximum="100" Height="3"
|
|
Margin="0,4,0,0"/>
|
|
</StackPanel>
|
|
|
|
</DockPanel>
|
|
</Border>
|
|
</UserControl>
|