Merge branch '15-5'

Author: StephaneDelcroix

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs

@@ -13,7 +13,9 @@ public class RoundedButton : Xamarin.Forms.Button
 		{
 			public RoundedButton(int radius)
 			{
+#pragma warning disable 0618
 				base.BorderRadius = radius;
+#pragma warning restore
 				base.WidthRequest = 2 * radius;
 				base.HeightRequest = 2 * radius;
 				HorizontalOptions = LayoutOptions.Center;
@@ -29,14 +31,18 @@ public RoundedButton(int radius)
 			{
 				get
 				{
+#pragma warning disable 0618
 					return base.BorderRadius;
+#pragma warning restore
 				}
 
 				set
 				{
 					base.WidthRequest = 2 * value;
 					base.HeightRequest = 2 * value;
+#pragma warning disable 0618
 					base.BorderRadius = value;
+#pragma warning restore
 				}
 			}
 
@@ -51,7 +57,9 @@ public RoundedButton(int radius)
 				{
 					base.WidthRequest = value;
 					base.HeightRequest = value;
+#pragma warning disable 0618
 					base.BorderRadius = ((int)value) / 2;
+#pragma warning restore
 				}
 			}
 
@@ -66,7 +74,9 @@ public RoundedButton(int radius)
 				{
 					base.WidthRequest = value;
 					base.HeightRequest = value;
+#pragma warning disable 0618
 					base.BorderRadius = ((int)value) / 2;
+#pragma warning restore
 				}
 			}
 

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs

@@ -24,7 +24,9 @@ public Issue1026 ()
 							Text = "Subscribe with LinkedIn", 
 							WidthRequest = 262,
 							HorizontalOptions = LayoutOptions.Center,
+#pragma warning disable 0618
 							BorderRadius = 0,
+#pragma warning restore
 						},
 //						new Label {
 //							Text = "or by email",
@@ -73,7 +75,9 @@ public Issue1026 ()
 							Text = "Create an account", 
 							WidthRequest = 262,
 							HorizontalOptions = LayoutOptions.Center,
+#pragma warning disable 0618
 							BorderRadius = 0,
+#pragma warning restore
 						},
 						new Label {
 							Text = "by subscribing, you accept the general conditions.",

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1436.cs

@@ -0,0 +1,99 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using System.Reflection;
+
+#if UITEST
+using Xamarin.Forms.Core.UITests;
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 1436, "Button border not drawn on Android without a BorderRadius", PlatformAffected.Android)]
+	public class Issue1436 : TestContentPage
+	{
+		protected override void Init()
+		{
+			var grid = new Grid
+			{
+				ColumnDefinitions = { new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) }, new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) } },
+				RowDefinitions = { new RowDefinition { Height = new GridLength(1, GridUnitType.Star) }, new RowDefinition { Height = new GridLength(1, GridUnitType.Star) } }
+			};
+
+			grid.Children.Add(new Button
+			{
+				Text = "Button",
+				HorizontalOptions = LayoutOptions.End,
+				BorderColor = Color.AliceBlue,
+				BorderWidth = 5
+			}, 0, 0);
+
+			grid.Children.Add(new Button
+			{
+				Text = "Button",
+				HorizontalOptions = LayoutOptions.Start,
+				BackgroundColor = Color.Gray
+			}, 1, 1);
+
+			grid.Children.Add(new Button
+			{
+				Text = "Button",
+				HorizontalOptions = LayoutOptions.End,
+			}, 0, 1);
+
+			grid.Children.Add(new Button
+			{
+				Text = "Button",
+
+				HorizontalOptions = LayoutOptions.Start,
+			}, 1, 0);
+
+			StackLayout stackLayout = new StackLayout
+			{
+				VerticalOptions = LayoutOptions.Center,
+				Children = {
+					new Label{ Text = "The following four buttons should all be the same size. One has a ridiculous border. One has a darker background. One is the default button." },
+					grid,
+					new Label{ Text = "The following three buttons should all have a red border." },
+					new Button {
+						Text = "BorderWidth = 1, CornerRadius = [default],",
+						HorizontalOptions = LayoutOptions.Center,
+						BorderColor = Color.Red,
+						BorderWidth = 1,
+					},
+					new Button {
+						Text = "BorderWidth = 1, CornerRadius = 0",
+						HorizontalOptions = LayoutOptions.Center,
+						BackgroundColor = Color.Blue,
+						BorderColor = Color.Red,
+						BorderWidth = 1,
+						CornerRadius = 0,
+						TextColor = Color.White
+					},
+					new Button {
+						Text = "BorderWidth = 1, CornerRadius = 1",
+						HorizontalOptions = LayoutOptions.Center,
+						BackgroundColor = Color.Black,
+						BorderColor = Color.Red,
+						BorderWidth = 1,
+						CornerRadius = 1,
+						TextColor = Color.White
+					}
+				},
+			};
+
+			Content = stackLayout;
+		}
+
+#if UITEST
+		[Test]
+		[Category(UITestCategories.ManualReview)]
+		public void Issue1436Test()
+		{
+			RunningApp.Screenshot("I am at Issue 1436");
+		}
+#endif
+	}
+}

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems

@@ -396,6 +396,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla60524.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla59925.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1326.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue1436.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)_Template.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla42620.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1028.cs" />
@@ -840,4 +841,4 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
+</Project>

Xamarin.Forms.Controls/CoreGalleryPages/ButtonCoreGalleryPage.cs

@@ -37,7 +37,9 @@ protected override void Build (StackLayout stackLayout)
 					Text = "BorderRadius",
 					BackgroundColor = Color.Transparent,
 					BorderColor = Color.Red,
+#pragma warning disable 0618
 					BorderRadius = 20,
+#pragma warning restore
 					BorderWidth = 1,
 				}
 			);

Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs

@@ -59,7 +59,9 @@ public ButtonGallery ()
 				BorderColor = Color.Black,
 				BackgroundColor = Color.Purple,
 				BorderWidth = 5,
+#pragma warning disable 0618
 				BorderRadius = 5
+#pragma warning restore
 			};
 			var timer = new Button { Text = "Timer" };
 			var busy = new Button { Text = "Toggle Busy" };

Xamarin.Forms.Core.UITests.Shared/PlatformQueries.cs

@@ -10,7 +10,7 @@ internal static class PlatformMethodQueries
 		public static readonly Dictionary<BindableProperty, Tuple<string[], bool>> PropertyPlatformMethodDictionary = new Dictionary<BindableProperty, Tuple<string[], bool>> {
 			{ ActivityIndicator.ColorProperty, Tuple.Create (new[] { "color" }, false) },
 			{ ActivityIndicator.IsRunningProperty, Tuple.Create (new[] { "isAnimating" }, false) },
-			{ Button.BorderRadiusProperty, Tuple.Create (new[] { "layer", "cornerRadius" }, false) },
+			{ Button.CornerRadiusProperty, Tuple.Create (new[] { "layer", "cornerRadius" }, false) },
 			{ Button.BorderWidthProperty, Tuple.Create (new[] { "layer", "borderWidth" }, false) },
 			{ Button.FontProperty, Tuple.Create (new[] { "titleLabel", "font" }, false) },
 			{ Button.TextProperty, Tuple.Create (new[] { "titleLabel", "text" }, false) },
@@ -33,7 +33,7 @@ internal static class PlatformMethodQueries
 				{ ActivityIndicator.ColorProperty, Tuple.Create(new[] { "getProgressDrawable", "getColor" }, false) },
 				{ ActivityIndicator.IsRunningProperty, Tuple.Create(new[] { "isIndeterminate" }, false) },
 				{ Button.BorderColorProperty, Tuple.Create(new[] { "getBackground" }, false) },
-				{ Button.BorderRadiusProperty, Tuple.Create(new[] { "getBackground" }, false) },
+				{ Button.CornerRadiusProperty, Tuple.Create(new[] { "getBackground" }, false) },
 				{ Button.BorderWidthProperty, Tuple.Create(new[] { "getBackground" }, false) },
 				{ Button.ImageProperty, Tuple.Create(new[] { "getBackground" }, false) },
 				{ Button.FontProperty, Tuple.Create(new[] { "getTypeface", "isBold" }, false) },

Xamarin.Forms.Core.UITests.Shared/Tests/ButtonUITests.cs

@@ -59,7 +59,7 @@ public void BorderRadius()
 			remote.GoTo();
 
 #if __IOS__
-			var borderRadius = remote.GetProperty<float>(Button.BorderRadiusProperty);
+			var borderRadius = remote.GetProperty<float>(Button.CornerRadiusProperty);
 			Assert.AreEqual(20.0f, borderRadius);
 #endif
 		}

Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs

@@ -890,6 +890,23 @@ public void IsSetIsTrueWhenPropSet()
 			Assert.IsTrue(isSet);
 		}
 
+		[Test]
+		public void IsSetIsTrueWhenPropCleared()
+		{
+			string defaultValue = "default";
+			string newValue = "new value";
+
+			var bindableProperty = BindableProperty.Create("Foo", typeof(string), typeof(MockBindable), defaultValue);
+			var bindable = new MockBindable();
+
+			bindable.SetValue(bindableProperty, newValue);
+
+			bindable.ClearValue(bindableProperty);
+
+			var isSet = bindable.IsSet(bindableProperty);
+			Assert.IsTrue(isSet);
+		}
+
 		[Test]
 		public void IsSetIsTrueWhenPropSetToDefault()
 		{
@@ -905,6 +922,7 @@ public void IsSetIsTrueWhenPropSetToDefault()
 			var isSet = bindable.IsSet(bindableProperty);
 			Assert.IsTrue(isSet);
 		}
+
 		[Test]
 		public void IsSetIsTrueWhenPropSetByDefaultValueCreator()
 		{

Xamarin.Forms.Core.UnitTests/ButtonUnitTest.cs

@@ -250,6 +250,47 @@ public void ButtonClickWhenCommandCanExecuteFalse()
 
 			Assert.False(invoked);
 		}
+		
+		public void ButtonBorderRadiusForwardsToButtonCornerRadius()
+		{
+			var button = new Button { Platform = new UnitPlatform() };
+			button.BorderRadius = 10;
+
+			Assert.AreEqual(10, button.CornerRadius);
+		}
+
+		[Test]
+		public void ButtonCornerRadiusForwardsToButtonBorderRadius()
+		{
+			var button = new Button { Platform = new UnitPlatform() };
+			button.CornerRadius = 10;
+
+			Assert.AreEqual(10, button.BorderRadius);
+		}
+
+		[Test]
+		public void ButtonCornerRadiusClearValueForwardsToButtonBorderRadius()
+		{
+			var button = new Button { Platform = new UnitPlatform() };
+			
+			button.CornerRadius = 10;
+
+			button.ClearValue(Button.CornerRadiusProperty);
+
+			Assert.AreEqual((int)Button.BorderRadiusProperty.DefaultValue, button.BorderRadius);
+		}
+
+		[Test]
+		public void ButtonBorderRadiusClearValueForwardsToButtonCornerRadius()
+		{
+			var button = new Button { Platform = new UnitPlatform() };
+
+			button.BorderRadius = 10;
+
+			button.ClearValue(Button.BorderRadiusProperty);
+
+			Assert.AreEqual((int)Button.CornerRadiusProperty.DefaultValue, button.CornerRadius);
+		}
 
 		private void AssertButtonContentLayoutsEqual(Button.ButtonContentLayout layout1, object layout2)
 		{
@@ -259,4 +300,4 @@ private void AssertButtonContentLayoutsEqual(Button.ButtonContentLayout layout1,
 			Assert.AreEqual(layout1.Spacing, bcl.Spacing);
 		}
 	}	
-}
+}