Fix 39802 (#217)

* [iOS] When using ContextActionsCell make sure we don't show the ContentCell separator

* [Android] Don't write separator view if not needed

2 files changed, 14 insertions, 2 deletions

diff --git a/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs b/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
index f1a53917..4d9918fa 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
@@ -89,6 +89,9 @@ namespace Xamarin.Forms.Platform.iOS
 			if (contextCell != null)
 			{
 				contextCell.Update(tableView, cell, nativeCell);
+				var viewTableCell = contextCell.ContentCell as ViewCellRenderer.ViewTableCell;
+				if (viewTableCell != null)
+					viewTableCell.SupressSeparator = true;
 				nativeCell = contextCell;
 			}
 
diff --git a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
index f1cb2fb6..4f8a43e8 100644
--- a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
@@ -86,11 +86,19 @@ namespace Xamarin.Forms.Platform.iOS
 				get { return ViewCell; }
 			}
 
+			internal bool SupressSeparator { get; set; }
+
 			public override void LayoutSubviews()
 			{
 				//This sets the content views frame.
 				base.LayoutSubviews();
 
+				if (SupressSeparator)
+				{
+					var oldFrame = Frame;
+					ContentView.Bounds = Frame = new RectangleF(oldFrame.Location, new SizeF(oldFrame.Width, oldFrame.Height + 0.5f));
+				}
+
 				var contentFrame = ContentView.Frame;
 				var view = ViewCell.View;
 
@@ -114,8 +122,9 @@ namespace Xamarin.Forms.Platform.iOS
 				var height = size.Height > 0 ? size.Height : double.PositiveInfinity;
 				var result = renderer.Element.Measure(width, height);
 
-				// make sure to add in the separator
-				return new SizeF(size.Width, (float)result.Request.Height + 1f / UIScreen.MainScreen.Scale);
+				// make sure to add in the separator if needed
+				var finalheight = ((float)result.Request.Height + (SupressSeparator ? 0f : 1f)) / UIScreen.MainScreen.Scale;
+				return new SizeF(size.Width, finalheight);
 			}
 
 			protected override void Dispose(bool disposing)