From 13c2236933febd04259f7fe2200febcf8056b62a Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 4 Dec 2020 11:40:44 -0500
Subject: [PATCH 01/46] Ported Popup Control from Xamarin/Xamarin.Forms#9616 to
 Xamarin Community Toolkit

---
 samples/XCT.Sample.Android/MainActivity.cs    |   6 +-
 ...rin.CommunityToolkit.Sample.Android.csproj |   2 +-
 .../ViewModels/Views/ViewsGalleryViewModel.cs |   5 +-
 .../Xamarin.CommunityToolkit.Sample.csproj    |   1 +
 .../Pages/Views/PopupGalleryPage.xaml         |  66 ++++
 .../Pages/Views/PopupGalleryPage.xaml.cs      |   7 +
 .../Pages/Views/Popups/ButtonPopup.xaml       |  48 +++
 .../Pages/Views/Popups/ButtonPopup.xaml.cs    |   9 +
 .../Views/Popups/MultipleButtonPopup.xaml     |  62 ++++
 .../Views/Popups/MultipleButtonPopup.xaml.cs  |  11 +
 .../Views/Popups/NoLightDismissPopup.xaml     |  52 +++
 .../Views/Popups/NoLightDismissPopup.xaml.cs  |   9 +
 .../Views/Popups/OpenedEventSimplePopup.xaml  |  42 +++
 .../Popups/OpenedEventSimplePopup.xaml.cs     |  21 ++
 .../Pages/Views/Popups/PopupAnchorPage.xaml   |  53 +++
 .../Views/Popups/PopupAnchorPage.xaml.cs      |  35 ++
 .../Pages/Views/Popups/PopupPositionPage.xaml | 117 ++++++
 .../Views/Popups/PopupPositionPage.xaml.cs    |   7 +
 .../Pages/Views/Popups/SimplePopup.xaml       |  42 +++
 .../Pages/Views/Popups/SimplePopup.xaml.cs    |   7 +
 .../Pages/Views/Popups/ToggleSizePopup.xaml   |  48 +++
 .../Views/Popups/ToggleSizePopup.xaml.cs      |  27 ++
 .../Pages/Views/Popups/TransparentPopup.xaml  |  17 +
 .../Views/Popups/TransparentPopup.xaml.cs     |   7 +
 .../ViewModels/Views/PopupControlViewModel.cs |  43 +++
 .../Views/Popups/PopupAnchorViewModel.cs      |  21 ++
 .../Views/Popups/PopupPositionViewModel.cs    |  74 ++++
 .../NavigationExtensions.android.cs           |  13 +
 .../Navigation/NavigationExtensions.ios.cs    |  13 +
 .../Navigation/NavigationExtensions.shared.cs |  34 ++
 .../Navigation/NavigationExtensions.uwp.cs    |  33 ++
 .../VisualElementExtension.shared.cs          |   5 +-
 .../VisualElementExtensions.uwp.cs            |  51 +++
 .../Helpers/FormsToolkit.ios.cs               |  20 +
 .../Startup/ToolkitPlatform.android.cs        |  26 ++
 .../Views/Popup/BasePopup.shared.cs           | 175 +++++++++
 .../Views/Popup/Popup.shared.cs               |  27 ++
 .../Popup/PopupDismissedEventArgs.shared.cs   |  15 +
 .../Views/Popup/PopupOfT.shared.cs            |  70 ++++
 .../Popup/PopupOpenedEventArgs.shared.cs      |  11 +
 .../Views/Popup/PopupRenderer.android.cs      | 350 ++++++++++++++++++
 .../Views/Popup/PopupRenderer.ios.cs          | 288 ++++++++++++++
 .../Views/Popup/PopupRenderer.uwp.cs          | 277 ++++++++++++++
 .../Views/ViewToRendererConverter.uwp.cs      | 104 ++++++
 .../Xamarin.CommunityToolkit.csproj           |  14 +-
 45 files changed, 2358 insertions(+), 7 deletions(-)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
 rename src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/{ => VisualElement}/VisualElementExtension.shared.cs (91%)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElement/VisualElementExtensions.uwp.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOpenedEventArgs.shared.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs

diff --git a/samples/XCT.Sample.Android/MainActivity.cs b/samples/XCT.Sample.Android/MainActivity.cs
index 9a00b8c73..0c945823c 100644
--- a/samples/XCT.Sample.Android/MainActivity.cs
+++ b/samples/XCT.Sample.Android/MainActivity.cs
@@ -2,7 +2,6 @@
 using Android.Content.PM;
 using Android.OS;
 using Android.Runtime;
-using Xamarin.Essentials;
 
 namespace Xamarin.CommunityToolkit.Sample.Droid
 {
@@ -17,14 +16,15 @@ protected override void OnCreate(Bundle savedInstanceState)
 			base.OnCreate(savedInstanceState);
 
 			global::Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
-			Platform.Init(this, savedInstanceState);
+			Essentials.Platform.Init(this, savedInstanceState);
+			ToolkitPlatform.Init(this);
 			global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
 			LoadApplication(new App());
 		}
 
 		public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults)
 		{
-			Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+			Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
 
 			base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
 		}
diff --git a/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj b/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
index 8fe84cb44..26f3cbeac 100644
--- a/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
+++ b/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
@@ -127,7 +127,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties XamarinHotReloadXFormsNugetUpgradeInfoBarXamarinCommunityToolkitSampleAndroidHideInfoBar="True" />
+      <UserProperties XamarinHotReloadXFormsNugetUpgradeInfoBarXamarinCommunityToolkitSampleAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/samples/XCT.Sample/ViewModels/Views/ViewsGalleryViewModel.cs b/samples/XCT.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
index 26dd7d0dc..1a1bc370d 100644
--- a/samples/XCT.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/ViewsGalleryViewModel.cs
@@ -48,7 +48,10 @@ public class ViewsGalleryViewModel : BaseGalleryViewModel
 				"A control to display a set of tabs and their respective content."),
 
 			new SectionModel(typeof(UniformGridPage), "UniformGrid",
-				"The UniformGrid is just like the Grid, with all rows and columns will have the same size.")
+				"The UniformGrid is just like the Grid, with all rows and columns will have the same size."),
+
+			new SectionModel(typeof(PopupGalleryPage), "Popup",
+				"The popup control renders native popups from the shared code. This page demonstrates a variety of different techniques for displaying native popups.")
 		};
 	}
 }
\ No newline at end of file
diff --git a/samples/XCT.Sample/Xamarin.CommunityToolkit.Sample.csproj b/samples/XCT.Sample/Xamarin.CommunityToolkit.Sample.csproj
index af5548634..132d64517 100644
--- a/samples/XCT.Sample/Xamarin.CommunityToolkit.Sample.csproj
+++ b/samples/XCT.Sample/Xamarin.CommunityToolkit.Sample.csproj
@@ -12,6 +12,7 @@
     <EmbeddedResource Include="Images\**" />
     <EmbeddedResource Include="Fonts\**" />
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />  
     <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml
new file mode 100644
index 000000000..0229b4d1e
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BasePage xmlns="http://xamarin.com/schemas/2014/forms"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
+                xmlns:viewModels="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views"
+                xmlns:custom="clr-namespace:Xamarin.Forms.PancakeView;assembly=Xamarin.Forms.PancakeView"
+                x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.PopupGalleryPage"
+                Title="Popup Control"
+                x:Name="root">
+
+    <ContentPage.BindingContext>
+        <viewModels:PopupControlViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Header" TargetType="Label">
+                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
+                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+                <Setter Property="Margin" Value="15, 10" />
+            </Style>
+            <Style TargetType="ScrollView">
+                <Setter Property="VerticalOptions" Value="FillAndExpand" />
+            </Style>
+            <Style x:Key="ItemsLayout" TargetType="StackLayout">
+                <Setter Property="Spacing" Value="16" />
+            </Style>
+        </ResourceDictionary>
+    </ContentPage.Resources>
+    
+    <ContentPage.Content>
+        <StackLayout>
+            <ScrollView>
+                <StackLayout>
+                    <Label Style="{StaticResource Header}"
+                           Text="The popup control renders native popups from the shared code. This page demonstrates a variety of different techniques for displaying native popups." />
+                    <StackLayout Style="{StaticResource ItemsLayout}"
+                                 BindableLayout.ItemsSource="{Binding Examples}">
+                        <BindableLayout.ItemTemplate>
+                            <DataTemplate>
+                                <custom:PancakeView Style="{StaticResource card}" 
+                                                    Margin="{StaticResource ContentPadding}">
+                                    <custom:PancakeView.GestureRecognizers>
+                                        <TapGestureRecognizer Command="{Binding BindingContext.DisplayPopup, Source={x:Reference root}}"
+                                                              CommandParameter="{Binding Type}" />
+                                    </custom:PancakeView.GestureRecognizers>
+                                    <Grid ColumnSpacing="20">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="12" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <BoxView BackgroundColor="{Binding Color}" />
+                                        <StackLayout Grid.Column="1" Spacing="8" Padding="0,24,24,24">
+                                            <Label Style="{StaticResource label_section_header}" Text="{Binding Title}" />
+                                            <Label Text="{Binding Description}" />
+                                        </StackLayout>
+                                    </Grid>
+                                </custom:PancakeView>
+                            </DataTemplate>
+                        </BindableLayout.ItemTemplate>
+                    </StackLayout>
+                </StackLayout>
+            </ScrollView>
+        </StackLayout>
+    </ContentPage.Content>
+</pages:BasePage>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml.cs
new file mode 100644
index 000000000..63fa5ecaf
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml.cs
@@ -0,0 +1,7 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views
+{
+	public partial class PopupGalleryPage
+	{
+		public PopupGalleryPage() => InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
new file mode 100644
index 000000000..c70ccdf88
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 400'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ButtonPopup">
+    
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+            <Style x:Key="ConfirmButton" TargetType="Button">
+                <Setter Property="VerticalOptions" Value="EndAndExpand" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <xct:Popup.View>
+        <StackLayout Style="{StaticResource PopupLayout}">
+            <Label Style="{StaticResource Title}" 
+                   Text="Button Popup" />
+            <BoxView Style="{StaticResource Divider}" />
+            <Label Style="{StaticResource Content}" 
+                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
+            <Button Text="OKAY"
+                    Style="{StaticResource ConfirmButton}"
+                    Clicked="Button_Clicked" />
+        </StackLayout>
+    </xct:Popup.View>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs
new file mode 100644
index 000000000..8c23d1d4d
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs
@@ -0,0 +1,9 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class ButtonPopup
+	{
+		public ButtonPopup() => InitializeComponent();
+
+		void Button_Clicked(object sender, System.EventArgs e) => Dismiss(null);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
new file mode 100644
index 000000000..4bc1b5a86
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 400'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.MultipleButtonPopup">
+    
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+            <Style x:Key="CancelButton" TargetType="Button">
+                <Setter Property="Background" Value="#FFF" />
+                <Setter Property="BorderWidth" Value="1" />
+                <Setter Property="BorderColor" Value="Blue" />
+                <Setter Property="TextColor" Value="Blue" />
+            </Style>
+            <Style x:Key="ButtonGroup" TargetType="StackLayout">
+                <Setter Property="VerticalOptions" Value="EndAndExpand" />
+                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+                <Setter Property="Spacing" Value="20" />
+                <Setter Property="Orientation" Value="Horizontal" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <xct:Popup.View>
+        <StackLayout Style="{StaticResource PopupLayout}">
+            <Label Style="{StaticResource Title}" 
+                   Text="Button Popup" />
+            <BoxView Style="{StaticResource Divider}" />
+            <Label Style="{StaticResource Content}" 
+                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
+            <StackLayout Style="{StaticResource ButtonGroup}">
+                <Button Text="Cancel"
+                        Style="{StaticResource CancelButton}"
+                        Clicked="Cancel_Clicked" />
+                <Button Text="OKAY"
+                        Clicked="Okay_Clicked" />    
+            </StackLayout>
+            
+        </StackLayout>
+    </xct:Popup.View>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs
new file mode 100644
index 000000000..ca000ce33
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs
@@ -0,0 +1,11 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class MultipleButtonPopup
+	{
+		public MultipleButtonPopup() => InitializeComponent();
+
+		void Cancel_Clicked(object sender, System.EventArgs e) => Dismiss(false);
+
+		void Okay_Clicked(object sender, System.EventArgs e) => Dismiss(true);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
new file mode 100644
index 000000000..594ca398e
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 400'}"
+           IsLightDismissEnabled="False"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.NoLightDismissPopup">
+
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <xct:Popup.View>
+        <StackLayout Style="{StaticResource PopupLayout}">
+            <Label 
+                Style="{StaticResource Title}" 
+                Text="Simple Popup" />
+            <BoxView Style="{StaticResource Divider}" />
+            <Label 
+                Style="{StaticResource Content}"
+                Text="{OnPlatform
+                    Android='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
+                    iOS='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
+                    UWP='UWP Flyouts do not support toggling light dismiss mode. On UWP this will always dismiss the flyout if you tap outside of the control'}" />
+            <Button 
+                Text="Close"
+                VerticalOptions="EndAndExpand"
+                Clicked="Button_Clicked" />
+        </StackLayout>
+    </xct:Popup.View>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs
new file mode 100644
index 000000000..bbaff0d7d
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs
@@ -0,0 +1,9 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class NoLightDismissPopup
+	{
+		public NoLightDismissPopup() => InitializeComponent();
+
+		void Button_Clicked(object sender, System.EventArgs e) => Dismiss(null);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
new file mode 100644
index 000000000..1ed70809c
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.OpenedEventSimplePopup">
+
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <xct:Popup.View>
+        <StackLayout Style="{StaticResource PopupLayout}">
+            <Label x:Name="title" 
+                   Style="{StaticResource Title}" />
+            <BoxView Style="{StaticResource Divider}" />
+            <Label x:Name="message" 
+                   Style="{StaticResource Content}" />
+        </StackLayout>
+    </xct:Popup.View>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
new file mode 100644
index 000000000..92121fa12
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
@@ -0,0 +1,21 @@
+using Xamarin.CommunityToolkit.UI.Views;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class OpenedEventSimplePopup
+	{
+		public OpenedEventSimplePopup()
+		{
+			InitializeComponent();
+			Opened += OnOpened;
+		}
+
+		void OnOpened(object sender, PopupOpenedEventArgs e)
+		{
+			Opened -= OnOpened;
+
+			title.Text = "Opened Event Popup";
+			message.Text = "The content of this popup was updated after the popup was rendered";
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
new file mode 100644
index 000000000..05b6a1c0c
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:viewModels="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups"
+             Title="Popup Anchors"
+             x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.PopupAnchorPage">
+
+    <ContentPage.BindingContext>
+        <viewModels:PopupAnchorViewModel />
+    </ContentPage.BindingContext>
+    
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <Style x:Key="BaseLabel" TargetType="Label">
+                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
+                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+            </Style>
+            
+            <Style x:Key="Header" TargetType="Label" BasedOn="{StaticResource BaseLabel}">
+                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
+                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+                <Setter Property="Margin" Value="15, 10" />
+            </Style>
+
+            <Style x:Key="Indicator" TargetType="Label" BasedOn="{StaticResource BaseLabel}">
+                <Setter Property="FontSize" Value="24" />
+            </Style>
+
+            <Style TargetType="Button">
+                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
+                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+            </Style>
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+    <ContentPage.Content>
+        <StackLayout>
+            <Label Style="{StaticResource Header}"
+                   Text="Popup's can be anchored to other Views on the page. Tap and drag the X to change where the popup will be centered." />
+            <Label x:Name="indicator" 
+                   Style="{StaticResource Indicator}" 
+                   Text="❌">
+                <Label.GestureRecognizers>
+                    <PanGestureRecognizer PanUpdated="OnPanUpdated" />
+                </Label.GestureRecognizers>
+            </Label>
+            <Button Text="Show Popup"
+                    Command="{Binding ShowPopup}"
+                    CommandParameter="{x:Reference indicator}"/>
+        </StackLayout>
+    </ContentPage.Content>
+
+</ContentPage>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs
new file mode 100644
index 000000000..8aaf9728d
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs
@@ -0,0 +1,35 @@
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class PopupAnchorPage
+	{
+		public PopupAnchorPage() => InitializeComponent();
+
+		void OnPanUpdated(object sender, PanUpdatedEventArgs e)
+		{
+			if (sender is Label label)
+			{
+				if (Device.RuntimePlatform == Device.Android)
+				{
+					label.TranslationX += e.TotalX;
+					label.TranslationY += e.TotalY;
+				}
+				else
+				{
+					switch (e.StatusType)
+					{
+						case GestureStatus.Running:
+							label.TranslationX = e.TotalX;
+							label.TranslationY = e.TotalY;
+							break;
+						case GestureStatus.Completed:
+							label.TranslationX += e.TotalX;
+							label.TranslationY += e.TotalY;
+							break;
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml
new file mode 100644
index 000000000..bf69cf869
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<pages:BasePage xmlns="http://xamarin.com/schemas/2014/forms"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
+                xmlns:viewModels="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups"
+                x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.PopupPositionPage"
+                Title="Popup Position"
+                x:Name="root">
+
+    <ContentPage.BindingContext>
+        <viewModels:PopupPositionViewModel />
+    </ContentPage.BindingContext>
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Header" TargetType="Label">
+                <Setter Property="VerticalOptions" Value="CenterAndExpand" />
+                <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+                <Setter Property="Margin" Value="15, 10" />
+            </Style>
+            <Style TargetType="ScrollView">
+                <Setter Property="VerticalOptions" Value="FillAndExpand" />
+            </Style>
+            <Style x:Key="ItemsLayout" TargetType="StackLayout">
+                <Setter Property="Spacing" Value="16" />
+            </Style>
+        </ResourceDictionary>
+    </ContentPage.Resources>
+
+    <ContentPage.Content>
+        <StackLayout>
+            <ScrollView>
+                <StackLayout>
+                    <Label Style="{StaticResource Header}"
+                           Text="Popup's can be positioned anywhere on the screen using VerticalOptions and HorizontalOptions. Tap the arrows below to see how this works." />
+                    <Grid HorizontalOptions="CenterAndExpand"
+                          VerticalOptions="CenterAndExpand">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <Button Grid.Row="0"
+                                Grid.Column="0"
+                                Text="&#x2196;"
+                                FontSize="18" 
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.TopLeft}" />
+
+                        <Button Grid.Row="0"
+                                Grid.Column="1"
+                                Text="&#x2191;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.Top}" />
+
+                        <Button Grid.Row="0"
+                                Grid.Column="2"
+                                Text="&#x2197;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.TopRight}" />
+
+                        <Button Grid.Row="1"
+                                Grid.Column="0"
+                                Text="&#x2190;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.Left}" />
+
+                        <Button Grid.Row="1"
+                                Grid.Column="1"
+                                Text="&#x26AC;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.Center}" />
+
+                        <Button Grid.Row="1"
+                                Grid.Column="2"
+                                Text="&#x2192;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.Right}" />
+
+                        <Button Grid.Row="2"
+                                Grid.Column="0"
+                                Text="&#x2199;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.BottomLeft}" />
+
+                        <Button Grid.Row="2"
+                                Grid.Column="1"
+                                Text="&#x2193;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.Bottom}" />
+
+                        <Button Grid.Row="2"
+                                Grid.Column="2"
+                                Text="&#x2198;"
+                                FontSize="18"
+                                Command="{Binding DisplayPopup}"
+                                CommandParameter="{x:Static viewModels:PopupPositionViewModel+PopupPosition.BottomRight}" />
+                        
+                    </Grid>
+                </StackLayout>
+            </ScrollView>
+        </StackLayout>
+    </ContentPage.Content>
+</pages:BasePage>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs
new file mode 100644
index 000000000..090c7d20b
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs
@@ -0,0 +1,7 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class PopupPositionPage
+	{
+		public PopupPositionPage() => InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml
new file mode 100644
index 000000000..6905a5206
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.SimplePopup">
+
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <xct:Popup.View>
+        <StackLayout Style="{StaticResource PopupLayout}">
+            <Label Style="{StaticResource Title}" 
+                   Text="Simple Popup" />
+            <BoxView Style="{StaticResource Divider}" />
+            <Label Style="{StaticResource Content}" 
+                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />    
+        </StackLayout>
+    </xct:Popup.View>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml.cs
new file mode 100644
index 000000000..0adc37d6a
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml.cs
@@ -0,0 +1,7 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class SimplePopup
+	{
+		public SimplePopup() => InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
new file mode 100644
index 000000000..5c6e657f5
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ToggleSizePopup">
+    
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+            <Style x:Key="ConfirmButton" TargetType="Button">
+                <Setter Property="VerticalOptions" Value="EndAndExpand" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <xct:Popup.View>
+        <StackLayout Style="{StaticResource PopupLayout}">
+            <Label Style="{StaticResource Title}" 
+                   Text="Button Popup" />
+            <BoxView Style="{StaticResource Divider}" />
+            <Label Style="{StaticResource Content}" 
+                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
+            <Button Text="Toggle Size"
+                    Style="{StaticResource ConfirmButton}"
+                    Clicked="Button_Clicked" />
+        </StackLayout>
+    </xct:Popup.View>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs
new file mode 100644
index 000000000..a4c34429c
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs
@@ -0,0 +1,27 @@
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class ToggleSizePopup
+	{
+		Size originalSize;
+
+		public ToggleSizePopup()
+		{
+			InitializeComponent();
+			originalSize = Size;
+		}
+
+		void Button_Clicked(object sender, System.EventArgs e)
+		{
+			if (originalSize == Size)
+			{
+				Size = new Size(originalSize.Width * 1.25, originalSize.Height * 1.25);
+			}
+			else
+			{
+				Size = originalSize;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
new file mode 100644
index 000000000..edf9d5626
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='200, 200', UWP='100, 100', iOS='100, 100'}"
+           Color="Transparent"
+           BorderColor="Transparent"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.TransparentPopup">
+
+    <xct:Popup.View>
+        <Frame 
+            CornerRadius="{OnPlatform Android='50', UWP='25', iOS='25'}" 
+            HeightRequest="{OnPlatform Android='100', UWP='50'}" WidthRequest="{OnPlatform Android='100', UWP='50'}" 
+            BackgroundColor="Red" />
+    </xct:Popup.View>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs
new file mode 100644
index 000000000..c260895a6
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs
@@ -0,0 +1,7 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class TransparentPopup
+	{
+		public TransparentPopup() => InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs
new file mode 100644
index 000000000..0c71bfaab
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
+using Xamarin.CommunityToolkit.Extensions;
+using Xamarin.CommunityToolkit.Sample.Models;
+using Xamarin.CommunityToolkit.Sample.Pages.Views.Popups;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views
+{
+	public class PopupControlViewModel
+	{
+		INavigation Navigation => App.Current.MainPage.Navigation;
+
+		public IEnumerable<SectionModel> Examples { get; } = new List<SectionModel> {
+			new SectionModel(typeof(SimplePopup), "Simple Popup", Color.Red, "Displays a basic popup centered on the screen"),
+			new SectionModel(typeof(PopupPositionPage), "Custom Positioning Popup", Color.Red, "Displays a basic popup anywhere on the screen using VerticalOptions and HorizontalOptions"),
+			new SectionModel(typeof(ButtonPopup), "Popup With 1 Button", Color.Red, "Displays a basic popup with a confirm button"),
+			new SectionModel(typeof(MultipleButtonPopup), "Popup With Multiple Buttons", Color.Red, "Displays a basic popup with a cancel and confirm button"),
+			new SectionModel(typeof(NoLightDismissPopup), "Simple Popup Without Light Dismiss", Color.Red, "Displays a basic popup but does not allow the user to close it if they tap outside of the popup. In other words the LightDismiss is set to false."),
+			new SectionModel(typeof(ToggleSizePopup), "Toggle Size Popup", Color.Red, "Displays a popup that can have it's size updated by pressing a button"),
+			new SectionModel(typeof(TransparentPopup), "Transparent Popup", Color.Red, "Displays a popup with a transparent background"),
+			new SectionModel(typeof(PopupAnchorPage), "Anchor Popup", Color.Red, "Popups can be anchored to other view's on the screen"),
+			new SectionModel(typeof(OpenedEventSimplePopup), "Opened Event Popup", Color.Red, "Popup with opened event"),
+		};
+
+		public ICommand DisplayPopup => new Command<Type>(OnDisplayPopup);
+
+		void OnDisplayPopup(Type popupType)
+		{
+			var view = (VisualElement)Activator.CreateInstance(popupType);
+			if (view is BasePopup popup)
+			{
+				Navigation.ShowPopup(popup);
+			}
+			else if (view is Page page)
+			{
+				Navigation.PushAsync(page);
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
new file mode 100644
index 000000000..375da6cf4
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
@@ -0,0 +1,21 @@
+using System.Windows.Input;
+using Xamarin.CommunityToolkit.Extensions;
+using Xamarin.CommunityToolkit.Sample.Pages.Views.Popups;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups
+{
+	public class PopupAnchorViewModel
+	{
+		INavigation Navigation => App.Current.MainPage.Navigation;
+
+		public ICommand ShowPopup => new Command<View>(OnShowPopup);
+
+		void OnShowPopup(View anchor)
+		{
+			var popup = new TransparentPopup();
+			popup.Anchor = anchor;
+			Navigation.ShowPopup(popup);
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
new file mode 100644
index 000000000..517365ace
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
@@ -0,0 +1,74 @@
+using System.Windows.Input;
+using Xamarin.CommunityToolkit.Extensions;
+using Xamarin.CommunityToolkit.Sample.Pages.Views.Popups;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups
+{
+	public class PopupPositionViewModel
+	{
+		INavigation Navigation => App.Current.MainPage.Navigation;
+
+		public ICommand DisplayPopup => new Command<PopupPosition>(OnDisplayPopup);
+
+		void OnDisplayPopup(PopupPosition position)
+		{
+			var popup = new SimplePopup();
+
+			switch (position)
+			{
+				case PopupPosition.TopLeft:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.Start, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.Start, true);
+					break;
+				case PopupPosition.Top:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.Start, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.Center, true);
+					break;
+				case PopupPosition.TopRight:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.Start, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.End, true);
+					break;
+				case PopupPosition.Left:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.Center, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.Start, true);
+					break;
+				case PopupPosition.Center:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.Center, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.Center, true);
+					break;
+				case PopupPosition.Right:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.Center, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.End, true);
+					break;
+				case PopupPosition.BottomLeft:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.End, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.Start, true);
+					break;
+				case PopupPosition.Bottom:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.End, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.Center, true);
+					break;
+				case PopupPosition.BottomRight:
+					popup.VerticalOptions = new LayoutOptions(LayoutAlignment.End, true);
+					popup.HorizontalOptions = new LayoutOptions(LayoutAlignment.End, true);
+					break;
+			}
+
+			Navigation.ShowPopup(popup);
+		}
+
+		public enum PopupPosition
+		{
+			TopLeft = 0,
+			Top = 1,
+			TopRight = 2,
+			Left = 3,
+			Center = 4,
+			Right = 5,
+			BottomLeft = 6,
+			Bottom = 7,
+			BottomRight = 8
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
new file mode 100644
index 000000000..c9fd831cc
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
@@ -0,0 +1,13 @@
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms.Platform.Android;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	public static partial class NavigationExtensions
+	{
+		static void OnShowPopup(BasePopup popup)
+		{
+			Platform.CreateRendererWithContext(popup, ToolkitPlatform.Context);
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
new file mode 100644
index 000000000..463a19d13
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
@@ -0,0 +1,13 @@
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms.Platform.iOS;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	public static partial class NavigationExtensions
+	{
+		static void OnShowPopup(BasePopup popup)
+		{
+			Platform.CreateRenderer(popup);
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
new file mode 100644
index 000000000..766016e14
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
@@ -0,0 +1,34 @@
+using System;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	/// <summary>
+	/// Extension methods for <see cref="INavigation"/>.
+	/// </summary>
+	public static partial class NavigationExtensions
+	{
+		/// <summary>
+		/// Displays a popup.
+		/// </summary>
+		/// <param name="navigation">
+		/// The current <see cref="INavigation"/>.
+		/// </param>
+		/// <param name="popup">
+		/// The <see cref="BasePopup"/> to display.
+		/// </param>
+		public static void ShowPopup(this INavigation navigation, BasePopup popup)
+		{
+#if __ANDROID__
+			OnShowPopup(popup);
+#elif __IOS__
+			OnShowPopup(popup);
+#elif WINDOWS_UWP
+			OnShowPopup(popup);
+#else
+			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
+#endif
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
new file mode 100644
index 000000000..e15ac44b4
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
@@ -0,0 +1,33 @@
+using System.Linq;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.UWP;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	public static partial class NavigationExtensions
+	{
+		static void OnShowPopup(BasePopup popup)
+		{
+			popup.Parent = GetCurrentPage(Application.Current.MainPage);
+			Platform.CreateRenderer(popup);
+
+			// https://github.com/xamarin/Xamarin.Forms/blob/0c95d0976cc089fe72476fb037851a64987de83c/Xamarin.Forms.Platform.iOS/PageExtensions.cs#L44
+			Page GetCurrentPage(Page currentPage)
+			{
+				if (currentPage.NavigationProxy.ModalStack.LastOrDefault() is Page modal)
+					return modal;
+				else if (currentPage is MasterDetailPage mdp)
+					return GetCurrentPage(mdp.Detail);
+				else if (currentPage is FlyoutPage fp)
+					return GetCurrentPage(fp.Detail);
+				else if (currentPage is Shell shell && shell.CurrentItem?.CurrentItem is IShellSectionController ssc)
+					return ssc.PresentedPage;
+				else if (currentPage is IPageContainer<Page> pc)
+					return GetCurrentPage(pc.CurrentPage);
+				else
+					return currentPage;
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElementExtension.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElement/VisualElementExtension.shared.cs
similarity index 91%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElementExtension.shared.cs
rename to src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElement/VisualElementExtension.shared.cs
index d7f4f9249..8906ec030 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElementExtension.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElement/VisualElementExtension.shared.cs
@@ -3,7 +3,10 @@
 
 namespace Xamarin.CommunityToolkit.Extensions
 {
-	public static class VisualElementExtension
+	/// <summary>
+	/// Extension methods for <see cref="VisualElement"/>.
+	/// </summary>
+	public static partial class VisualElementExtension
 	{
 		public static Task<bool> ColorTo(this VisualElement element, Color color, uint length = 250u, Easing easing = null)
 		{
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElement/VisualElementExtensions.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElement/VisualElementExtensions.uwp.cs
new file mode 100644
index 000000000..53ddcc1b0
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/VisualElement/VisualElementExtensions.uwp.cs
@@ -0,0 +1,51 @@
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.UWP;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	/// <summary>
+	/// Extension methods for <see cref="VisualElement"/>.
+	/// </summary>
+	public static partial class VisualElementExtensions
+	{
+
+		/// <summary>
+		/// <see cref="VisualElement"/> cleanup object to dispose and
+		/// destroy resources.
+		/// </summary>
+		/// <param name="self">
+		/// The <see cref="VisualElement"/> to cleanup.
+		/// </param>
+		/// <remarks>
+		/// This extension method is ported from Xamarin.Forms and should remain in sync.
+		/// </remarks>
+		internal static void Cleanup(this VisualElement self)
+		{
+			if (self == null)
+				throw new ArgumentNullException("self");
+
+			var renderer = Platform.GetRenderer(self);
+
+			foreach (var element in self.Descendants())
+			{
+				var visual = element as VisualElement;
+				if (visual == null)
+					continue;
+
+				var childRenderer = Platform.GetRenderer(visual);
+				if (childRenderer != null)
+				{
+					childRenderer.Dispose();
+					Platform.SetRenderer(visual, null);
+				}
+			}
+
+			if (renderer != null)
+			{
+				renderer.Dispose();
+				Platform.SetRenderer(self, null);
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs
new file mode 100644
index 000000000..c515b44d7
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs
@@ -0,0 +1,20 @@
+using UIKit;
+
+namespace Xamarin.CommunityToolkit.Helpers
+{
+	public static class FormsToolkit
+	{
+		static bool? isiOS9OrNewer;
+
+		public static bool IsiOS9OrNewer
+		{
+			get
+			{
+				if (!isiOS9OrNewer.HasValue)
+					isiOS9OrNewer = UIDevice.CurrentDevice.CheckSystemVersion(9, 0);
+
+				return isiOS9OrNewer.Value;
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
new file mode 100644
index 000000000..c2db78882
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
@@ -0,0 +1,26 @@
+using Android.Content;
+
+namespace Xamarin.CommunityToolkit
+{
+	/// <summary>
+	/// Platform extension methods.
+	/// </summary>
+	public static partial class ToolkitPlatform
+	{
+		/// <summary>
+		/// Gets the <see cref="Context"/>.
+		/// </summary>
+		internal static Context Context { get; private set; }
+
+		/// <summary>
+		/// Initializes the Android <see cref="Context"/>.
+		/// </summary>
+		/// <param name="context">
+		/// The current <see cref="Context"/>.
+		/// </param>
+		public static void Init(Context context)
+		{
+			Context = context;
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
new file mode 100644
index 000000000..b9f290c9b
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -0,0 +1,175 @@
+using System;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	/// <summary>
+	/// The popup controls base implementation.
+	/// </summary>
+	public abstract class BasePopup : VisualElement
+	{
+		/// <summary>
+		/// Instantiates a new instance of <see cref="BasePopup"/>.
+		/// </summary>
+		public BasePopup()
+		{
+			Color = Color.White;
+			BorderColor = default(Color);
+			VerticalOptions = LayoutOptions.CenterAndExpand;
+			HorizontalOptions = LayoutOptions.CenterAndExpand;
+			IsLightDismissEnabled = true;
+		}
+
+		public static BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(BasePopup));
+		public static BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(BasePopup));
+
+		public static BindableProperty VerticalOptionsProperty = BindableProperty.Create(nameof(VerticalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
+		public static BindableProperty HorizontalOptionsProperty = BindableProperty.Create(nameof(HorizontalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
+
+		/// <summary>
+		/// Gets or sets the <see cref="View"/> to render in the Popup.
+		/// </summary>
+		/// <remarks>
+		/// The View can be or type: <see cref="View"/>, <see cref="ContentPage"/> or <see cref="NavigationPage"/>
+		/// </remarks>
+		public virtual View View { get; set; }
+
+		/// <summary>
+		/// Gets or sets the <see cref="Color"/> of the Popup.
+		/// </summary>
+		/// <remarks>
+		/// This color sets the native background color of the <see cref="Popup"/>, which is
+		/// independent of any background color configured in the actual View.
+		/// </remarks>
+		public Color Color
+		{
+			get => (Color)GetValue(ColorProperty);
+			set => SetValue(ColorProperty, value);
+		}
+
+		/// <summary>
+		/// Gets or sets the <see cref="LayoutOptions"/> for positioning the <see cref="Popup"/> vertically on the screen.
+		/// </summary>
+		public LayoutOptions VerticalOptions
+		{
+			get => (LayoutOptions)GetValue(VerticalOptionsProperty);
+			set => SetValue(VerticalOptionsProperty, value);
+		}
+
+		/// <summary>
+		/// Gets or sets the <see cref="LayoutOptions"/> for positioning the <see cref="Popup"/> horizontally on the screen.
+		/// </summary>
+		public LayoutOptions HorizontalOptions
+		{
+			get => (LayoutOptions)GetValue(HorizontalOptionsProperty);
+			set => SetValue(HorizontalOptionsProperty, value);
+		}
+
+		// REVIEW - 11/30/2020 - ahoefling
+		// In the original code review https://github.com/xamarin/Xamarin.Forms/pull/9616
+		// It was recommended to configure BorderColor as a platform specific attached
+		// property since it is only usable on UWP. 
+		//
+		// Do we want to leave this as part of the API with plans to implement or
+		// should we move it as an attached property.
+
+		/// <summary>
+		/// Gets or sets the <see cref="Color"/> of the Popup Border.
+		/// </summary>
+		/// <remarks>
+		/// This color sets the native border color of the <see cref="Popup"/>, which is
+		/// independent of any border color configured in the actual view.
+		/// </remarks>
+		public Color BorderColor { get; set; } // UWP ONLY - wasn't originally in spec
+
+		/// <summary>
+		/// Gets or sets the <see cref="View"/> anchor.
+		/// </summary>
+		/// <remarks>
+		/// The Anchor is where the Popup will render closest to. When an Anchor is configured
+		/// the popup will appear centered over that control or as close as possible.
+		/// </remarks>
+		public View Anchor { get; set; }
+
+		/// <summary>
+		/// Gets or sets the <see cref="Size"/> of the Popup Display. 
+		/// </summary>
+		/// <remarks>
+		/// The Popup will always try to constrain the actual size of the <see cref="Popup" />
+		/// to the <see cref="Popup" /> of the View unless a <see cref="Size"/> is specified.
+		/// If the <see cref="Popup" /> contiains <see cref="LayoutOptions"/> a <see cref="Size"/>
+		/// will be required. This will allow the View to have a concept of <see cref="Size"/>
+		/// that varies from the actual <see cref="Size"/> of the <see cref="Popup" />
+		/// </remarks>
+		public Size Size
+		{
+			get => (Size)GetValue(SizeProperty);
+			set => SetValue(SizeProperty, value);
+		}
+
+		/// <summary>
+		/// Gets or sets a value indicating whether the popup can be light dismissed.
+		/// </summary>
+		/// <remarks>
+		/// When true and the user taps outside of the popup it will dismiss.
+		/// </remarks>
+		public bool IsLightDismissEnabled { get; set; }
+
+		/// <summary>
+		/// Dismissed event is invoked when the popup is closed.
+		/// </summary>
+		public event EventHandler<PopupDismissedEventArgs> Dismissed;
+
+		/// <summary>
+		/// Opened event is invoked when the popup is opened.
+		/// </summary>
+		public event EventHandler<PopupOpenedEventArgs> Opened;
+
+		/// <summary>
+		/// Invokes the <see cref="Dismissed"/> event.
+		/// </summary>
+		/// <param name="result">
+		/// The results to add to the <see cref="PopupDismissedEventArgs"/>.
+		/// </param>
+		protected void OnDismissed(object result)
+		{
+			Dismissed?.Invoke(this, new PopupDismissedEventArgs { Result = result });
+		}
+
+		/// <summary>
+		/// Invokes the <see cref="Opened"/> event.
+		/// </summary>
+		internal virtual void OnOpened()
+		{
+			Opened?.Invoke(this, new PopupOpenedEventArgs());
+		}
+
+		/// <summary>
+		/// Invoked when the popup is light dismissed. In other words when the
+		/// user taps outside of the popup and it closes.
+		/// </summary>
+		public virtual void LightDismiss()
+		{
+			// REVIEW - AH 12/3/2020
+			// Should this API be protected internal? It is not intended
+			// to be called outside of XCT, but it should allow for subclassing.
+
+			// TODO - AH 12/3/2020
+			// This is not being tested correctly. It is not
+			// implemented in iOS or UWP.
+
+			// empty default implementation
+		}
+
+		/// <inheritdoc />
+		protected override void OnBindingContextChanged()
+		{
+			base.OnBindingContextChanged();
+
+			if (View != null)
+			{
+				SetInheritedBindingContext(View, BindingContext);
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
new file mode 100644
index 000000000..e7717d8ab
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
@@ -0,0 +1,27 @@
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	/// <summary>
+	/// Default popup implementation that uses a
+	/// generic <see cref="object"/> result.
+	/// </summary>
+	public class Popup : Popup<object>
+	{
+		/// <summary>
+		/// Initalizes a default implementation of <see cref="Popup"/>.
+		/// </summary>
+		public Popup() { }
+
+		/// <summary>
+		/// Initializes the <see cref="Popup"/> with a <see cref="View"/>.
+		/// </summary>
+		/// <param name="view">
+		/// The <see cref="View"/> to render in the <see cref="Popup"/>.
+		/// </param>
+		public Popup(View view)
+		{
+			View = view;
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
new file mode 100644
index 000000000..0a60a2b08
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	/// <summary>
+	/// Popup dismissed event arguments used when a popup is dismissed.
+	/// </summary>
+	public class PopupDismissedEventArgs : EventArgs
+	{
+		/// <summary>
+		/// The resulting object to return.
+		/// </summary>
+		public object Result { get; set; }
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
new file mode 100644
index 000000000..fe8ffa035
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
@@ -0,0 +1,70 @@
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	/// <inheritdoc/>
+	public abstract class Popup<T> : BasePopup
+	{
+		TaskCompletionSource<T> taskCompletionSource;
+		View view;
+
+		/// <summary>
+		/// Initalizes a default implementation of <see cref="Popup{T}"/>.
+		/// </summary>
+		protected Popup() =>
+			taskCompletionSource = new TaskCompletionSource<T>();
+
+		/// <inheritdoc />
+		public override View View
+		{
+			get => view;
+			set
+			{
+				if (view == value)
+					return;
+
+				view = value;
+			}
+		}
+
+		/// <summary>
+		/// Resets the Popup.
+		/// </summary>
+		public void Reset() =>
+			taskCompletionSource = new TaskCompletionSource<T>();
+
+		/// <summary>
+		/// Dismiss the current popup.
+		/// </summary>
+		/// <param name="result">
+		/// The result to return.
+		/// </param>
+		public void Dismiss(T result)
+		{
+			taskCompletionSource.TrySetResult(result);
+			OnDismissed(result);
+		}
+
+		/// <summary>
+		/// Gets the final result of the dismissed popup.
+		/// </summary>
+		public Task<T> Result => taskCompletionSource.Task;
+
+		/// <inheritdoc/>
+		public override void LightDismiss() =>
+			taskCompletionSource.TrySetResult(GetLightDismissResult());
+
+		/// <summary>
+		/// Gets the light dismiss default result.
+		/// </summary>
+		/// <returns>
+		/// The light dismiss value of <see cref="T"/>.
+		/// </returns>
+		/// <remarks>
+		/// When a user dismisses the Popup via the light dismiss, this
+		/// method will return a default value.
+		/// </remarks>
+		protected virtual T GetLightDismissResult() => default(T);
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOpenedEventArgs.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOpenedEventArgs.shared.cs
new file mode 100644
index 000000000..ced827005
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOpenedEventArgs.shared.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	/// <summary>
+	/// Popup opened event arguments used when a popup is opened.
+	/// </summary>
+	public class PopupOpenedEventArgs : EventArgs
+	{
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
new file mode 100644
index 000000000..ea578c7ff
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
@@ -0,0 +1,350 @@
+using System;
+using System.ComponentModel;
+using Android.App;
+using Android.Content;
+using Android.Graphics.Drawables;
+using Android.Views;
+using Android.Widget;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+using static Android.App.ActionBar;
+using AView = Android.Views.View;
+using FormsPlatform = Xamarin.Forms.Platform.Android.Platform;
+using GravityFlags = Android.Views.GravityFlags;
+
+[assembly: ExportRenderer(typeof(BasePopup), typeof(PopupRenderer))]
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	public class PopupRenderer : Dialog, IVisualElementRenderer, IDialogInterfaceOnCancelListener
+	{
+		int? defaultLabelFor;
+		VisualElementTracker tracker;
+		ContainerView container;
+		bool isDisposed = false;
+
+		public BasePopup Element { get; private set; }
+
+		void IVisualElementRenderer.UpdateLayout() => tracker?.UpdateLayout();
+
+		VisualElement IVisualElementRenderer.Element => Element;
+
+		AView IVisualElementRenderer.View => container;
+
+		ViewGroup IVisualElementRenderer.ViewGroup => null;
+
+		VisualElementTracker IVisualElementRenderer.Tracker => tracker;
+
+		public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
+
+		public event EventHandler<PropertyChangedEventArgs> ElementPropertyChanged;
+
+		public PopupRenderer(Context context)
+			: base(context)
+		{
+		}
+
+		void IVisualElementRenderer.SetElement(VisualElement element)
+		{
+			if (element == null)
+				throw new ArgumentNullException(nameof(element));
+
+			if (!(element is BasePopup popup))
+				throw new ArgumentNullException("Element is not of type " + typeof(BasePopup), nameof(element));
+
+			var oldElement = Element;
+			Element = popup;
+			CreateControl();
+
+			if (oldElement != null)
+				oldElement.PropertyChanged -= OnElementPropertyChanged;
+
+			element.PropertyChanged += OnElementPropertyChanged;
+
+			if (tracker == null)
+				tracker = new VisualElementTracker(this);
+
+			OnElementChanged(new ElementChangedEventArgs<BasePopup>(oldElement, Element));
+		}
+
+		protected virtual void OnElementChanged(ElementChangedEventArgs<BasePopup> e)
+		{
+			if (e.NewElement != null && !isDisposed)
+			{
+				SetEvents();
+				SetColor();
+				SetSize();
+				SetAnchor();
+				SetLightDismiss();
+
+				Show();
+			}
+
+			ElementChanged?.Invoke(this, new VisualElementChangedEventArgs(e.OldElement, e.NewElement));
+		}
+
+		public override void Show()
+		{
+			base.Show();
+			Element?.OnOpened();
+		}
+
+		protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName ||
+				args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName ||
+				args.PropertyName == BasePopup.SizeProperty.PropertyName)
+			{
+				SetSize();
+				SetAnchor();
+			}
+			else if (args.PropertyName == BasePopup.ColorProperty.PropertyName)
+			{
+				SetColor();
+			}
+
+			ElementPropertyChanged?.Invoke(this, args);
+		}
+
+		void CreateControl()
+		{
+			if (container == null)
+			{
+				container = new ContainerView(Context, Element.View);
+				SetContentView(container);
+			}
+		}
+
+		void SetEvents()
+		{
+			SetOnCancelListener(this);
+			Element.Dismissed += OnDismissed;
+		}
+
+		void SetColor()
+		{
+			Window.SetBackgroundDrawable(new ColorDrawable(Element.Color.ToAndroid()));
+		}
+
+		void SetSize()
+		{
+			if (Element.Size != default)
+			{
+				var decorView = (ViewGroup)Window.DecorView;
+				var child = (FrameLayout)decorView.GetChildAt(0);
+
+				var childLayoutParams = (FrameLayout.LayoutParams)child.LayoutParameters;
+				childLayoutParams.Width = (int)Element.Size.Width;
+				childLayoutParams.Height = (int)Element.Size.Height;
+				child.LayoutParameters = childLayoutParams;
+
+				var horizontalParams = -1;
+				switch (Element.View.HorizontalOptions.Alignment)
+				{
+					case LayoutAlignment.Center:
+					case LayoutAlignment.End:
+					case LayoutAlignment.Start:
+						horizontalParams = LayoutParams.WrapContent;
+						break;
+					case LayoutAlignment.Fill:
+						horizontalParams = LayoutParams.MatchParent;
+						break;
+				}
+
+				var verticalParams = -1;
+				switch (Element.View.VerticalOptions.Alignment)
+				{
+					case LayoutAlignment.Center:
+					case LayoutAlignment.End:
+					case LayoutAlignment.Start:
+						verticalParams = LayoutParams.WrapContent;
+						break;
+					case LayoutAlignment.Fill:
+						verticalParams = LayoutParams.MatchParent;
+						break;
+				}
+
+				if (Element.View.WidthRequest > -1)
+				{
+					var inputMeasuredWidth = Element.View.WidthRequest > Element.Size.Width ?
+						(int)Element.Size.Width : (int)Element.View.WidthRequest;
+					container.Measure(inputMeasuredWidth, (int)MeasureSpecMode.Unspecified);
+					horizontalParams = container.MeasuredWidth;
+				}
+				else
+				{
+					container.Measure((int)Element.Size.Width, (int)MeasureSpecMode.Unspecified);
+					horizontalParams = container.MeasuredWidth > Element.Size.Width ?
+						(int)Element.Size.Width : container.MeasuredWidth;
+				}
+
+				if (Element.View.HeightRequest > -1)
+				{
+					verticalParams = (int)Element.View.HeightRequest;
+				}
+				else
+				{
+					var inputMeasuredWidth = Element.View.WidthRequest > -1 ? horizontalParams : (int)Element.Size.Width;
+					container.Measure(inputMeasuredWidth, (int)MeasureSpecMode.Unspecified);
+					verticalParams = container.MeasuredHeight > Element.Size.Height ?
+						(int)Element.Size.Height : container.MeasuredHeight;
+				}
+
+				var containerLayoutParams = new FrameLayout.LayoutParams(horizontalParams, verticalParams);
+
+				switch (Element.View.VerticalOptions.Alignment)
+				{
+					case LayoutAlignment.Start:
+						containerLayoutParams.Gravity = GravityFlags.Top;
+						break;
+					case LayoutAlignment.Center:
+					case LayoutAlignment.Fill:
+						containerLayoutParams.Gravity = GravityFlags.FillVertical;
+						containerLayoutParams.Height = (int)Element.Size.Height;
+						container.MatchHeight = true;
+						break;
+					case LayoutAlignment.End:
+						containerLayoutParams.Gravity = GravityFlags.Bottom;
+						break;
+				}
+
+				switch (Element.View.HorizontalOptions.Alignment)
+				{
+					case LayoutAlignment.Start:
+						containerLayoutParams.Gravity |= GravityFlags.Left;
+						break;
+					case LayoutAlignment.Center:
+					case LayoutAlignment.Fill:
+						containerLayoutParams.Gravity |= GravityFlags.FillHorizontal;
+						containerLayoutParams.Width = (int)Element.Size.Width;
+						container.MatchWidth = true;
+						break;
+					case LayoutAlignment.End:
+						containerLayoutParams.Gravity |= GravityFlags.Right;
+						break;
+				}
+
+				container.LayoutParameters = containerLayoutParams;
+			}
+		}
+
+		void SetAnchor()
+		{
+			if (Element.Anchor != null)
+			{
+				var anchorView = FormsPlatform.GetRenderer(Element.Anchor).View;
+				var locationOnScreen = new int[2];
+				anchorView.GetLocationOnScreen(locationOnScreen);
+
+				Window.SetGravity(GravityFlags.Top | GravityFlags.Left);
+				Window.DecorView.Measure((int)MeasureSpecMode.Unspecified, (int)MeasureSpecMode.Unspecified);
+
+				// This logic is tricky, please read these notes if you need to modify
+				// Android window coordinate starts (0,0) at the top left and (max,max) at the bottom right. All of the positions
+				// that are being handled in this operation assume the point is at the top left of the rectangle. This means the
+				// calculation operates in this order:
+				// 1. Calculate top-left position of Anchor
+				// 2. Calculate the Actual Center of the Anchor by adding the width /2 and height / 2
+				// 3. Calculate the top-left point of where the dialog should be positioned by subtracting the Width / 2 and height / 2
+				//    of the dialog that is about to be drawn.
+				Window.Attributes.X = locationOnScreen[0] + (anchorView.Width / 2) - (Window.DecorView.MeasuredWidth / 2);
+				Window.Attributes.Y = locationOnScreen[1] + (anchorView.Height / 2) - (Window.DecorView.MeasuredHeight / 2);
+			}
+			else
+			{
+				SetDialogPosition();
+			}
+		}
+
+		void SetLightDismiss()
+		{
+			if (Element.IsLightDismissEnabled)
+				return;
+
+			SetCancelable(false);
+			SetCanceledOnTouchOutside(false);
+		}
+
+		void SetDialogPosition()
+		{
+			var gravityFlags = GravityFlags.Center;
+			switch (Element.VerticalOptions.Alignment)
+			{
+				case LayoutAlignment.Start:
+					gravityFlags = GravityFlags.Top;
+					break;
+				case LayoutAlignment.End:
+					gravityFlags = GravityFlags.Bottom;
+					break;
+				default:
+					gravityFlags = GravityFlags.CenterVertical;
+					break;
+			}
+
+			switch (Element.HorizontalOptions.Alignment)
+			{
+				case LayoutAlignment.Start:
+					gravityFlags |= GravityFlags.Left;
+					break;
+				case LayoutAlignment.End:
+					gravityFlags |= GravityFlags.Right;
+					break;
+				default:
+					gravityFlags |= GravityFlags.CenterHorizontal;
+					break;
+			}
+
+			Window.SetGravity(gravityFlags);
+		}
+
+		void OnDismissed(object sender, PopupDismissedEventArgs e)
+		{
+			Dismiss();
+		}
+
+		public void OnCancel(IDialogInterface dialog)
+		{
+			if (IsShowing && Element.IsLightDismissEnabled)
+				Element.LightDismiss();
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			if (isDisposed)
+				return;
+
+			isDisposed = true;
+			if (disposing)
+			{
+				tracker?.Dispose();
+				tracker = null;
+
+				if (Element != null)
+				{
+					Element.PropertyChanged -= OnElementPropertyChanged;
+					Element = null;
+				}
+			}
+
+			base.Dispose(disposing);
+		}
+
+		SizeRequest IVisualElementRenderer.GetDesiredSize(int widthConstraint, int heightConstraint)
+		{
+			if (isDisposed || container == null)
+				return default(SizeRequest);
+
+			container.Measure(widthConstraint, heightConstraint);
+			return new SizeRequest(new Size(container.MeasuredWidth, container.MeasuredHeight), default(Size));
+		}
+
+		void IVisualElementRenderer.SetLabelFor(int? id)
+		{
+			if (defaultLabelFor == null)
+				defaultLabelFor = container.LabelFor;
+
+			container.LabelFor = (int)(id ?? defaultLabelFor);
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs
new file mode 100644
index 000000000..5ef1a52ff
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs
@@ -0,0 +1,288 @@
+using System;
+using System.ComponentModel;
+using CoreGraphics;
+using UIKit;
+using Xamarin.CommunityToolkit.Helpers;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.Platform.iOS;
+
+[assembly: ExportRenderer(typeof(BasePopup), typeof(PopupRenderer))]
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	public class PopupRenderer : UIViewController, IVisualElementRenderer
+	{
+		bool isDisposed;
+
+		public IVisualElementRenderer Control { get; private set; }
+
+		public BasePopup Element { get; private set; }
+
+		VisualElement IVisualElementRenderer.Element { get => Element; }
+
+		public UIView NativeView { get => base.View; }
+
+		public UIViewController ViewController { get; private set; }
+
+		public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
+
+		public event EventHandler<PropertyChangedEventArgs> ElementPropertyChanged;
+
+		[Preserve(Conditional = true)]
+		public PopupRenderer()
+		{
+		}
+
+		public void SetElementSize(Size size)
+		{
+			Control?.SetElementSize(size);
+		}
+
+		public override void ViewDidLayoutSubviews()
+		{
+			base.ViewDidLayoutSubviews();
+			SetElementSize(new Size(base.View.Bounds.Width, base.View.Bounds.Height));
+		}
+
+		public override void ViewDidAppear(bool animated)
+		{
+			base.ViewDidAppear(animated);
+
+			ModalInPopover = !Element.IsLightDismissEnabled;
+		}
+
+		public SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
+		{
+			return NativeView.GetSizeRequest(widthConstraint, heightConstraint);
+		}
+
+		void IVisualElementRenderer.SetElement(VisualElement element)
+		{
+			if (element == null)
+				throw new ArgumentNullException(nameof(element));
+
+			if (!(element is BasePopup popup))
+				throw new ArgumentNullException("Element is not of type " + typeof(BasePopup), nameof(element));
+
+			var oldElement = Element;
+			Element = popup;
+			CreateControl();
+
+			// REVIEW - AH 12/4/2020
+			// This is a hold over from Xamarin.Forms
+			// internal code. I don't think it is still
+			// needed but I left it in for now.
+			Performance.Start(out var reference);
+
+			if (oldElement != null)
+				oldElement.PropertyChanged -= OnElementPropertyChanged;
+
+			element.PropertyChanged += OnElementPropertyChanged;
+
+			OnElementChanged(new ElementChangedEventArgs<BasePopup>(oldElement, Element));
+
+			Performance.Stop(reference);
+		}
+
+		protected virtual void OnElementChanged(ElementChangedEventArgs<BasePopup> e)
+		{
+			if (e.NewElement != null && !isDisposed)
+			{
+				ModalInPopover = true;
+				ModalPresentationStyle = UIModalPresentationStyle.Popover;
+
+				SetViewController();
+				SetPresentationController();
+				SetEvents();
+				SetSize();
+				SetLayout();
+				SetBackgroundColor();
+				SetView();
+				AddToCurrentPageViewController();
+			}
+
+			ElementChanged?.Invoke(this, new VisualElementChangedEventArgs(e.OldElement, e.NewElement));
+		}
+
+		protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName ||
+				args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName)
+			{
+				SetLayout();
+			}
+			else if (args.PropertyName == BasePopup.SizeProperty.PropertyName)
+			{
+				SetSize();
+			}
+			else if (args.PropertyName == BasePopup.ColorProperty.PropertyName)
+			{
+				SetBackgroundColor();
+			}
+
+			ElementPropertyChanged?.Invoke(this, args);
+		}
+
+		void CreateControl()
+		{
+			var view = Element.View;
+			var contentPage = new ContentPage { Content = view, Padding = new Thickness(25) };
+
+			Control = Platform.CreateRenderer(contentPage);
+			Platform.SetRenderer(contentPage, Control);
+			contentPage.Parent = Application.Current.MainPage;
+		}
+
+		void SetViewController()
+		{
+			var currentPageRenderer = Platform.GetRenderer(Application.Current.MainPage);
+			ViewController = currentPageRenderer.ViewController;
+		}
+
+		void SetEvents()
+		{
+			Element.Dismissed += OnDismissed;
+		}
+
+		void SetSize()
+		{
+			if (!Element.Size.IsZero)
+			{
+				PreferredContentSize = new CGSize(Element.Size.Width, Element.Size.Height);
+			}
+		}
+
+		void SetLayout()
+		{
+			((UIPopoverPresentationController)PresentationController).SourceRect = new CGRect(0, 0, PreferredContentSize.Width, PreferredContentSize.Height);
+
+			if (Element.Anchor == null)
+			{
+				nfloat originX = 0;
+				nfloat originY = 0;
+
+				switch (Element.VerticalOptions.Alignment)
+				{
+					case LayoutAlignment.End:
+						originY = UIScreen.MainScreen.Bounds.Height - PreferredContentSize.Height;
+						break;
+					case LayoutAlignment.Center:
+						originY = (UIScreen.MainScreen.Bounds.Height / 2) - (PreferredContentSize.Height / 2);
+						break;
+				}
+
+				switch (Element.HorizontalOptions.Alignment)
+				{
+					case LayoutAlignment.End:
+						originX = UIScreen.MainScreen.Bounds.Width;
+						break;
+					case LayoutAlignment.Center:
+						originX = UIScreen.MainScreen.Bounds.Width / 2;
+						break;
+				}
+
+				PopoverPresentationController.SourceRect = new CGRect(originX, originY, 0, 0);
+			}
+			else
+			{
+				var view = Platform.GetRenderer(Element.Anchor).NativeView;
+				PopoverPresentationController.SourceView = view;
+				PopoverPresentationController.SourceRect = view.Bounds;
+			}
+		}
+
+		void SetBackgroundColor()
+		{
+			Control.NativeView.BackgroundColor = Element.Color.ToUIColor();
+		}
+
+		void SetView()
+		{
+			base.View.AddSubview(Control.ViewController.View);
+			base.View.Bounds = new CGRect(0, 0, PreferredContentSize.Width, PreferredContentSize.Height);
+			AddChildViewController(Control.ViewController);
+		}
+
+		void SetPresentationController()
+		{
+			((UIPopoverPresentationController)PresentationController).SourceView = ViewController.View;
+
+			// Setting PermittedArrowDirector to 0 breaks the Popover layout. It would be nice if there is no anchor to remove the arrow.
+			((UIPopoverPresentationController)PresentationController).PermittedArrowDirections = UIPopoverArrowDirection.Up;
+			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate(this);
+		}
+
+		void AddToCurrentPageViewController()
+		{
+			ViewController.PresentViewController(this, true, () => Element.OnOpened());
+		}
+
+		async void OnDismissed(object sender, PopupDismissedEventArgs e)
+		{
+			if (!FormsToolkit.IsiOS9OrNewer)
+				await ViewController.DismissViewControllerAsync(true);
+			else
+				ViewController.DismissViewController(true, null);
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			if (isDisposed)
+				return;
+
+			isDisposed = true;
+			if (disposing)
+			{
+				if (Element != null)
+				{
+					Element.PropertyChanged -= OnElementPropertyChanged;
+
+					if (Platform.GetRenderer(Element) == this)
+					{
+						// NOTE - AH 9/12/2020
+						// This used to use the internal property
+						// 'Xamarin.Forms.Platform.Android.Platform.RendererProperty'
+						// That property is marked internal so the closest thing we can do
+						// is duplicate the implementation here.
+						//
+						// I don't think this is really needed for the control, but I am
+						// leaving it in so it can be reviewed.
+						var rendererProperty = BindableProperty.CreateAttached("Renderer", typeof(IVisualElementRenderer), typeof(Platform), default(IVisualElementRenderer), propertyChanged: (bindable, oldvalue, newvalue) =>
+						{
+							var view = bindable as VisualElement;
+							if (view != null)
+								view.IsPlatformEnabled = newvalue != null;
+						});
+
+						Element.ClearValue(rendererProperty);
+					}
+
+					Element = null;
+				}
+			}
+
+			base.Dispose(disposing);
+		}
+
+		class PopoverDelegate : UIPopoverPresentationControllerDelegate
+		{
+			PopupRenderer popupRenderer;
+
+			public PopoverDelegate(PopupRenderer renderer) =>
+				popupRenderer = renderer;
+
+			public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController)
+			{
+				return UIModalPresentationStyle.None;
+			}
+
+			public override void DidDismiss(UIPresentationController presentationController)
+			{
+				if (popupRenderer.IsViewLoaded && popupRenderer.Element.IsLightDismissEnabled)
+					popupRenderer.Element.LightDismiss();
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
new file mode 100644
index 000000000..1f78427fa
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
@@ -0,0 +1,277 @@
+using System;
+using System.ComponentModel;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.Platform.UWP;
+using UWPThickness = Windows.UI.Xaml.Thickness;
+using XamlStyle = Windows.UI.Xaml.Style;
+
+[assembly: ExportRenderer(typeof(BasePopup), typeof(PopupRenderer))]
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	public class PopupRenderer : Flyout, IVisualElementRenderer
+	{
+		const double defaultBorderThickness = 2;
+		const double defaultSize = 600;
+		bool isDisposed = false;
+		XamlStyle flyoutStyle;
+		XamlStyle panelStyle;
+
+		public BasePopup Element { get; private set; }
+
+		internal ViewToRendererConverter.WrapperControl Control { get; private set; }
+
+		FrameworkElement IVisualElementRenderer.ContainerElement { get => null; }
+
+		VisualElement IVisualElementRenderer.Element { get => Element; }
+
+		public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
+
+		public event EventHandler<PropertyChangedEventArgs> ElementPropertyChanged;
+
+		public PopupRenderer()
+		{
+		}
+
+		void IVisualElementRenderer.SetElement(VisualElement element)
+		{
+			if (element == null)
+				throw new ArgumentNullException(nameof(element));
+
+			if (!(element is BasePopup popup))
+				throw new ArgumentNullException("Element is not of type " + typeof(BasePopup), nameof(element));
+
+			var oldElement = Element;
+			Element = popup;
+			CreateControl();
+
+			Performance.Start(out var reference);
+
+			if (oldElement != null)
+				oldElement.PropertyChanged -= OnElementPropertyChanged;
+
+			element.PropertyChanged += OnElementPropertyChanged;
+
+			OnElementChanged(new ElementChangedEventArgs<BasePopup>(oldElement, Element));
+
+			Performance.Stop(reference);
+		}
+
+		void CreateControl()
+		{
+			if (Control == null)
+			{
+				Control = new Xamarin.CommunityToolkit.UI.Views.ViewToRendererConverter.WrapperControl(Element.View);
+				Content = Control;
+			}
+		}
+
+		void InitializeStyles()
+		{
+			flyoutStyle = new XamlStyle { TargetType = typeof(FlyoutPresenter) };
+			panelStyle = new XamlStyle { TargetType = typeof(Panel) };
+		}
+
+		protected virtual void OnElementChanged(ElementChangedEventArgs<BasePopup> e)
+		{
+			if (e.NewElement != null && !isDisposed)
+			{
+				InitializeStyles();
+				SetEvents();
+				SetColor();
+				SetBorderColor();
+				SetSize();
+				SetLayout();
+				ApplyStyles();
+				Show();
+			}
+
+			ElementChanged?.Invoke(this, new VisualElementChangedEventArgs(e.OldElement, e.NewElement));
+		}
+
+		protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			if (args.PropertyName == BasePopup.VerticalOptionsProperty.PropertyName ||
+				args.PropertyName == BasePopup.HorizontalOptionsProperty.PropertyName ||
+				args.PropertyName == BasePopup.SizeProperty.PropertyName ||
+				args.PropertyName == BasePopup.ColorProperty.PropertyName)
+			{
+				ConfigureControl();
+			}
+
+			ElementPropertyChanged?.Invoke(this, args);
+		}
+
+		void ConfigureControl()
+		{
+			InitializeStyles();
+			SetEvents();
+			SetColor();
+			SetBorderColor();
+			SetSize();
+			SetLayout();
+			ApplyStyles();
+		}
+
+		void SetEvents()
+		{
+			if (Element.IsLightDismissEnabled)
+				Closed += OnClosed;
+
+			Element.Dismissed += OnDismissed;
+		}
+
+		void SetSize()
+		{
+			var standardSize = new Size { Width = defaultSize, Height = defaultSize / 2 };
+
+			var currentSize = Element.Size != default(Size) ? Element.Size : standardSize;
+			Control.Width = currentSize.Width;
+			Control.Height = currentSize.Height;
+
+			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.MinHeightProperty, currentSize.Height + (defaultBorderThickness * 2)));
+			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.MinWidthProperty, currentSize.Width + (defaultBorderThickness * 2)));
+			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.MaxHeightProperty, currentSize.Height + (defaultBorderThickness * 2)));
+			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.MaxWidthProperty, currentSize.Width + (defaultBorderThickness * 2)));
+		}
+
+		void SetLayout()
+		{
+			LightDismissOverlayMode = LightDismissOverlayMode.On;
+			SetDialogPosition(Element.VerticalOptions, Element.HorizontalOptions);
+		}
+
+		// this should be converted to an attached property
+		void SetBorderColor()
+		{
+			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.PaddingProperty, 0));
+			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BorderThicknessProperty, new UWPThickness(defaultBorderThickness)));
+
+			if (Element.BorderColor == default(Color))
+				flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BorderBrushProperty, Color.FromHex("#2e6da0").ToWindowsColor()));
+			else
+				flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BorderBrushProperty, Element.BorderColor.ToWindowsColor()));
+		}
+
+		void SetColor()
+		{
+			// REVIEW - AH 12/3/2020
+			// Should this be using BackgroundColor or Color?
+			if (Element.View.BackgroundColor == default(Color))
+				panelStyle.Setters.Add(new Windows.UI.Xaml.Setter(Panel.BackgroundProperty, Element.Color.ToWindowsColor()));
+
+			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BackgroundProperty, Element.Color.ToWindowsColor()));
+
+#if UWP_18362
+			if (Element.Color == Color.Transparent)
+				flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.IsDefaultShadowEnabledProperty, false));
+#endif
+		}
+
+		void ApplyStyles()
+		{
+			Control.Style = panelStyle;
+			FlyoutPresenterStyle = flyoutStyle;
+		}
+
+		void Show()
+		{
+			if (Element.Anchor != null)
+			{
+				var anchor = Platform.GetRenderer(Element.Anchor).ContainerElement;
+				FlyoutBase.SetAttachedFlyout(anchor, this);
+				FlyoutBase.ShowAttachedFlyout(anchor);
+			}
+			else
+			{
+				var frameworkElement = Platform.GetRenderer(Element.Parent as VisualElement).ContainerElement;
+				FlyoutBase.SetAttachedFlyout(frameworkElement, this);
+				FlyoutBase.ShowAttachedFlyout(frameworkElement);
+			}
+
+			Element.OnOpened();
+		}
+
+		void SetDialogPosition(LayoutOptions verticalOptions, LayoutOptions horizontalOptions)
+		{
+			if (IsTopLeft())
+				Placement = FlyoutPlacementMode.TopEdgeAlignedLeft;
+			else if (IsTop())
+				Placement = FlyoutPlacementMode.Top;
+			else if (IsTopRight())
+				Placement = FlyoutPlacementMode.TopEdgeAlignedRight;
+			else if (IsRight())
+				Placement = FlyoutPlacementMode.Right;
+			else if (IsBottomRight())
+				Placement = FlyoutPlacementMode.BottomEdgeAlignedRight;
+			else if (IsBottom())
+				Placement = FlyoutPlacementMode.Bottom;
+			else if (IsBottomLeft())
+				Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft;
+			else if (IsLeft())
+				Placement = FlyoutPlacementMode.Left;
+			else if (Element.Anchor == null)
+				Placement = FlyoutPlacementMode.Full;
+			else
+				Placement = FlyoutPlacementMode.Top;
+
+			bool IsTopLeft() => verticalOptions.Alignment == LayoutAlignment.Start && horizontalOptions.Alignment == LayoutAlignment.Start;
+			bool IsTop() => verticalOptions.Alignment == LayoutAlignment.Start && horizontalOptions.Alignment == LayoutAlignment.Center;
+			bool IsTopRight() => verticalOptions.Alignment == LayoutAlignment.Start && horizontalOptions.Alignment == LayoutAlignment.End;
+			bool IsRight() => verticalOptions.Alignment == LayoutAlignment.Center && horizontalOptions.Alignment == LayoutAlignment.End;
+			bool IsBottomRight() => verticalOptions.Alignment == LayoutAlignment.End && horizontalOptions.Alignment == LayoutAlignment.End;
+			bool IsBottom() => verticalOptions.Alignment == LayoutAlignment.End && horizontalOptions.Alignment == LayoutAlignment.Center;
+			bool IsBottomLeft() => verticalOptions.Alignment == LayoutAlignment.End && horizontalOptions.Alignment == LayoutAlignment.Start;
+			bool IsLeft() => verticalOptions.Alignment == LayoutAlignment.Center && horizontalOptions.Alignment == LayoutAlignment.Start;
+		}
+
+		SizeRequest IVisualElementRenderer.GetDesiredSize(double widthConstraint, double heightConstraint)
+		{
+			if (isDisposed || Control == null)
+				return new SizeRequest();
+
+			var constraint = new Windows.Foundation.Size(widthConstraint, heightConstraint);
+			Control.Measure(constraint);
+
+			var size = new Size(Math.Ceiling(Control.DesiredSize.Width), Math.Ceiling(Control.DesiredSize.Height));
+			return new SizeRequest(size);
+		}
+
+		UIElement IVisualElementRenderer.GetNativeElement() => Control;
+
+		void OnDismissed(object sender, PopupDismissedEventArgs e)
+		{
+			Hide();
+		}
+
+		void OnClosed(object sender, object e)
+		{
+			if (IsOpen && Element.IsLightDismissEnabled)
+				Element.LightDismiss();
+		}
+
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		protected virtual void Dispose(bool disposing)
+		{
+			if (!isDisposed && disposing)
+			{
+				Element.Dismissed -= OnDismissed;
+				Element = null;
+
+				Closed -= OnClosed;
+			}
+
+			isDisposed = true;
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs
new file mode 100644
index 000000000..accb4f8ab
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs
@@ -0,0 +1,104 @@
+using System;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Xamarin.CommunityToolkit.Extensions;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.UWP;
+using WRect = Windows.Foundation.Rect;
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	public class ViewToRendererConverter
+	{
+		// This class is ported from Xamarin.Forms and should remain in sync
+		internal class WrapperControl : Panel
+		{
+			readonly View _view;
+
+			FrameworkElement FrameworkElement { get; }
+
+			internal void CleanUp()
+			{
+				_view?.Cleanup();
+
+				if (_view != null)
+					_view.MeasureInvalidated -= OnMeasureInvalidated;
+			}
+
+			public WrapperControl(View view)
+			{
+				_view = view;
+				_view.MeasureInvalidated += OnMeasureInvalidated;
+
+				var renderer = Platform.CreateRenderer(view);
+				Platform.SetRenderer(view, renderer);
+
+				FrameworkElement = renderer.ContainerElement;
+				Children.Add(renderer.ContainerElement);
+
+				// make sure we re-measure once the template is applied
+				if (FrameworkElement != null)
+				{
+					FrameworkElement.Loaded += (sender, args) =>
+					{
+						// If the view is a layout (stacklayout, grid, etc) we need to trigger a layout pass
+						// with all the controls in a consistent native state (i.e., loaded) so they'll actually
+						// have Bounds set
+						(_view as Layout)?.ForceLayout();
+						InvalidateMeasure();
+					};
+				}
+			}
+
+			void OnMeasureInvalidated(object sender, EventArgs e)
+			{
+				InvalidateMeasure();
+			}
+
+			protected override Windows.Foundation.Size ArrangeOverride(Windows.Foundation.Size finalSize)
+			{
+				_view.IsInNativeLayout = true;
+				Layout.LayoutChildIntoBoundingRegion(_view, new Rectangle(0, 0, finalSize.Width, finalSize.Height));
+
+				if (_view.Width <= 0 || _view.Height <= 0)
+				{
+					// Hide Panel when size _view is empty.
+					// It is necessary that this element does not overlap other elements when it should be hidden.
+					Opacity = 0;
+				}
+				else
+				{
+					Opacity = 1;
+					FrameworkElement?.Arrange(new WRect(_view.X, _view.Y, _view.Width, _view.Height));
+				}
+				_view.IsInNativeLayout = false;
+
+				return finalSize;
+			}
+
+			protected override Windows.Foundation.Size MeasureOverride(Windows.Foundation.Size availableSize)
+			{
+				var request = _view.Measure(availableSize.Width, availableSize.Height, MeasureFlags.IncludeMargins).Request;
+
+				if (request.Height < 0)
+				{
+					request.Height = availableSize.Height;
+				}
+
+				Windows.Foundation.Size result;
+				if (_view.HorizontalOptions.Alignment == LayoutAlignment.Fill && !double.IsInfinity(availableSize.Width) && availableSize.Width != 0)
+				{
+					result = new Windows.Foundation.Size(availableSize.Width, request.Height);
+				}
+				else
+				{
+					result = new Windows.Foundation.Size(request.Width, request.Height);
+				}
+
+				FrameworkElement?.Measure(availableSize);
+
+				return result;
+			}
+		}
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
index a2072552a..8448aa6c8 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.1.2">
   <PropertyGroup>
     <TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid10.0;Xamarin.TVOS10;Xamarin.WatchOS10;Xamarin.Mac20;tizen40</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.17763;netcoreapp3.1;net472;net471</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.19041;netcoreapp3.1;net472;net471</TargetFrameworks>
     <AssemblyName>Xamarin.CommunityToolkit</AssemblyName>
     <RootNamespace>Xamarin.CommunityToolkit</RootNamespace>
     <PackageId>Xamarin.CommunityToolkit</PackageId>
@@ -63,6 +63,18 @@
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
     <DefineConstants>UWP</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.14393'">
+    <DefineConstants>$(DefineConstants);UWP_14393</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.16299' ">
+    <DefineConstants>$(DefineConstants);UWP_16299;UWP_14393</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.18362' ">
+    <DefineConstants>$(DefineConstants);UWP_18362;UWP_16299;UWP_14393</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0.19041' ">
+    <DefineConstants>$(DefineConstants);UWP_19041;UWP_18362;UWP_16299;UWP_14393</DefineConstants>
+  </PropertyGroup>
   <ItemGroup Condition=" '$(Configuration)'=='Release' ">
     <!-- Manage Xamarin.Forms version for distribution -->
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />

From 829c8793b707a5dd3e5e08f6a8cc41d1d69e703d Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 4 Dec 2020 12:11:39 -0500
Subject: [PATCH 02/46] Added missing async/await api

---
 .../NavigationExtensions.android.cs           |  9 +++++-
 .../Navigation/NavigationExtensions.ios.cs    |  9 +++++-
 .../Navigation/NavigationExtensions.shared.cs | 29 +++++++++++++++++++
 .../Navigation/NavigationExtensions.uwp.cs    |  7 +++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
index c9fd831cc..d6453eea3 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
@@ -1,4 +1,5 @@
-using Xamarin.CommunityToolkit.UI.Views;
+using System.Threading.Tasks;
+using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms.Platform.Android;
 
 namespace Xamarin.CommunityToolkit.Extensions
@@ -9,5 +10,11 @@ static void OnShowPopup(BasePopup popup)
 		{
 			Platform.CreateRendererWithContext(popup, ToolkitPlatform.Context);
 		}
+
+		static Task<T> OnShowPopupTask<T>(Popup<T> popup)
+		{
+			OnShowPopup(popup);
+			return popup.Result;
+		}
 	}
 }
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
index 463a19d13..4a5a0e343 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
@@ -1,4 +1,5 @@
-using Xamarin.CommunityToolkit.UI.Views;
+using System.Threading.Tasks;
+using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms.Platform.iOS;
 
 namespace Xamarin.CommunityToolkit.Extensions
@@ -9,5 +10,11 @@ static void OnShowPopup(BasePopup popup)
 		{
 			Platform.CreateRenderer(popup);
 		}
+
+		static Task<T> OnShowPopup<T>(Popup<T> popup)
+		{
+			OnShowPopup(popup);
+			return popup.Result;
+		}
 	}
 }
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
index 766016e14..905569452 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms;
 
@@ -28,6 +29,34 @@ public static void ShowPopup(this INavigation navigation, BasePopup popup)
 			OnShowPopup(popup);
 #else
 			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
+#endif
+		}
+
+		/// <summary>
+		/// Displays a popup and returns a result.
+		/// </summary>
+		/// <typeparam name="T">
+		/// The <see cref="T"/> result that is returned when the popup is dismissed.
+		/// </typeparam>
+		/// <param name="navigation">
+		/// The current <see cref="INavigation"/>.
+		/// </param>
+		/// <param name="popup">
+		/// The <see cref="Popup{T}"/> to display.
+		/// </param>
+		/// <returns>
+		/// A task that will complete once the <see cref="Popup{T}"/> is dismissed.
+		/// </returns>
+		public static Task<T> ShowPopupAsync<T>(this INavigation navigation, Popup<T> popup)
+		{
+#if __ANDROID__
+			return OnShowPopupAsync(popup);
+#elif __IOS__
+			return OnShowPopupAsync(popup);
+#elif WINDOWS_UWP
+			return OnShowPopupAsync(popup);
+#else
+			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
 #endif
 		}
 	}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
index e15ac44b4..c1abd0ffd 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using System.Threading.Tasks;
 using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.UWP;
@@ -29,5 +30,11 @@ Page GetCurrentPage(Page currentPage)
 					return currentPage;
 			}
 		}
+
+		static Task<T> OnShowPopupAsync<T>(Popup<T> popup)
+		{
+			OnShowPopup(popup);
+			return popup.Result;
+		}
 	}
 }

From 0fdc8755f3f6d1f2148b31b2cab3b4f0e810820a Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 4 Dec 2020 13:43:14 -0500
Subject: [PATCH 03/46] Added popup result sample and fixed uwp/android
 implementations

---
 .../Pages/Views/PopupGalleryPage.xaml         |  2 +-
 .../Pages/Views/Popups/ReturnResultPopup.cs   | 38 +++++++++++++++++++
 .../ViewModels/Views/PopupControlViewModel.cs | 17 ++++++---
 .../NavigationExtensions.android.cs           |  2 +-
 .../Navigation/NavigationExtensions.ios.cs    |  2 +-
 .../Views/Popup/PopupRenderer.android.cs      |  2 +-
 .../Views/Popup/PopupRenderer.uwp.cs          |  6 +--
 7 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml
index 0229b4d1e..54b0596e8 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml
@@ -9,7 +9,7 @@
                 x:Name="root">
 
     <ContentPage.BindingContext>
-        <viewModels:PopupControlViewModel />
+        <viewModels:PopupGalleryViewModel />
     </ContentPage.BindingContext>
 
     <ContentPage.Resources>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
new file mode 100644
index 000000000..e1408e203
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public class ReturnResultPopup : Popup<string>
+	{
+		public ReturnResultPopup()
+		{
+			View = new StackLayout
+			{
+				Children = { Message(), CloseButton() }
+			};
+
+			Button CloseButton()
+			{
+				var button = new Button
+				{
+					Text = "Close"
+				};
+
+				button.Clicked += (s, e) => Dismiss("Close button tapped");
+				return button;
+			}
+
+			Label Message() =>
+				new Label
+				{
+					Text = "Hello World"
+				};
+		}
+
+		protected override string GetLightDismissResult() => "Light Dismiss";
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs
index 0c71bfaab..ba97ec40f 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs
@@ -9,7 +9,7 @@
 
 namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views
 {
-	public class PopupControlViewModel
+	public class PopupGalleryViewModel
 	{
 		INavigation Navigation => App.Current.MainPage.Navigation;
 
@@ -23,20 +23,27 @@ public class PopupControlViewModel
 			new SectionModel(typeof(TransparentPopup), "Transparent Popup", Color.Red, "Displays a popup with a transparent background"),
 			new SectionModel(typeof(PopupAnchorPage), "Anchor Popup", Color.Red, "Popups can be anchored to other view's on the screen"),
 			new SectionModel(typeof(OpenedEventSimplePopup), "Opened Event Popup", Color.Red, "Popup with opened event"),
+			new SectionModel(typeof(ReturnResultPopup), "Return Result Popup", Color.Red, "A popup that returns a string message when dismissed")
 		};
 
 		public ICommand DisplayPopup => new Command<Type>(OnDisplayPopup);
 
-		void OnDisplayPopup(Type popupType)
+		async void OnDisplayPopup(Type popupType)
 		{
 			var view = (VisualElement)Activator.CreateInstance(popupType);
-			if (view is BasePopup popup)
+
+			if (view is Popup<string> popup)
+			{
+				var result = await Navigation.ShowPopupAsync(popup);
+				await App.Current.MainPage.DisplayAlert("Popup Result", result, "OKAY");
+			}
+			else if (view is BasePopup basePopup)
 			{
-				Navigation.ShowPopup(popup);
+				Navigation.ShowPopup(basePopup);
 			}
 			else if (view is Page page)
 			{
-				Navigation.PushAsync(page);
+				await Navigation.PushAsync(page);
 			}
 		}
 	}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
index d6453eea3..12afb7e12 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
@@ -11,7 +11,7 @@ static void OnShowPopup(BasePopup popup)
 			Platform.CreateRendererWithContext(popup, ToolkitPlatform.Context);
 		}
 
-		static Task<T> OnShowPopupTask<T>(Popup<T> popup)
+		static Task<T> OnShowPopupAsync<T>(Popup<T> popup)
 		{
 			OnShowPopup(popup);
 			return popup.Result;
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
index 4a5a0e343..3293d10f0 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
@@ -11,7 +11,7 @@ static void OnShowPopup(BasePopup popup)
 			Platform.CreateRenderer(popup);
 		}
 
-		static Task<T> OnShowPopup<T>(Popup<T> popup)
+		static Task<T> OnShowPopupAsync<T>(Popup<T> popup)
 		{
 			OnShowPopup(popup);
 			return popup.Result;
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
index ea578c7ff..792b2b761 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
@@ -305,7 +305,7 @@ void OnDismissed(object sender, PopupDismissedEventArgs e)
 
 		public void OnCancel(IDialogInterface dialog)
 		{
-			if (IsShowing && Element.IsLightDismissEnabled)
+			if (Element.IsLightDismissEnabled)
 				Element.LightDismiss();
 		}
 
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
index 1f78427fa..94bf6901d 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
@@ -121,7 +121,7 @@ void ConfigureControl()
 		void SetEvents()
 		{
 			if (Element.IsLightDismissEnabled)
-				Closed += OnClosed;
+				Closing += OnClosing;
 
 			Element.Dismissed += OnDismissed;
 		}
@@ -249,7 +249,7 @@ void OnDismissed(object sender, PopupDismissedEventArgs e)
 			Hide();
 		}
 
-		void OnClosed(object sender, object e)
+		void OnClosing(object sender, object e)
 		{
 			if (IsOpen && Element.IsLightDismissEnabled)
 				Element.LightDismiss();
@@ -268,7 +268,7 @@ protected virtual void Dispose(bool disposing)
 				Element.Dismissed -= OnDismissed;
 				Element = null;
 
-				Closed -= OnClosed;
+				Closed -= OnClosing;
 			}
 
 			isDisposed = true;

From 572323699988456a08afa4e84b8afcc466979a9e Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 4 Dec 2020 14:56:54 -0500
Subject: [PATCH 04/46] Renamed View->Content

---
 .../Pages/Views/Popups/ButtonPopup.xaml       | 22 ++++++------
 .../Views/Popups/MultipleButtonPopup.xaml     | 30 ++++++++--------
 .../Views/Popups/NoLightDismissPopup.xaml     | 34 +++++++++----------
 .../Views/Popups/OpenedEventSimplePopup.xaml  | 16 ++++-----
 .../Pages/Views/Popups/ReturnResultPopup.cs   |  7 ++--
 .../Pages/Views/Popups/SimplePopup.xaml       | 16 ++++-----
 .../Pages/Views/Popups/ToggleSizePopup.xaml   | 22 ++++++------
 .../Pages/Views/Popups/TransparentPopup.xaml  | 10 +++---
 .../Views/Popup/BasePopup.shared.cs           |  9 ++---
 .../Views/Popup/Popup.shared.cs               | 15 --------
 .../Views/Popup/PopupOfT.shared.cs            | 14 --------
 .../Views/Popup/PopupRenderer.android.cs      | 22 ++++++------
 .../Views/Popup/PopupRenderer.ios.cs          |  2 +-
 .../Views/Popup/PopupRenderer.uwp.cs          |  6 ++--
 14 files changed, 89 insertions(+), 136 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
index c70ccdf88..737355dba 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
@@ -32,17 +32,15 @@
         </ResourceDictionary>
     </xct:Popup.Resources>
 
-    <xct:Popup.View>
-        <StackLayout Style="{StaticResource PopupLayout}">
-            <Label Style="{StaticResource Title}" 
-                   Text="Button Popup" />
-            <BoxView Style="{StaticResource Divider}" />
-            <Label Style="{StaticResource Content}" 
-                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
-            <Button Text="OKAY"
-                    Style="{StaticResource ConfirmButton}"
-                    Clicked="Button_Clicked" />
-        </StackLayout>
-    </xct:Popup.View>
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label Style="{StaticResource Title}" 
+                Text="Button Popup" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" 
+                Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
+        <Button Text="OKAY"
+                Style="{StaticResource ConfirmButton}"
+                Clicked="Button_Clicked" />
+    </StackLayout>
     
 </xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
index 4bc1b5a86..ea0dfcfae 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
@@ -41,22 +41,20 @@
         </ResourceDictionary>
     </xct:Popup.Resources>
 
-    <xct:Popup.View>
-        <StackLayout Style="{StaticResource PopupLayout}">
-            <Label Style="{StaticResource Title}" 
-                   Text="Button Popup" />
-            <BoxView Style="{StaticResource Divider}" />
-            <Label Style="{StaticResource Content}" 
-                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
-            <StackLayout Style="{StaticResource ButtonGroup}">
-                <Button Text="Cancel"
-                        Style="{StaticResource CancelButton}"
-                        Clicked="Cancel_Clicked" />
-                <Button Text="OKAY"
-                        Clicked="Okay_Clicked" />    
-            </StackLayout>
-            
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label Style="{StaticResource Title}" 
+                Text="Button Popup" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" 
+                Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
+        <StackLayout Style="{StaticResource ButtonGroup}">
+            <Button Text="Cancel"
+                    Style="{StaticResource CancelButton}"
+                    Clicked="Cancel_Clicked" />
+            <Button Text="OKAY"
+                    Clicked="Okay_Clicked" />    
         </StackLayout>
-    </xct:Popup.View>
+            
+    </StackLayout>
     
 </xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
index 594ca398e..9948ea96e 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
@@ -30,23 +30,21 @@
         </ResourceDictionary>
     </xct:Popup.Resources>
 
-    <xct:Popup.View>
-        <StackLayout Style="{StaticResource PopupLayout}">
-            <Label 
-                Style="{StaticResource Title}" 
-                Text="Simple Popup" />
-            <BoxView Style="{StaticResource Divider}" />
-            <Label 
-                Style="{StaticResource Content}"
-                Text="{OnPlatform
-                    Android='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
-                    iOS='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
-                    UWP='UWP Flyouts do not support toggling light dismiss mode. On UWP this will always dismiss the flyout if you tap outside of the control'}" />
-            <Button 
-                Text="Close"
-                VerticalOptions="EndAndExpand"
-                Clicked="Button_Clicked" />
-        </StackLayout>
-    </xct:Popup.View>
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label 
+            Style="{StaticResource Title}" 
+            Text="Simple Popup" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label 
+            Style="{StaticResource Content}"
+            Text="{OnPlatform
+                Android='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
+                iOS='This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.',
+                UWP='UWP Flyouts do not support toggling light dismiss mode. On UWP this will always dismiss the flyout if you tap outside of the control'}" />
+        <Button 
+            Text="Close"
+            VerticalOptions="EndAndExpand"
+            Clicked="Button_Clicked" />
+    </StackLayout>
     
 </xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
index 1ed70809c..abfa1feee 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
@@ -29,14 +29,12 @@
         </ResourceDictionary>
     </xct:Popup.Resources>
 
-    <xct:Popup.View>
-        <StackLayout Style="{StaticResource PopupLayout}">
-            <Label x:Name="title" 
-                   Style="{StaticResource Title}" />
-            <BoxView Style="{StaticResource Divider}" />
-            <Label x:Name="message" 
-                   Style="{StaticResource Content}" />
-        </StackLayout>
-    </xct:Popup.View>
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label x:Name="title" 
+                Style="{StaticResource Title}" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label x:Name="message" 
+                Style="{StaticResource Content}" />
+    </StackLayout>
     
 </xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
index e1408e203..335583f53 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
@@ -10,7 +7,7 @@ public class ReturnResultPopup : Popup<string>
 	{
 		public ReturnResultPopup()
 		{
-			View = new StackLayout
+			Content = new StackLayout
 			{
 				Children = { Message(), CloseButton() }
 			};
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml
index 6905a5206..080234063 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml
@@ -29,14 +29,12 @@
         </ResourceDictionary>
     </xct:Popup.Resources>
 
-    <xct:Popup.View>
-        <StackLayout Style="{StaticResource PopupLayout}">
-            <Label Style="{StaticResource Title}" 
-                   Text="Simple Popup" />
-            <BoxView Style="{StaticResource Divider}" />
-            <Label Style="{StaticResource Content}" 
-                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />    
-        </StackLayout>
-    </xct:Popup.View>
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label Style="{StaticResource Title}" 
+               Text="Simple Popup" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" 
+               Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />    
+    </StackLayout>
     
 </xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
index 5c6e657f5..bcb2f7f0e 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
@@ -32,17 +32,15 @@
         </ResourceDictionary>
     </xct:Popup.Resources>
 
-    <xct:Popup.View>
-        <StackLayout Style="{StaticResource PopupLayout}">
-            <Label Style="{StaticResource Title}" 
-                   Text="Button Popup" />
-            <BoxView Style="{StaticResource Divider}" />
-            <Label Style="{StaticResource Content}" 
-                   Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
-            <Button Text="Toggle Size"
-                    Style="{StaticResource ConfirmButton}"
-                    Clicked="Button_Clicked" />
-        </StackLayout>
-    </xct:Popup.View>
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label Style="{StaticResource Title}" 
+                Text="Button Popup" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" 
+                Text="This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls." />
+        <Button Text="Toggle Size"
+                Style="{StaticResource ConfirmButton}"
+                Clicked="Button_Clicked" />
+    </StackLayout>
     
 </xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
index edf9d5626..e5c3ef4d3 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
@@ -7,11 +7,9 @@
            BorderColor="Transparent"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.TransparentPopup">
 
-    <xct:Popup.View>
-        <Frame 
-            CornerRadius="{OnPlatform Android='50', UWP='25', iOS='25'}" 
-            HeightRequest="{OnPlatform Android='100', UWP='50'}" WidthRequest="{OnPlatform Android='100', UWP='50'}" 
-            BackgroundColor="Red" />
-    </xct:Popup.View>
+    <Frame 
+        CornerRadius="{OnPlatform Android='50', UWP='25', iOS='25'}" 
+        HeightRequest="{OnPlatform Android='100', UWP='50'}" WidthRequest="{OnPlatform Android='100', UWP='50'}" 
+        BackgroundColor="Red" />
     
 </xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index b9f290c9b..a643089a1 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -6,6 +6,7 @@ namespace Xamarin.CommunityToolkit.UI.Views
 	/// <summary>
 	/// The popup controls base implementation.
 	/// </summary>
+	[ContentProperty(nameof(Content))]
 	public abstract class BasePopup : VisualElement
 	{
 		/// <summary>
@@ -27,12 +28,12 @@ public BasePopup()
 		public static BindableProperty HorizontalOptionsProperty = BindableProperty.Create(nameof(HorizontalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
 
 		/// <summary>
-		/// Gets or sets the <see cref="View"/> to render in the Popup.
+		/// Gets or sets the <see cref="View"/> content to render in the Popup.
 		/// </summary>
 		/// <remarks>
 		/// The View can be or type: <see cref="View"/>, <see cref="ContentPage"/> or <see cref="NavigationPage"/>
 		/// </remarks>
-		public virtual View View { get; set; }
+		public virtual View Content { get; set; }
 
 		/// <summary>
 		/// Gets or sets the <see cref="Color"/> of the Popup.
@@ -166,9 +167,9 @@ protected override void OnBindingContextChanged()
 		{
 			base.OnBindingContextChanged();
 
-			if (View != null)
+			if (Content != null)
 			{
-				SetInheritedBindingContext(View, BindingContext);
+				SetInheritedBindingContext(Content, BindingContext);
 			}
 		}
 	}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
index e7717d8ab..53fc8cbd6 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
@@ -8,20 +8,5 @@ namespace Xamarin.CommunityToolkit.UI.Views
 	/// </summary>
 	public class Popup : Popup<object>
 	{
-		/// <summary>
-		/// Initalizes a default implementation of <see cref="Popup"/>.
-		/// </summary>
-		public Popup() { }
-
-		/// <summary>
-		/// Initializes the <see cref="Popup"/> with a <see cref="View"/>.
-		/// </summary>
-		/// <param name="view">
-		/// The <see cref="View"/> to render in the <see cref="Popup"/>.
-		/// </param>
-		public Popup(View view)
-		{
-			View = view;
-		}
 	}
 }
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
index fe8ffa035..ab06a8e8e 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
@@ -7,7 +7,6 @@ namespace Xamarin.CommunityToolkit.UI.Views
 	public abstract class Popup<T> : BasePopup
 	{
 		TaskCompletionSource<T> taskCompletionSource;
-		View view;
 
 		/// <summary>
 		/// Initalizes a default implementation of <see cref="Popup{T}"/>.
@@ -15,19 +14,6 @@ public abstract class Popup<T> : BasePopup
 		protected Popup() =>
 			taskCompletionSource = new TaskCompletionSource<T>();
 
-		/// <inheritdoc />
-		public override View View
-		{
-			get => view;
-			set
-			{
-				if (view == value)
-					return;
-
-				view = value;
-			}
-		}
-
 		/// <summary>
 		/// Resets the Popup.
 		/// </summary>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
index 792b2b761..556bc2119 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
@@ -111,7 +111,7 @@ void CreateControl()
 		{
 			if (container == null)
 			{
-				container = new ContainerView(Context, Element.View);
+				container = new ContainerView(Context, Element.Content);
 				SetContentView(container);
 			}
 		}
@@ -140,7 +140,7 @@ void SetSize()
 				child.LayoutParameters = childLayoutParams;
 
 				var horizontalParams = -1;
-				switch (Element.View.HorizontalOptions.Alignment)
+				switch (Element.Content.HorizontalOptions.Alignment)
 				{
 					case LayoutAlignment.Center:
 					case LayoutAlignment.End:
@@ -153,7 +153,7 @@ void SetSize()
 				}
 
 				var verticalParams = -1;
-				switch (Element.View.VerticalOptions.Alignment)
+				switch (Element.Content.VerticalOptions.Alignment)
 				{
 					case LayoutAlignment.Center:
 					case LayoutAlignment.End:
@@ -165,10 +165,10 @@ void SetSize()
 						break;
 				}
 
-				if (Element.View.WidthRequest > -1)
+				if (Element.Content.WidthRequest > -1)
 				{
-					var inputMeasuredWidth = Element.View.WidthRequest > Element.Size.Width ?
-						(int)Element.Size.Width : (int)Element.View.WidthRequest;
+					var inputMeasuredWidth = Element.Content.WidthRequest > Element.Size.Width ?
+						(int)Element.Size.Width : (int)Element.Content.WidthRequest;
 					container.Measure(inputMeasuredWidth, (int)MeasureSpecMode.Unspecified);
 					horizontalParams = container.MeasuredWidth;
 				}
@@ -179,13 +179,13 @@ void SetSize()
 						(int)Element.Size.Width : container.MeasuredWidth;
 				}
 
-				if (Element.View.HeightRequest > -1)
+				if (Element.Content.HeightRequest > -1)
 				{
-					verticalParams = (int)Element.View.HeightRequest;
+					verticalParams = (int)Element.Content.HeightRequest;
 				}
 				else
 				{
-					var inputMeasuredWidth = Element.View.WidthRequest > -1 ? horizontalParams : (int)Element.Size.Width;
+					var inputMeasuredWidth = Element.Content.WidthRequest > -1 ? horizontalParams : (int)Element.Size.Width;
 					container.Measure(inputMeasuredWidth, (int)MeasureSpecMode.Unspecified);
 					verticalParams = container.MeasuredHeight > Element.Size.Height ?
 						(int)Element.Size.Height : container.MeasuredHeight;
@@ -193,7 +193,7 @@ void SetSize()
 
 				var containerLayoutParams = new FrameLayout.LayoutParams(horizontalParams, verticalParams);
 
-				switch (Element.View.VerticalOptions.Alignment)
+				switch (Element.Content.VerticalOptions.Alignment)
 				{
 					case LayoutAlignment.Start:
 						containerLayoutParams.Gravity = GravityFlags.Top;
@@ -209,7 +209,7 @@ void SetSize()
 						break;
 				}
 
-				switch (Element.View.HorizontalOptions.Alignment)
+				switch (Element.Content.HorizontalOptions.Alignment)
 				{
 					case LayoutAlignment.Start:
 						containerLayoutParams.Gravity |= GravityFlags.Left;
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs
index 5ef1a52ff..c483e1518 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs
@@ -127,7 +127,7 @@ protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEv
 
 		void CreateControl()
 		{
-			var view = Element.View;
+			var view = Element.Content;
 			var contentPage = new ContentPage { Content = view, Padding = new Thickness(25) };
 
 			Control = Platform.CreateRenderer(contentPage);
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
index 94bf6901d..1024c89ec 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
@@ -66,7 +66,7 @@ void CreateControl()
 		{
 			if (Control == null)
 			{
-				Control = new Xamarin.CommunityToolkit.UI.Views.ViewToRendererConverter.WrapperControl(Element.View);
+				Control = new Xamarin.CommunityToolkit.UI.Views.ViewToRendererConverter.WrapperControl(Element.Content);
 				Content = Control;
 			}
 		}
@@ -160,9 +160,7 @@ void SetBorderColor()
 
 		void SetColor()
 		{
-			// REVIEW - AH 12/3/2020
-			// Should this be using BackgroundColor or Color?
-			if (Element.View.BackgroundColor == default(Color))
+			if (Element.Content.BackgroundColor == default(Color))
 				panelStyle.Setters.Add(new Windows.UI.Xaml.Setter(Panel.BackgroundProperty, Element.Color.ToWindowsColor()));
 
 			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BackgroundProperty, Element.Color.ToWindowsColor()));

From 8b14da1863efca54cb48c902cad0b4a9d46c9d81 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 4 Dec 2020 15:32:47 -0500
Subject: [PATCH 05/46] Updated styles of sample popups

---
 .../Pages/Views/Popups/ButtonPopup.xaml       |  2 +-
 .../Views/Popups/MultipleButtonPopup.xaml     |  2 +-
 .../Views/Popups/NoLightDismissPopup.xaml     |  2 +-
 .../Pages/Views/Popups/ReturnResultPopup.cs   | 35 --------------
 .../Pages/Views/Popups/ReturnResultPopup.xaml | 47 +++++++++++++++++++
 .../Views/Popups/ReturnResultPopup.xaml.cs    | 12 +++++
 .../Pages/Views/Popups/ToggleSizePopup.xaml   |  2 +-
 .../Pages/Views/Popups/TransparentPopup.xaml  |  2 +-
 8 files changed, 64 insertions(+), 40 deletions(-)
 delete mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
index 737355dba..87184158e 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
@@ -2,7 +2,7 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 400'}"
+           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ButtonPopup">
     
     <xct:Popup.Resources>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
index ea0dfcfae..f2c405dd0 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
@@ -2,7 +2,7 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 400'}"
+           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.MultipleButtonPopup">
     
     <xct:Popup.Resources>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
index 9948ea96e..ab230b96e 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
@@ -2,7 +2,7 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 400'}"
+           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
            IsLightDismissEnabled="False"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.NoLightDismissPopup">
 
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
deleted file mode 100644
index 335583f53..000000000
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using Xamarin.CommunityToolkit.UI.Views;
-using Xamarin.Forms;
-
-namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
-{
-	public class ReturnResultPopup : Popup<string>
-	{
-		public ReturnResultPopup()
-		{
-			Content = new StackLayout
-			{
-				Children = { Message(), CloseButton() }
-			};
-
-			Button CloseButton()
-			{
-				var button = new Button
-				{
-					Text = "Close"
-				};
-
-				button.Clicked += (s, e) => Dismiss("Close button tapped");
-				return button;
-			}
-
-			Label Message() =>
-				new Label
-				{
-					Text = "Hello World"
-				};
-		}
-
-		protected override string GetLightDismissResult() => "Light Dismiss";
-	}
-}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
new file mode 100644
index 000000000..df4943fc4
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 350'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ReturnResultPopup"
+           x:TypeArguments="x:String">
+
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+            <Style x:Key="ConfirmButton" TargetType="Button">
+                <Setter Property="VerticalOptions" Value="EndAndExpand" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label Style="{StaticResource Title}" 
+                Text="Return Result Popup" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" 
+                Text="This popup returns a value when it is dismissed. The value varies depending if you tap on the CLOSE button or dismis the popup by tapping outside of it's bounds." />
+        <Button Text="CLOSE"
+                Style="{StaticResource ConfirmButton}"
+                Clicked="Button_Clicked" />
+    </StackLayout>
+
+</xct:Popup>
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs
new file mode 100644
index 000000000..871627399
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs
@@ -0,0 +1,12 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class ReturnResultPopup
+	{
+		public ReturnResultPopup() =>
+			InitializeComponent();
+
+		protected override string GetLightDismissResult() => "Light Dismiss";
+
+		void Button_Clicked(object sender, System.EventArgs e) => Dismiss("Close button tapped");
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
index bcb2f7f0e..e9da864ce 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
@@ -2,7 +2,7 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 350'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ToggleSizePopup">
     
     <xct:Popup.Resources>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
index e5c3ef4d3..ca7cd79f4 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
@@ -8,7 +8,7 @@
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.TransparentPopup">
 
     <Frame 
-        CornerRadius="{OnPlatform Android='50', UWP='25', iOS='25'}" 
+        CornerRadius="{OnPlatform Android='50', UWP='50', iOS='25'}" 
         HeightRequest="{OnPlatform Android='100', UWP='50'}" WidthRequest="{OnPlatform Android='100', UWP='50'}" 
         BackgroundColor="Red" />
     

From 80f9ddb3a2a6df2012e1a5843a31477f346b0953 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 20:46:15 -0500
Subject: [PATCH 06/46] Updated BorderColor to be a platform specific property
 for UWP

---
 .../Pages/Views/Popups/TransparentPopup.xaml   |  3 ++-
 .../Views/Popup/BasePopup.shared.cs            | 18 ------------------
 .../Views/Popup/PopupRenderer.uwp.cs           |  6 +++---
 .../Views/Popup/UWP/Popup.shared.cs            | 16 ++++++++++++++++
 4 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/Popup.shared.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
index ca7cd79f4..8b6967237 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
@@ -2,9 +2,10 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:uwpxct="clr-namespace:Xamarin.CommunityToolkit.UI.Views.WindowsSpecific;assembly=Xamarin.CommunityToolkit"
            Size="{OnPlatform Android='200, 200', UWP='100, 100', iOS='100, 100'}"
            Color="Transparent"
-           BorderColor="Transparent"
+           uwpxct:Popup.BorderColor="Transparent"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.TransparentPopup">
 
     <Frame 
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index a643089a1..2dd074ed6 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -15,7 +15,6 @@ public abstract class BasePopup : VisualElement
 		public BasePopup()
 		{
 			Color = Color.White;
-			BorderColor = default(Color);
 			VerticalOptions = LayoutOptions.CenterAndExpand;
 			HorizontalOptions = LayoutOptions.CenterAndExpand;
 			IsLightDismissEnabled = true;
@@ -66,23 +65,6 @@ public LayoutOptions HorizontalOptions
 			set => SetValue(HorizontalOptionsProperty, value);
 		}
 
-		// REVIEW - 11/30/2020 - ahoefling
-		// In the original code review https://github.com/xamarin/Xamarin.Forms/pull/9616
-		// It was recommended to configure BorderColor as a platform specific attached
-		// property since it is only usable on UWP. 
-		//
-		// Do we want to leave this as part of the API with plans to implement or
-		// should we move it as an attached property.
-
-		/// <summary>
-		/// Gets or sets the <see cref="Color"/> of the Popup Border.
-		/// </summary>
-		/// <remarks>
-		/// This color sets the native border color of the <see cref="Popup"/>, which is
-		/// independent of any border color configured in the actual view.
-		/// </remarks>
-		public Color BorderColor { get; set; } // UWP ONLY - wasn't originally in spec
-
 		/// <summary>
 		/// Gets or sets the <see cref="View"/> anchor.
 		/// </summary>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
index 1024c89ec..1d07fd8e7 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
@@ -146,16 +146,16 @@ void SetLayout()
 			SetDialogPosition(Element.VerticalOptions, Element.HorizontalOptions);
 		}
 
-		// this should be converted to an attached property
 		void SetBorderColor()
 		{
 			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.PaddingProperty, 0));
 			flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BorderThicknessProperty, new UWPThickness(defaultBorderThickness)));
 
-			if (Element.BorderColor == default(Color))
+			var borderColor = Views.WindowsSpecific.Popup.GetBorderColor(Element);
+			if (borderColor == default(Color))
 				flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BorderBrushProperty, Color.FromHex("#2e6da0").ToWindowsColor()));
 			else
-				flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BorderBrushProperty, Element.BorderColor.ToWindowsColor()));
+				flyoutStyle.Setters.Add(new Windows.UI.Xaml.Setter(FlyoutPresenter.BorderBrushProperty, borderColor.ToWindowsColor()));
 		}
 
 		void SetColor()
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/Popup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/Popup.shared.cs
new file mode 100644
index 000000000..0217ff2e1
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/Popup.shared.cs
@@ -0,0 +1,16 @@
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.UI.Views.WindowsSpecific
+{
+	public static class Popup
+	{
+		public static readonly BindableProperty BorderColorProperty = BindableProperty.Create(
+			"BorderColor", typeof(Color), typeof(Views.Popup), default(Color));
+
+		public static void SetBorderColor(BindableObject element, Color color) =>
+			element.SetValue(BorderColorProperty, color);
+
+		public static Color GetBorderColor(BindableObject element) =>
+			(Color)element.GetValue(BorderColorProperty);
+	}
+}
\ No newline at end of file

From e313d69377fe5f693270be6908b07fde02548e91 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 20:47:41 -0500
Subject: [PATCH 07/46] Moved Android/iOS/UWP renderers to platform specific
 folders

---
 .../Views/Popup/{ => Android}/PopupRenderer.android.cs            | 0
 .../Views/Popup/{ => UWP}/PopupRenderer.uwp.cs                    | 0
 .../Views/Popup/{ => iOS}/PopupRenderer.ios.cs                    | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/{ => Android}/PopupRenderer.android.cs (100%)
 rename src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/{ => UWP}/PopupRenderer.uwp.cs (100%)
 rename src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/{ => iOS}/PopupRenderer.ios.cs (100%)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.android.cs
rename to src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.uwp.cs
rename to src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupRenderer.ios.cs
rename to src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs

From 9cac54c83af936a68d0a0af4d2c90509d61400dd Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 20:50:27 -0500
Subject: [PATCH 08/46] Changed PopupDismissedEventArgs so it is immutable

---
 .../Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs | 2 +-
 .../Views/Popup/PopupDismissedEventArgs.shared.cs            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index 2dd074ed6..b563d2bc0 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -116,7 +116,7 @@ public Size Size
 		/// </param>
 		protected void OnDismissed(object result)
 		{
-			Dismissed?.Invoke(this, new PopupDismissedEventArgs { Result = result });
+			Dismissed?.Invoke(this, new PopupDismissedEventArgs(result));
 		}
 
 		/// <summary>
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
index 0a60a2b08..40a070979 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
@@ -7,9 +7,12 @@ namespace Xamarin.CommunityToolkit.UI.Views
 	/// </summary>
 	public class PopupDismissedEventArgs : EventArgs
 	{
+		public PopupDismissedEventArgs(object result) =>
+			Result = result;
+
 		/// <summary>
 		/// The resulting object to return.
 		/// </summary>
-		public object Result { get; set; }
+		public object Result { get; }
 	}
 }

From fa2a061b382e59fb3873dccb73e1cb50385d1e0f Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 20:51:17 -0500
Subject: [PATCH 09/46] Removed visual studio edits to sample android project

---
 .../Xamarin.CommunityToolkit.Sample.Android.csproj              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj b/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
index 26f3cbeac..8fe84cb44 100644
--- a/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
+++ b/samples/XCT.Sample.Android/Xamarin.CommunityToolkit.Sample.Android.csproj
@@ -127,7 +127,7 @@
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties XamarinHotReloadXFormsNugetUpgradeInfoBarXamarinCommunityToolkitSampleAndroidHideInfoBar="True" TriggeredFromHotReload="False" />
+      <UserProperties XamarinHotReloadXFormsNugetUpgradeInfoBarXamarinCommunityToolkitSampleAndroidHideInfoBar="True" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file

From 0eb052d0684c49b326a1ba08edef6b74c721023f Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 21:52:33 -0500
Subject: [PATCH 10/46] Removed = false for isDisposed as it is default

---
 .../Views/Popup/Android/PopupRenderer.android.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs
index 556bc2119..0642dbd37 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Android/PopupRenderer.android.cs
@@ -22,7 +22,7 @@ public class PopupRenderer : Dialog, IVisualElementRenderer, IDialogInterfaceOnC
 		int? defaultLabelFor;
 		VisualElementTracker tracker;
 		ContainerView container;
-		bool isDisposed = false;
+		bool isDisposed;
 
 		public BasePopup Element { get; private set; }
 

From c3c5ad58ef69266a183b31bce91b945822a14ea8 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 21:54:37 -0500
Subject: [PATCH 11/46] Normalized accessor properties for ios and uwp

---
 .../Views/Popup/UWP/PopupRenderer.uwp.cs                      | 4 ++--
 .../Views/Popup/iOS/PopupRenderer.ios.cs                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
index 1d07fd8e7..243ed01fb 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
@@ -26,9 +26,9 @@ public class PopupRenderer : Flyout, IVisualElementRenderer
 
 		internal ViewToRendererConverter.WrapperControl Control { get; private set; }
 
-		FrameworkElement IVisualElementRenderer.ContainerElement { get => null; }
+		FrameworkElement IVisualElementRenderer.ContainerElement => null;
 
-		VisualElement IVisualElementRenderer.Element { get => Element; }
+		VisualElement IVisualElementRenderer.Element => Element;
 
 		public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
 
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index c483e1518..144ea93f1 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -20,9 +20,9 @@ public class PopupRenderer : UIViewController, IVisualElementRenderer
 
 		public BasePopup Element { get; private set; }
 
-		VisualElement IVisualElementRenderer.Element { get => Element; }
+		VisualElement IVisualElementRenderer.Element => Element;
 
-		public UIView NativeView { get => base.View; }
+		public UIView NativeView => base.View;
 
 		public UIViewController ViewController { get; private set; }
 

From b1a0a48420b230f9ed16591699d41d9c7617187c Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 21:56:23 -0500
Subject: [PATCH 12/46] Removed performance apis since they are used internally
 at Xamarin.Forms

---
 .../Views/Popup/UWP/PopupRenderer.uwp.cs                  | 4 ----
 .../Views/Popup/iOS/PopupRenderer.ios.cs                  | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
index 243ed01fb..7abfcf9b9 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
@@ -50,16 +50,12 @@ void IVisualElementRenderer.SetElement(VisualElement element)
 			Element = popup;
 			CreateControl();
 
-			Performance.Start(out var reference);
-
 			if (oldElement != null)
 				oldElement.PropertyChanged -= OnElementPropertyChanged;
 
 			element.PropertyChanged += OnElementPropertyChanged;
 
 			OnElementChanged(new ElementChangedEventArgs<BasePopup>(oldElement, Element));
-
-			Performance.Stop(reference);
 		}
 
 		void CreateControl()
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index 144ea93f1..4f37295a3 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -70,20 +70,12 @@ void IVisualElementRenderer.SetElement(VisualElement element)
 			Element = popup;
 			CreateControl();
 
-			// REVIEW - AH 12/4/2020
-			// This is a hold over from Xamarin.Forms
-			// internal code. I don't think it is still
-			// needed but I left it in for now.
-			Performance.Start(out var reference);
-
 			if (oldElement != null)
 				oldElement.PropertyChanged -= OnElementPropertyChanged;
 
 			element.PropertyChanged += OnElementPropertyChanged;
 
 			OnElementChanged(new ElementChangedEventArgs<BasePopup>(oldElement, Element));
-
-			Performance.Stop(reference);
 		}
 
 		protected virtual void OnElementChanged(ElementChangedEventArgs<BasePopup> e)

From 70e0a45d73b273cc0d043cd666f5b424f7bb33b2 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 21:58:08 -0500
Subject: [PATCH 13/46] Simplified OnElementChanged to use shared method
 ConfigureControl

---
 .../Views/Popup/UWP/PopupRenderer.uwp.cs                  | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
index 7abfcf9b9..99b70621c 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
@@ -77,13 +77,7 @@ protected virtual void OnElementChanged(ElementChangedEventArgs<BasePopup> e)
 		{
 			if (e.NewElement != null && !isDisposed)
 			{
-				InitializeStyles();
-				SetEvents();
-				SetColor();
-				SetBorderColor();
-				SetSize();
-				SetLayout();
-				ApplyStyles();
+				ConfigureControl();
 				Show();
 			}
 

From 816066bec59b0544f575c3278dac0dc9040cf56e Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 11 Dec 2020 22:01:38 -0500
Subject: [PATCH 14/46] Removed iOS 9 code

---
 .../Helpers/FormsToolkit.ios.cs               | 20 -------------------
 .../Views/Popup/iOS/PopupRenderer.ios.cs      |  9 ++-------
 .../Views/ViewToRendererConverter.uwp.cs      |  3 ++-
 3 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs
deleted file mode 100644
index c515b44d7..000000000
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Helpers/FormsToolkit.ios.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using UIKit;
-
-namespace Xamarin.CommunityToolkit.Helpers
-{
-	public static class FormsToolkit
-	{
-		static bool? isiOS9OrNewer;
-
-		public static bool IsiOS9OrNewer
-		{
-			get
-			{
-				if (!isiOS9OrNewer.HasValue)
-					isiOS9OrNewer = UIDevice.CurrentDevice.CheckSystemVersion(9, 0);
-
-				return isiOS9OrNewer.Value;
-			}
-		}
-	}
-}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index 4f37295a3..edb8dbfb1 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -211,13 +211,8 @@ void AddToCurrentPageViewController()
 			ViewController.PresentViewController(this, true, () => Element.OnOpened());
 		}
 
-		async void OnDismissed(object sender, PopupDismissedEventArgs e)
-		{
-			if (!FormsToolkit.IsiOS9OrNewer)
-				await ViewController.DismissViewControllerAsync(true);
-			else
-				ViewController.DismissViewController(true, null);
-		}
+		async void OnDismissed(object sender, PopupDismissedEventArgs e) =>
+			await ViewController.DismissViewControllerAsync(true);
 
 		protected override void Dispose(bool disposing)
 		{
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs
index accb4f8ab..d55bb8d81 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/ViewToRendererConverter.uwp.cs
@@ -10,7 +10,8 @@ namespace Xamarin.CommunityToolkit.UI.Views
 {
 	public class ViewToRendererConverter
 	{
-		// This class is ported from Xamarin.Forms and should remain in sync
+		// This class is ported from Xamarin.Forms and should remain in sync.
+		// This is used in the PopupRenderer.uwp.cs
 		internal class WrapperControl : Panel
 		{
 			readonly View _view;

From 44a4a920fd28bed7e75590f9080b95f41c8deb6a Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 12 Dec 2020 22:51:28 -0500
Subject: [PATCH 15/46] Updated NavigationExtensions to follow Xamarin
 Essentials style by adding netstandard impl that throws exception

---
 .../NavigationExtensions.android.cs           |  8 ++---
 .../Navigation/NavigationExtensions.ios.cs    |  8 ++---
 ...andard.macos.tvos.watchos.tizen.wpf.gtk.cs | 16 ++++++++++
 .../Navigation/NavigationExtensions.shared.cs | 31 +++----------------
 .../Navigation/NavigationExtensions.uwp.cs    |  6 ++--
 .../Xamarin.CommunityToolkit.csproj           |  8 +++++
 6 files changed, 38 insertions(+), 39 deletions(-)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
index 12afb7e12..668c99914 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.android.cs
@@ -6,14 +6,12 @@ namespace Xamarin.CommunityToolkit.Extensions
 {
 	public static partial class NavigationExtensions
 	{
-		static void OnShowPopup(BasePopup popup)
-		{
+		static void PlatformShowPopup(BasePopup popup) =>
 			Platform.CreateRendererWithContext(popup, ToolkitPlatform.Context);
-		}
 
-		static Task<T> OnShowPopupAsync<T>(Popup<T> popup)
+		static Task<T> PlatformShowPopupAsync<T>(Popup<T> popup)
 		{
-			OnShowPopup(popup);
+			PlatformShowPopup(popup);
 			return popup.Result;
 		}
 	}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
index 3293d10f0..30620892f 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.ios.cs
@@ -6,14 +6,12 @@ namespace Xamarin.CommunityToolkit.Extensions
 {
 	public static partial class NavigationExtensions
 	{
-		static void OnShowPopup(BasePopup popup)
-		{
+		static void PlatformShowPopup(BasePopup popup) =>
 			Platform.CreateRenderer(popup);
-		}
 
-		static Task<T> OnShowPopupAsync<T>(Popup<T> popup)
+		static Task<T> PlatformShowPopupAsync<T>(Popup<T> popup)
 		{
-			OnShowPopup(popup);
+			PlatformShowPopup(popup);
 			return popup.Result;
 		}
 	}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs
new file mode 100644
index 000000000..aec17c6dc
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Threading.Tasks;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	public static partial class NavigationExtensions
+	{
+		static void PlatformShowPopup(BasePopup popup) =>
+			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
+
+		static Task<T> PlatformShowPopupAsync<T>(Popup<T> popup) =>
+			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
+	}
+}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
index 905569452..a25a717bf 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.shared.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms;
 
@@ -19,18 +18,8 @@ public static partial class NavigationExtensions
 		/// <param name="popup">
 		/// The <see cref="BasePopup"/> to display.
 		/// </param>
-		public static void ShowPopup(this INavigation navigation, BasePopup popup)
-		{
-#if __ANDROID__
-			OnShowPopup(popup);
-#elif __IOS__
-			OnShowPopup(popup);
-#elif WINDOWS_UWP
-			OnShowPopup(popup);
-#else
-			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
-#endif
-		}
+		public static void ShowPopup(this INavigation navigation, BasePopup popup) =>
+			PlatformShowPopup(popup);
 
 		/// <summary>
 		/// Displays a popup and returns a result.
@@ -47,17 +36,7 @@ public static void ShowPopup(this INavigation navigation, BasePopup popup)
 		/// <returns>
 		/// A task that will complete once the <see cref="Popup{T}"/> is dismissed.
 		/// </returns>
-		public static Task<T> ShowPopupAsync<T>(this INavigation navigation, Popup<T> popup)
-		{
-#if __ANDROID__
-			return OnShowPopupAsync(popup);
-#elif __IOS__
-			return OnShowPopupAsync(popup);
-#elif WINDOWS_UWP
-			return OnShowPopupAsync(popup);
-#else
-			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
-#endif
-		}
+		public static Task<T> ShowPopupAsync<T>(this INavigation navigation, Popup<T> popup) =>
+			PlatformShowPopupAsync(popup);
 	}
 }
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
index c1abd0ffd..fb6c4decf 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.uwp.cs
@@ -8,7 +8,7 @@ namespace Xamarin.CommunityToolkit.Extensions
 {
 	public static partial class NavigationExtensions
 	{
-		static void OnShowPopup(BasePopup popup)
+		static void PlatformShowPopup(BasePopup popup)
 		{
 			popup.Parent = GetCurrentPage(Application.Current.MainPage);
 			Platform.CreateRenderer(popup);
@@ -31,9 +31,9 @@ Page GetCurrentPage(Page currentPage)
 			}
 		}
 
-		static Task<T> OnShowPopupAsync<T>(Popup<T> popup)
+		static Task<T> PlatformShowPopupAsync<T>(Popup<T> popup)
 		{
-			OnShowPopup(popup);
+			PlatformShowPopup(popup);
 			return popup.Result;
 		}
 	}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
index 8448aa6c8..7ec91a182 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
@@ -60,6 +60,10 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
+  </PropertyGroup>
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
     <DefineConstants>UWP</DefineConstants>
   </PropertyGroup>
@@ -86,6 +90,10 @@
     <None Include="..\..\..\assets\XamarinCommunityToolkit_128x128.png" PackagePath="icon.png" Pack="true" />
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
   </ItemGroup>
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
+    <Compile Include="**/*.netstandard.cs" />
+    <Compile Include="**/*.netstandard*.cs" />
+  </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard1.0')) ">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />

From 2191e02ced221e53fbd6b16fe60945599743be17 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 12 Dec 2020 23:00:53 -0500
Subject: [PATCH 16/46] Added Control.Cleanup invocation to dispose method

---
 .../Views/Popup/UWP/PopupRenderer.uwp.cs                       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
index 99b70621c..eb15cfe4d 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
@@ -256,6 +256,9 @@ protected virtual void Dispose(bool disposing)
 				Element.Dismissed -= OnDismissed;
 				Element = null;
 
+				Control.CleanUp();
+				Control = null;
+
 				Closed -= OnClosing;
 			}
 

From 1a3a54dd32af020b341fc7bef654d37a8eec1d8d Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 12 Dec 2020 23:02:35 -0500
Subject: [PATCH 17/46] [iOS] Removed async/await from OnDismissed since it is
 an event the invocation doesn't need to know when it is complete

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index edb8dbfb1..cd763ea32 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -211,8 +211,8 @@ void AddToCurrentPageViewController()
 			ViewController.PresentViewController(this, true, () => Element.OnOpened());
 		}
 
-		async void OnDismissed(object sender, PopupDismissedEventArgs e) =>
-			await ViewController.DismissViewControllerAsync(true);
+		void OnDismissed(object sender, PopupDismissedEventArgs e) =>
+			ViewController.DismissViewControllerAsync(true);
 
 		protected override void Dispose(bool disposing)
 		{

From 9901f237a4f0aeb3c78c9ec38ececd89d7aef46e Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 12 Dec 2020 23:04:22 -0500
Subject: [PATCH 18/46] Fixed comment

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index cd763ea32..1af28ce5d 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -230,7 +230,7 @@ protected override void Dispose(bool disposing)
 					{
 						// NOTE - AH 9/12/2020
 						// This used to use the internal property
-						// 'Xamarin.Forms.Platform.Android.Platform.RendererProperty'
+						// 'Xamarin.Forms.Platform.iOS.Platform.RendererProperty'
 						// That property is marked internal so the closest thing we can do
 						// is duplicate the implementation here.
 						//

From 4ff12e53407f70c49d028022a05ef16eb4452b1d Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 12 Dec 2020 23:22:49 -0500
Subject: [PATCH 19/46] Updated iOS to use WeakEventManager

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs      | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index 1af28ce5d..bd0523a80 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -14,6 +14,7 @@ namespace Xamarin.CommunityToolkit.UI.Views
 {
 	public class PopupRenderer : UIViewController, IVisualElementRenderer
 	{
+		readonly WeakEventManager eventManager = new WeakEventManager();
 		bool isDisposed;
 
 		public IVisualElementRenderer Control { get; private set; }
@@ -33,6 +34,7 @@ public class PopupRenderer : UIViewController, IVisualElementRenderer
 		[Preserve(Conditional = true)]
 		public PopupRenderer()
 		{
+			eventManager.AddEventHandler(OnDismiss, nameof(OnDismiss));
 		}
 
 		public void SetElementSize(Size size)
@@ -203,7 +205,7 @@ void SetPresentationController()
 
 			// Setting PermittedArrowDirector to 0 breaks the Popover layout. It would be nice if there is no anchor to remove the arrow.
 			((UIPopoverPresentationController)PresentationController).PermittedArrowDirections = UIPopoverArrowDirection.Up;
-			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate(this);
+			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate(eventManager);
 		}
 
 		void AddToCurrentPageViewController()
@@ -253,23 +255,24 @@ protected override void Dispose(bool disposing)
 			base.Dispose(disposing);
 		}
 
+		void OnDismiss(object sender, EventArgs e)
+		{
+			if (IsViewLoaded && Element.IsLightDismissEnabled)
+				Element.LightDismiss();
+		}
+
 		class PopoverDelegate : UIPopoverPresentationControllerDelegate
 		{
-			PopupRenderer popupRenderer;
+			readonly WeakEventManager eventManager;
 
-			public PopoverDelegate(PopupRenderer renderer) =>
-				popupRenderer = renderer;
+			public PopoverDelegate(WeakEventManager eventManager) =>
+				this.eventManager = eventManager;
 
-			public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController)
-			{
-				return UIModalPresentationStyle.None;
-			}
+			public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController) =>
+				UIModalPresentationStyle.None;
 
-			public override void DidDismiss(UIPresentationController presentationController)
-			{
-				if (popupRenderer.IsViewLoaded && popupRenderer.Element.IsLightDismissEnabled)
-					popupRenderer.Element.LightDismiss();
-			}
+			public override void DidDismiss(UIPresentationController presentationController) =>
+				eventManager.RaiseEvent(this, new EventArgs(), nameof(OnDismiss));
 		}
 	}
 }

From 53c06cceff43b6dd4fd94c1d3c7997060e981f57 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 12 Dec 2020 23:23:45 -0500
Subject: [PATCH 20/46] changed instantiation to use default(SizeRequest)

---
 .../Views/Popup/UWP/PopupRenderer.uwp.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
index eb15cfe4d..ef2b602ac 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/UWP/PopupRenderer.uwp.cs
@@ -221,7 +221,7 @@ void SetDialogPosition(LayoutOptions verticalOptions, LayoutOptions horizontalOp
 		SizeRequest IVisualElementRenderer.GetDesiredSize(double widthConstraint, double heightConstraint)
 		{
 			if (isDisposed || Control == null)
-				return new SizeRequest();
+				return default(SizeRequest);
 
 			var constraint = new Windows.Foundation.Size(widthConstraint, heightConstraint);
 			Control.Measure(constraint);

From b4b98a64c78b104911e0f42f231c2bab0470a472 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 18 Dec 2020 21:53:30 -0500
Subject: [PATCH 21/46] ios - Changed WeakEventManager so it is a protected
 static object on the popup renderer. This will help create a weak reference
 to the popup delegate for the GC

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs      | 43 +++++++------------
 1 file changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index bd0523a80..183f9e101 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -14,9 +14,10 @@ namespace Xamarin.CommunityToolkit.UI.Views
 {
 	public class PopupRenderer : UIViewController, IVisualElementRenderer
 	{
-		readonly WeakEventManager eventManager = new WeakEventManager();
 		bool isDisposed;
 
+		protected static WeakEventManager EventManager { get; private set; } = new WeakEventManager();
+
 		public IVisualElementRenderer Control { get; private set; }
 
 		public BasePopup Element { get; private set; }
@@ -32,15 +33,11 @@ public class PopupRenderer : UIViewController, IVisualElementRenderer
 		public event EventHandler<PropertyChangedEventArgs> ElementPropertyChanged;
 
 		[Preserve(Conditional = true)]
-		public PopupRenderer()
-		{
-			eventManager.AddEventHandler(OnDismiss, nameof(OnDismiss));
-		}
+		public PopupRenderer() =>
+			EventManager.AddEventHandler(OnDismiss, nameof(OnDismiss));
 
-		public void SetElementSize(Size size)
-		{
+		public void SetElementSize(Size size) =>
 			Control?.SetElementSize(size);
-		}
 
 		public override void ViewDidLayoutSubviews()
 		{
@@ -55,10 +52,8 @@ public override void ViewDidAppear(bool animated)
 			ModalInPopover = !Element.IsLightDismissEnabled;
 		}
 
-		public SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
-		{
-			return NativeView.GetSizeRequest(widthConstraint, heightConstraint);
-		}
+		public SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint) =>
+			NativeView.GetSizeRequest(widthConstraint, heightConstraint);
 
 		void IVisualElementRenderer.SetElement(VisualElement element)
 		{
@@ -135,10 +130,8 @@ void SetViewController()
 			ViewController = currentPageRenderer.ViewController;
 		}
 
-		void SetEvents()
-		{
+		void SetEvents() =>
 			Element.Dismissed += OnDismissed;
-		}
 
 		void SetSize()
 		{
@@ -187,10 +180,8 @@ void SetLayout()
 			}
 		}
 
-		void SetBackgroundColor()
-		{
+		void SetBackgroundColor() =>
 			Control.NativeView.BackgroundColor = Element.Color.ToUIColor();
-		}
 
 		void SetView()
 		{
@@ -205,13 +196,11 @@ void SetPresentationController()
 
 			// Setting PermittedArrowDirector to 0 breaks the Popover layout. It would be nice if there is no anchor to remove the arrow.
 			((UIPopoverPresentationController)PresentationController).PermittedArrowDirections = UIPopoverArrowDirection.Up;
-			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate(eventManager);
+			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate();
 		}
 
-		void AddToCurrentPageViewController()
-		{
+		void AddToCurrentPageViewController() =>
 			ViewController.PresentViewController(this, true, () => Element.OnOpened());
-		}
 
 		void OnDismissed(object sender, PopupDismissedEventArgs e) =>
 			ViewController.DismissViewControllerAsync(true);
@@ -224,6 +213,9 @@ protected override void Dispose(bool disposing)
 			isDisposed = true;
 			if (disposing)
 			{
+				EventManager.RemoveEventHandler(OnDismiss, nameof(OnDismiss));
+				EventManager = null;
+
 				if (Element != null)
 				{
 					Element.PropertyChanged -= OnElementPropertyChanged;
@@ -263,16 +255,11 @@ void OnDismiss(object sender, EventArgs e)
 
 		class PopoverDelegate : UIPopoverPresentationControllerDelegate
 		{
-			readonly WeakEventManager eventManager;
-
-			public PopoverDelegate(WeakEventManager eventManager) =>
-				this.eventManager = eventManager;
-
 			public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController) =>
 				UIModalPresentationStyle.None;
 
 			public override void DidDismiss(UIPresentationController presentationController) =>
-				eventManager.RaiseEvent(this, new EventArgs(), nameof(OnDismiss));
+				EventManager.RaiseEvent(this, new EventArgs(), nameof(OnDismiss));
 		}
 	}
 }

From 7b6c7b94585ec9929ca0252e2aeb52cbf16bc953 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Fri, 18 Dec 2020 22:56:26 -0500
Subject: [PATCH 22/46] Moved sample popup code to new location

---
 .../XCT.Sample}/Pages/Views/PopupGalleryPage.xaml                 | 0
 .../XCT.Sample}/Pages/Views/PopupGalleryPage.xaml.cs              | 0
 .../XCT.Sample}/Pages/Views/Popups/ButtonPopup.xaml               | 0
 .../XCT.Sample}/Pages/Views/Popups/ButtonPopup.xaml.cs            | 0
 .../XCT.Sample}/Pages/Views/Popups/MultipleButtonPopup.xaml       | 0
 .../XCT.Sample}/Pages/Views/Popups/MultipleButtonPopup.xaml.cs    | 0
 .../XCT.Sample}/Pages/Views/Popups/NoLightDismissPopup.xaml       | 0
 .../XCT.Sample}/Pages/Views/Popups/NoLightDismissPopup.xaml.cs    | 0
 .../XCT.Sample}/Pages/Views/Popups/OpenedEventSimplePopup.xaml    | 0
 .../XCT.Sample}/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs | 0
 .../XCT.Sample}/Pages/Views/Popups/PopupAnchorPage.xaml           | 0
 .../XCT.Sample}/Pages/Views/Popups/PopupAnchorPage.xaml.cs        | 0
 .../XCT.Sample}/Pages/Views/Popups/PopupPositionPage.xaml         | 0
 .../XCT.Sample}/Pages/Views/Popups/PopupPositionPage.xaml.cs      | 0
 .../XCT.Sample}/Pages/Views/Popups/ReturnResultPopup.xaml         | 0
 .../XCT.Sample}/Pages/Views/Popups/ReturnResultPopup.xaml.cs      | 0
 .../XCT.Sample}/Pages/Views/Popups/SimplePopup.xaml               | 0
 .../XCT.Sample}/Pages/Views/Popups/SimplePopup.xaml.cs            | 0
 .../XCT.Sample}/Pages/Views/Popups/ToggleSizePopup.xaml           | 0
 .../XCT.Sample}/Pages/Views/Popups/ToggleSizePopup.xaml.cs        | 0
 .../XCT.Sample}/Pages/Views/Popups/TransparentPopup.xaml          | 0
 .../XCT.Sample}/Pages/Views/Popups/TransparentPopup.xaml.cs       | 0
 .../XCT.Sample}/ViewModels/Views/PopupControlViewModel.cs         | 0
 .../XCT.Sample}/ViewModels/Views/Popups/PopupAnchorViewModel.cs   | 0
 .../XCT.Sample}/ViewModels/Views/Popups/PopupPositionViewModel.cs | 0
 25 files changed, 0 insertions(+), 0 deletions(-)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/PopupGalleryPage.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/PopupGalleryPage.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/ButtonPopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/ButtonPopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/MultipleButtonPopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/MultipleButtonPopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/NoLightDismissPopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/NoLightDismissPopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/OpenedEventSimplePopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/PopupAnchorPage.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/PopupAnchorPage.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/PopupPositionPage.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/PopupPositionPage.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/ReturnResultPopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/ReturnResultPopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/SimplePopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/SimplePopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/ToggleSizePopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/ToggleSizePopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/TransparentPopup.xaml (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/Pages/Views/Popups/TransparentPopup.xaml.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/ViewModels/Views/PopupControlViewModel.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/ViewModels/Views/Popups/PopupAnchorViewModel.cs (100%)
 rename {src/CommunityToolkit/Xamarin.CommunityToolkit.Sample => samples/XCT.Sample}/ViewModels/Views/Popups/PopupPositionViewModel.cs (100%)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml b/samples/XCT.Sample/Pages/Views/PopupGalleryPage.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml
rename to samples/XCT.Sample/Pages/Views/PopupGalleryPage.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml.cs b/samples/XCT.Sample/Pages/Views/PopupGalleryPage.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/PopupGalleryPage.xaml.cs
rename to samples/XCT.Sample/Pages/Views/PopupGalleryPage.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml b/samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml b/samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/SimplePopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml
rename to samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs
rename to samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs b/samples/XCT.Sample/ViewModels/Views/PopupControlViewModel.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/PopupControlViewModel.cs
rename to samples/XCT.Sample/ViewModels/Views/PopupControlViewModel.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
rename to samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
similarity index 100%
rename from src/CommunityToolkit/Xamarin.CommunityToolkit.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
rename to samples/XCT.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs

From 0aacaed1f7806926f98824b173749ead1098f45a Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sun, 20 Dec 2020 09:22:53 -0500
Subject: [PATCH 23/46] Added WeakEventManager for BasePopup events (Opened,
 Dismissed)

---
 .../Views/Popup/BasePopup.shared.cs           | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index b563d2bc0..d965f112b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -1,4 +1,5 @@
 using System;
+using Xamarin.CommunityToolkit.Helpers;
 using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.UI.Views
@@ -9,6 +10,9 @@ namespace Xamarin.CommunityToolkit.UI.Views
 	[ContentProperty(nameof(Content))]
 	public abstract class BasePopup : VisualElement
 	{
+		readonly WeakEventManager<PopupDismissedEventArgs> dismissWeakEventManager = new WeakEventManager<PopupDismissedEventArgs>();
+		readonly WeakEventManager<PopupOpenedEventArgs> openedWeakEventManager = new WeakEventManager<PopupOpenedEventArgs>();
+
 		/// <summary>
 		/// Instantiates a new instance of <see cref="BasePopup"/>.
 		/// </summary>
@@ -101,12 +105,20 @@ public Size Size
 		/// <summary>
 		/// Dismissed event is invoked when the popup is closed.
 		/// </summary>
-		public event EventHandler<PopupDismissedEventArgs> Dismissed;
+		public event EventHandler<PopupDismissedEventArgs> Dismissed
+		{
+			add => dismissWeakEventManager.AddEventHandler(value);
+			remove => dismissWeakEventManager.RemoveEventHandler(value);
+		}
 
 		/// <summary>
 		/// Opened event is invoked when the popup is opened.
 		/// </summary>
-		public event EventHandler<PopupOpenedEventArgs> Opened;
+		public event EventHandler<PopupOpenedEventArgs> Opened
+		{
+			add => openedWeakEventManager.AddEventHandler(value);
+			remove => openedWeakEventManager.RemoveEventHandler(value);
+		}
 
 		/// <summary>
 		/// Invokes the <see cref="Dismissed"/> event.
@@ -114,18 +126,14 @@ public Size Size
 		/// <param name="result">
 		/// The results to add to the <see cref="PopupDismissedEventArgs"/>.
 		/// </param>
-		protected void OnDismissed(object result)
-		{
-			Dismissed?.Invoke(this, new PopupDismissedEventArgs(result));
-		}
+		protected void OnDismissed(object result) =>
+			dismissWeakEventManager.RaiseEvent(this, new PopupDismissedEventArgs(result), nameof(Dismissed));
 
 		/// <summary>
 		/// Invokes the <see cref="Opened"/> event.
 		/// </summary>
-		internal virtual void OnOpened()
-		{
-			Opened?.Invoke(this, new PopupOpenedEventArgs());
-		}
+		internal virtual void OnOpened() =>
+			openedWeakEventManager.RaiseEvent(this, new PopupOpenedEventArgs(), nameof(Opened));
 
 		/// <summary>
 		/// Invoked when the popup is light dismissed. In other words when the

From 6ab80aa3c8fb6b6325002c7fadb61a61600ef4c9 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sun, 20 Dec 2020 17:46:28 -0500
Subject: [PATCH 24/46] ios - changed popover delegate to use action

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs      | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index 183f9e101..ea39fb0e7 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -16,8 +16,6 @@ public class PopupRenderer : UIViewController, IVisualElementRenderer
 	{
 		bool isDisposed;
 
-		protected static WeakEventManager EventManager { get; private set; } = new WeakEventManager();
-
 		public IVisualElementRenderer Control { get; private set; }
 
 		public BasePopup Element { get; private set; }
@@ -33,8 +31,9 @@ public class PopupRenderer : UIViewController, IVisualElementRenderer
 		public event EventHandler<PropertyChangedEventArgs> ElementPropertyChanged;
 
 		[Preserve(Conditional = true)]
-		public PopupRenderer() =>
-			EventManager.AddEventHandler(OnDismiss, nameof(OnDismiss));
+		public PopupRenderer()
+		{
+		}
 
 		public void SetElementSize(Size size) =>
 			Control?.SetElementSize(size);
@@ -196,7 +195,7 @@ void SetPresentationController()
 
 			// Setting PermittedArrowDirector to 0 breaks the Popover layout. It would be nice if there is no anchor to remove the arrow.
 			((UIPopoverPresentationController)PresentationController).PermittedArrowDirections = UIPopoverArrowDirection.Up;
-			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate();
+			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate(OnDismiss);
 		}
 
 		void AddToCurrentPageViewController() =>
@@ -213,8 +212,6 @@ protected override void Dispose(bool disposing)
 			isDisposed = true;
 			if (disposing)
 			{
-				EventManager.RemoveEventHandler(OnDismiss, nameof(OnDismiss));
-				EventManager = null;
 
 				if (Element != null)
 				{
@@ -241,13 +238,17 @@ protected override void Dispose(bool disposing)
 					}
 
 					Element = null;
+
+					var presentationController = (UIPopoverPresentationController)PresentationController;
+					if (presentationController != null)
+						presentationController.Delegate = null;
 				}
 			}
 
 			base.Dispose(disposing);
 		}
 
-		void OnDismiss(object sender, EventArgs e)
+		void OnDismiss()
 		{
 			if (IsViewLoaded && Element.IsLightDismissEnabled)
 				Element.LightDismiss();
@@ -255,11 +256,18 @@ void OnDismiss(object sender, EventArgs e)
 
 		class PopoverDelegate : UIPopoverPresentationControllerDelegate
 		{
+			Action dismissCallback;
+
+			public PopoverDelegate(Action callback)
+			{
+				dismissCallback = callback;
+			}
+
 			public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController) =>
 				UIModalPresentationStyle.None;
 
 			public override void DidDismiss(UIPresentationController presentationController) =>
-				EventManager.RaiseEvent(this, new EventArgs(), nameof(OnDismiss));
+				dismissCallback?.Invoke();
 		}
 	}
 }

From 952bdcf3011d032ae83dd33f6b5b0f87516dbce6 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Mon, 21 Dec 2020 10:03:41 -0800
Subject: [PATCH 25/46] Added PopOverDelegate.PopoverDismissed

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs      | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index ea39fb0e7..a3e3c99ed 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -191,11 +191,20 @@ void SetView()
 
 		void SetPresentationController()
 		{
+			var popOverDelegate = new PopoverDelegate();
+			popOverDelegate.PopoverDismissed += HandlePopoverDelegateDismissed;
+
 			((UIPopoverPresentationController)PresentationController).SourceView = ViewController.View;
 
 			// Setting PermittedArrowDirector to 0 breaks the Popover layout. It would be nice if there is no anchor to remove the arrow.
 			((UIPopoverPresentationController)PresentationController).PermittedArrowDirections = UIPopoverArrowDirection.Up;
-			((UIPopoverPresentationController)PresentationController).Delegate = new PopoverDelegate(OnDismiss);
+			((UIPopoverPresentationController)PresentationController).Delegate = popOverDelegate;
+		}
+
+		void HandlePopoverDelegateDismissed(object sender, UIPresentationController e)
+		{
+			if (IsViewLoaded && Element.IsLightDismissEnabled)
+				Element.LightDismiss();
 		}
 
 		void AddToCurrentPageViewController() =>
@@ -212,7 +221,6 @@ protected override void Dispose(bool disposing)
 			isDisposed = true;
 			if (disposing)
 			{
-
 				if (Element != null)
 				{
 					Element.PropertyChanged -= OnElementPropertyChanged;
@@ -229,8 +237,7 @@ protected override void Dispose(bool disposing)
 						// leaving it in so it can be reviewed.
 						var rendererProperty = BindableProperty.CreateAttached("Renderer", typeof(IVisualElementRenderer), typeof(Platform), default(IVisualElementRenderer), propertyChanged: (bindable, oldvalue, newvalue) =>
 						{
-							var view = bindable as VisualElement;
-							if (view != null)
+							if (bindable is VisualElement view)
 								view.IsPlatformEnabled = newvalue != null;
 						});
 
@@ -248,26 +255,21 @@ protected override void Dispose(bool disposing)
 			base.Dispose(disposing);
 		}
 
-		void OnDismiss()
-		{
-			if (IsViewLoaded && Element.IsLightDismissEnabled)
-				Element.LightDismiss();
-		}
-
 		class PopoverDelegate : UIPopoverPresentationControllerDelegate
 		{
-			Action dismissCallback;
+			readonly WeakEventManager<UIPresentationController> popoverDismissedEventManager = new WeakEventManager<UIPresentationController>();
 
-			public PopoverDelegate(Action callback)
+			public event EventHandler<UIPresentationController> PopoverDismissed
 			{
-				dismissCallback = callback;
+				add => popoverDismissedEventManager.AddEventHandler(value);
+				remove => popoverDismissedEventManager.RemoveEventHandler(value);
 			}
 
 			public override UIModalPresentationStyle GetAdaptivePresentationStyle(UIPresentationController forPresentationController) =>
 				UIModalPresentationStyle.None;
 
 			public override void DidDismiss(UIPresentationController presentationController) =>
-				dismissCallback?.Invoke();
+				popoverDismissedEventManager.RaiseEvent(this, presentationController, nameof(PopoverDismissed));
 		}
 	}
 }

From 42864380fd2e47af50bf4543c44a464c137ec30a Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 9 Jan 2021 18:37:39 -0500
Subject: [PATCH 26/46] Updated accessor for LightDismiss to protected internal

---
 .../Views/Popup/BasePopup.shared.cs                         | 6 +-----
 .../Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index d965f112b..dc09cfd39 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -139,12 +139,8 @@ internal virtual void OnOpened() =>
 		/// Invoked when the popup is light dismissed. In other words when the
 		/// user taps outside of the popup and it closes.
 		/// </summary>
-		public virtual void LightDismiss()
+		protected internal virtual void LightDismiss()
 		{
-			// REVIEW - AH 12/3/2020
-			// Should this API be protected internal? It is not intended
-			// to be called outside of XCT, but it should allow for subclassing.
-
 			// TODO - AH 12/3/2020
 			// This is not being tested correctly. It is not
 			// implemented in iOS or UWP.
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
index ab06a8e8e..6fa3d69a4 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
@@ -38,7 +38,7 @@ public void Dismiss(T result)
 		public Task<T> Result => taskCompletionSource.Task;
 
 		/// <inheritdoc/>
-		public override void LightDismiss() =>
+		protected internal override void LightDismiss() =>
 			taskCompletionSource.TrySetResult(GetLightDismissResult());
 
 		/// <summary>

From c4453e35d9dfcc0654bfdcd37fe1fb5bb835a476 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 9 Jan 2021 18:47:18 -0500
Subject: [PATCH 27/46] Updated comment in LightDismiss

---
 .../Views/Popup/BasePopup.shared.cs                 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index dc09cfd39..ac5a4a883 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -141,11 +141,14 @@ internal virtual void OnOpened() =>
 		/// </summary>
 		protected internal virtual void LightDismiss()
 		{
-			// TODO - AH 12/3/2020
-			// This is not being tested correctly. It is not
-			// implemented in iOS or UWP.
-
-			// empty default implementation
+			// Note 1/9/2021
+			// Left empty be design
+			//
+			// This method needs to be left empty as it is not
+			// required for a child class to have an implementation
+			// of LightDismiss. This means if a renderer invokes
+			// this method nothing will happen unless the child
+			// class has an implementation.
 		}
 
 		/// <inheritdoc />

From f4594bebc7362d01de59a547ea19b26e4cd37c10 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 9 Jan 2021 18:48:02 -0500
Subject: [PATCH 28/46] Removed stale iOS code

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs      | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index a3e3c99ed..2a4c16d6e 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -224,26 +224,6 @@ protected override void Dispose(bool disposing)
 				if (Element != null)
 				{
 					Element.PropertyChanged -= OnElementPropertyChanged;
-
-					if (Platform.GetRenderer(Element) == this)
-					{
-						// NOTE - AH 9/12/2020
-						// This used to use the internal property
-						// 'Xamarin.Forms.Platform.iOS.Platform.RendererProperty'
-						// That property is marked internal so the closest thing we can do
-						// is duplicate the implementation here.
-						//
-						// I don't think this is really needed for the control, but I am
-						// leaving it in so it can be reviewed.
-						var rendererProperty = BindableProperty.CreateAttached("Renderer", typeof(IVisualElementRenderer), typeof(Platform), default(IVisualElementRenderer), propertyChanged: (bindable, oldvalue, newvalue) =>
-						{
-							if (bindable is VisualElement view)
-								view.IsPlatformEnabled = newvalue != null;
-						});
-
-						Element.ClearValue(rendererProperty);
-					}
-
 					Element = null;
 
 					var presentationController = (UIPopoverPresentationController)PresentationController;

From e127ecf1d7a17e47dcd27e3e8dd2e730787470f2 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 9 Jan 2021 18:50:25 -0500
Subject: [PATCH 29/46] Updated xml comments

---
 .../Views/Popup/BasePopup.shared.cs                         | 2 +-
 .../Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs    | 4 +---
 .../Views/Popup/PopupDismissedEventArgs.shared.cs           | 6 ++++++
 .../Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index ac5a4a883..608432020 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -5,7 +5,7 @@
 namespace Xamarin.CommunityToolkit.UI.Views
 {
 	/// <summary>
-	/// The popup controls base implementation.
+	/// The popup control's base implementation.
 	/// </summary>
 	[ContentProperty(nameof(Content))]
 	public abstract class BasePopup : VisualElement
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
index 53fc8cbd6..a92c4955b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/Popup.shared.cs
@@ -1,6 +1,4 @@
-using Xamarin.Forms;
-
-namespace Xamarin.CommunityToolkit.UI.Views
+namespace Xamarin.CommunityToolkit.UI.Views
 {
 	/// <summary>
 	/// Default popup implementation that uses a
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
index 40a070979..5b5e46dd6 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
@@ -7,6 +7,12 @@ namespace Xamarin.CommunityToolkit.UI.Views
 	/// </summary>
 	public class PopupDismissedEventArgs : EventArgs
 	{
+		/// <summary>
+		/// Initialization an instance of <see cref="PopupDismissedEventArgs"/>.
+		/// </summary>
+		/// <param name="result">
+		/// The result of the popup.
+		/// </param>
 		public PopupDismissedEventArgs(object result) =>
 			Result = result;
 
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
index 6fa3d69a4..cb0cd4c2b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupOfT.shared.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Xamarin.Forms;
 
 namespace Xamarin.CommunityToolkit.UI.Views
 {

From ccc89bcba4cc47cb025c896dbbca57c8333b027a Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sun, 10 Jan 2021 00:02:14 -0500
Subject: [PATCH 30/46] Removed obj dir from compilation in 'netstandard'
 projects and fixed debugger issues

---
 .../Xamarin.CommunityToolkit.csproj                       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
index 7ec91a182..a96757c73 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Xamarin.CommunityToolkit.csproj
@@ -60,10 +60,6 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
-  </PropertyGroup>
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
     <DefineConstants>UWP</DefineConstants>
   </PropertyGroup>
@@ -93,6 +89,10 @@
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
     <Compile Include="**/*.netstandard.cs" />
     <Compile Include="**/*.netstandard*.cs" />
+    <!-- Remove obj to prevent stale code from other implementations from being included -->
+    <Compile Remove="obj\**" />
+    <EmbeddedResource Remove="obj\**" />
+    <None Remove="obj\**" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard1.0')) ">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />

From 76f01b28514339da725f7957bcd7e1fa5cf7538b Mon Sep 17 00:00:00 2001
From: Pedro Jesus <pedrojesus.cefet@gmail.com>
Date: Sun, 10 Jan 2021 13:59:32 -0300
Subject: [PATCH 31/46] removed Init method and added code to get the Context

---
 samples/XCT.Sample.Android/MainActivity.cs    |  1 -
 .../Startup/ToolkitPlatform.android.cs        | 22 +++++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/samples/XCT.Sample.Android/MainActivity.cs b/samples/XCT.Sample.Android/MainActivity.cs
index 0c945823c..d2392c841 100644
--- a/samples/XCT.Sample.Android/MainActivity.cs
+++ b/samples/XCT.Sample.Android/MainActivity.cs
@@ -17,7 +17,6 @@ protected override void OnCreate(Bundle savedInstanceState)
 
 			global::Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
 			Essentials.Platform.Init(this, savedInstanceState);
-			ToolkitPlatform.Init(this);
 			global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
 			LoadApplication(new App());
 		}
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
index c2db78882..1f2b542ae 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
@@ -1,26 +1,24 @@
 using Android.Content;
+using Xamarin.Forms.Platform.Android;
 
 namespace Xamarin.CommunityToolkit
 {
 	/// <summary>
 	/// Platform extension methods.
 	/// </summary>
-	public static partial class ToolkitPlatform
+	static class ToolkitPlatform
 	{
 		/// <summary>
 		/// Gets the <see cref="Context"/>.
 		/// </summary>
-		internal static Context Context { get; private set; }
-
-		/// <summary>
-		/// Initializes the Android <see cref="Context"/>.
-		/// </summary>
-		/// <param name="context">
-		/// The current <see cref="Context"/>.
-		/// </param>
-		public static void Init(Context context)
+		public static Context Context
 		{
-			Context = context;
+			get
+			{
+				var page = Forms.Application.Current.MainPage;
+				var renderer = page.GetRenderer();
+				return renderer.View.Context;
+			}
 		}
 	}
-}
+}
\ No newline at end of file

From 812332c927efa7945de69f061ae2e6ad23449f04 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sun, 10 Jan 2021 15:06:24 -0500
Subject: [PATCH 32/46] changed accessor of ToolkitPlatform to internal

---
 .../Startup/ToolkitPlatform.android.cs                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
index 1f2b542ae..60d866add 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Startup/ToolkitPlatform.android.cs
@@ -6,12 +6,12 @@ namespace Xamarin.CommunityToolkit
 	/// <summary>
 	/// Platform extension methods.
 	/// </summary>
-	static class ToolkitPlatform
+	internal static class ToolkitPlatform
 	{
 		/// <summary>
 		/// Gets the <see cref="Context"/>.
 		/// </summary>
-		public static Context Context
+		internal static Context Context
 		{
 			get
 			{

From 2b1c7edaaed59f80c49a1071dafa0f168ceb184a Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 16 Jan 2021 11:57:30 -0500
Subject: [PATCH 33/46] Added new UI popup tests for Xaml binding vs C# binding

---
 .../Views/Popups/CsharpBindingPopup.xaml      | 40 +++++++++++++++++
 .../Views/Popups/CsharpBindingPopup.xaml.cs   | 13 ++++++
 .../Pages/Views/Popups/XamlBindingPopup.xaml  | 45 +++++++++++++++++++
 .../Views/Popups/XamlBindingPopup.xaml.cs     |  7 +++
 .../ViewModels/Views/PopupControlViewModel.cs |  4 +-
 .../Popups/CsharpBindingPopupViewModel.cs     |  9 ++++
 .../Views/Popups/XamlBindingPopupViewModel.cs |  9 ++++
 7 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
 create mode 100644 samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml.cs
 create mode 100644 samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
 create mode 100644 samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml.cs
 create mode 100644 samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs
 create mode 100644 samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs

diff --git a/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
new file mode 100644
index 000000000..aeb26ef67
--- /dev/null
+++ b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.CsharpBindingPopup">
+
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label Style="{StaticResource Title}" 
+               Text="{Binding Title}" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" 
+               Text="{Binding Message}" />    
+    </StackLayout>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml.cs
new file mode 100644
index 000000000..1f4a2ba3a
--- /dev/null
+++ b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml.cs
@@ -0,0 +1,13 @@
+using Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class CsharpBindingPopup
+	{
+		public CsharpBindingPopup()
+		{
+			InitializeComponent();
+			BindingContext = new CsharpBindingPopupViewModel();
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
new file mode 100644
index 000000000..01ff7963d
--- /dev/null
+++ b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
+           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:vm="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups"
+           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.XamlBindingPopup">
+
+    <xct:Popup.BindingContext>
+        <vm:XamlBindingPopupViewModel />
+    </xct:Popup.BindingContext>
+
+    <xct:Popup.Resources>
+        <ResourceDictionary>
+            <Style x:Key="Title" TargetType="Label">
+                <Setter Property="FontSize" Value="26" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="TextColor" Value="#000" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+                <Setter Property="HorizontalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="Divider" TargetType="BoxView">
+                <Setter Property="HeightRequest" Value="1" />
+                <Setter Property="Margin" Value="50, 25" />
+                <Setter Property="Color" Value="#c3c3c3" />
+            </Style>
+            <Style x:Key="Content" TargetType="Label">
+                <Setter Property="HorizontalTextAlignment" Value="Start" />
+                <Setter Property="VerticalTextAlignment" Value="Center" />
+            </Style>
+            <Style x:Key="PopupLayout" TargetType="StackLayout">
+                <Setter Property="Padding" Value="{OnPlatform Android=20, UWP=20, iOS=5}" />
+            </Style>
+        </ResourceDictionary>
+    </xct:Popup.Resources>
+
+    <StackLayout Style="{StaticResource PopupLayout}">
+        <Label Style="{StaticResource Title}" 
+               Text="{Binding Title}" />
+        <BoxView Style="{StaticResource Divider}" />
+        <Label Style="{StaticResource Content}" 
+               Text="{Binding Message}" />    
+    </StackLayout>
+    
+</xct:Popup>
\ No newline at end of file
diff --git a/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml.cs
new file mode 100644
index 000000000..16d026950
--- /dev/null
+++ b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml.cs
@@ -0,0 +1,7 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	public partial class XamlBindingPopup
+	{
+		public XamlBindingPopup() => InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/samples/XCT.Sample/ViewModels/Views/PopupControlViewModel.cs b/samples/XCT.Sample/ViewModels/Views/PopupControlViewModel.cs
index ba97ec40f..2e6fd0d7d 100644
--- a/samples/XCT.Sample/ViewModels/Views/PopupControlViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/PopupControlViewModel.cs
@@ -23,7 +23,9 @@ public class PopupGalleryViewModel
 			new SectionModel(typeof(TransparentPopup), "Transparent Popup", Color.Red, "Displays a popup with a transparent background"),
 			new SectionModel(typeof(PopupAnchorPage), "Anchor Popup", Color.Red, "Popups can be anchored to other view's on the screen"),
 			new SectionModel(typeof(OpenedEventSimplePopup), "Opened Event Popup", Color.Red, "Popup with opened event"),
-			new SectionModel(typeof(ReturnResultPopup), "Return Result Popup", Color.Red, "A popup that returns a string message when dismissed")
+			new SectionModel(typeof(ReturnResultPopup), "Return Result Popup", Color.Red, "A popup that returns a string message when dismissed"),
+			new SectionModel(typeof(XamlBindingPopup), "Xaml Binding Popup", Color.Red, "A simple popup that uses XAML BindingContext"),
+			new SectionModel(typeof(CsharpBindingPopup), "C# Binding Popup", Color.Red, "A simple popup that uses C# BindingContext")
 		};
 
 		public ICommand DisplayPopup => new Command<Type>(OnDisplayPopup);
diff --git a/samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs
new file mode 100644
index 000000000..5eca29b0e
--- /dev/null
+++ b/samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs
@@ -0,0 +1,9 @@
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups
+{
+	public class CsharpBindingPopupViewModel
+	{
+		public string Title => "Xaml Binding Popup";
+
+		public string Message => "This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.";
+	}
+}
diff --git a/samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs
new file mode 100644
index 000000000..ef1e5ad89
--- /dev/null
+++ b/samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs
@@ -0,0 +1,9 @@
+namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups
+{
+	public class XamlBindingPopupViewModel
+	{
+		public string Title => "Xaml Binding Popup";
+
+		public string Message => "This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.";
+	}
+}

From 26465542b3b60a02eba158f51a995657c18e36fd Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 16 Jan 2021 12:09:20 -0500
Subject: [PATCH 34/46] Updated XCT xmlns to use uri instead of fully qualified
 namespace

---
 samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml          | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml   | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml  | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml  | 2 +-
 .../XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml   | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml    | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml          | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml      | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml     | 2 +-
 samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml     | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
index 87184158e..49ab4045f 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ButtonPopup">
     
diff --git a/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
index aeb26ef67..5b00ae773 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.CsharpBindingPopup">
 
diff --git a/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
index f2c405dd0..2843b0dc9 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.MultipleButtonPopup">
     
diff --git a/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
index ab230b96e..11e62e8fa 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
            IsLightDismissEnabled="False"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.NoLightDismissPopup">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
index abfa1feee..e9207cf1a 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.OpenedEventSimplePopup">
 
diff --git a/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
index df4943fc4..7dbeac5a9 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 350'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ReturnResultPopup"
            x:TypeArguments="x:String">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
index 080234063..39e0306d2 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.SimplePopup">
 
diff --git a/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
index e9da864ce..c5d38ea7a 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 350'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ToggleSizePopup">
     
diff --git a/samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml
index 8b6967237..5d7a58609 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/TransparentPopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            xmlns:uwpxct="clr-namespace:Xamarin.CommunityToolkit.UI.Views.WindowsSpecific;assembly=Xamarin.CommunityToolkit"
            Size="{OnPlatform Android='200, 200', UWP='100, 100', iOS='100, 100'}"
            Color="Transparent"
diff --git a/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
index 01ff7963d..2c4c1aa2a 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-           xmlns:xct="clr-namespace:Xamarin.CommunityToolkit.UI.Views;assembly=Xamarin.CommunityToolkit"
+           xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            xmlns:vm="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups"
            Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.XamlBindingPopup">

From 034c9f122f196f7af14f108d2faf4f37a6fb9562 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 16 Jan 2021 12:28:48 -0500
Subject: [PATCH 35/46] Added shared popup size across samples

---
 .../XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml | 14 ++++++++++++--
 .../Pages/Views/Popups/CsharpBindingPopup.xaml     | 12 +++++++++++-
 .../Pages/Views/Popups/MultipleButtonPopup.xaml    | 14 ++++++++++++--
 .../Pages/Views/Popups/NoLightDismissPopup.xaml    | 12 +++++++++++-
 .../Pages/Views/Popups/OpenedEventSimplePopup.xaml | 12 +++++++++++-
 samples/XCT.Sample/Pages/Views/Popups/PopupSize.cs | 13 +++++++++++++
 .../Pages/Views/Popups/ReturnResultPopup.xaml      | 12 +++++++++++-
 .../XCT.Sample/Pages/Views/Popups/SimplePopup.xaml | 12 +++++++++++-
 .../Pages/Views/Popups/ToggleSizePopup.xaml        | 14 ++++++++++++--
 .../Pages/Views/Popups/XamlBindingPopup.xaml       | 12 +++++++++++-
 10 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 samples/XCT.Sample/Pages/Views/Popups/PopupSize.cs

diff --git a/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
index 49ab4045f..b87a4e2c9 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/ButtonPopup.xaml
@@ -2,9 +2,19 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ButtonPopup">
-    
+
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
index 5b00ae773..7565ac229 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/CsharpBindingPopup.xaml
@@ -2,9 +2,19 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.CsharpBindingPopup">
 
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
index 2843b0dc9..4e8471020 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/MultipleButtonPopup.xaml
@@ -2,9 +2,19 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.MultipleButtonPopup">
-    
+
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
index 11e62e8fa..d5793142c 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/NoLightDismissPopup.xaml
@@ -2,10 +2,20 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 400'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            IsLightDismissEnabled="False"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.NoLightDismissPopup">
 
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
index e9207cf1a..e96a078fa 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
@@ -2,9 +2,19 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.OpenedEventSimplePopup">
 
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/PopupSize.cs b/samples/XCT.Sample/Pages/Views/Popups/PopupSize.cs
new file mode 100644
index 000000000..00cc6be6b
--- /dev/null
+++ b/samples/XCT.Sample/Pages/Views/Popups/PopupSize.cs
@@ -0,0 +1,13 @@
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Sample.Pages.Views.Popups
+{
+	static class PopupSize
+	{
+		public static Size Android => new Size(1200, 1000);
+
+		public static Size iOS => new Size(250, 350);
+
+		public static Size UWP => new Size(300, 400);
+	}
+}
diff --git a/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
index 7dbeac5a9..315d3329c 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/ReturnResultPopup.xaml
@@ -2,10 +2,20 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 350'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ReturnResultPopup"
            x:TypeArguments="x:String">
 
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
index 39e0306d2..5c88e5097 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/SimplePopup.xaml
@@ -2,9 +2,19 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.SimplePopup">
 
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
index c5d38ea7a..5926e946b 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/ToggleSizePopup.xaml
@@ -2,9 +2,19 @@
 <xct:Popup xmlns="http://xamarin.com/schemas/2014/forms"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
-           Size="{OnPlatform Android='800, 800', UWP='300, 300', iOS='250, 350'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.ToggleSizePopup">
-    
+
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.Resources>
         <ResourceDictionary>
             <Style x:Key="Title" TargetType="Label">
diff --git a/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
index 2c4c1aa2a..c15942eda 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/XamlBindingPopup.xaml
@@ -3,9 +3,19 @@
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
            xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
            xmlns:vm="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups"
-           Size="{OnPlatform Android='800, 700', UWP='300, 250', iOS='250, 350'}"
+           xmlns:local="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages.Views.Popups"
            x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.XamlBindingPopup">
 
+    <xct:Popup.Size>
+        <OnPlatform x:TypeArguments="Size">
+            <OnPlatform.Platforms>
+                <On Platform="Android" Value="{x:Static local:PopupSize.Android}" />
+                <On Platform="UWP" Value="{x:Static local:PopupSize.UWP}" />
+                <On Platform="iOS" Value="{x:Static local:PopupSize.iOS}" />
+            </OnPlatform.Platforms>
+        </OnPlatform>
+    </xct:Popup.Size>
+
     <xct:Popup.BindingContext>
         <vm:XamlBindingPopupViewModel />
     </xct:Popup.BindingContext>

From ffdaf7d380d1742f51c4a71ed4339907938001f0 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Sat, 16 Jan 2021 20:12:42 -0500
Subject: [PATCH 36/46] Fixed popup BindingContext not working when set in XAML

---
 .../Views/Popup/BasePopup.shared.cs           | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index 608432020..51a97d8cf 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -16,7 +16,7 @@ public abstract class BasePopup : VisualElement
 		/// <summary>
 		/// Instantiates a new instance of <see cref="BasePopup"/>.
 		/// </summary>
-		public BasePopup()
+		protected BasePopup()
 		{
 			Color = Color.White;
 			VerticalOptions = LayoutOptions.CenterAndExpand;
@@ -24,11 +24,13 @@ public BasePopup()
 			IsLightDismissEnabled = true;
 		}
 
-		public static BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(BasePopup));
-		public static BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(BasePopup));
+		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(BasePopup), propertyChanged: OnContentChanged);
 
-		public static BindableProperty VerticalOptionsProperty = BindableProperty.Create(nameof(VerticalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
-		public static BindableProperty HorizontalOptionsProperty = BindableProperty.Create(nameof(HorizontalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
+		public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(BasePopup));
+		public static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(BasePopup));
+
+		public static readonly BindableProperty VerticalOptionsProperty = BindableProperty.Create(nameof(VerticalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
+		public static readonly BindableProperty HorizontalOptionsProperty = BindableProperty.Create(nameof(HorizontalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
 
 		/// <summary>
 		/// Gets or sets the <see cref="View"/> content to render in the Popup.
@@ -36,7 +38,11 @@ public BasePopup()
 		/// <remarks>
 		/// The View can be or type: <see cref="View"/>, <see cref="ContentPage"/> or <see cref="NavigationPage"/>
 		/// </remarks>
-		public virtual View Content { get; set; }
+		public virtual View Content
+		{
+			get => (View)GetValue(ContentProperty);
+			set => SetValue(ContentProperty, value);
+		}
 
 		/// <summary>
 		/// Gets or sets the <see cref="Color"/> of the Popup.
@@ -157,9 +163,13 @@ protected override void OnBindingContextChanged()
 			base.OnBindingContextChanged();
 
 			if (Content != null)
-			{
 				SetInheritedBindingContext(Content, BindingContext);
-			}
+		}
+
+		static void OnContentChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			if (bindable is BasePopup popup)
+				popup.OnBindingContextChanged();
 		}
 	}
 }

From cf1f280b9c06e03db0eeeb72632a5ceefe27a466 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:55:54 -0800
Subject: [PATCH 37/46] Update Samples

- Capitalize x:Name variables
- Replace expression-bodied properties with read-only properties where applicable
---
 .../Pages/Views/Popups/OpenedEventSimplePopup.xaml       | 4 ++--
 .../Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs    | 4 ++--
 .../XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml   | 2 +-
 .../XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml | 2 +-
 .../Views/Popups/CsharpBindingPopupViewModel.cs          | 4 ++--
 .../ViewModels/Views/Popups/PopupAnchorViewModel.cs      | 7 ++++++-
 .../ViewModels/Views/Popups/PopupPositionViewModel.cs    | 9 +++++++--
 .../ViewModels/Views/Popups/XamlBindingPopupViewModel.cs | 4 ++--
 8 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
index e96a078fa..24cf3d7db 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml
@@ -40,10 +40,10 @@
     </xct:Popup.Resources>
 
     <StackLayout Style="{StaticResource PopupLayout}">
-        <Label x:Name="title" 
+        <Label x:Name="Title" 
                 Style="{StaticResource Title}" />
         <BoxView Style="{StaticResource Divider}" />
-        <Label x:Name="message" 
+        <Label x:Name="Message" 
                 Style="{StaticResource Content}" />
     </StackLayout>
     
diff --git a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
index 92121fa12..31080bab5 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
+++ b/samples/XCT.Sample/Pages/Views/Popups/OpenedEventSimplePopup.xaml.cs
@@ -14,8 +14,8 @@ void OnOpened(object sender, PopupOpenedEventArgs e)
 		{
 			Opened -= OnOpened;
 
-			title.Text = "Opened Event Popup";
-			message.Text = "The content of this popup was updated after the popup was rendered";
+			Title.Text = "Opened Event Popup";
+			Message.Text = "The content of this popup was updated after the popup was rendered";
 		}
 	}
 }
\ No newline at end of file
diff --git a/samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml b/samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
index 05b6a1c0c..2b95b7385 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/PopupAnchorPage.xaml
@@ -37,7 +37,7 @@
         <StackLayout>
             <Label Style="{StaticResource Header}"
                    Text="Popup's can be anchored to other Views on the page. Tap and drag the X to change where the popup will be centered." />
-            <Label x:Name="indicator" 
+            <Label x:Name="Indicator" 
                    Style="{StaticResource Indicator}" 
                    Text="❌">
                 <Label.GestureRecognizers>
diff --git a/samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml b/samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml
index bf69cf869..fdb89a59e 100644
--- a/samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml
+++ b/samples/XCT.Sample/Pages/Views/Popups/PopupPositionPage.xaml
@@ -5,7 +5,7 @@
                 xmlns:viewModels="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups"
                 x:Class="Xamarin.CommunityToolkit.Sample.Pages.Views.Popups.PopupPositionPage"
                 Title="Popup Position"
-                x:Name="root">
+                x:Name="Root">
 
     <ContentPage.BindingContext>
         <viewModels:PopupPositionViewModel />
diff --git a/samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs
index 5eca29b0e..ce53e9799 100644
--- a/samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/Popups/CsharpBindingPopupViewModel.cs
@@ -2,8 +2,8 @@
 {
 	public class CsharpBindingPopupViewModel
 	{
-		public string Title => "Xaml Binding Popup";
+		public string Title { get; } = "Xaml Binding Popup";
 
-		public string Message => "This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.";
+		public string Message { get; } = "This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.";
 	}
 }
diff --git a/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
index 375da6cf4..b48814228 100644
--- a/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
@@ -7,9 +7,14 @@ namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups
 {
 	public class PopupAnchorViewModel
 	{
+		public PopupAnchorViewModel()
+		{
+			ShowPopup = new Command<View>(OnShowPopup);
+		}
+
 		INavigation Navigation => App.Current.MainPage.Navigation;
 
-		public ICommand ShowPopup => new Command<View>(OnShowPopup);
+		public ICommand ShowPopup { get; }
 
 		void OnShowPopup(View anchor)
 		{
diff --git a/samples/XCT.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
index 517365ace..4e12e874d 100644
--- a/samples/XCT.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/Popups/PopupPositionViewModel.cs
@@ -7,9 +7,14 @@ namespace Xamarin.CommunityToolkit.Sample.ViewModels.Views.Popups
 {
 	public class PopupPositionViewModel
 	{
-		INavigation Navigation => App.Current.MainPage.Navigation;
+		public PopupPositionViewModel()
+		{
+			DisplayPopup = new Command<PopupPosition>(OnDisplayPopup);
+		}
+
+		INavigation Navigation => Application.Current.MainPage.Navigation;
 
-		public ICommand DisplayPopup => new Command<PopupPosition>(OnDisplayPopup);
+		public ICommand DisplayPopup { get; }
 
 		void OnDisplayPopup(PopupPosition position)
 		{
diff --git a/samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs
index ef1e5ad89..421f699dc 100644
--- a/samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/Popups/XamlBindingPopupViewModel.cs
@@ -2,8 +2,8 @@
 {
 	public class XamlBindingPopupViewModel
 	{
-		public string Title => "Xaml Binding Popup";
+		public string Title { get; } = "Xaml Binding Popup";
 
-		public string Message => "This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.";
+		public string Message { get; } = "This is a native popup with a Xamarin.Forms View being rendered. The behaviors of the popup will confirm to 100% native look and feel, but still allows you to use your Xamarin.Forms controls.";
 	}
 }

From 7fa64333874728134a8b5432a8201efaefc58844 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 13:39:19 -0800
Subject: [PATCH 38/46] Add PopupDismissedEventArgs<T>

---
 .../Popup/PopupDismissedEventArgs.shared.cs     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
index 5b5e46dd6..bf063487b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/PopupDismissedEventArgs.shared.cs
@@ -5,7 +5,18 @@ namespace Xamarin.CommunityToolkit.UI.Views
 	/// <summary>
 	/// Popup dismissed event arguments used when a popup is dismissed.
 	/// </summary>
-	public class PopupDismissedEventArgs : EventArgs
+	public class PopupDismissedEventArgs : PopupDismissedEventArgs<object>
+	{
+		public PopupDismissedEventArgs(object result)
+			: base(result)
+		{
+		}
+	}
+
+	/// <summary>
+	/// Popup dismissed event arguments used when a popup is dismissed.
+	/// </summary>
+	public class PopupDismissedEventArgs<T> : EventArgs
 	{
 		/// <summary>
 		/// Initialization an instance of <see cref="PopupDismissedEventArgs"/>.
@@ -13,12 +24,12 @@ public class PopupDismissedEventArgs : EventArgs
 		/// <param name="result">
 		/// The result of the popup.
 		/// </param>
-		public PopupDismissedEventArgs(object result) =>
+		public PopupDismissedEventArgs(T result) =>
 			Result = result;
 
 		/// <summary>
 		/// The resulting object to return.
 		/// </summary>
-		public object Result { get; }
+		public T Result { get; }
 	}
 }

From dc5ea886081f44037aaceffff21350c169ec3eaa Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 14:00:53 -0800
Subject: [PATCH 39/46] Add Default Values for Color and Size

---
 .../Views/Popup/BasePopup.shared.cs                       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
index 51a97d8cf..da137d302 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/BasePopup.shared.cs
@@ -26,8 +26,8 @@ protected BasePopup()
 
 		public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(BasePopup), propertyChanged: OnContentChanged);
 
-		public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(BasePopup));
-		public static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(BasePopup));
+		public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(BasePopup), Color.Default);
+		public static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(BasePopup), default(Size));
 
 		public static readonly BindableProperty VerticalOptionsProperty = BindableProperty.Create(nameof(VerticalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
 		public static readonly BindableProperty HorizontalOptionsProperty = BindableProperty.Create(nameof(HorizontalOptions), typeof(LayoutOptions), typeof(BasePopup), LayoutOptions.CenterAndExpand);
@@ -85,7 +85,7 @@ public LayoutOptions HorizontalOptions
 		public View Anchor { get; set; }
 
 		/// <summary>
-		/// Gets or sets the <see cref="Size"/> of the Popup Display. 
+		/// Gets or sets the <see cref="Size"/> of the Popup Display.
 		/// </summary>
 		/// <remarks>
 		/// The Popup will always try to constrain the actual size of the <see cref="Popup" />
@@ -148,7 +148,7 @@ internal virtual void OnOpened() =>
 		protected internal virtual void LightDismiss()
 		{
 			// Note 1/9/2021
-			// Left empty be design
+			// Left empty by design
 			//
 			// This method needs to be left empty as it is not
 			// required for a child class to have an implementation

From 659f2af0ae6b0ef740ecb61cb0523096eb0c84ea Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 14:02:25 -0800
Subject: [PATCH 40/46] Remove Unncessary `base` Keyword, per styling guide

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index 2a4c16d6e..f3b00a518 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -22,7 +22,7 @@ public class PopupRenderer : UIViewController, IVisualElementRenderer
 
 		VisualElement IVisualElementRenderer.Element => Element;
 
-		public UIView NativeView => base.View;
+		public UIView NativeView => View;
 
 		public UIViewController ViewController { get; private set; }
 
@@ -41,7 +41,7 @@ public void SetElementSize(Size size) =>
 		public override void ViewDidLayoutSubviews()
 		{
 			base.ViewDidLayoutSubviews();
-			SetElementSize(new Size(base.View.Bounds.Width, base.View.Bounds.Height));
+			SetElementSize(new Size(View.Bounds.Width, View.Bounds.Height));
 		}
 
 		public override void ViewDidAppear(bool animated)
@@ -184,8 +184,8 @@ void SetBackgroundColor() =>
 
 		void SetView()
 		{
-			base.View.AddSubview(Control.ViewController.View);
-			base.View.Bounds = new CGRect(0, 0, PreferredContentSize.Width, PreferredContentSize.Height);
+			View.AddSubview(Control.ViewController.View);
+			View.Bounds = new CGRect(0, 0, PreferredContentSize.Width, PreferredContentSize.Height);
 			AddChildViewController(Control.ViewController);
 		}
 

From 0fbc08eca506f73f2f350de6c3dfdf0eae3fffaf Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 14:17:44 -0800
Subject: [PATCH 41/46] Optimize originX + originX, Add missing `await`

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs      | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index f3b00a518..0eea69c7b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -146,28 +146,19 @@ void SetLayout()
 
 			if (Element.Anchor == null)
 			{
-				nfloat originX = 0;
-				nfloat originY = 0;
-
-				switch (Element.VerticalOptions.Alignment)
+				var originX = Element.VerticalOptions.Alignment switch
 				{
-					case LayoutAlignment.End:
-						originY = UIScreen.MainScreen.Bounds.Height - PreferredContentSize.Height;
-						break;
-					case LayoutAlignment.Center:
-						originY = (UIScreen.MainScreen.Bounds.Height / 2) - (PreferredContentSize.Height / 2);
-						break;
-				}
+					LayoutAlignment.End => UIScreen.MainScreen.Bounds.Width,
+					LayoutAlignment.Center => UIScreen.MainScreen.Bounds.Width / 2,
+					_ => 0f
+				};
 
-				switch (Element.HorizontalOptions.Alignment)
+				var originY = Element.VerticalOptions.Alignment switch
 				{
-					case LayoutAlignment.End:
-						originX = UIScreen.MainScreen.Bounds.Width;
-						break;
-					case LayoutAlignment.Center:
-						originX = UIScreen.MainScreen.Bounds.Width / 2;
-						break;
-				}
+					LayoutAlignment.End => UIScreen.MainScreen.Bounds.Height - PreferredContentSize.Height,
+					LayoutAlignment.Center => (UIScreen.MainScreen.Bounds.Height / 2) - (PreferredContentSize.Height / 2),
+					_ => 0f
+				};
 
 				PopoverPresentationController.SourceRect = new CGRect(originX, originY, 0, 0);
 			}
@@ -210,8 +201,8 @@ void HandlePopoverDelegateDismissed(object sender, UIPresentationController e)
 		void AddToCurrentPageViewController() =>
 			ViewController.PresentViewController(this, true, () => Element.OnOpened());
 
-		void OnDismissed(object sender, PopupDismissedEventArgs e) =>
-			ViewController.DismissViewControllerAsync(true);
+		async void OnDismissed(object sender, PopupDismissedEventArgs e) =>
+			await ViewController.DismissViewControllerAsync(true);
 
 		protected override void Dispose(bool disposing)
 		{

From 0c7febb683a99a52b56970ec163c6648b2e2903b Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 14:17:48 -0800
Subject: [PATCH 42/46] Update PopupAnchorViewModel.cs

---
 .../XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs b/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
index b48814228..440bf9c3d 100644
--- a/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
+++ b/samples/XCT.Sample/ViewModels/Views/Popups/PopupAnchorViewModel.cs
@@ -12,7 +12,7 @@ public PopupAnchorViewModel()
 			ShowPopup = new Command<View>(OnShowPopup);
 		}
 
-		INavigation Navigation => App.Current.MainPage.Navigation;
+		INavigation Navigation => Application.Current.MainPage.Navigation;
 
 		public ICommand ShowPopup { get; }
 

From 75d5db547c0c54d1c01f2bb0daf1df6ff68c2a74 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 14:25:21 -0800
Subject: [PATCH 43/46] Fix orignY

Copy/paste error
---
 .../Views/Popup/iOS/PopupRenderer.ios.cs                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index 0eea69c7b..939927dae 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -153,7 +153,7 @@ void SetLayout()
 					_ => 0f
 				};
 
-				var originY = Element.VerticalOptions.Alignment switch
+				var originY = Element.HorizontalOptions.Alignment switch
 				{
 					LayoutAlignment.End => UIScreen.MainScreen.Bounds.Height - PreferredContentSize.Height,
 					LayoutAlignment.Center => (UIScreen.MainScreen.Bounds.Height / 2) - (PreferredContentSize.Height / 2),

From aa11cfa17bb43dc6e945a77e48f236cedbb362ad Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Fri, 29 Jan 2021 14:27:57 -0800
Subject: [PATCH 44/46] Update PopupRenderer.ios.cs

---
 .../Views/Popup/iOS/PopupRenderer.ios.cs             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
index 939927dae..32200acd6 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/Popup/iOS/PopupRenderer.ios.cs
@@ -146,17 +146,17 @@ void SetLayout()
 
 			if (Element.Anchor == null)
 			{
-				var originX = Element.VerticalOptions.Alignment switch
+				var originY = Element.VerticalOptions.Alignment switch
 				{
-					LayoutAlignment.End => UIScreen.MainScreen.Bounds.Width,
-					LayoutAlignment.Center => UIScreen.MainScreen.Bounds.Width / 2,
+					LayoutAlignment.End => UIScreen.MainScreen.Bounds.Height - PreferredContentSize.Height,
+					LayoutAlignment.Center => (UIScreen.MainScreen.Bounds.Height / 2) - (PreferredContentSize.Height / 2),
 					_ => 0f
 				};
 
-				var originY = Element.HorizontalOptions.Alignment switch
+				var originX = Element.HorizontalOptions.Alignment switch
 				{
-					LayoutAlignment.End => UIScreen.MainScreen.Bounds.Height - PreferredContentSize.Height,
-					LayoutAlignment.Center => (UIScreen.MainScreen.Bounds.Height / 2) - (PreferredContentSize.Height / 2),
+					LayoutAlignment.End => UIScreen.MainScreen.Bounds.Width,
+					LayoutAlignment.Center => UIScreen.MainScreen.Bounds.Width / 2,
 					_ => 0f
 				};
 

From 8c1dd738b8e3d137d69971a95d668e1ee27e654e Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Sun, 31 Jan 2021 12:57:32 -0800
Subject: [PATCH 45/46] Update
 NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs

---
 ...Extensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs
index aec17c6dc..61a1c791b 100644
--- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/Navigation/NavigationExtensions.netstandard.macos.tvos.watchos.tizen.wpf.gtk.cs
@@ -8,9 +8,9 @@ namespace Xamarin.CommunityToolkit.Extensions
 	public static partial class NavigationExtensions
 	{
 		static void PlatformShowPopup(BasePopup popup) =>
-			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
+			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin.CommunityToolkit.BasePopup");
 
 		static Task<T> PlatformShowPopupAsync<T>(Popup<T> popup) =>
-			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin Community Toolkit Popups.");
+			throw new NotSupportedException($"The current platform '{Device.RuntimePlatform}' does not support Xamarin.CommunityToolkit.Popup.");
 	}
 }

From 9f9cd88137b153ef23de57d86f4d05fd58350211 Mon Sep 17 00:00:00 2001
From: Andrew Hoefling <andrew@hoefling.me>
Date: Mon, 1 Feb 2021 09:06:18 -0500
Subject: [PATCH 46/46] Added NavigableElementExtension - This allows rendering
 popup from ContentPage and other children of NavigableElement

---
 .../NavigableElementExtensions.shared.cs      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/NavigableElement/NavigableElementExtensions.shared.cs

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/NavigableElement/NavigableElementExtensions.shared.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/NavigableElement/NavigableElementExtensions.shared.cs
new file mode 100644
index 000000000..78b262388
--- /dev/null
+++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Extensions/NavigableElement/NavigableElementExtensions.shared.cs
@@ -0,0 +1,42 @@
+using System.Threading.Tasks;
+using Xamarin.CommunityToolkit.UI.Views;
+using Xamarin.Forms;
+
+namespace Xamarin.CommunityToolkit.Extensions
+{
+	/// <summary>
+	/// Extension methods for <see cref="NavigableElement"/>
+	/// </summary>
+	public static class NavigableElementExtensions
+	{
+		/// <summary>
+		/// Displays a popup.
+		/// </summary>
+		/// <param name="element">
+		/// The current <see cref="NavigableElement"/> that has a valid <see cref="INavigation"/>.
+		/// </param>
+		/// <param name="popup">
+		/// The <see cref="BasePopup"/> to display.
+		/// </param>
+		public static void ShowPopup(this NavigableElement element, BasePopup popup) =>
+			element.Navigation.ShowPopup(popup);
+
+		/// <summary>
+		/// Displays a poup and returns a result.
+		/// </summary>
+		/// <typeparam name="T">
+		/// The <see cref="T"/> result that is returned when the popup is dismissed.
+		/// </typeparam>
+		/// <param name="element">
+		/// The current <see cref="NavigableElement"/> that has a valid <see cref="INavigation"/>.
+		/// </param>
+		/// <param name="popup">
+		/// The <see cref="Popup{T}"/> to display.
+		/// </param>
+		/// <returns>
+		/// A task that will complete once the <see cref="Popup{T}"/> is dismissed.
+		/// </returns>
+		public static Task<T> ShowPopupAsync<T>(this NavigableElement element, Popup<T> popup) =>
+			element.Navigation.ShowPopupAsync(popup);
+	}
+}