Fix broken Android platform tests (xamarin#14590)

fabulous-dev · Sep 9, 2021 · 0b7b8c4 · 0b7b8c4
1 parent 8fcf470
commit 0b7b8c4
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 6 deletions.
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11795.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11795.xaml
@@ -43,21 +43,52 @@
                       Margin="12, 0"
                       Padding="12">
                       <Label
-                          Text="BoxView"/>
+                          Text="Color BoxView"
+                          FontSize="Micro"/>
+                      <BoxView
+                          x:Name="SolidBoxView"
+                          HeightRequest="60"
+                          WidthRequest="120"
+                          CornerRadius="12"
+                          BackgroundColor="Red"/>
+                      <Label
+                          Text="Gradient BoxView"
+                          FontSize="Micro"/>
                       <BoxView
                           x:Name="GradientBoxView"
-                          HeightRequest="120"
+                          HeightRequest="60"
                           WidthRequest="120"
                           CornerRadius="12"
                           Background="{StaticResource LinearBrush}"/>
                       <Label
-                          Text="Frame"/>
+                          Text="Color Frame"
+                          FontSize="Micro"/>
+                      <Frame
+                          x:Name="SolidFrame"
+                          HasShadow="True"
+                          HeightRequest="60"
+                          WidthRequest="120"
+                          CornerRadius="12"
+                          Padding="6"
+                          BackgroundColor="Red">
+                          <Grid>
+                              <Label
+                                  HorizontalOptions="Center"
+                                  VerticalOptions="Center"
+                                  TextColor="White"
+                                  Text="Color"/>
+                          </Grid>
+                      </Frame>
+                      <Label
+                          Text="Gradient Frame"
+                          FontSize="Micro"/>
                       <Frame
                           x:Name="GradientFrame"
                           HasShadow="True"
-                          HeightRequest="120"
+                          HeightRequest="60"
                           WidthRequest="120"
                           CornerRadius="12"
+                          Padding="6"
                           Background="{StaticResource LinearBrush}">
                           <Grid>
                               <Label

diff --git a/Xamarin.Forms.Platform.Android.UnitTests/AssertionExtensions.cs b/Xamarin.Forms.Platform.Android.UnitTests/AssertionExtensions.cs
@@ -43,6 +43,19 @@ public static AColor ColorAtPoint(this Bitmap bitmap, int x, int y, bool include
 			}
 		}
 
+		public static void ForceDraw(this AView view)
+		{
+			var bitmap = Bitmap.CreateBitmap(view.Width, view.Height, Bitmap.Config.Argb8888);
+
+			var canvas = new Canvas(bitmap);
+			canvas.Save();
+			canvas.Translate(0, 0);
+			view.Draw(canvas);
+			canvas.Restore();
+
+			bitmap.Dispose();
+		}
+
 		public static Bitmap ToBitmap(this AView view)
 		{
 			var bitmap = Bitmap.CreateBitmap(view.Width, view.Height, Bitmap.Config.Argb8888);

diff --git a/Xamarin.Forms.Platform.Android.UnitTests/CornerRadiusTests.cs b/Xamarin.Forms.Platform.Android.UnitTests/CornerRadiusTests.cs
@@ -82,6 +82,9 @@ public async Task CheckCornerRadius(VisualElement visualElement)
 					var view = renderer.View;
 					Layout(visualElement, view);
 
+					if (view.Background is GradientStrokeDrawable)
+						view.ForceDraw();
+
 					// Need to parent the Frame for it to work on lower APIs (below Marshmallow)
 					ParentView(view);
 					var image = view.ToBitmap();

diff --git a/Xamarin.Forms.Platform.Android.UnitTests/PlatformTestFixture.cs b/Xamarin.Forms.Platform.Android.UnitTests/PlatformTestFixture.cs
@@ -358,6 +358,10 @@ async Task<TProperty> GetRendererPropertyWithLayout<TProperty>(VisualElement ele
 				{
 					var view = renderer.View;
 					Layout(element, view);
+
+					if(view.Background is GradientStrokeDrawable)
+						view.ForceDraw();
+
 					return getProperty(renderer);
 				}
 			});

diff --git a/Xamarin.Forms.Platform.Android/GradientStrokeDrawable.cs b/Xamarin.Forms.Platform.Android/GradientStrokeDrawable.cs
@@ -87,7 +87,8 @@ protected override void OnDraw(Shape shape, Canvas canvas, Paint paint)
 			if (_backgroundColor.HasValue)
 				paint.Color = _backgroundColor.Value;
 
-			shape.Draw(canvas, _strokePaint);
+			if (_strokePaint.StrokeWidth > 0)
+				shape.Draw(canvas, _strokePaint);
 		}
 
 		public abstract class GradientShader

diff --git a/Xamarin.Forms.Platform.Android/Renderers/BoxRenderer.cs b/Xamarin.Forms.Platform.Android/Renderers/BoxRenderer.cs
@@ -160,7 +160,7 @@ void UpdateCornerRadius()
 				{
 					Shape = new RectShape()
 				});
-				if (Background is GradientDrawable backgroundGradient)
+				if (Background is GradientStrokeDrawable backgroundGradient)
 				{
 					var cornerRadii = new[] {
 						(float)(Context.ToPixels(cornerRadius.TopLeft)),