From 3688199035bf12d9c7073615fc4ab199d215f711 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Wed, 18 Jan 2023 02:28:10 +0800
Subject: [PATCH 1/2] feat: add progress bar default theme, add left and right
 layout.

---
 src/Semi.Avalonia.Demo/MainWindow.axaml       |   3 +
 .../Pages/ProgressBarDemo.axaml               |  96 ++++++
 .../Pages/ProgressBarDemo.axaml.cs            |  18 +
 src/Semi.Avalonia/Controls/Controls.axaml     |   1 +
 src/Semi.Avalonia/Controls/ProgressBar.axaml  | 310 ++++++++++++++++++
 src/Semi.Avalonia/Themes/Light/Light.axaml    |   1 +
 .../Themes/Light/ProgressBar.axaml            |   8 +
 7 files changed, 437 insertions(+)
 create mode 100644 src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
 create mode 100644 src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
 create mode 100644 src/Semi.Avalonia/Controls/ProgressBar.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Light/ProgressBar.axaml

diff --git a/src/Semi.Avalonia.Demo/MainWindow.axaml b/src/Semi.Avalonia.Demo/MainWindow.axaml
index 6527bb7..a7b2a3f 100644
--- a/src/Semi.Avalonia.Demo/MainWindow.axaml
+++ b/src/Semi.Avalonia.Demo/MainWindow.axaml
@@ -46,6 +46,9 @@
         <TabItem Header="Notification">
             <pages:NotificationDemo />
         </TabItem>
+        <TabItem Header="ProgressBar">
+            <pages:ProgressBarDemo />
+        </TabItem>
         <TabItem Header="RadioButton">
             <pages:RadioButtonDemo />
         </TabItem>
diff --git a/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml b/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
new file mode 100644
index 0000000..692d649
--- /dev/null
+++ b/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
@@ -0,0 +1,96 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.ProgressBarDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <StackPanel
+        Margin="20"
+        HorizontalAlignment="Left"
+        Spacing="20">
+        <ProgressBar
+            Width="200"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="20" />
+        <ProgressBar
+            Width="200"
+            IsIndeterminate="True"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="20" />
+        <ProgressBar
+            Width="200"
+            Classes="Left"
+            IsIndeterminate="True"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="20" />
+        <ProgressBar
+            Width="200"
+            Classes="Left"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="20" />
+        <ProgressBar
+            Width="200"
+            Classes="Right"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="20" />
+        <StackPanel
+            HorizontalAlignment="Left"
+            Orientation="Horizontal"
+            Spacing="20">
+            <ProgressBar
+                Classes="Left"
+                Maximum="100"
+                Minimum="0"
+                Orientation="Vertical"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                Classes="Right"
+                Maximum="100"
+                Minimum="0"
+                Orientation="Vertical"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                Maximum="100"
+                Minimum="0"
+                Orientation="Vertical"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                Classes="Left"
+                Maximum="100"
+                Minimum="0"
+                Orientation="Vertical"
+                ShowProgressText="False"
+                Value="20" />
+            <ProgressBar
+                IsIndeterminate="True"
+                Maximum="100"
+                Minimum="0"
+                Orientation="Vertical"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                IsIndeterminate="True"
+                Maximum="100"
+                Minimum="0"
+                Orientation="Vertical"
+                ShowProgressText="False"
+                Value="20" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>
diff --git a/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs b/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
new file mode 100644
index 0000000..54f8165
--- /dev/null
+++ b/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class ProgressBarDemo : UserControl
+{
+    public ProgressBarDemo()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/Controls.axaml b/src/Semi.Avalonia/Controls/Controls.axaml
index f604a23..925e022 100644
--- a/src/Semi.Avalonia/Controls/Controls.axaml
+++ b/src/Semi.Avalonia/Controls/Controls.axaml
@@ -15,6 +15,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/NotificationCard.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/PathIcon.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Popup.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/ProgressBar.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/RadioButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/RepeatButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/SelectableTextBlock.axaml" />
diff --git a/src/Semi.Avalonia/Controls/ProgressBar.axaml b/src/Semi.Avalonia/Controls/ProgressBar.axaml
new file mode 100644
index 0000000..4fae4cc
--- /dev/null
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -0,0 +1,310 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="using:Avalonia.Controls.Converters">
+    <Design.PreviewWith>
+        <StackPanel Margin="20" Spacing="20">
+            <ProgressBar
+                Width="200"
+                Maximum="100"
+                Minimum="0"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                Width="200"
+                IsIndeterminate="True"
+                Maximum="100"
+                Minimum="0"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                Width="200"
+                Classes="Left"
+                IsIndeterminate="True"
+                Maximum="100"
+                Minimum="0"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                Width="200"
+                Classes="Left"
+                Maximum="100"
+                Minimum="0"
+                ShowProgressText="True"
+                Value="20" />
+            <ProgressBar
+                Width="200"
+                Classes="Right"
+                Maximum="100"
+                Minimum="0"
+                ShowProgressText="True"
+                Value="20" />
+            <StackPanel
+                HorizontalAlignment="Left"
+                Orientation="Horizontal"
+                Spacing="20">
+                <ProgressBar
+                    Classes="Left"
+                    Maximum="100"
+                    Minimum="0"
+                    Orientation="Vertical"
+                    ShowProgressText="True"
+                    Value="20" />
+                <ProgressBar
+                    Classes="Right"
+                    Maximum="100"
+                    Minimum="0"
+                    Orientation="Vertical"
+                    ShowProgressText="True"
+                    Value="20" />
+                <ProgressBar
+                    Maximum="100"
+                    Minimum="0"
+                    Orientation="Vertical"
+                    ShowProgressText="True"
+                    Value="20" />
+                <ProgressBar
+                    Classes="Left"
+                    Maximum="100"
+                    Minimum="0"
+                    Orientation="Vertical"
+                    ShowProgressText="False"
+                    Value="20" />
+                <ProgressBar
+                    IsIndeterminate="True"
+                    Maximum="100"
+                    Minimum="0"
+                    Orientation="Vertical"
+                    ShowProgressText="True"
+                    Value="20" />
+                <ProgressBar
+                    IsIndeterminate="True"
+                    Maximum="100"
+                    Minimum="0"
+                    Orientation="Vertical"
+                    ShowProgressText="False"
+                    Value="20" />
+            </StackPanel>
+        </StackPanel>
+    </Design.PreviewWith>
+
+    <converters:StringFormatConverter x:Key="StringFormatConverter" />
+
+    <ControlTheme x:Key="{x:Type ProgressBar}" TargetType="ProgressBar">
+        <Setter Property="Foreground" Value="{DynamicResource ProgressBarIndicatorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource ProgressBarBackground}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ProgressBarBorderThemeThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ProgressBarBackgroundCornerRadius}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ProgressBarRootBorderBrush}" />
+        <Setter Property="MinHeight" Value="{DynamicResource ProgressBarThemeMinHeight}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="ProgressBar">
+                <Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="Auto, *, Auto">
+                    <Border
+                        x:Name="ProgressBarRoot"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        ClipToBounds="True"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Panel>
+                            <Panel x:Name="DeterminateRoot" Opacity="1">
+                                <Panel.Transitions>
+                                    <Transitions>
+                                        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                                    </Transitions>
+                                </Panel.Transitions>
+                                <Border
+                                    x:Name="PART_Indicator"
+                                    Margin="{TemplateBinding Padding}"
+                                    Background="{TemplateBinding Foreground}"
+                                    CornerRadius="{TemplateBinding CornerRadius}" />
+                            </Panel>
+                            <Panel x:Name="IndeterminateRoot" Opacity="0">
+                                <Panel.Transitions>
+                                    <Transitions>
+                                        <DoubleTransition Property="Opacity" Duration="0:0:0.197" />
+                                    </Transitions>
+                                </Panel.Transitions>
+                                <Border
+                                    x:Name="IndeterminateProgressBarIndicator"
+                                    Margin="{TemplateBinding Padding}"
+                                    Background="{TemplateBinding Foreground}"
+                                    CornerRadius="{TemplateBinding CornerRadius}" />
+                                <Border
+                                    x:Name="IndeterminateProgressBarIndicator2"
+                                    Margin="{TemplateBinding Padding}"
+                                    Background="{TemplateBinding Foreground}"
+                                    CornerRadius="{TemplateBinding CornerRadius}" />
+                            </Panel>
+                        </Panel>
+                    </Border>
+                    <LayoutTransformControl
+                        x:Name="PART_LayoutTransformControl"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        IsVisible="{TemplateBinding ShowProgressText}">
+                        <TextBlock Foreground="{DynamicResource ProgressBarTextForeground}">
+                            <TextBlock.Text>
+                                <MultiBinding Converter="{StaticResource StringFormatConverter}">
+                                    <TemplateBinding Property="ProgressTextFormat" />
+                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <TemplateBinding Property="Percentage" />
+                                    <TemplateBinding Property="Minimum" />
+                                    <TemplateBinding Property="Maximum" />
+                                </MultiBinding>
+                            </TextBlock.Text>
+                        </TextBlock>
+                    </LayoutTransformControl>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:horizontal /template/ Border#PART_Indicator">
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+        </Style>
+        <Style Selector="^:vertical /template/ Border#PART_Indicator">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+        </Style>
+        <Style Selector="^:horizontal">
+            <Setter Property="MinWidth" Value="200" />
+            <Setter Property="MinHeight" Value="4" />
+        </Style>
+        <Style Selector="^:vertical">
+            <Setter Property="MinWidth" Value="4" />
+            <Setter Property="MinHeight" Value="200" />
+        </Style>
+        <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+            <Setter Property="LayoutTransform">
+                <Setter.Value>
+                    <RotateTransform Angle="90" />
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style Selector="^:indeterminate /template/ Panel#DeterminateRoot">
+            <Setter Property="Opacity" Value="0" />
+        </Style>
+        <Style Selector="^:indeterminate /template/ Panel#IndeterminateRoot">
+            <Setter Property="Opacity" Value="1" />
+        </Style>
+        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerAnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
+            <Style.Animations>
+                <Animation IterationCount="Infinite" Duration="0:0:2">
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationStartPosition}" />
+                    </KeyFrame>
+                    <KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
+                        <Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2AnimationEndPosition}" />
+                    </KeyFrame>
+                </Animation>
+            </Style.Animations>
+        </Style>
+        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
+            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+        </Style>
+        <Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
+            <Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+        </Style>
+        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
+            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.ContainerWidth}" />
+        </Style>
+        <Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
+            <Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateProperties.Container2Width}" />
+        </Style>
+        <Style Selector="^.Left">
+            <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                <Setter Property="Grid.Column" Value="0" />
+                <Setter Property="Grid.Row" Value="1" />
+                <Setter Property="LayoutTransformControl.Margin" Value="4 0" />
+            </Style>
+            <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                <Setter Property="Grid.Column" Value="1" />
+                <Setter Property="Grid.Row" Value="0" />
+                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
+            </Style>
+            <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
+                <Setter Property="Border.MinHeight" Value="4" />
+                <Setter Property="Border.VerticalAlignment" Value="Center" />
+            </Style>
+            <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
+                <Setter Property="Border.MinWidth" Value="4" />
+                <Setter Property="Border.HorizontalAlignment" Value="Center" />
+            </Style>
+        </Style>
+        <Style Selector="^.Right">
+            <Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                <Setter Property="Grid.Column" Value="2" />
+                <Setter Property="Grid.Row" Value="1" />
+                <Setter Property="LayoutTransformControl.Margin" Value="4 0" />
+            </Style>
+            <Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
+                <Setter Property="Grid.Column" Value="1" />
+                <Setter Property="Grid.Row" Value="2" />
+                <Setter Property="LayoutTransformControl.Margin" Value="0 4" />
+            </Style>
+            <Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
+                <Setter Property="Border.MinHeight" Value="4" />
+                <Setter Property="Border.VerticalAlignment" Value="Center" />
+            </Style>
+            <Style Selector="^:vertical /template/ Border#ProgressBarRoot">
+                <Setter Property="Border.MinWidth" Value="4" />
+                <Setter Property="Border.HorizontalAlignment" Value="Center" />
+            </Style>
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml
index be1249f..e3becb9 100644
--- a/src/Semi.Avalonia/Themes/Light/Light.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Light.axaml
@@ -11,6 +11,7 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Label.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ListBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/NotificationCard.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ProgressBar.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/RadioButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/ScrollViewer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TabControl.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
new file mode 100644
index 0000000..306bebc
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
+    <SolidColorBrush x:Key="ProgressBarIndicatorBrush" Color="#0077FA" />
+    <CornerRadius x:Key="ProgressBarBackgroundCornerRadius">3</CornerRadius>
+    <SolidColorBrush x:Key="ProgressBarBackground" Color="LightGray" />
+    <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
+    <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
+</ResourceDictionary>

From eab1a7a808ed2f8e297a9e2a7bf87a9d557c51dd Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Wed, 18 Jan 2023 16:36:10 +0800
Subject: [PATCH 2/2] feat: add color variant.

---
 .../Pages/ProgressBarDemo.axaml               | 29 ++++++++++++++++++-
 src/Semi.Avalonia/Controls/ProgressBar.axaml  | 13 +++++++--
 .../Themes/Light/ProgressBar.axaml            |  4 +++
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml b/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
index 692d649..19f39c0 100644
--- a/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
+++ b/src/Semi.Avalonia.Demo/Pages/ProgressBarDemo.axaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
+    d:DesignHeight="800"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <StackPanel
@@ -92,5 +92,32 @@
                 ShowProgressText="False"
                 Value="20" />
         </StackPanel>
+        <ProgressBar
+            Width="200"
+            Classes="Success"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="60" />
+        <ProgressBar
+            Width="200"
+            Classes="Warning"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="60" />
+        <ProgressBar
+            Width="200"
+            Classes="Error"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="60" />
+        <ProgressBar
+            Width="200"
+            Maximum="100"
+            Minimum="0"
+            ShowProgressText="True"
+            Value="60" />
     </StackPanel>
 </UserControl>
diff --git a/src/Semi.Avalonia/Controls/ProgressBar.axaml b/src/Semi.Avalonia/Controls/ProgressBar.axaml
index 4fae4cc..783a00a 100644
--- a/src/Semi.Avalonia/Controls/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Controls/ProgressBar.axaml
@@ -150,7 +150,7 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         IsVisible="{TemplateBinding ShowProgressText}">
-                        <TextBlock Foreground="{DynamicResource ProgressBarTextForeground}">
+                        <TextBlock FontWeight="{DynamicResource ProgressBarTextFontWeight}" Foreground="{DynamicResource ProgressBarTextForeground}">
                             <TextBlock.Text>
                                 <MultiBinding Converter="{StaticResource StringFormatConverter}">
                                     <TemplateBinding Property="ProgressTextFormat" />
@@ -165,13 +165,22 @@
                 </Grid>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^.Warning">
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarWarningForeground}" />
+        </Style>
+        <Style Selector="^.Error">
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
+        </Style>
+        <Style Selector="^.Success">
+            <Setter Property="ProgressBar.Foreground" Value="{DynamicResource ProgressBarSuccessForeground}" />
+        </Style>
         <Style Selector="^:horizontal /template/ Border#PART_Indicator">
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Stretch" />
         </Style>
         <Style Selector="^:vertical /template/ Border#PART_Indicator">
             <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="VerticalAlignment" Value="Top" />
         </Style>
         <Style Selector="^:horizontal">
             <Setter Property="MinWidth" Value="200" />
diff --git a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
index 306bebc..92a40c2 100644
--- a/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
+++ b/src/Semi.Avalonia/Themes/Light/ProgressBar.axaml
@@ -5,4 +5,8 @@
     <SolidColorBrush x:Key="ProgressBarBackground" Color="LightGray" />
     <SolidColorBrush x:Key="ProgressBarTextForeground" Color="#1C1F23" />
     <SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
+    <FontWeight x:Key="ProgressBarTextFontWeight">600</FontWeight>
+    <SolidColorBrush x:Key="ProgressBarSuccessForeground" Color="#3BB346" />
+    <SolidColorBrush x:Key="ProgressBarWarningForeground" Color="#FC8800" />
+    <SolidColorBrush x:Key="ProgressBarErrorForeground" Color="#F93920" />
 </ResourceDictionary>