From 878397978b9b8a25a1c26abc45b8000b2f0e7aff Mon Sep 17 00:00:00 2001
From: abdesol <abdesoltak@gmail.com>
Date: Thu, 30 Dec 2021 20:49:13 +0300
Subject: [PATCH 1/3] Added Progress text to ProgressBar.xaml from
 Avalonia.Themes.Fluent

---
 src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index 7ad75588e1..a8bca77d3e 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -21,6 +21,7 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Border x:Name="ProgressBarRoot" ClipToBounds="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">          
+          <Grid>
             <Panel>
               <Panel x:Name="DeterminateRoot">
                 <Border CornerRadius="{TemplateBinding CornerRadius}" x:Name="PART_Indicator" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
@@ -29,7 +30,11 @@
                 <Border x:Name="IndeterminateProgressBarIndicator" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
                 <Border x:Name="IndeterminateProgressBarIndicator2" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
               </Panel>
-            </Panel>          
+            </Panel>
+            <LayoutTransformControl HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_LayoutTransformControl">
+              <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}" Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
+            </LayoutTransformControl>
+          </Grid>
         </Border>
       </ControlTemplate>
     </Setter>

From 7ef5296898357b18164d3137341a9ad98451ed79 Mon Sep 17 00:00:00 2001
From: abdesol <abdesoltak@gmail.com>
Date: Fri, 31 Dec 2021 07:00:22 +0300
Subject: [PATCH 2/3] Changed progress text foreground to template binding of
 the progress bar foreground

---
 src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index a8bca77d3e..e971eb46f2 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -21,7 +21,6 @@
     <Setter Property="Template">
       <ControlTemplate>
         <Border x:Name="ProgressBarRoot" ClipToBounds="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">          
-          <Grid>
             <Panel>
               <Panel x:Name="DeterminateRoot">
                 <Border CornerRadius="{TemplateBinding CornerRadius}" x:Name="PART_Indicator" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
@@ -30,11 +29,10 @@
                 <Border x:Name="IndeterminateProgressBarIndicator" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
                 <Border x:Name="IndeterminateProgressBarIndicator2" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
               </Panel>
+              <LayoutTransformControl x:Name="PART_LayoutTransformControl" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}">
+                <TextBlock Foreground="{TemplateBinding Foreground}" Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
+              </LayoutTransformControl>
             </Panel>
-            <LayoutTransformControl HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_LayoutTransformControl">
-              <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}" Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
-            </LayoutTransformControl>
-          </Grid>
         </Border>
       </ControlTemplate>
     </Setter>

From e9d861bc6659640d9e61797ad8ddc65298d68c14 Mon Sep 17 00:00:00 2001
From: Abdella Solomon <69455299+Abdesol@users.noreply.github.com>
Date: Sat, 1 Jan 2022 12:45:54 +0300
Subject: [PATCH 3/3] Changed text foreground of progressbar from template
 binding to SystemControlForegroundBaseHighBrush

---
 src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
index e971eb46f2..48b450a338 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml
@@ -30,7 +30,7 @@
                 <Border x:Name="IndeterminateProgressBarIndicator2" CornerRadius="{TemplateBinding CornerRadius}" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Foreground}" />
               </Panel>
               <LayoutTransformControl x:Name="PART_LayoutTransformControl" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding ShowProgressText, RelativeSource={RelativeSource TemplatedParent}}">
-                <TextBlock Foreground="{TemplateBinding Foreground}" Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
+                <TextBlock Foreground="{DynamicResource SystemControlForegroundBaseHighBrush}" Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat={}{0:0}%}" />
               </LayoutTransformControl>
             </Panel>
         </Border>