From bfd4ed0f048ec06646854a91af05c706375050a8 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shane94@hotmail.com>
Date: Tue, 7 May 2019 10:52:53 -0600
Subject: [PATCH] Apply round corners shape based on radius (#6099)

* Apply round corners shape based on radius

* update gallery

* apply to SmallComponentShape

* add color scheme back

* basic fixes

* - make corner radius default the same
- reapply theme on ios so corner is changeable
- force set ios border width to size

* fix border width for default and remove extra call to bgcolor
---
 .../VisualControlsPage.xaml                        |  8 ++---
 Xamarin.Forms.Material.Android/MaterialColors.cs   |  1 +
 .../MaterialFrameRenderer.cs                       |  4 +--
 .../MaterialFrameRenderer.cs                       | 39 ++++++++++++++--------
 4 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
index ff69242..dbba76b 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
@@ -147,8 +147,8 @@
                 </StackLayout>
             </Frame>
 
-            <Label Text="Default With Border (No Shadow)" Margin="0,0,0,-10" />
-            <Frame Padding="16" BorderColor="{StaticResource DarkRedColor}" HasShadow="false">
+            <Label Text="Default With Border (No Shadow, CornerRadius 0)" Margin="0,0,0,-10" />
+            <Frame CornerRadius="0" Padding="16" BorderColor="{StaticResource DarkRedColor}" HasShadow="false">
                 <StackLayout Spacing="16">
                     <Image Source="photo.jpg" Margin="-16,-16,-16,0" Aspect="AspectFit" />
                     <Label Text="Walk below the arches" FontSize="24" />
@@ -158,8 +158,8 @@
                 </StackLayout>
             </Frame>
 
-            <Label Text="No Card Padding &amp; Thin Content Padding" Margin="0,0,0,-10" />
-            <Frame Padding="0" BorderColor="{StaticResource DarkRedColor}" CornerRadius="10">
+            <Label Text="No Card Padding &amp; Thin Content Padding &amp; CornerRadius 15" Margin="0,0,0,-10" />
+            <Frame CornerRadius="15" Padding="0" BorderColor="{StaticResource DarkRedColor}">
                 <StackLayout Spacing="16" BackgroundColor="{StaticResource LightRedColor}" Padding="8">
                     <Image Source="photo.jpg" Margin="-8,-8,-8,0" Aspect="AspectFit" />
                     <Label Text="Walk below the arches" FontSize="24" />
diff --git a/Xamarin.Forms.Material.Android/MaterialColors.cs b/Xamarin.Forms.Material.Android/MaterialColors.cs
index 47c8500..be2f1cc 100644
--- a/Xamarin.Forms.Material.Android/MaterialColors.cs
+++ b/Xamarin.Forms.Material.Android/MaterialColors.cs
@@ -40,6 +40,7 @@ namespace Xamarin.Forms.Material.Tizen
 
 		public const float SliderTrackAlpha = kSliderBaselineEnabledBackgroundAlpha;
 
+		public const double kFrameCornerRadiusDefault = 4;
 		// values based on
 		// copying to match iOS
 		// TODO generalize into xplat classes
diff --git a/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs b/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs
index f681f2b..858e291 100644
--- a/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs
+++ b/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs
@@ -191,11 +191,9 @@ namespace Xamarin.Forms.Material.Android
 				return;
 
 			var cornerRadius = Element.CornerRadius;
-			if (cornerRadius < 0f && _defaultCornerRadius < 0f)
-				return;
 
 			if (_defaultCornerRadius < 0f)
-				_defaultCornerRadius = Radius;
+				_defaultCornerRadius = Context.ToPixels(MaterialColors.kFrameCornerRadiusDefault);
 
 			if (cornerRadius < 0f)
 				Radius = _defaultCornerRadius;
diff --git a/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs b/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs
index e41ab26..75ae3ff 100644
--- a/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs
+++ b/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs
@@ -15,7 +15,7 @@ namespace Xamarin.Forms.Material.iOS
 	{
 		CardScheme _defaultCardScheme;
 		CardScheme _cardScheme;
-		nfloat _defaultCornerRadius = -1f;
+		float _defaultCornerRadius = -1;
 		VisualElementPackager _packager;
 		VisualElementTracker _tracker;
 		bool _disposed = false;
@@ -86,9 +86,6 @@ namespace Xamarin.Forms.Material.iOS
 
 				Element.PropertyChanged += OnElementPropertyChanged;
 
-				UpdateCornerRadius();
-				UpdateBorderColor();
-				UpdateBackgroundColor();
 				ApplyTheme();
 			}
 
@@ -115,17 +112,21 @@ namespace Xamarin.Forms.Material.iOS
 			base.Dispose(disposing);
 		}
 
+
 		protected virtual CardScheme CreateCardScheme()
 		{
 			return new CardScheme
 			{
-				ColorScheme = MaterialColors.Light.CreateColorScheme(),
-				ShapeScheme = new ShapeScheme(),
+				ColorScheme = MaterialColors.Light.CreateColorScheme()
 			};
 		}
 
 		protected virtual void ApplyTheme()
 		{
+			UpdateCornerRadius();
+			UpdateBorderColor();
+			UpdateBackgroundColor();
+
 			if (Element.BorderColor.IsDefault)
 				CardThemer.ApplyScheme(_cardScheme, this);
 			else
@@ -150,16 +151,14 @@ namespace Xamarin.Forms.Material.iOS
 			}
 			else if (e.PropertyName == Xamarin.Forms.Frame.CornerRadiusProperty.PropertyName)
 			{
-				UpdateCornerRadius();
+				updatedTheme = true;
 			}
 			else if (e.PropertyName == Xamarin.Forms.Frame.BorderColorProperty.PropertyName)
 			{
-				UpdateBorderColor();
 				updatedTheme = true;
 			}
 			else if (e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
 			{
-				UpdateBackgroundColor();
 				updatedTheme = true;
 			}
 
@@ -173,13 +172,25 @@ namespace Xamarin.Forms.Material.iOS
 		{
 			// set the default radius on the first time
 			if (_defaultCornerRadius < 0)
-				_defaultCornerRadius = CornerRadius;
+				_defaultCornerRadius = (float)MaterialColors.kFrameCornerRadiusDefault;
 
 			var cornerRadius = Element.CornerRadius;
 			if (cornerRadius < 0)
-				CornerRadius = _defaultCornerRadius;
-			else
-				CornerRadius = cornerRadius;
+				cornerRadius = _defaultCornerRadius;
+
+			if (_cardScheme != null)
+			{
+				var shapeScheme = new ShapeScheme();
+				var shapeCategory = new ShapeCategory(ShapeCornerFamily.Rounded, cornerRadius);
+
+				shapeScheme.SmallComponentShape = shapeCategory;
+				shapeScheme.MediumComponentShape = shapeCategory;
+				shapeScheme.LargeComponentShape = shapeCategory;
+
+				_cardScheme.ShapeScheme = shapeScheme;
+			}
+
+			CornerRadius = cornerRadius;
 		}
 
 		void UpdateBorderColor()
@@ -191,6 +202,8 @@ namespace Xamarin.Forms.Material.iOS
 					colorScheme.OnSurfaceColor = _defaultCardScheme.ColorScheme.OnSurfaceColor;
 				else
 					colorScheme.OnSurfaceColor = borderColor.ToUIColor();
+
+				SetBorderWidth(borderColor.IsDefault ? 0f : 1f, UIControlState.Normal);
 			}
 		}
 
-- 
2.7.4