From 3ca387a3ffb27279fc0c77d41199f5f5c5ea3372 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Soucy <ma.soucy@nventive.com>
Date: Mon, 29 May 2023 11:57:53 -0400
Subject: [PATCH 1/2] feat(ProgressBar): Progress bars style can now be
 overrided using lightweight styling

---
 .../Styles/Controls/v2/ProgressBar.xaml       | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
index 889d81508..667343103 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
@@ -5,19 +5,44 @@
 					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 					mc:Ignorable="d">
 
-	<x:Double x:Key="MaterialProgressBarMinWidth">250</x:Double>
-	<x:Double x:Key="MaterialProgressBarHeight">4</x:Double>
-	
+	<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
+	<x:Double x:Key="ProgressBarHeight">4</x:Double>
+
+	<ResourceDictionary.ThemeDictionaries>
+
+		<ResourceDictionary x:Key="Default">
+
+			<StaticResource x:Key="MaterialProgressBarForeground" ResourceKey="PrimaryBrush" />
+
+			<StaticResource x:Key="MaterialProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+
+			<StaticResource x:Key="MaterialProgressBarMinWidth" ResourceKey="ProgressBarMinWidth" />
+
+			<StaticResource x:Key="MaterialProgressBarHeight" ResourceKey="ProgressBarHeight" />
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="Light">
+
+			<StaticResource x:Key="MaterialProgressBarForeground" ResourceKey="PrimaryBrush" />
+
+			<StaticResource x:Key="MaterialProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+
+			<StaticResource x:Key="MaterialProgressBarMinWidth" ResourceKey="ProgressBarMinWidth" />
+
+			<StaticResource x:Key="MaterialProgressBarHeight" ResourceKey="ProgressBarHeight" />
+		</ResourceDictionary>
+	</ResourceDictionary.ThemeDictionaries>
+
 	<Style x:Key="MaterialProgressBarStyle"
 		   TargetType="muxc:ProgressBar">
 		<Setter Property="Foreground"
-				Value="{ThemeResource PrimaryVariantDarkBrush}" />
+				Value="{ThemeResource MaterialProgressBarForeground}" />
 		<Setter Property="Background"
-				Value="{ThemeResource PrimaryVariantLightBrush}" />
+				Value="{ThemeResource MaterialProgressBarBackground}" />
 		<Setter Property="MinWidth"
-				Value="{StaticResource MaterialProgressBarMinWidth}" />
+				Value="{ThemeResource MaterialProgressBarMinWidth}" />
 		<Setter Property="Height"
-				Value="{StaticResource MaterialProgressBarHeight}" />
+				Value="{ThemeResource MaterialProgressBarHeight}" />
 	</Style>
 
 </ResourceDictionary>

From 78d8992f3a4c3bd2c5707b55ffcbdd2cbebb09be Mon Sep 17 00:00:00 2001
From: Marc-Antoine Soucy <ma.soucy@nventive.com>
Date: Mon, 5 Jun 2023 09:30:33 -0400
Subject: [PATCH 2/2] feat(ProgressBar): Progress bars style can now be
 overrided using lightweight styling

---
 .../Styles/Controls/v2/ProgressBar.xaml       | 72 +++++++------------
 1 file changed, 27 insertions(+), 45 deletions(-)

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
index 667343103..c00f59697 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
@@ -1,48 +1,30 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					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"
-					xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-					mc:Ignorable="d">
-
-	<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
-	<x:Double x:Key="ProgressBarHeight">4</x:Double>
-
-	<ResourceDictionary.ThemeDictionaries>
-
-		<ResourceDictionary x:Key="Default">
-
-			<StaticResource x:Key="MaterialProgressBarForeground" ResourceKey="PrimaryBrush" />
-
-			<StaticResource x:Key="MaterialProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
-
-			<StaticResource x:Key="MaterialProgressBarMinWidth" ResourceKey="ProgressBarMinWidth" />
-
-			<StaticResource x:Key="MaterialProgressBarHeight" ResourceKey="ProgressBarHeight" />
-		</ResourceDictionary>
-
-		<ResourceDictionary x:Key="Light">
-
-			<StaticResource x:Key="MaterialProgressBarForeground" ResourceKey="PrimaryBrush" />
-
-			<StaticResource x:Key="MaterialProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
-
-			<StaticResource x:Key="MaterialProgressBarMinWidth" ResourceKey="ProgressBarMinWidth" />
-
-			<StaticResource x:Key="MaterialProgressBarHeight" ResourceKey="ProgressBarHeight" />
-		</ResourceDictionary>
-	</ResourceDictionary.ThemeDictionaries>
-
-	<Style x:Key="MaterialProgressBarStyle"
-		   TargetType="muxc:ProgressBar">
-		<Setter Property="Foreground"
-				Value="{ThemeResource MaterialProgressBarForeground}" />
-		<Setter Property="Background"
-				Value="{ThemeResource MaterialProgressBarBackground}" />
-		<Setter Property="MinWidth"
-				Value="{ThemeResource MaterialProgressBarMinWidth}" />
-		<Setter Property="Height"
-				Value="{ThemeResource MaterialProgressBarHeight}" />
-	</Style>
+                    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"
+                    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+                    mc:Ignorable="d">
+
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
+            <StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Light">
+            <StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
+            <StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <x:Double x:Key="ProgressBarMinWidth">250</x:Double>
+    <x:Double x:Key="ProgressBarHeight">4</x:Double>
+
+    <Style x:Key="MaterialProgressBarStyle"
+           TargetType="muxc:ProgressBar">
+        <Setter Property="Foreground" Value="{ThemeResource ProgressBarForeground}" />
+        <Setter Property="Background" Value="{ThemeResource ProgressBarBackground}" />
+        <Setter Property="MinWidth" Value="{StaticResource ProgressBarMinWidth}" />
+        <Setter Property="Height" Value="{StaticResource ProgressBarHeight}" />
+    </Style>
 
 </ResourceDictionary>