From b59f084ab2124ac9b448e0c030cd6b87c0459a59 Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Wed, 17 Jan 2024 02:17:38 +1100
Subject: [PATCH 1/7] feat: Adding ProgressRing extension

---
 .../Uno.Toolkit.Samples.Shared/App.xaml       |  1 -
 .../Content/Controls/LoadingViewSample.xaml   |  2 +-
 .../Behaviors/ProgressRingExtensions.cs       | 60 +++++++++++++++++++
 .../ExtendedSplashScreen.xaml                 | 11 +++-
 .../Controls/LoadingView/LoadingView.xaml     |  9 ++-
 5 files changed, 79 insertions(+), 4 deletions(-)
 create mode 100644 src/Uno.Toolkit.UI/Behaviors/ProgressRingExtensions.cs

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml
index 0dfb44b00..e05e3d1fa 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml
@@ -53,7 +53,6 @@
                                     <RowDefinition Height="*" />
                                 </Grid.RowDefinitions>
                                 <ProgressRing Grid.Row="1"
-                                              IsActive="True"
                                               HorizontalAlignment="Center"
                                               VerticalAlignment="Center"
 											  Height="100"
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
index 256d6ec01..3f38a5c95 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
@@ -38,7 +38,7 @@
                     <utu:LoadingView.LoadingContentTemplate>
                         <DataTemplate>
                             <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-						<ProgressRing IsActive="True" />
+						<ProgressRing />
                                 <TextBlock Text="{Binding}" />
                             </StackPanel>
                         </DataTemplate>
diff --git a/src/Uno.Toolkit.UI/Behaviors/ProgressRingExtensions.cs b/src/Uno.Toolkit.UI/Behaviors/ProgressRingExtensions.cs
new file mode 100644
index 000000000..84a46583f
--- /dev/null
+++ b/src/Uno.Toolkit.UI/Behaviors/ProgressRingExtensions.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Windows.System;
+using Microsoft.Extensions.Logging;
+using Uno.Extensions;
+using Uno.Logging;
+using System.Diagnostics.CodeAnalysis;
+using Uno.UI.Extensions;
+
+
+#if IS_WINUI
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Input;
+using ItemsRepeater = Microsoft.UI.Xaml.Controls.ItemsRepeater;
+#endif
+
+
+namespace Uno.Toolkit.UI
+{
+	public static class ProgressRingExtensions
+	{
+		public static readonly DependencyProperty IsActiveProperty =
+			DependencyProperty.RegisterAttached(
+				"IsActive",
+				typeof(bool),
+				typeof(ProgressRingExtensions),
+				new PropertyMetadata(false, IsActiveChanged));
+
+		private static void IsActiveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			if (d is FrameworkElement element &&
+				e.NewValue is bool isActive)
+			{				
+				foreach (var item in element.EnumerateDescendants().OfType<ProgressRing>())
+				{
+					item.IsActive = isActive;
+				}
+			}
+		}
+
+		public static void SetIsActive(this FrameworkElement element, bool value)
+		{
+			element.SetValue(IsActiveProperty, value);
+		}
+
+		public static bool GetIsActive(this FrameworkElement element)
+		{
+			return (bool)element.GetValue(IsActiveProperty);
+		}
+	}
+}
diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml
index f2eaa5c46..567407c31 100644
--- a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml
+++ b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml
@@ -57,7 +57,12 @@
 										</Storyboard>
 									</VisualTransition>
 								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Loading" />
+								<VisualState x:Name="Loading">
+									<VisualState.Setters>
+										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="true"/>
+										<Setter Target="SplashScreenPresenter.(utu:ProgressRingExtensions.IsActive)" Value="true"/>
+									</VisualState.Setters>
+								</VisualState>
 								<VisualState x:Name="Loaded">
 									<VisualState.Setters>
 										<Setter Target="ContentPresenter.Opacity"
@@ -70,6 +75,8 @@
 												Value="Collapsed" />
 										<Setter Target="LoadingContentPresenter.Visibility"
 												Value="Collapsed" />
+										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="false"/>
+										<Setter Target="SplashScreenPresenter.(utu:ProgressRingExtensions.IsActive)" Value="false"/>
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -84,6 +91,7 @@
 										  VerticalContentAlignment="Stretch" />
 						<ContentPresenter x:Name="SplashScreenPresenter"
 										  Content="{TemplateBinding SplashScreenContent}"
+										  utu:ProgressRingExtensions.IsActive="false"
 										  IsHitTestVisible="False"
 										  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 										  HorizontalContentAlignment="Stretch"
@@ -92,6 +100,7 @@
 						<ContentControl x:Name="LoadingContentPresenter"
 										Content="{TemplateBinding LoadingContent}"
 										IsHitTestVisible="False"
+										utu:ProgressRingExtensions.IsActive="false"
 										ContentTemplate="{TemplateBinding LoadingContentTemplate}"
 										HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 										HorizontalContentAlignment="Stretch"
diff --git a/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml b/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml
index 4f4d95ba3..ac89c1649 100644
--- a/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml
+++ b/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml
@@ -48,13 +48,18 @@
 										</Storyboard>
 									</VisualTransition>
 								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Loading" />
+								<VisualState x:Name="Loading">
+									<VisualState.Setters>
+										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="true"/>
+									</VisualState.Setters>
+								</VisualState>
 								<VisualState x:Name="Loaded">
 									<VisualState.Setters>
 										<Setter Target="ContentPresenter.Opacity"
 												Value="1" />
 										<Setter Target="LoadingContentPresenter.Opacity"
 												Value="0" />
+										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="false"/>
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -62,12 +67,14 @@
 
 						<ContentPresenter x:Name="ContentPresenter"
 										  Content="{TemplateBinding Content}"
+										  utu:ProgressRingExtensions.IsActive="false"
 										  Opacity="0"
 										  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 										  HorizontalContentAlignment="Stretch"
 										  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 										  VerticalContentAlignment="Stretch" />
 						<ContentControl x:Name="LoadingContentPresenter"
+										utu:ProgressRingExtensions.IsActive="false"
 										Content="{TemplateBinding LoadingContent}"
 										ContentTemplate="{TemplateBinding LoadingContentTemplate}"
 										ContentTemplateSelector="{TemplateBinding LoadingContentTemplateSelector}"

From 86d4c6fad4a936a0dec08d8797fd9e1ddaaa373e Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Sat, 20 Jan 2024 02:17:25 +1100
Subject: [PATCH 2/7] chore: Renaming ProgressRingExtensions to
 ProgressExtensions and include ProgressBar

---
 .../Content/Controls/LoadingViewSample.xaml   | 106 +++++++++---------
 ...ingExtensions.cs => ProgressExtensions.cs} |  15 ++-
 .../ExtendedSplashScreen.xaml                 |  12 +-
 .../Controls/LoadingView/LoadingView.xaml     |   8 +-
 4 files changed, 74 insertions(+), 67 deletions(-)
 rename src/Uno.Toolkit.UI/Behaviors/{ProgressRingExtensions.cs => ProgressExtensions.cs} (79%)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
index 3f38a5c95..308bfd824 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
@@ -1,60 +1,60 @@
-<Page x:Class="Uno.Toolkit.Samples.Content.Controls.LoadingViewSample"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:local="using:Uno.Toolkit.Samples.Content.Controls"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:utu="using:Uno.Toolkit.UI"
-	  xmlns:sample="using:Uno.Toolkit.Samples"
-	  mc:Ignorable="d"
-	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+<Page
+    x:Class="Uno.Toolkit.Samples.Content.Controls.LoadingViewSample"
+    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:local="using:Uno.Toolkit.Samples.Content.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:sample="using:Uno.Toolkit.Samples"
+    xmlns:utu="using:Uno.Toolkit.UI"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    mc:Ignorable="d">
 
-	<sample:SamplePageLayout x:Name="SamplePageLayout"
-							 IsDesignAgnostic="True">
-		<sample:SamplePageLayout.DesignAgnosticTemplate>
-			<DataTemplate>
-				<StackPanel>
-				<utu:LoadingView DataContext="{Binding Data}"
-                                 LoadingContent="Loading...."
-								 x:Name="LoadingView">
-					<utu:LoadingView.Source>
-						<utu:CompositeLoadableSource>
-							<utu:LoadableSource Source="{Binding LoadContent0Command}" />
-							<utu:LoadableSource Source="{Binding LoadContent1Command}" />
-						</utu:CompositeLoadableSource>
-					</utu:LoadingView.Source>
+    <sample:SamplePageLayout x:Name="SamplePageLayout" IsDesignAgnostic="True">
+        <sample:SamplePageLayout.DesignAgnosticTemplate>
+            <DataTemplate>
+                <StackPanel>
+                    <utu:LoadingView
+                        x:Name="LoadingView"
+                        DataContext="{Binding Data}"
+                        LoadingContent="Loading....">
+                        <utu:LoadingView.Source>
+                            <utu:CompositeLoadableSource>
+                                <utu:LoadableSource Source="{Binding LoadContent0Command}" />
+                                <utu:LoadableSource Source="{Binding LoadContent1Command}" />
+                            </utu:CompositeLoadableSource>
+                        </utu:LoadingView.Source>
 
-					<StackPanel x:Name="TestPanel">
-						<TextBlock Text="{Binding Text}" />
-						<ListView ItemsSource="{Binding Source}" />
+                        <StackPanel x:Name="TestPanel">
+                            <TextBlock Text="{Binding Text}" />
+                            <ListView ItemsSource="{Binding Source}" />
 
-						<Button Content="Reload Text"
-								Command="{Binding LoadContent0Command}" />
-						<Button Content="Reload List"
-								Command="{Binding LoadContent1Command}" />
-					</StackPanel>
+                            <Button Command="{Binding LoadContent0Command}" Content="Reload Text" />
+                            <Button Command="{Binding LoadContent1Command}" Content="Reload List" />
+                        </StackPanel>
 
 
-                    <utu:LoadingView.LoadingContentTemplate>
-                        <DataTemplate>
-                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-						<ProgressRing />
-                                <TextBlock Text="{Binding}" />
-                            </StackPanel>
-                        </DataTemplate>
-                    </utu:LoadingView.LoadingContentTemplate>
-				</utu:LoadingView>
-					<ToggleSwitch IsOn="{Binding UseTransitions, ElementName=LoadingView, Mode=TwoWay}">
-						<ToggleSwitch.OnContent>
-							<TextBlock Text="Transitions enabled" />
-						</ToggleSwitch.OnContent>
-						<ToggleSwitch.OffContent>
-							<TextBlock Text="Transitions disabled" />
-						</ToggleSwitch.OffContent>
-					</ToggleSwitch>
-				</StackPanel>
-			</DataTemplate>
-		</sample:SamplePageLayout.DesignAgnosticTemplate>
-	</sample:SamplePageLayout>
+                        <utu:LoadingView.LoadingContentTemplate>
+                            <DataTemplate>
+                                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                                    <ProgressRing />
+                                    <ProgressBar Width="200" />
+                                    <TextBlock Text="{Binding}" />
+                                </StackPanel>
+                            </DataTemplate>
+                        </utu:LoadingView.LoadingContentTemplate>
+                    </utu:LoadingView>
+                    <ToggleSwitch IsOn="{Binding UseTransitions, ElementName=LoadingView, Mode=TwoWay}">
+                        <ToggleSwitch.OnContent>
+                            <TextBlock Text="Transitions enabled" />
+                        </ToggleSwitch.OnContent>
+                        <ToggleSwitch.OffContent>
+                            <TextBlock Text="Transitions disabled" />
+                        </ToggleSwitch.OffContent>
+                    </ToggleSwitch>
+                </StackPanel>
+            </DataTemplate>
+        </sample:SamplePageLayout.DesignAgnosticTemplate>
+    </sample:SamplePageLayout>
 
 </Page>
diff --git a/src/Uno.Toolkit.UI/Behaviors/ProgressRingExtensions.cs b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
similarity index 79%
rename from src/Uno.Toolkit.UI/Behaviors/ProgressRingExtensions.cs
rename to src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
index 84a46583f..53eb41d93 100644
--- a/src/Uno.Toolkit.UI/Behaviors/ProgressRingExtensions.cs
+++ b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
@@ -26,13 +26,13 @@
 
 namespace Uno.Toolkit.UI
 {
-	public static class ProgressRingExtensions
+	public static class ProgressExtensions
 	{
 		public static readonly DependencyProperty IsActiveProperty =
 			DependencyProperty.RegisterAttached(
 				"IsActive",
 				typeof(bool),
-				typeof(ProgressRingExtensions),
+				typeof(ProgressExtensions),
 				new PropertyMetadata(false, IsActiveChanged));
 
 		private static void IsActiveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -40,9 +40,16 @@ private static void IsActiveChanged(DependencyObject d, DependencyPropertyChange
 			if (d is FrameworkElement element &&
 				e.NewValue is bool isActive)
 			{				
-				foreach (var item in element.EnumerateDescendants().OfType<ProgressRing>())
+				foreach (var item in element.EnumerateDescendants())
 				{
-					item.IsActive = isActive;
+					if(item is ProgressRing progressRing)
+					{
+						progressRing.IsActive = isActive;
+					}
+					else if(item is ProgressBar progressBar)
+					{
+						progressBar.IsIndeterminate = isActive;
+					}
 				}
 			}
 		}
diff --git a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml
index 567407c31..7e0821e61 100644
--- a/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml
+++ b/src/Uno.Toolkit.UI/Controls/ExtendedSplashScreen/ExtendedSplashScreen.xaml
@@ -59,8 +59,8 @@
 								</VisualStateGroup.Transitions>
 								<VisualState x:Name="Loading">
 									<VisualState.Setters>
-										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="true"/>
-										<Setter Target="SplashScreenPresenter.(utu:ProgressRingExtensions.IsActive)" Value="true"/>
+										<Setter Target="LoadingContentPresenter.(utu:ProgressExtensions.IsActive)" Value="true"/>
+										<Setter Target="SplashScreenPresenter.(utu:ProgressExtensions.IsActive)" Value="true"/>
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Loaded">
@@ -75,8 +75,8 @@
 												Value="Collapsed" />
 										<Setter Target="LoadingContentPresenter.Visibility"
 												Value="Collapsed" />
-										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="false"/>
-										<Setter Target="SplashScreenPresenter.(utu:ProgressRingExtensions.IsActive)" Value="false"/>
+										<Setter Target="LoadingContentPresenter.(utu:ProgressExtensions.IsActive)" Value="false"/>
+										<Setter Target="SplashScreenPresenter.(utu:ProgressExtensions.IsActive)" Value="false"/>
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -91,7 +91,7 @@
 										  VerticalContentAlignment="Stretch" />
 						<ContentPresenter x:Name="SplashScreenPresenter"
 										  Content="{TemplateBinding SplashScreenContent}"
-										  utu:ProgressRingExtensions.IsActive="false"
+										  utu:ProgressExtensions.IsActive="false"
 										  IsHitTestVisible="False"
 										  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 										  HorizontalContentAlignment="Stretch"
@@ -100,7 +100,7 @@
 						<ContentControl x:Name="LoadingContentPresenter"
 										Content="{TemplateBinding LoadingContent}"
 										IsHitTestVisible="False"
-										utu:ProgressRingExtensions.IsActive="false"
+										utu:ProgressExtensions.IsActive="false"
 										ContentTemplate="{TemplateBinding LoadingContentTemplate}"
 										HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 										HorizontalContentAlignment="Stretch"
diff --git a/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml b/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml
index ac89c1649..8e602cfaa 100644
--- a/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml
+++ b/src/Uno.Toolkit.UI/Controls/LoadingView/LoadingView.xaml
@@ -50,7 +50,7 @@
 								</VisualStateGroup.Transitions>
 								<VisualState x:Name="Loading">
 									<VisualState.Setters>
-										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="true"/>
+										<Setter Target="LoadingContentPresenter.(utu:ProgressExtensions.IsActive)" Value="true"/>
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Loaded">
@@ -59,7 +59,7 @@
 												Value="1" />
 										<Setter Target="LoadingContentPresenter.Opacity"
 												Value="0" />
-										<Setter Target="LoadingContentPresenter.(utu:ProgressRingExtensions.IsActive)" Value="false"/>
+										<Setter Target="LoadingContentPresenter.(utu:ProgressExtensions.IsActive)" Value="false"/>
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -67,14 +67,14 @@
 
 						<ContentPresenter x:Name="ContentPresenter"
 										  Content="{TemplateBinding Content}"
-										  utu:ProgressRingExtensions.IsActive="false"
+										  utu:ProgressExtensions.IsActive="false"
 										  Opacity="0"
 										  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
 										  HorizontalContentAlignment="Stretch"
 										  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 										  VerticalContentAlignment="Stretch" />
 						<ContentControl x:Name="LoadingContentPresenter"
-										utu:ProgressRingExtensions.IsActive="false"
+										utu:ProgressExtensions.IsActive="false"
 										Content="{TemplateBinding LoadingContent}"
 										ContentTemplate="{TemplateBinding LoadingContentTemplate}"
 										ContentTemplateSelector="{TemplateBinding LoadingContentTemplateSelector}"

From 1aee150147b414a2370406f59f9124099f96bf84 Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Sat, 20 Jan 2024 03:48:45 +1100
Subject: [PATCH 3/7] chore: Fixing windows build

---
 .../Behaviors/ProgressExtensions.cs           | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
index 53eb41d93..18ce5284c 100644
--- a/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
+++ b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
@@ -1,17 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Windows.System;
-using Microsoft.Extensions.Logging;
-using Uno.Extensions;
-using Uno.Logging;
-using System.Diagnostics.CodeAnalysis;
 using Uno.UI.Extensions;
 
-
 #if IS_WINUI
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -20,10 +10,10 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
 using ItemsRepeater = Microsoft.UI.Xaml.Controls.ItemsRepeater;
 #endif
 
-
 namespace Uno.Toolkit.UI
 {
 	public static class ProgressExtensions
@@ -39,14 +29,14 @@ private static void IsActiveChanged(DependencyObject d, DependencyPropertyChange
 		{
 			if (d is FrameworkElement element &&
 				e.NewValue is bool isActive)
-			{				
+			{
 				foreach (var item in element.EnumerateDescendants())
 				{
-					if(item is ProgressRing progressRing)
+					if (item is ProgressRing progressRing)
 					{
 						progressRing.IsActive = isActive;
 					}
-					else if(item is ProgressBar progressBar)
+					else if (item is ProgressBar progressBar)
 					{
 						progressBar.IsIndeterminate = isActive;
 					}
@@ -63,5 +53,26 @@ public static bool GetIsActive(this FrameworkElement element)
 		{
 			return (bool)element.GetValue(IsActiveProperty);
 		}
+
+#if WINDOWS_UWP || WINDOWS
+		// Copied from Uno.UI.Extensions.ViewExtensions for Windows targets
+		private static IEnumerable<DependencyObject> EnumerateDescendants(this DependencyObject reference)
+		{
+			foreach (DependencyObject child in reference.EnumerateChildren())
+			{
+				yield return child;
+				foreach (DependencyObject item in child.EnumerateDescendants())
+				{
+					yield return item;
+				}
+			}
+		}
+
+		private static IEnumerable<DependencyObject> EnumerateChildren(this DependencyObject reference)
+		{
+			return from x in Enumerable.Range(0, VisualTreeHelper.GetChildrenCount(reference))
+											  select VisualTreeHelper.GetChild(reference, x);
+		}
+#endif
 	}
 }

From cfccee5f84f215d6edd7cd223e9a5084bc8f3cc5 Mon Sep 17 00:00:00 2001
From: Luke Blevins <lukeblevins@outlook.com>
Date: Fri, 2 Feb 2024 11:02:10 -0500
Subject: [PATCH 4/7] fix: Address review feedback

---
 .../Content/Controls/LoadingViewSample.xaml   | 104 +++++++++---------
 .../Behaviors/ProgressExtensions.cs           |  54 +++------
 2 files changed, 69 insertions(+), 89 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
index 308bfd824..b3fcecc5a 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
@@ -1,60 +1,60 @@
 <Page
-    x:Class="Uno.Toolkit.Samples.Content.Controls.LoadingViewSample"
-    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:local="using:Uno.Toolkit.Samples.Content.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:sample="using:Uno.Toolkit.Samples"
-    xmlns:utu="using:Uno.Toolkit.UI"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    mc:Ignorable="d">
+	x:Class="Uno.Toolkit.Samples.Content.Controls.LoadingViewSample"
+	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:local="using:Uno.Toolkit.Samples.Content.Controls"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:sample="using:Uno.Toolkit.Samples"
+	xmlns:utu="using:Uno.Toolkit.UI"
+	Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+	mc:Ignorable="d">
 
-    <sample:SamplePageLayout x:Name="SamplePageLayout" IsDesignAgnostic="True">
-        <sample:SamplePageLayout.DesignAgnosticTemplate>
-            <DataTemplate>
-                <StackPanel>
-                    <utu:LoadingView
-                        x:Name="LoadingView"
-                        DataContext="{Binding Data}"
-                        LoadingContent="Loading....">
-                        <utu:LoadingView.Source>
-                            <utu:CompositeLoadableSource>
-                                <utu:LoadableSource Source="{Binding LoadContent0Command}" />
-                                <utu:LoadableSource Source="{Binding LoadContent1Command}" />
-                            </utu:CompositeLoadableSource>
-                        </utu:LoadingView.Source>
+	<sample:SamplePageLayout x:Name="SamplePageLayout" IsDesignAgnostic="True">
+		<sample:SamplePageLayout.DesignAgnosticTemplate>
+			<DataTemplate>
+				<StackPanel>
+					<utu:LoadingView
+						x:Name="LoadingView"
+						DataContext="{Binding Data}"
+						LoadingContent="Loading....">
+						<utu:LoadingView.Source>
+							<utu:CompositeLoadableSource>
+								<utu:LoadableSource Source="{Binding LoadContent0Command}" />
+								<utu:LoadableSource Source="{Binding LoadContent1Command}" />
+							</utu:CompositeLoadableSource>
+						</utu:LoadingView.Source>
 
-                        <StackPanel x:Name="TestPanel">
-                            <TextBlock Text="{Binding Text}" />
-                            <ListView ItemsSource="{Binding Source}" />
+						<StackPanel x:Name="TestPanel">
+							<TextBlock Text="{Binding Text}" />
+							<ListView ItemsSource="{Binding Source}" />
 
-                            <Button Command="{Binding LoadContent0Command}" Content="Reload Text" />
-                            <Button Command="{Binding LoadContent1Command}" Content="Reload List" />
-                        </StackPanel>
+							<Button Command="{Binding LoadContent0Command}" Content="Reload Text" />
+							<Button Command="{Binding LoadContent1Command}" Content="Reload List" />
+						</StackPanel>
 
 
-                        <utu:LoadingView.LoadingContentTemplate>
-                            <DataTemplate>
-                                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                    <ProgressRing />
-                                    <ProgressBar Width="200" />
-                                    <TextBlock Text="{Binding}" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </utu:LoadingView.LoadingContentTemplate>
-                    </utu:LoadingView>
-                    <ToggleSwitch IsOn="{Binding UseTransitions, ElementName=LoadingView, Mode=TwoWay}">
-                        <ToggleSwitch.OnContent>
-                            <TextBlock Text="Transitions enabled" />
-                        </ToggleSwitch.OnContent>
-                        <ToggleSwitch.OffContent>
-                            <TextBlock Text="Transitions disabled" />
-                        </ToggleSwitch.OffContent>
-                    </ToggleSwitch>
-                </StackPanel>
-            </DataTemplate>
-        </sample:SamplePageLayout.DesignAgnosticTemplate>
-    </sample:SamplePageLayout>
+						<utu:LoadingView.LoadingContentTemplate>
+							<DataTemplate>
+								<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+									<ProgressRing />
+									<ProgressBar Width="200" />
+									<TextBlock Text="{Binding}" />
+								</StackPanel>
+							</DataTemplate>
+						</utu:LoadingView.LoadingContentTemplate>
+					</utu:LoadingView>
+					<ToggleSwitch IsOn="{Binding UseTransitions, ElementName=LoadingView, Mode=TwoWay}">
+						<ToggleSwitch.OnContent>
+							<TextBlock Text="Transitions enabled" />
+						</ToggleSwitch.OnContent>
+						<ToggleSwitch.OffContent>
+							<TextBlock Text="Transitions disabled" />
+						</ToggleSwitch.OffContent>
+					</ToggleSwitch>
+				</StackPanel>
+			</DataTemplate>
+		</sample:SamplePageLayout.DesignAgnosticTemplate>
+	</sample:SamplePageLayout>
 
 </Page>
diff --git a/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
index 18ce5284c..db8f6b96a 100644
--- a/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
+++ b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Uno.UI.Extensions;
 
@@ -18,12 +19,22 @@ namespace Uno.Toolkit.UI
 {
 	public static class ProgressExtensions
 	{
-		public static readonly DependencyProperty IsActiveProperty =
-			DependencyProperty.RegisterAttached(
-				"IsActive",
-				typeof(bool),
-				typeof(ProgressExtensions),
-				new PropertyMetadata(false, IsActiveChanged));
+		#region DependencyProperty: IsActive
+
+		/// <summary>
+		/// Backing property for a value which recursively sets whether the
+		/// nested progress controls are displaying a loading animation.
+		/// </summary>
+		public static readonly DependencyProperty IsActiveProperty = DependencyProperty.RegisterAttached(
+			"IsActive",
+			typeof(bool),
+			typeof(ProgressExtensions),
+			new PropertyMetadata(false, IsActiveChanged));
+
+		public static bool GetIsActive(FrameworkElement element) => (bool)element.GetValue(IsActiveProperty);
+		public static void SetIsActive(FrameworkElement element, bool value) => element.SetValue(IsActiveProperty, value);
+
+		#endregion
 
 		private static void IsActiveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
 		{
@@ -43,36 +54,5 @@ private static void IsActiveChanged(DependencyObject d, DependencyPropertyChange
 				}
 			}
 		}
-
-		public static void SetIsActive(this FrameworkElement element, bool value)
-		{
-			element.SetValue(IsActiveProperty, value);
-		}
-
-		public static bool GetIsActive(this FrameworkElement element)
-		{
-			return (bool)element.GetValue(IsActiveProperty);
-		}
-
-#if WINDOWS_UWP || WINDOWS
-		// Copied from Uno.UI.Extensions.ViewExtensions for Windows targets
-		private static IEnumerable<DependencyObject> EnumerateDescendants(this DependencyObject reference)
-		{
-			foreach (DependencyObject child in reference.EnumerateChildren())
-			{
-				yield return child;
-				foreach (DependencyObject item in child.EnumerateDescendants())
-				{
-					yield return item;
-				}
-			}
-		}
-
-		private static IEnumerable<DependencyObject> EnumerateChildren(this DependencyObject reference)
-		{
-			return from x in Enumerable.Range(0, VisualTreeHelper.GetChildrenCount(reference))
-											  select VisualTreeHelper.GetChild(reference, x);
-		}
-#endif
 	}
 }

From 105ac233cb0ea4715fbdd963e8ddd52a06c88ddd Mon Sep 17 00:00:00 2001
From: Luke Blevins <lukeblevins@outlook.com>
Date: Fri, 2 Feb 2024 11:19:50 -0500
Subject: [PATCH 5/7] chore: Revert xaml formatting mistakes

---
 .../Content/Controls/LoadingViewSample.xaml   | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
index b3fcecc5a..fef47bf2d 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
@@ -1,23 +1,22 @@
-<Page
-	x:Class="Uno.Toolkit.Samples.Content.Controls.LoadingViewSample"
-	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:local="using:Uno.Toolkit.Samples.Content.Controls"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:sample="using:Uno.Toolkit.Samples"
-	xmlns:utu="using:Uno.Toolkit.UI"
-	Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-	mc:Ignorable="d">
+<Page x:Class="Uno.Toolkit.Samples.Content.Controls.LoadingViewSample"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:local="using:Uno.Toolkit.Samples.Content.Controls"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  xmlns:utu="using:Uno.Toolkit.UI"
+	  xmlns:sample="using:Uno.Toolkit.Samples"
+	  mc:Ignorable="d"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-	<sample:SamplePageLayout x:Name="SamplePageLayout" IsDesignAgnostic="True">
+	<sample:SamplePageLayout x:Name="SamplePageLayout"
+							 IsDesignAgnostic="True">
 		<sample:SamplePageLayout.DesignAgnosticTemplate>
 			<DataTemplate>
 				<StackPanel>
-					<utu:LoadingView
-						x:Name="LoadingView"
-						DataContext="{Binding Data}"
-						LoadingContent="Loading....">
+					<utu:LoadingView DataContext="{Binding Data}"
+									 LoadingContent="Loading...."
+									 x:Name="LoadingView">
 						<utu:LoadingView.Source>
 							<utu:CompositeLoadableSource>
 								<utu:LoadableSource Source="{Binding LoadContent0Command}" />
@@ -29,8 +28,10 @@
 							<TextBlock Text="{Binding Text}" />
 							<ListView ItemsSource="{Binding Source}" />
 
-							<Button Command="{Binding LoadContent0Command}" Content="Reload Text" />
-							<Button Command="{Binding LoadContent1Command}" Content="Reload List" />
+							<Button Content="Reload Text"
+									Command="{Binding LoadContent0Command}" />
+							<Button Content="Reload List"
+									Command="{Binding LoadContent1Command}" />
 						</StackPanel>
 
 

From fd6628e144367c022481074f5419aaef471ff7c0 Mon Sep 17 00:00:00 2001
From: Luke Blevins <lukeblevins@outlook.com>
Date: Fri, 2 Feb 2024 11:26:32 -0500
Subject: [PATCH 6/7] chore: Revert xaml formatting mistakes contd

---
 .../Content/Controls/LoadingViewSample.xaml   | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
index fef47bf2d..d3a85c656 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/LoadingViewSample.xaml
@@ -14,37 +14,37 @@
 		<sample:SamplePageLayout.DesignAgnosticTemplate>
 			<DataTemplate>
 				<StackPanel>
-					<utu:LoadingView DataContext="{Binding Data}"
-									 LoadingContent="Loading...."
-									 x:Name="LoadingView">
-						<utu:LoadingView.Source>
-							<utu:CompositeLoadableSource>
-								<utu:LoadableSource Source="{Binding LoadContent0Command}" />
-								<utu:LoadableSource Source="{Binding LoadContent1Command}" />
-							</utu:CompositeLoadableSource>
-						</utu:LoadingView.Source>
+				<utu:LoadingView DataContext="{Binding Data}"
+                                 LoadingContent="Loading...."
+								 x:Name="LoadingView">
+					<utu:LoadingView.Source>
+						<utu:CompositeLoadableSource>
+							<utu:LoadableSource Source="{Binding LoadContent0Command}" />
+							<utu:LoadableSource Source="{Binding LoadContent1Command}" />
+						</utu:CompositeLoadableSource>
+					</utu:LoadingView.Source>
 
-						<StackPanel x:Name="TestPanel">
-							<TextBlock Text="{Binding Text}" />
-							<ListView ItemsSource="{Binding Source}" />
+					<StackPanel x:Name="TestPanel">
+						<TextBlock Text="{Binding Text}" />
+						<ListView ItemsSource="{Binding Source}" />
 
-							<Button Content="Reload Text"
-									Command="{Binding LoadContent0Command}" />
-							<Button Content="Reload List"
-									Command="{Binding LoadContent1Command}" />
-						</StackPanel>
+						<Button Content="Reload Text"
+								Command="{Binding LoadContent0Command}" />
+						<Button Content="Reload List"
+								Command="{Binding LoadContent1Command}" />
+					</StackPanel>
 
-
-						<utu:LoadingView.LoadingContentTemplate>
-							<DataTemplate>
-								<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-									<ProgressRing />
-									<ProgressBar Width="200" />
-									<TextBlock Text="{Binding}" />
-								</StackPanel>
-							</DataTemplate>
-						</utu:LoadingView.LoadingContentTemplate>
-					</utu:LoadingView>
+					<utu:LoadingView.LoadingContentTemplate>
+						<DataTemplate>
+							<StackPanel HorizontalAlignment="Center" 
+										VerticalAlignment="Center">
+								<ProgressRing />
+								<ProgressBar Width="200" />
+								<TextBlock Text="{Binding}" />
+							</StackPanel>
+						</DataTemplate>
+					</utu:LoadingView.LoadingContentTemplate>
+				</utu:LoadingView>
 					<ToggleSwitch IsOn="{Binding UseTransitions, ElementName=LoadingView, Mode=TwoWay}">
 						<ToggleSwitch.OnContent>
 							<TextBlock Text="Transitions enabled" />

From 08abab3df94b922a6e982d52347a579733d21f43 Mon Sep 17 00:00:00 2001
From: Luke Blevins <lukeblevins@outlook.com>
Date: Fri, 2 Feb 2024 12:08:41 -0500
Subject: [PATCH 7/7] fix: Use VisualTreeHelperEx helper to get children

---
 src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
index db8f6b96a..85482cb50 100644
--- a/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
+++ b/src/Uno.Toolkit.UI/Behaviors/ProgressExtensions.cs
@@ -41,7 +41,7 @@ private static void IsActiveChanged(DependencyObject d, DependencyPropertyChange
 			if (d is FrameworkElement element &&
 				e.NewValue is bool isActive)
 			{
-				foreach (var item in element.EnumerateDescendants())
+				foreach (var item in element.GetChildren())
 				{
 					if (item is ProgressRing progressRing)
 					{