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] 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>