Merge 4.7.0 into 4.8.0

Author: PureWeen

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

@@ -2232,4 +2232,4 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
+</Project>

Xamarin.Forms.Platform.iOS/PageLifecycleManager.cs

@@ -4,7 +4,7 @@
 
 namespace Xamarin.Forms.Platform.iOS
 {
-	internal class PageLifecycleManager : IDisposable
+	internal class PageLifecycleManager : IDisposable, IDisconnectable
 	{
 		NSObject _activateObserver;
 		NSObject _resignObserver;
@@ -36,24 +36,29 @@ protected virtual void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				if (_activateObserver != null)
-				{
-					NSNotificationCenter.DefaultCenter.RemoveObserver(_activateObserver);
-					_activateObserver = null;
-				}
+				(this as IDisconnectable).Disconnect();
+			}
 
-				if (_resignObserver != null)
-				{
-					NSNotificationCenter.DefaultCenter.RemoveObserver(_resignObserver);
-					_resignObserver = null;
-				}
+			_disposed = true;
+		}
 
-				HandlePageDisappearing();
+		void IDisconnectable.Disconnect()
+		{
+			if (_activateObserver != null)
+			{
+				NSNotificationCenter.DefaultCenter.RemoveObserver(_activateObserver);
+				_activateObserver = null;
+			}
 
-				_pageController = null;
+			if (_resignObserver != null)
+			{
+				NSNotificationCenter.DefaultCenter.RemoveObserver(_resignObserver);
+				_resignObserver = null;
 			}
 
-			_disposed = true;
+			HandlePageDisappearing();
+
+			_pageController = null;
 		}
 
 		public void Dispose()
@@ -85,8 +90,12 @@ public void HandlePageDisappearing()
 
 		bool CheckIfWeAreTheCurrentPage()
 		{
+			if (_pageController == null)
+				return false;
+
 			if (_pageController.RealParent is IPageContainer<Page> multipage)
 				return multipage.CurrentPage == _pageController;
+
 			return true;
 		}
 	}

Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs

@@ -267,6 +267,7 @@ void IDisconnectable.Disconnect()
 				Element = null;
 			}
 
+			(_pageLifecycleManager as IDisconnectable)?.Disconnect();
 			_events?.Disconnect();
 			_packager?.Disconnect();
 			_tracker?.Disconnect();
@@ -279,7 +280,6 @@ protected override void Dispose(bool disposing)
 
 			if (disposing)
 			{
-				var page = Page;
 				(this as IDisconnectable).Disconnect();
 
 				_pageLifecycleManager?.Dispose();

Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj

@@ -341,4 +341,4 @@
     <PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup />
-</Project>
+</Project>