From 0b91765a42a1bb3da1a38887d8ee255c2774b22e Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Tue, 31 Mar 2020 07:09:03 -0700
Subject: [PATCH] testing updates for ContentPage Navigation

---
 .../PopupPluginSample.iOS.csproj                |  2 ++
 samples/src/PopupPluginSample/App.xaml.cs       |  7 +------
 .../src/PopupPluginSample/Views/MenuPage.xaml   |  1 +
 .../src/PopupPluginSample/Views/PopupView.xaml  | 12 ++++++++----
 samples/src/PopupPluginSample/Views/ViewA.xaml  | 15 +++++++++++++++
 .../src/PopupPluginSample/Views/ViewA.xaml.cs   | 10 ++++++++++
 samples/src/PopupPluginSample/Views/ViewB.xaml  | 17 +++++++++++++++++
 .../src/PopupPluginSample/Views/ViewB.xaml.cs   | 10 ++++++++++
 .../Prism.Plugin.Popups.csproj                  |  2 +-
 9 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 samples/src/PopupPluginSample/Views/ViewA.xaml
 create mode 100644 samples/src/PopupPluginSample/Views/ViewA.xaml.cs
 create mode 100644 samples/src/PopupPluginSample/Views/ViewB.xaml
 create mode 100644 samples/src/PopupPluginSample/Views/ViewB.xaml.cs

diff --git a/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj b/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj
index c9d66b8..c14e743 100644
--- a/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj
+++ b/samples/src/PopupPluginSample.iOS/PopupPluginSample.iOS.csproj
@@ -51,6 +51,8 @@
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <MtouchLink>None</MtouchLink>
+    <MtouchInterpreter>-all</MtouchInterpreter>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
diff --git a/samples/src/PopupPluginSample/App.xaml.cs b/samples/src/PopupPluginSample/App.xaml.cs
index c4b02e3..bbaaa71 100644
--- a/samples/src/PopupPluginSample/App.xaml.cs
+++ b/samples/src/PopupPluginSample/App.xaml.cs
@@ -13,6 +13,7 @@
 
 namespace PopupPluginSample
 {
+    [AutoRegisterForNavigation]
     public partial class App : PrismApplication
     {
         /* 
@@ -46,12 +47,6 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
 
             containerRegistry.RegisterForNavigation<TabbedPage>();
             containerRegistry.RegisterForNavigation<NavigationPage>();
-            containerRegistry.RegisterForNavigation<MainPage>();
-            containerRegistry.RegisterForNavigation<MDPRoot>();
-            containerRegistry.RegisterForNavigation<MenuPage>();
-            containerRegistry.RegisterForNavigation<NavigationRoot>();
-            containerRegistry.RegisterForNavigation<PopupView>();
-            containerRegistry.RegisterForNavigation<TabbedRoot>();
 
             containerRegistry.RegisterDialog<SampleDialog, SampleDialogViewModel>();
         }
diff --git a/samples/src/PopupPluginSample/Views/MenuPage.xaml b/samples/src/PopupPluginSample/Views/MenuPage.xaml
index 7614372..b72379d 100644
--- a/samples/src/PopupPluginSample/Views/MenuPage.xaml
+++ b/samples/src/PopupPluginSample/Views/MenuPage.xaml
@@ -17,6 +17,7 @@
       <Button Text="Tabbed Page" Command="{prism:NavigateTo '/TabbedRoot'}" />
       <Button Text="Navigation Page" Command="{prism:NavigateTo '/NavigationRoot/MainPage'}" />
       <Button Text="Sample Dialog" Command="{prism:ShowDialog SampleDialog}" />
+      <Button Text="ViewA" Command="{prism:NavigateTo ViewA}" />
       <!--        <Button Text="Content Page" Command="NavigateCommand" CommandParameter="MainPage" />-->
     </StackLayout>
     <Label Grid.Row="1"
diff --git a/samples/src/PopupPluginSample/Views/PopupView.xaml b/samples/src/PopupPluginSample/Views/PopupView.xaml
index f9abc63..8c02c95 100644
--- a/samples/src/PopupPluginSample/Views/PopupView.xaml
+++ b/samples/src/PopupPluginSample/Views/PopupView.xaml
@@ -6,13 +6,17 @@
                  prism:ViewModelLocator.AutowireViewModel="True"
                  Padding="100"
                  x:Class="PopupPluginSample.Views.PopupView">
-    <StackLayout HorizontalOptions="Center" 
+  <StackLayout HorizontalOptions="Center" 
                 VerticalOptions="Center"
                 MinimumWidthRequest="300"
                 MinimumHeightRequest="300"
-                BackgroundColor="White">
-        <Label Text="{Binding Message}" />
-        <Button Text="Navigate Back" Command="{Binding NavigateBackCommand}" />
+                BackgroundColor="White"
+                 Padding="20">
+    <Label Text="{Binding Message}" />
+    <Button Text="Navigate to ViewB"
+            Command="{prism:NavigateTo ViewB}" />
+    <Button Text="Navigate Back"
+            Command="{Binding NavigateBackCommand}" />
     <Button Text="Navigate to Menu Page"
             Command="{prism:NavigateTo '/MenuPage'}" />
   </StackLayout>
diff --git a/samples/src/PopupPluginSample/Views/ViewA.xaml b/samples/src/PopupPluginSample/Views/ViewA.xaml
new file mode 100644
index 0000000..946f8e3
--- /dev/null
+++ b/samples/src/PopupPluginSample/Views/ViewA.xaml
@@ -0,0 +1,15 @@
+<?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:d="http://xamarin.com/schemas/2014/forms/design"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:prism="http://prismlibrary.com"
+             mc:Ignorable="d"
+             x:Class="PopupPluginSample.Views.ViewA">
+  <StackLayout VerticalOptions="Center"
+               HorizontalOptions="Center">
+    <Label Text="View A" />
+    <Button Text="Display Popup"
+            Command="{prism:NavigateTo 'PopupView'}" />
+  </StackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/samples/src/PopupPluginSample/Views/ViewA.xaml.cs b/samples/src/PopupPluginSample/Views/ViewA.xaml.cs
new file mode 100644
index 0000000..b2c2ba1
--- /dev/null
+++ b/samples/src/PopupPluginSample/Views/ViewA.xaml.cs
@@ -0,0 +1,10 @@
+namespace PopupPluginSample.Views
+{
+    public partial class ViewA
+    {
+        public ViewA()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/src/PopupPluginSample/Views/ViewB.xaml b/samples/src/PopupPluginSample/Views/ViewB.xaml
new file mode 100644
index 0000000..48042a2
--- /dev/null
+++ b/samples/src/PopupPluginSample/Views/ViewB.xaml
@@ -0,0 +1,17 @@
+<?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:d="http://xamarin.com/schemas/2014/forms/design"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:prism="http://prismlibrary.com"
+             mc:Ignorable="d"
+             x:Class="PopupPluginSample.Views.ViewB">
+  <StackLayout VerticalOptions="Center"
+               HorizontalOptions="Center">
+    <Label Text="Welcome to ViewB" />
+    <Button Text="Go Back"
+            Command="{prism:GoBack}"/>
+    <Button Text="Go to Menu"
+            Command="{prism:NavigateTo '/MenuPage'}" />
+  </StackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/samples/src/PopupPluginSample/Views/ViewB.xaml.cs b/samples/src/PopupPluginSample/Views/ViewB.xaml.cs
new file mode 100644
index 0000000..a0f1d8f
--- /dev/null
+++ b/samples/src/PopupPluginSample/Views/ViewB.xaml.cs
@@ -0,0 +1,10 @@
+namespace PopupPluginSample.Views
+{
+    public partial class ViewB
+    {
+        public ViewB()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj b/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj
index 0ca41ac..a3b8387 100644
--- a/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj
+++ b/src/Prism.Plugin.Popups/Prism.Plugin.Popups.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;Xamarin.iOS10;MonoAndroid81;MonoAndroid90</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;Xamarin.iOS10;MonoAndroid81;MonoAndroid90;MonoAndroid10.0</TargetFrameworks>
     <Description>Prism Forms Plugin to provide Popup Navigation working with the Rg.Plugins.Popup library</Description>
   </PropertyGroup>