Merge pull request #659 from dimonovdd/fixIncorrectWindowLevel

Setting UIWindowLevel.Normal during removal

Author: martijn00

Rg.Plugins.Popup/Platforms/Ios/Impl/PopupPlatformIos.cs

@@ -105,7 +105,10 @@ public async Task RemoveAsync(PopupPage page)
                     window.Dispose();
                     window = null;
                 }
-                if (UIApplication.SharedApplication.KeyWindow.WindowLevel == -1 && _windows.Count == 0)
+
+                if(_windows.Count > 0)
+                    _windows.Last().WindowLevel = UIWindowLevel.Normal;
+                else if (UIApplication.SharedApplication.KeyWindow.WindowLevel == -1)
                     UIApplication.SharedApplication.KeyWindow.WindowLevel = UIWindowLevel.Normal;
             }
         }

Samples/Demo/Demo.csproj

@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="4.5.0.657" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
   </ItemGroup>
 
   <ItemGroup>

Samples/Demo/Pages/MainPage.xaml

@@ -25,6 +25,7 @@
                     Clicked="OnOpenUserAnimationFromStyle" />
             <Button Text="Open Settings" Clicked="OnOpenSettingsPage" />
             <Button Text="Open MvvmPage" Clicked="OnOpenMvvmPage" />
+            <Button Text="Open TestCurrentViewController" Clicked="OnTestCurrentViewController"/>
         </StackLayout>
     </ScrollView>
 </ContentPage>

Samples/Demo/Pages/MainPage.xaml.cs

@@ -74,5 +74,12 @@ private async void OnOpenMvvmPage(object sender, EventArgs e)
 
             await PopupNavigation.Instance.PushAsync(page);
         }
+
+        private async void OnTestCurrentViewController(object sender, EventArgs e)
+        {
+            var page = new TestCurrentViewController(0);
+
+            await PopupNavigation.Instance.PushAsync(page);
+        }
     }
 }

Samples/Demo/Pages/TestCurrentViewController.xaml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
+              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+              xmlns:rg="http://rotorgames.com"
+              xmlns:animations="clr-namespace:Demo.Animations;assembly=Demo"
+              x:Class="Demo.Pages.TestCurrentViewController">
+
+  <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+    <Frame BackgroundColor="Silver">
+      <StackLayout Spacing="20">
+        <Label HorizontalOptions="Center" Text="index" FontSize="16"></Label>
+        <Label HorizontalOptions="Center" FontSize="16" x:Name="indexLable"></Label>
+        <Button Text="Open TestCurrentViewController" Clicked="OnTestCurrentViewController"></Button>
+        <Button Text="Open file picker" Clicked="OnFilePicker"></Button>
+      </StackLayout>
+    </Frame>
+  </StackLayout>
+</rg:PopupPage>

Samples/Demo/Pages/TestCurrentViewController.xaml.cs

@@ -0,0 +1,30 @@
+using System;
+using Rg.Plugins.Popup.Pages;
+using Rg.Plugins.Popup.Services;
+
+namespace Demo.Pages
+{
+    public partial class TestCurrentViewController : PopupPage
+    {
+        private int index = 0;
+
+        public TestCurrentViewController(int index)
+        {
+            InitializeComponent();
+            this.index = index;
+            indexLable.Text = this.index.ToString();
+        }
+
+        private async void OnTestCurrentViewController(object sender, EventArgs e)
+        {
+            var page = new TestCurrentViewController(index + 1);
+
+            await PopupNavigation.Instance.PushAsync(page);
+        }
+
+        private async void OnFilePicker(object sender, EventArgs e)
+        {
+            var file = await Xamarin.Essentials.FilePicker.PickAsync();
+        }
+    }
+}