Merge pull request #226 from vardansargsyan92/feature/flyout-page-support

Feature/flyout page support

Author: dansiegel

samples/src/PopupPluginSample/App.xaml.cs

@@ -38,6 +38,7 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
             containerRegistry.RegisterForNavigation<NavigationPage>();
             containerRegistry.RegisterForNavigation<MainPage, MainPageViewModel>();
             containerRegistry.RegisterForNavigation<MDPRoot, MDPRootViewModel>();
+            containerRegistry.RegisterForNavigation<FLPRoot, FLPRootViewModel>();
             containerRegistry.RegisterForNavigation<MenuPage, MenuPageViewModel>();
             containerRegistry.RegisterForNavigation<NavigationRoot>();
             containerRegistry.RegisterForNavigation<PopupView, PopupViewModel>();

samples/src/PopupPluginSample/ViewModels/FLPRootViewModel.cs

@@ -0,0 +1,12 @@
+using Prism.Navigation;
+
+namespace PopupPluginSample.ViewModels
+{
+    public class FLPRootViewModel : BaseViewModel
+    {
+        public FLPRootViewModel(INavigationService navigationService)
+            : base(navigationService)
+        {
+        }
+    }
+}

samples/src/PopupPluginSample/Views/FLPRoot.xaml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FlyoutPage xmlns="http://xamarin.com/schemas/2014/forms" 
+                  xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                  xmlns:prism="http://prismlibrary.com"
+                  xmlns:local="clr-namespace:PopupPluginSample.Xaml"
+                  x:Class="PopupPluginSample.Views.FLPRoot">
+
+  <FlyoutPage.Flyout>
+    <ContentPage Title="Menu">
+      <Grid>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="1*" />
+          <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+
+        <BoxView Color="LightCoral"
+                 HorizontalOptions="FillAndExpand"
+                 VerticalOptions="FillAndExpand" />
+        <Label Text="A Menu" 
+               TextColor="White"
+               HorizontalOptions="CenterAndExpand"
+               VerticalOptions="CenterAndExpand"
+               Grid.Row="0" />
+
+        <StackLayout Padding="40"
+                             Grid.Row="1">
+          <Label Text="You might have menu options here" Grid.Row="1" />
+          <Button Text="Launch Popup (XAML)" 
+                  Command="{local:DebugNavigateTo PopupView}" />
+          <Button Text="Launch Popup (Classic)"
+                  Command="{Binding NavigateCommand}"
+                  CommandParameter="PopupView" />
+          <Button Text="Sample Dialog"
+            Command="{prism:ShowDialog SampleDialog}" />
+          <Button Text="Back to Menu" 
+                  Command="{prism:NavigateTo '/MenuPage'}" />
+        </StackLayout>
+      </Grid>
+    </ContentPage>
+  </FlyoutPage.Flyout>
+
+</FlyoutPage>

samples/src/PopupPluginSample/Views/FLPRoot.xaml.cs

@@ -0,0 +1,15 @@
+using Prism.Navigation;
+using Xamarin.Forms;
+
+namespace PopupPluginSample.Views
+{
+    public partial class FLPRoot : FlyoutPage, IFlyoutPageOptions
+    {
+        public FLPRoot()
+        {
+            InitializeComponent();
+        }
+
+        public bool IsPresentedAfterNavigation => Device.Idiom != TargetIdiom.Phone;
+    }
+}

samples/src/PopupPluginSample/Views/MenuPage.xaml

@@ -15,6 +15,7 @@
                  VerticalOptions="Center">
       <Label Text="Select the root page to test from" />
       <Button Text="Master Detail Page" Command="{prism:NavigateTo '/MDPRoot/NavigationRoot/MainPage'}" />
+      <Button Text="Flyout Page" Command="{prism:NavigateTo '/FLPRoot/NavigationRoot/MainPage'}" />
       <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}" />

src/Prism.Plugin.Popups/Extensions/PageExtensions.cs

@@ -25,14 +25,14 @@ public static bool IsOrDerivesFrom<T>(this Page page) where T : Page =>
         /// <returns>The displayed page.</returns>
         public static Page GetDisplayedPage(this Page page)
         {
-            while (page.IsOrDerivesFrom<MasterDetailPage>() ||
+            while (page.IsOrDerivesFrom<FlyoutPage>() ||
                   page.IsOrDerivesFrom<TabbedPage>() ||
                   page.IsOrDerivesFrom<NavigationPage>())
             {
                 switch (page)
                 {
-                    case MasterDetailPage mdp:
-                        page = mdp.Detail;
+                    case FlyoutPage flp:
+                        page = flp.Detail;
                         break;
                     case TabbedPage tabbed:
                         page = tabbed.CurrentPage;