From 4d1c5b09c3ecf1e2250374d72e38c2a9611c2d70 Mon Sep 17 00:00:00 2001
From: Jesse Jiang <jessejiang0214@outlook.com>
Date: Wed, 31 Aug 2016 17:20:19 +1000
Subject: [PATCH] Fix entry cannot lost focus issue for iOS and Android Add
 testing demo for entry.

---
 .../SlideOverKitDroidHandler.cs               |  7 +++++
 SlideOverKit.iOS/SlideOverKitiOSHandler.cs    |  1 +
 .../Pages/PopOverView.xaml                    |  1 +
 .../Pages/RightSideMasterPage.xaml            | 27 +++++++------------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/SlideOverKit.Droid/SlideOverKitDroidHandler.cs b/SlideOverKit.Droid/SlideOverKitDroidHandler.cs
index e9ffd51..7818188 100644
--- a/SlideOverKit.Droid/SlideOverKitDroidHandler.cs
+++ b/SlideOverKit.Droid/SlideOverKitDroidHandler.cs
@@ -5,6 +5,8 @@
 using Android.Animation;
 using System.Linq;
 using Android.Util;
+using Android.Views.InputMethods;
+using Android.Content;
 
 namespace SlideOverKit.Droid
 {
@@ -211,7 +213,12 @@ void HideBackgroundForPopup ()
         {
             _currentPopup = null;
             if (_popupRenderer != null) {
+                if (_popupRenderer.ViewGroup.HasFocus) {
+                    InputMethodManager inputManager = (InputMethodManager)Forms.Context.GetSystemService (Context.InputMethodService);
+                    inputManager.HideSoftInputFromWindow (_popupRenderer.ViewGroup.WindowToken, HideSoftInputFlags.None);
+                }            
                 _pageRenderer.RemoveView (_popupRenderer.ViewGroup);
+                _popupRenderer.Dispose();
                 _popupRenderer = null;
             }
             if (_backgroundOverlay != null) {
diff --git a/SlideOverKit.iOS/SlideOverKitiOSHandler.cs b/SlideOverKit.iOS/SlideOverKitiOSHandler.cs
index 597bba2..837de42 100644
--- a/SlideOverKit.iOS/SlideOverKitiOSHandler.cs
+++ b/SlideOverKit.iOS/SlideOverKitiOSHandler.cs
@@ -63,6 +63,7 @@ void HideBackgroundOverlay ()
                 _backgroundOverlay.Dispose ();
                 _backgroundOverlay = null;
             }
+            _menuOverlayRenderer.NativeView.EndEditing (true);
         }
 
         void HideBackgroundForPopup ()
diff --git a/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/PopOverView.xaml b/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/PopOverView.xaml
index dc349bf..bebadfb 100755
--- a/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/PopOverView.xaml
+++ b/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/PopOverView.xaml
@@ -2,6 +2,7 @@
 <t:SlidePopupView xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:t="clr-namespace:SlideOverKit" x:Class="SlideOverKit.MoreSample.PopOverView">
 	<StackLayout Padding="15,10,15,30" Spacing="20" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
 		<Label HeightRequest="30" Text="Build some Awesome SlideOver's" FontSize="24" XAlign="Center" />
+		<Entry Placeholder="Testing..." HeightRequest="40"/>
 		<Image HeightRequest="40" Source="xamconsulting.png">
 		</Image>
 		<Button x:Name="DoneButton" Text="Close" />
diff --git a/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/RightSideMasterPage.xaml b/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/RightSideMasterPage.xaml
index 54b0689..8d6966b 100755
--- a/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/RightSideMasterPage.xaml
+++ b/SlideOverKitMoreSamples/SlideOverKit.Sample/Pages/RightSideMasterPage.xaml
@@ -5,39 +5,32 @@
 			<ColumnDefinition Width="*" />
 			<ColumnDefinition Width="*" />
 		</Grid.ColumnDefinitions>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="*" />
-			<RowDefinition Height="*" />
-			<RowDefinition Height="*" />
-			<RowDefinition Height="*" />
-			<RowDefinition Height="*" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
 		<Label Text="Right Side Menu" FontSize="18" Grid.ColumnSpan="2" XAlign="Center" YAlign="Center" TextColor="Black" />
-		<Grid Grid.Column="0" Grid.Row="1" BackgroundColor="#E15771">
+		<Entry Placeholder="Search..."  Grid.ColumnSpan="2" Grid.Row="1" HeightRequest="40" VerticalOptions="Center" />
+		<Grid Grid.Column="0" Grid.Row="2" BackgroundColor="#E15771">
 			<Image Source="Home.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Grid Grid.Column="1" Grid.Row="1" BackgroundColor="#348ECA">
+		<Grid Grid.Column="1" Grid.Row="2" BackgroundColor="#348ECA">
 			<Image Source="Happy.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Grid Grid.Column="0" Grid.Row="2" BackgroundColor="#348ECA">
+		<Grid Grid.Column="0" Grid.Row="3" BackgroundColor="#348ECA">
 			<Image Source="Settings.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Grid Grid.Column="1" Grid.Row="2" BackgroundColor="#348ECA">
+		<Grid Grid.Column="1" Grid.Row="3" BackgroundColor="#348ECA">
 			<Image Source="VideoCall.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Grid Grid.Column="0" Grid.Row="3" BackgroundColor="#348ECA">
+		<Grid Grid.Column="0" Grid.Row="4" BackgroundColor="#348ECA">
 			<Image Source="Microphone.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Grid Grid.Column="1" Grid.Row="3" BackgroundColor="#3AAA70">
+		<Grid Grid.Column="1" Grid.Row="4" BackgroundColor="#3AAA70">
 			<Image Source="Enter.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Grid Grid.Column="0" Grid.Row="4" BackgroundColor="#348ECA">
+		<Grid Grid.Column="0" Grid.Row="5" BackgroundColor="#348ECA">
 			<Image Source="Pencil.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Grid Grid.Column="1" Grid.Row="4" BackgroundColor="#348ECA">
+		<Grid Grid.Column="1" Grid.Row="5" BackgroundColor="#348ECA">
 			<Image Source="MessageFilled.png" WidthRequest="50" HeightRequest="50" HorizontalOptions="Center" VerticalOptions="Center" />
 		</Grid>
-		<Image Grid.ColumnSpan="2"  Grid.Row="5" WidthRequest="10" HeightRequest="10" HorizontalOptions="Center" VerticalOptions="Center"  Source="DoubleDown_Black.png"/>
+		<Image Grid.ColumnSpan="2"  Grid.Row="6" WidthRequest="10" HeightRequest="10" HorizontalOptions="Center" VerticalOptions="Center"  Source="DoubleDown_Black.png"/>
 	</Grid>
 </t:SlideMenuView>
\ No newline at end of file