Merge branch '4.8.0' into 5.0.0

Author: samhouts

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11311.cs

@@ -0,0 +1,125 @@
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
+using NUnit.Framework;
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Markup;
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Issue(IssueTracker.None, 11311, "[Regression] CollectionView NSRangeException", PlatformAffected.iOS)]
+	public class Issue11311 : TestTabbedPage
+	{
+		const string Success = "Success";
+
+		protected override void Init()
+		{
+			Device.SetFlags(new[] { "Markup_Experimental" });
+
+			Children.Add(FirstPage());
+			Children.Add(CollectionViewPage());
+		}
+
+		ContentPage FirstPage() 
+		{
+			var firstPage = new ContentPage
+			{
+				Title = "The first page",
+				Content = new Label { Text = Success }
+			};
+
+			firstPage.Appearing += (sender, args) => {
+				if (firstPage.Parent is TabbedPage tabbedPage
+				&& tabbedPage.Children[1] is ContentPage collectionViewPage
+				&& collectionViewPage.Content is RefreshView refreshView)
+				{
+					refreshView.IsRefreshing = true;
+				}
+			};
+
+			return firstPage;
+		}
+
+		ContentPage CollectionViewPage()
+		{
+			BindingContext = new _11311ViewModel();
+
+			var refreshView = new RefreshView
+			{
+				Content = new CollectionView
+				{
+					Footer = new BoxView { BackgroundColor = Color.Red, HeightRequest = 53 }
+				}.Bind(ItemsView.ItemsSourceProperty, nameof(_11311ViewModel.ScoreCollectionList))
+
+			}.Bind(RefreshView.CommandProperty, nameof(_11311ViewModel.PopulateCollectionCommand))
+			 .Bind(RefreshView.IsRefreshingProperty, nameof(_11311ViewModel.IsRefreshing));
+
+			var page = new ContentPage
+			{
+				Title = "CollectionView Page",
+				Content = refreshView
+			};
+
+			return page;
+		}
+
+		class _11311ViewModel : INotifyPropertyChanged
+		{
+			bool _isRefreshing;
+			IEnumerable<int> _scoreCollectionList;
+
+			public _11311ViewModel()
+			{
+				PopulateCollectionCommand = new Command(ExecuteRefreshCommand);
+				_scoreCollectionList = Enumerable.Empty<int>();
+			}
+
+			public event PropertyChangedEventHandler PropertyChanged;
+
+			public ICommand PopulateCollectionCommand { get; }
+
+			public IEnumerable<int> ScoreCollectionList
+			{
+				get => _scoreCollectionList;
+				set
+				{
+					_scoreCollectionList = value;
+					OnPropertyChanged();
+				}
+			}
+
+			public bool IsRefreshing
+			{
+				get => _isRefreshing;
+				set
+				{
+					if (IsRefreshing != value)
+					{
+						_isRefreshing = value;
+						OnPropertyChanged();
+					}
+				}
+			}
+
+			void ExecuteRefreshCommand()
+			{
+				ScoreCollectionList = Enumerable.Range(0, 100);
+				IsRefreshing = false;
+			}
+
+			void OnPropertyChanged([CallerMemberName] string propertyName = "") => 
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+		}
+
+#if UITEST
+		[Test]
+		public void CollectionViewWithFooterShouldNotCrashOnDisplay()
+		{
+			// If this hasn't already crashed, the test is passing
+			RunningApp.WaitForElement(Success);
+		}
+#endif
+	}
+}

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems

@@ -37,8 +37,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue11137.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11106.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11251.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Issue11259.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11523.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11259.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11311.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue8291.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue2674.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue6484.cs" />

Xamarin.Forms.Platform.Android/Platform.cs

@@ -1329,9 +1329,13 @@ public static SizeRequest GetNativeSize(VisualElement view, double widthConstrai
 		{
 			Performance.Start(out string reference);
 
-			// FIXME: potential crash
 			IVisualElementRenderer visualElementRenderer = GetRenderer(view);
 
+			if (visualElementRenderer == null || visualElementRenderer.View.IsDisposed())
+			{
+				return new SizeRequest(Size.Zero, Size.Zero);
+			}
+
 			var context = visualElementRenderer.View.Context;
 
 			// negative numbers have special meanings to android they don't to us

Xamarin.Forms.Platform.Tizen/FormsApplication.cs

@@ -11,6 +11,7 @@
 using ElmSharp.Wearable;
 using Specific = Xamarin.Forms.PlatformConfiguration.TizenSpecific.Application;
 using Xamarin.Forms.Platform.Tizen.Native;
+using Tizen.Common;
 
 namespace Xamarin.Forms.Platform.Tizen
 {
@@ -60,6 +61,12 @@ protected override void OnPreCreate()
 			base.OnPreCreate();
 			Application.ClearCurrent();
 
+			if (DotnetUtil.TizenAPIVersion < 5)
+			{
+				// We should set the env variable to support IsolatedStorageFile on tizen 4.0 or lower version.
+				Environment.SetEnvironmentVariable("XDG_DATA_HOME", Current.DirectoryInfo.Data);
+			}
+
 			var type = typeof(Window);
 			// Use reflection to avoid breaking compatibility. ElmSharp.Window.CreateWindow() is has been added since API6.
 			var methodInfo = type.GetMethod("CreateWindow", BindingFlags.NonPublic | BindingFlags.Static);

Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewController.cs

@@ -205,9 +205,16 @@ void UpdateHeaderFooterPosition()
 					_headerUIView.Frame = new CoreGraphics.CGRect(0, -headerHeight, CollectionView.Frame.Width, headerHeight);
 				}
 
-				if (_footerUIView != null && (_footerUIView.Frame.Y != ItemsViewLayout.CollectionViewContentSize.Height || emptyHeight > 0))
+				nfloat height = 0;
+
+				if (IsViewLoaded && View.Window != null)
+				{
+					height = ItemsViewLayout.CollectionViewContentSize.Height;
+				}
+
+				if (_footerUIView != null && (_footerUIView.Frame.Y != height || emptyHeight > 0))
 				{
-					_footerUIView.Frame = new CoreGraphics.CGRect(0, ItemsViewLayout.CollectionViewContentSize.Height + emptyHeight, CollectionView.Frame.Width, footerHeight);
+					_footerUIView.Frame = new CoreGraphics.CGRect(0, height + emptyHeight, CollectionView.Frame.Width, footerHeight);
 				}
 			}
 		}