From 862ab0fb12b3862989cf3a6480689dab7a3d8971 Mon Sep 17 00:00:00 2001
From: Ariel De Los Santos <ariel.delossantos@nventive.com>
Date: Wed, 20 Sep 2023 11:21:57 -0400
Subject: [PATCH] feat(ProgressBar): lightweight styling for Progress controls

fix: pr comments
---
 .../Styles/Controls/v2/ProgressBar.xaml       |  2 ++
 .../Uno.Themes.WinUI.Markup/Theme.Styles.cs   | 12 -------
 .../Theme/ProgressBar.cs                      | 33 +++++++++++++++++++
 .../Theme/ProgressRing.cs                     | 33 +++++++++++++++++++
 4 files changed, 68 insertions(+), 12 deletions(-)
 create mode 100644 src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
 create mode 100644 src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
index 0edf29c25..88071b895 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
@@ -9,12 +9,14 @@
 		<ResourceDictionary x:Key="Default">
 			<StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+			
 			<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
 			<x:Double x:Key="ProgressBarHeight">4</x:Double>
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="Light">
 			<StaticResource x:Key="ProgressBarForeground" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="ProgressBarBackground" ResourceKey="SurfaceVariantBrush" />
+			
 			<x:Double x:Key="ProgressBarMinWidth">250</x:Double>
 			<x:Double x:Key="ProgressBarHeight">4</x:Double>
 		</ResourceDictionary>
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs
index adea2edd7..9ad290dff 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs
@@ -101,18 +101,6 @@ public static class PipsPager
 				public static StaticResourceKey<Style> Default => new("PipsPagerStyle");
 			}
 
-			public static class ProgressBar
-			{
-				[ResourceKeyDefinition(typeof(Style), "ProgressBarStyle", TargetType = typeof(ProgressBar))]
-				public static StaticResourceKey<Style> Default => new("ProgressBarStyle");
-			}
-
-			public static class ProgressRing
-			{
-				[ResourceKeyDefinition(typeof(Style), "ProgressRingStyle", TargetType = typeof(ProgressRing))]
-				public static StaticResourceKey<Style> Default => new("ProgressRingStyle");
-			}
-
 			public static class Slider
 			{
 				[ResourceKeyDefinition(typeof(Style), "SliderStyle", TargetType = typeof(Slider))]
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
new file mode 100644
index 000000000..aad69e712
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressBar.cs
@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static class ProgressBar
+		{
+			public static class Resources
+			{
+				[ResourceKeyDefinition(typeof(Brush), "ProgressBarForeground")]
+				public static ResourceValue<Brush> Foreground => new("ProgressBarForeground", true);
+
+				[ResourceKeyDefinition(typeof(Brush), "ProgressBarBackground")]
+				public static ResourceValue<Brush> Background => new("ProgressBarBackground", true);
+
+				[ResourceKeyDefinition(typeof(double), "ProgressBarMinWidth")]
+				public static ResourceValue<double> MinWidth => new("ProgressBarMinWidth", true);
+
+				[ResourceKeyDefinition(typeof(double), "ProgressBarHeight")]
+				public static ResourceValue<double> Height => new("ProgressBarHeight", true);
+			}
+
+			public static class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "ProgressBarStyle", TargetType = typeof(ProgressBar))]
+				public static ResourceValue<Style> Default => new("ProgressBarStyle");
+			}
+		}
+	}
+}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
new file mode 100644
index 000000000..3b82a21c4
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/ProgressRing.cs
@@ -0,0 +1,33 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static class ProgressRing
+		{
+			public static class Resources
+			{
+				public static class Foreground
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ProgressRingForeground")]
+					public static ResourceValue<Brush> Default => new("ProgressRingForeground", true);
+				}
+
+				public static class Background
+				{
+					[ResourceKeyDefinition(typeof(Brush), "ProgressRingBackground")]
+					public static ResourceValue<Brush> Default => new("ProgressRingBackground", true);
+				}
+			}
+
+			public static class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "ProgressRingStyle", TargetType = typeof(ProgressRing))]
+				public static ResourceValue<Style> Default => new("ProgressRingStyle");
+			}
+		}
+	}
+}