Fixed-Footer-Scrolling-Issue (#29381)

Author: prakashKannanSf3972

src/Controls/src/Core/Handlers/Items/Android/Adapters/EmptyViewAdapter.cs

@@ -223,7 +223,7 @@ protected RecyclerView.ViewHolder CreateHeaderFooterViewHolder(object content, D
 			}
 
 			// No template, Footer is not a Forms View, so just display Footer.ToString
-			return SimpleViewHolder.FromText(content?.ToString(), context, false);
+			return SimpleViewHolder.FromText(content?.ToString(), context, fill: false);
 		}
 
 		protected RecyclerView.ViewHolder CreateEmptyViewHolder(object content, DataTemplate template, ViewGroup parent)
@@ -235,7 +235,7 @@ protected RecyclerView.ViewHolder CreateEmptyViewHolder(object content, DataTemp
 				if (content is not View formsView)
 				{
 					// No template, EmptyView is not a Forms View, so just display EmptyView.ToString
-					return SimpleViewHolder.FromText(content?.ToString(), context);
+					return SimpleViewHolder.FromText(content?.ToString(), context, () => GetWidth(parent), () => GetHeight(parent), ItemsView);
 				}
 
 				// EmptyView is a Forms View; display that
@@ -319,6 +319,14 @@ void UpdateHeaderFooterHeight(object item, bool isHeader)
 				size = content.Measure(double.PositiveInfinity, double.PositiveInfinity);
 			}
 
+			if (item is string text)
+			{
+				Label label = new Label { Text = text };
+				TemplateHelpers.GetHandler(label, ItemsView.FindMauiContext());
+
+				size = label.Measure(double.PositiveInfinity, double.PositiveInfinity);
+			}
+
 			var itemHeight = size.Height;
 
 			if (isHeader)

src/Controls/src/Core/Handlers/Items/Android/SimpleViewHolder.cs

@@ -27,19 +27,19 @@ public void Recycle(ItemsView itemsView)
 			itemsView.RemoveLogicalChild(View);
 		}
 
-		public static SimpleViewHolder FromText(string text, Context context, bool fill = true)
+		public static SimpleViewHolder FromText(string text, Context context, Func<double> width = null, Func<double> height = null, ItemsView container = null, bool fill = true)
 		{
-			var textView = new TextView(context) { Text = text };
-
 			if (fill)
 			{
-				var layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MatchParent,
-					ViewGroup.LayoutParams.MatchParent);
-				textView.LayoutParameters = layoutParams;
+				// When displaying an EmptyView with Header and Footer, we need to account for the Header and Footer sizes in layout calculations.
+				// This prevents the EmptyView from occupying the full remaining space. 
+				Label label = new Label() { Text = text, VerticalOptions = LayoutOptions.Center, HorizontalOptions = LayoutOptions.Center };
+				SizedItemContentView itemContentControl = new SizedItemContentView(context, width, height);
+				itemContentControl.RealizeContent(label, container);
+				return new SimpleViewHolder(itemContentControl, null);
 			}
 
-			textView.Gravity = GravityFlags.Center;
-
+			TextView textView = new TextView(context) { Text = text, Gravity = GravityFlags.Center };
 			return new SimpleViewHolder(textView, null);
 		}
 

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

@@ -0,0 +1,43 @@
+namespace Maui.Controls.Sample.Issues;
+
+[Issue(IssueTracker.Github, 28765, "[Android] Inconsistent footer scrolling in CollectionView when EmptyView as string", PlatformAffected.Android)]
+public class Issue28765 : TestContentPage
+{
+	override protected void Init()
+	{
+		Grid grid = new Grid
+		{
+			RowDefinitions =
+			{
+				new RowDefinition { Height = GridLength.Star },
+				new RowDefinition { Height = GridLength.Star }
+			}
+		};
+
+		CollectionView headerFooterView = new CollectionView
+		{
+			EmptyView = "No items to display",
+			Header = new Label
+			{
+				Text = "Header View",
+			},
+			Footer = new Label
+			{
+				Text = "Footer View"
+			}
+		};
+
+		CollectionView headerFooterStringView = new CollectionView
+		{
+			EmptyView = "No items to display",
+			Header = "Header String",
+			Footer = "Footer String"
+		};
+		Grid.SetRow(headerFooterStringView, 1);
+
+		grid.Children.Add(headerFooterView);
+		grid.Children.Add(headerFooterStringView);
+
+		Content = grid;
+	}
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28765.cs

@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue28765 : _IssuesUITest
+{
+    public override string Issue => "[Android] Inconsistent footer scrolling in CollectionView when EmptyView as string";
+    public Issue28765(TestDevice device) : base(device)
+    {
+    }
+
+    [Test, Order(1)]
+    [Category(UITestCategories.CollectionView)]
+    public void EmptyViewStringWithHeaderAndFooterAsView()
+    {
+        App.WaitForElement("Footer View");
+    }
+
+    [Test, Order(2)]
+    [Category(UITestCategories.CollectionView)]
+    public void EmptyViewStringWithHeaderAndFooterString()
+    {
+        App.WaitForElement("Footer String");
+    }
+}