[Windows] Fix for 7144 ( IndicatorView using templated icons not working )

Author: SyedAbdulAzeemSF4852

src/Controls/tests/TestCases.HostApp/Issues/Issue7144.cs

@@ -5,7 +5,7 @@ namespace Controls.TestCases.HostApp.Issues;
 [Issue(IssueTracker.Github, 7144, "IndicatorView using templated icons not working", PlatformAffected.UWP)]
 public class Issue7144 : ContentPage
 {
-	public ObservableCollection<Monkey> Monkeys { get; set; } = new ObservableCollection<Monkey>();
+	public ObservableCollection<Issue7144Monkey> Monkeys { get; set; } = new ObservableCollection<Issue7144Monkey>();
 
 	public Issue7144()
 	{
@@ -88,21 +88,21 @@ public Issue7144()
 
 	void CreateMonkeyCollection()
 	{
-		Monkeys.Add(new Monkey
+		Monkeys.Add(new Issue7144Monkey
 		{
 			Name = "Baboon",
 			Image = "dotnet_bot.png"
 		});
 
-		Monkeys.Add(new Monkey
+		Monkeys.Add(new Issue7144Monkey
 		{
 			Name = "Capuchin Monkey",
 			Image = "dotnet_bot.png"
 		});
 	}
 }
 
-public class Monkey
+public class Issue7144Monkey
 {
 	public string Name { get; set; }
 

src/Core/src/Platform/Windows/MauiPageControl.cs

@@ -34,23 +34,18 @@ public void SetIndicatorView(IIndicatorView indicatorView)
 				Items.Clear();
 		}
 
-		private bool HasTemplate()
-		{
-			return _indicatorView is null || (_indicatorView is ITemplatedIndicatorView templatedView && templatedView.IndicatorsLayoutOverride is not null);
-		}
-
 		internal void UpdateIndicatorsColor()
 		{
-			if (HasTemplate())
+			if (_indicatorView is null || (_indicatorView is ITemplatedIndicatorView templatedView && templatedView.IndicatorsLayoutOverride is not null))
 			{
 				return;
 			}
 
-			if (_indicatorView?.IndicatorColor is SolidPaint solidPaint)
+			if (_indicatorView.IndicatorColor is SolidPaint solidPaint)
 				_fillColor = solidPaint?.ToPlatform();
-			if (_indicatorView?.SelectedIndicatorColor is SolidPaint selectedSolidPaint)
+			if (_indicatorView.SelectedIndicatorColor is SolidPaint selectedSolidPaint)
 				_selectedColor = selectedSolidPaint.ToPlatform();
-			var position = _indicatorView?.Position;
+			var position = _indicatorView.Position;
 			int i = 0;
 			foreach (var item in Items)
 			{
@@ -61,15 +56,15 @@ internal void UpdateIndicatorsColor()
 
 		internal void CreateIndicators()
 		{
-			if (HasTemplate())
+			if (_indicatorView is null || (_indicatorView is ITemplatedIndicatorView templatedView && templatedView.IndicatorsLayoutOverride is not null))
 			{
 				return;
 			}
 
 			var position = GetIndexFromPosition();
 			var indicators = new List<WShape>();
 
-			var indicatorCount = _indicatorView?.GetMaximumVisible();
+			var indicatorCount = _indicatorView.GetMaximumVisible();
 			if (indicatorCount > 0)
 			{
 				for (int i = 0; i < indicatorCount; i++)