dansiegel · dansiegel · Apr 21, 2021 · Apr 21, 2021 · Apr 21, 2021 · Apr 21, 2021
diff --git a/src/Mobile.BuildTools/Drawing/WatermarkTextBanner.cs b/src/Mobile.BuildTools/Drawing/WatermarkTextBanner.cs
@@ -93,8 +93,8 @@ private string StripDescenders(string text)
         private static (SKPoint, SKPoint) GetBannerLocations(WatermarkPosition watermarkPosition, Size size, float bannerHeight)
             => watermarkPosition switch
             {
-                WatermarkPosition.Top => (new SKPoint(0, 0), new SKPoint(size.Width, 0)),
-                WatermarkPosition.Bottom => (new SKPoint(0, size.Height), new SKPoint(size.Width, size.Height)),
+                WatermarkPosition.Top => (new SKPoint(0, bannerHeight / 2), new SKPoint(size.Width, bannerHeight / 2)),
+                WatermarkPosition.Bottom => (new SKPoint(0, size.Height - (bannerHeight / 2)), new SKPoint(size.Width, size.Height - (bannerHeight / 2))),
                 WatermarkPosition.TopLeft => (new SKPoint(-bannerHeight, size.Height / 2 + bannerHeight), new SKPoint(size.Width / 2 + bannerHeight, -bannerHeight)),
                 WatermarkPosition.TopRight => (new SKPoint(size.Width / 2 - bannerHeight, -bannerHeight), new SKPoint(size.Width + bannerHeight, size.Height / 2 + bannerHeight)),
                 WatermarkPosition.BottomLeft => (new SKPoint(-bannerHeight, size.Height / 2 - bannerHeight), new SKPoint(size.Width / 2 + bannerHeight, size.Height + bannerHeight)),

diff --git a/src/Mobile.BuildTools/Generators/Images/ImageResizeGenerator.cs b/src/Mobile.BuildTools/Generators/Images/ImageResizeGenerator.cs
@@ -84,7 +84,8 @@ internal void ProcessImage(OutputImage outputImage)
 
         private SKBitmap ApplyPadding(OutputImage outputImage, ImageBase image, Context context, SKBitmap outputBitmap)
         {
-            if (outputImage.PaddingFactor is null)
+            if (outputImage.PaddingFactor is null ||
+                outputImage.PaddingFactor == 0)
             {
                 return outputBitmap;
             }

diff --git a/tests/Mobile.BuildTools.Tests/Fixtures/Generators/ImageResizerGeneratorFixture.cs b/tests/Mobile.BuildTools.Tests/Fixtures/Generators/ImageResizerGeneratorFixture.cs
@@ -1,11 +1,11 @@
 using System.IO;
-using System.Text;
+using System.Text;
 using Mobile.BuildTools.Generators.Images;
 using Mobile.BuildTools.Models.AppIcons;
 using SkiaSharp;
 using Xunit;
 using Xunit.Abstractions;
-
+
 namespace Mobile.BuildTools.Tests.Fixtures.Generators
 {
     public class ImageResizer { }
@@ -30,7 +30,7 @@ public ImageResizerGeneratorFixture(ITestOutputHelper testOutputHelper)
         [InlineData("dotnetbot.svg", "xhdpi", .5)]
         public void GeneratesImage(string inputFile, string resourcePath, double scale)
         {
-            var config = GetConfiguration();
+            var config = GetConfiguration();
             config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(inputFile), inputFile), (nameof(scale), scale));
             var generator = new ImageResizeGenerator(config);
 
@@ -49,8 +49,8 @@ public void GeneratesImage(string inputFile, string resourcePath, double scale)
 
             var ex = Record.Exception(() => generator.ProcessImage(image));
 
-            Assert.Null(ex);
-
+            Assert.Null(ex);
+
             VerifyImageContents(image);
         }
 
@@ -63,8 +63,8 @@ public void GeneratesImage(string inputFile, string resourcePath, double scale)
         [InlineData("dotnetbot.svg", "xhdpi", 150)]
         public void GeneratesImageWithCustomHeightWidth(string inputFile, string resourcePath, int expectedOutput)
         {
-            var config = GetConfiguration();
-            config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(inputFile), inputFile), (nameof(expectedOutput), expectedOutput));
+            var config = GetConfiguration();
+            config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(inputFile), inputFile), (nameof(expectedOutput), expectedOutput));
             var generator = new ImageResizeGenerator(config);
 
             var image = new OutputImage
@@ -82,8 +82,8 @@ public void GeneratesImageWithCustomHeightWidth(string inputFile, string resourc
 
             var ex = Record.Exception(() => generator.ProcessImage(image));
 
-            Assert.Null(ex);
-
+            Assert.Null(ex);
+
             VerifyImageContents(image);
         }
 
@@ -94,7 +94,7 @@ public void GeneratesImageWithCustomHeightWidth(string inputFile, string resourc
         [InlineData("icon", "beta-version")]
         public void AppliesWatermark(string inputImageName, string watermarkImage)
         {
-            var config = GetConfiguration();
+            var config = GetConfiguration();
             config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(inputImageName), inputImageName), (nameof(watermarkImage), watermarkImage));
             var generator = new ImageResizeGenerator(config);
 
@@ -169,14 +169,34 @@ public void SetsCustomBackground()
         }
 
         [Theory]
-        [InlineData("Dev", 0.5)]
-        [InlineData("Dev", 1.0)]
-        [InlineData("Stage", 0.5)]
-        [InlineData("Something long", 0.5)]
-        public void AppliesTextBanner(string text, double scale)
+        [InlineData("Dev", 0.5, WatermarkPosition.BottomLeft)]
+        [InlineData("Dev", 1.0, WatermarkPosition.BottomLeft)]
+        [InlineData("Stage", 0.5, WatermarkPosition.BottomLeft)]
+        [InlineData("Something long", 1.0, WatermarkPosition.BottomLeft)]
+        [InlineData("Dev", 0.5, WatermarkPosition.BottomRight)]
+        [InlineData("Dev", 1.0, WatermarkPosition.BottomRight)]
+        [InlineData("Stage", 0.5, WatermarkPosition.BottomRight)]
+        [InlineData("Something long", 1.0, WatermarkPosition.BottomRight)]
+        [InlineData("Dev", 0.5, WatermarkPosition.Bottom)]
+        [InlineData("Dev", 1.0, WatermarkPosition.Bottom)]
+        [InlineData("Stage", 0.5, WatermarkPosition.Bottom)]
+        [InlineData("Something long", 1.0, WatermarkPosition.Bottom)]
+        [InlineData("Dev", 0.5, WatermarkPosition.TopLeft)]
+        [InlineData("Dev", 1.0, WatermarkPosition.TopLeft)]
+        [InlineData("Stage", 0.5, WatermarkPosition.TopLeft)]
+        [InlineData("Something long", 1.0, WatermarkPosition.TopLeft)]
+        [InlineData("Dev", 0.5, WatermarkPosition.TopRight)]
+        [InlineData("Dev", 1.0, WatermarkPosition.TopRight)]
+        [InlineData("Stage", 0.5, WatermarkPosition.TopRight)]
+        [InlineData("Something long", 1.0, WatermarkPosition.TopRight)]
+        [InlineData("Dev", 0.5, WatermarkPosition.Top)]
+        [InlineData("Dev", 1.0, WatermarkPosition.Top)]
+        [InlineData("Stage", 0.5, WatermarkPosition.Top)]
+        [InlineData("Something long", 1.0, WatermarkPosition.Top)]
+        public void AppliesTextBanner(string text, double scale, WatermarkPosition position)
         {
-            var config = GetConfiguration();
-            config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(text), text), (nameof(scale), scale));
+            var config = GetConfiguration();
+            config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(text), text), (nameof(scale), scale), (nameof(position), position));
             var generator = new ImageResizeGenerator(config);
 
             var image = new OutputImage
@@ -191,12 +211,13 @@ public void AppliesTextBanner(string text, double scale)
                 ShouldBeVisible = true,
                 Watermark = new WatermarkConfiguration
                 {
-                    Text = text
+                    Text = text,
+                    Position = position
                 }
             };
 
-            generator.ProcessImage(image);
-
+            generator.ProcessImage(image);
+
             VerifyImageContents(image);
         }
 
@@ -209,10 +230,10 @@ public void AppliesTextBanner(string text, double scale)
         [InlineData("dotnetbot.svg", .5)]
         public void AppliesPadding(string inputFile, double paddingFactor)
         {
-            var config = GetConfiguration();
+            var config = GetConfiguration();
             config.IntermediateOutputPath += GetOutputDirectorySuffix((nameof(paddingFactor), paddingFactor), (nameof(inputFile), inputFile));
-            var generator = new ImageResizeGenerator(config);
-
+            var generator = new ImageResizeGenerator(config);
+
             var image = new OutputImage
             {
                 Height = 0,
@@ -231,50 +252,50 @@ public void AppliesPadding(string inputFile, double paddingFactor)
 
             var ex = Record.Exception(() => generator.ProcessImage(image));
 
-            Assert.Null(ex);
-
+            Assert.Null(ex);
+
             VerifyImageContents(image);
-        }
-
-        private static string GetOutputDirectorySuffix(params (string, object)[] values)
-        {
-            var builder = new StringBuilder();
-
-            foreach (var value in values)
-            {
-                var prefix = "and";
-                if (builder.Length == 0)
-                {
-                    prefix = "-with";
-                }
-
-                builder.Append($"{prefix}-{value.Item1}-of-{value.Item2}-");
-            }
-
-            return builder.ToString();
-        }
-
-        private void VerifyImageContents(OutputImage image)
-        {
-            var expectedFilePath = Path.Combine(TestConstants.ExpectedImageDirectory, image.OutputFile);
-            var outputFilePath = image.OutputFile;
-
-            Assert.True(File.Exists(expectedFilePath), $"Expected image file '{expectedFilePath}' does not exist");
-            Assert.True(File.Exists(outputFilePath), $"Resulting image file '{outputFilePath}' does not exist");
-
+        }
+
+        private static string GetOutputDirectorySuffix(params (string, object)[] values)
+        {
+            var builder = new StringBuilder();
+
+            foreach (var value in values)
+            {
+                var prefix = "and";
+                if (builder.Length == 0)
+                {
+                    prefix = "-with";
+                }
+
+                builder.Append($"-{prefix}-{value.Item1}-of-{value.Item2}");
+            }
+
+            return builder.ToString();
+        }
+
+        private void VerifyImageContents(OutputImage image)
+        {
+            var expectedFilePath = Path.Combine(TestConstants.ExpectedImageDirectory, image.OutputFile);
+            var outputFilePath = image.OutputFile;
+
+            Assert.True(File.Exists(expectedFilePath), $"Expected image file '{expectedFilePath}' does not exist");
+            Assert.True(File.Exists(outputFilePath), $"Resulting image file '{outputFilePath}' does not exist");
+
             using var expectedImage = SKBitmap.Decode(expectedFilePath);
-            using var outputImage = SKBitmap.Decode(outputFilePath);
-
-            Assert.Equal(expectedImage.Width, outputImage.Width);
+            using var outputImage = SKBitmap.Decode(outputFilePath);
+
+            Assert.Equal(expectedImage.Width, outputImage.Width);
             Assert.Equal(expectedImage.Height, outputImage.Height);
 
             for (var y = 0; y < expectedImage.Height; ++y)
             {
                 for (var x = 0; x < expectedImage.Width; ++x)
-                {
+                {
                     Assert.Equal(expectedImage.GetPixel(x, y), outputImage.GetPixel(x, y));
                 }
-            }
+            }
         }
     }
 }
diff --git a/...inputFile-of-dotnetbot.png-/dotnetbot.png → ...-inputFile-of-dotnetbot.png/dotnetbot.png b/...inputFile-of-dotnetbot.png-/dotnetbot.png → ...-inputFile-of-dotnetbot.png/dotnetbot.png
diff --git a/...inputFile-of-dotnetbot.svg-/dotnetbot.png → ...-inputFile-of-dotnetbot.svg/dotnetbot.png b/...inputFile-of-dotnetbot.svg-/dotnetbot.png → ...-inputFile-of-dotnetbot.svg/dotnetbot.png
diff --git a/...inputFile-of-dotnetbot.png-/dotnetbot.png → ...-inputFile-of-dotnetbot.png/dotnetbot.png b/...inputFile-of-dotnetbot.png-/dotnetbot.png → ...-inputFile-of-dotnetbot.png/dotnetbot.png
diff --git a/...inputFile-of-dotnetbot.svg-/dotnetbot.png → ...-inputFile-of-dotnetbot.svg/dotnetbot.png b/...inputFile-of-dotnetbot.svg-/dotnetbot.png → ...-inputFile-of-dotnetbot.svg/dotnetbot.png
diff --git a/...inputFile-of-dotnetbot.png-/dotnetbot.png → ...-inputFile-of-dotnetbot.png/dotnetbot.png b/...inputFile-of-dotnetbot.png-/dotnetbot.png → ...-inputFile-of-dotnetbot.png/dotnetbot.png
diff --git a/...inputFile-of-dotnetbot.svg-/dotnetbot.png → ...-inputFile-of-dotnetbot.svg/dotnetbot.png b/...inputFile-of-dotnetbot.svg-/dotnetbot.png → ...-inputFile-of-dotnetbot.svg/dotnetbot.png
diff --git a/...tBanner--with-text-of-Dev-and-scale-of-0.5-and-position-of-Bottom/dotnetbot.png b/...tBanner--with-text-of-Dev-and-scale-of-0.5-and-position-of-Bottom/dotnetbot.png
diff --git a/...ner--with-text-of-Dev-and-scale-of-0.5-and-position-of-BottomLeft/dotnetbot.png b/...ner--with-text-of-Dev-and-scale-of-0.5-and-position-of-BottomLeft/dotnetbot.png
diff --git a/...xt-of-Dev-and-scale-of-0.5-/dotnetbot.png → ...and-position-of-BottomRight/dotnetbot.png b/...xt-of-Dev-and-scale-of-0.5-/dotnetbot.png → ...and-position-of-BottomRight/dotnetbot.png
diff --git a/...TextBanner--with-text-of-Dev-and-scale-of-0.5-and-position-of-Top/dotnetbot.png b/...TextBanner--with-text-of-Dev-and-scale-of-0.5-and-position-of-Top/dotnetbot.png
diff --git a/...Banner--with-text-of-Dev-and-scale-of-0.5-and-position-of-TopLeft/dotnetbot.png b/...Banner--with-text-of-Dev-and-scale-of-0.5-and-position-of-TopLeft/dotnetbot.png
diff --git a/...anner--with-text-of-Dev-and-scale-of-0.5-and-position-of-TopRight/dotnetbot.png b/...anner--with-text-of-Dev-and-scale-of-0.5-and-position-of-TopRight/dotnetbot.png
diff --git a/...extBanner--with-text-of-Dev-and-scale-of-1-and-position-of-Bottom/dotnetbot.png b/...extBanner--with-text-of-Dev-and-scale-of-1-and-position-of-Bottom/dotnetbot.png
diff --git a/...anner--with-text-of-Dev-and-scale-of-1-and-position-of-BottomLeft/dotnetbot.png b/...anner--with-text-of-Dev-and-scale-of-1-and-position-of-BottomLeft/dotnetbot.png
diff --git a/...text-of-Dev-and-scale-of-1-/dotnetbot.png → ...and-position-of-BottomRight/dotnetbot.png b/...text-of-Dev-and-scale-of-1-/dotnetbot.png → ...and-position-of-BottomRight/dotnetbot.png
diff --git a/...esTextBanner--with-text-of-Dev-and-scale-of-1-and-position-of-Top/dotnetbot.png b/...esTextBanner--with-text-of-Dev-and-scale-of-1-and-position-of-Top/dotnetbot.png
diff --git a/...xtBanner--with-text-of-Dev-and-scale-of-1-and-position-of-TopLeft/dotnetbot.png b/...xtBanner--with-text-of-Dev-and-scale-of-1-and-position-of-TopLeft/dotnetbot.png
diff --git a/...tBanner--with-text-of-Dev-and-scale-of-1-and-position-of-TopRight/dotnetbot.png b/...tBanner--with-text-of-Dev-and-scale-of-1-and-position-of-TopRight/dotnetbot.png
diff --git a/...with-text-of-Something long-and-scale-of-1-and-position-of-Bottom/dotnetbot.png b/...with-text-of-Something long-and-scale-of-1-and-position-of-Bottom/dotnetbot.png
diff --git a/...-text-of-Something long-and-scale-of-1-and-position-of-BottomLeft/dotnetbot.png b/...-text-of-Something long-and-scale-of-1-and-position-of-BottomLeft/dotnetbot.png
diff --git a/...text-of-Something long-and-scale-of-1-and-position-of-BottomRight/dotnetbot.png b/...text-of-Something long-and-scale-of-1-and-position-of-BottomRight/dotnetbot.png
diff --git a/...r--with-text-of-Something long-and-scale-of-1-and-position-of-Top/dotnetbot.png b/...r--with-text-of-Something long-and-scale-of-1-and-position-of-Top/dotnetbot.png
diff --git a/...ith-text-of-Something long-and-scale-of-1-and-position-of-TopLeft/dotnetbot.png b/...ith-text-of-Something long-and-scale-of-1-and-position-of-TopLeft/dotnetbot.png
diff --git a/...th-text-of-Something long-and-scale-of-1-and-position-of-TopRight/dotnetbot.png b/...th-text-of-Something long-and-scale-of-1-and-position-of-TopRight/dotnetbot.png
diff --git a/...anner--with-text-of-Stage-and-scale-of-0.5-and-position-of-Bottom/dotnetbot.png b/...anner--with-text-of-Stage-and-scale-of-0.5-and-position-of-Bottom/dotnetbot.png
diff --git a/...r--with-text-of-Stage-and-scale-of-0.5-and-position-of-BottomLeft/dotnetbot.png b/...r--with-text-of-Stage-and-scale-of-0.5-and-position-of-BottomLeft/dotnetbot.png
diff --git a/...-of-Stage-and-scale-of-0.5-/dotnetbot.png → ...and-position-of-BottomRight/dotnetbot.png b/...-of-Stage-and-scale-of-0.5-/dotnetbot.png → ...and-position-of-BottomRight/dotnetbot.png
diff --git a/...xtBanner--with-text-of-Stage-and-scale-of-0.5-and-position-of-Top/dotnetbot.png b/...xtBanner--with-text-of-Stage-and-scale-of-0.5-and-position-of-Top/dotnetbot.png
diff --git a/...nner--with-text-of-Stage-and-scale-of-0.5-and-position-of-TopLeft/dotnetbot.png b/...nner--with-text-of-Stage-and-scale-of-0.5-and-position-of-TopLeft/dotnetbot.png
diff --git a/...ner--with-text-of-Stage-and-scale-of-0.5-and-position-of-TopRight/dotnetbot.png b/...ner--with-text-of-Stage-and-scale-of-0.5-and-position-of-TopRight/dotnetbot.png
diff --git a/...e/AppliesTextBanner-with-text-of-Something long-and-scale-of-0.5-/dotnetbot.png b/...e/AppliesTextBanner-with-text-of-Something long-and-scale-of-0.5-/dotnetbot.png
diff --git a/...rmarkImage-of-beta-version-/dotnetbot.png → ...ermarkImage-of-beta-version/dotnetbot.png b/...rmarkImage-of-beta-version-/dotnetbot.png → ...ermarkImage-of-beta-version/dotnetbot.png
diff --git a/...-watermarkImage-of-example-/dotnetbot.png → ...d-watermarkImage-of-example/dotnetbot.png b/...-watermarkImage-of-example-/dotnetbot.png → ...d-watermarkImage-of-example/dotnetbot.png
diff --git a/...-watermarkImage-of-beta-version-/icon.png → ...d-watermarkImage-of-beta-version/icon.png b/...-watermarkImage-of-beta-version-/icon.png → ...d-watermarkImage-of-beta-version/icon.png
diff --git a/...n-and-watermarkImage-of-example-/icon.png → ...on-and-watermarkImage-of-example/icon.png b/...n-and-watermarkImage-of-example-/icon.png → ...on-and-watermarkImage-of-example/icon.png
diff --git a/...etbot.png-and-scale-of-0.5-/dotnetbot.png → ...netbot.png-and-scale-of-0.5/dotnetbot.png b/...etbot.png-and-scale-of-0.5-/dotnetbot.png → ...netbot.png-and-scale-of-0.5/dotnetbot.png
diff --git a/...tbot.png-and-scale-of-0.75-/dotnetbot.png → ...etbot.png-and-scale-of-0.75/dotnetbot.png b/...tbot.png-and-scale-of-0.75-/dotnetbot.png → ...etbot.png-and-scale-of-0.75/dotnetbot.png
diff --git a/...tnetbot.png-and-scale-of-1-/dotnetbot.png → ...otnetbot.png-and-scale-of-1/dotnetbot.png b/...tnetbot.png-and-scale-of-1-/dotnetbot.png → ...otnetbot.png-and-scale-of-1/dotnetbot.png
diff --git a/...etbot.svg-and-scale-of-0.5-/dotnetbot.png → ...netbot.svg-and-scale-of-0.5/dotnetbot.png b/...etbot.svg-and-scale-of-0.5-/dotnetbot.png → ...netbot.svg-and-scale-of-0.5/dotnetbot.png
diff --git a/...tbot.svg-and-scale-of-0.75-/dotnetbot.png → ...etbot.svg-and-scale-of-0.75/dotnetbot.png b/...tbot.svg-and-scale-of-0.75-/dotnetbot.png → ...etbot.svg-and-scale-of-0.75/dotnetbot.png
diff --git a/...tnetbot.svg-and-scale-of-1-/dotnetbot.png → ...otnetbot.svg-and-scale-of-1/dotnetbot.png b/...tnetbot.svg-and-scale-of-1-/dotnetbot.png → ...otnetbot.svg-and-scale-of-1/dotnetbot.png
diff --git a/...-and-expectedOutput-of-150-/dotnetbot.png → ...g-and-expectedOutput-of-150/dotnetbot.png b/...-and-expectedOutput-of-150-/dotnetbot.png → ...g-and-expectedOutput-of-150/dotnetbot.png
diff --git a/...-and-expectedOutput-of-225-/dotnetbot.png → ...g-and-expectedOutput-of-225/dotnetbot.png b/...-and-expectedOutput-of-225-/dotnetbot.png → ...g-and-expectedOutput-of-225/dotnetbot.png
diff --git a/...-and-expectedOutput-of-300-/dotnetbot.png → ...g-and-expectedOutput-of-300/dotnetbot.png b/...-and-expectedOutput-of-300-/dotnetbot.png → ...g-and-expectedOutput-of-300/dotnetbot.png
diff --git a/...-and-expectedOutput-of-150-/dotnetbot.png → ...g-and-expectedOutput-of-150/dotnetbot.png b/...-and-expectedOutput-of-150-/dotnetbot.png → ...g-and-expectedOutput-of-150/dotnetbot.png
diff --git a/...-and-expectedOutput-of-225-/dotnetbot.png → ...g-and-expectedOutput-of-225/dotnetbot.png b/...-and-expectedOutput-of-225-/dotnetbot.png → ...g-and-expectedOutput-of-225/dotnetbot.png
diff --git a/...-and-expectedOutput-of-300-/dotnetbot.png → ...g-and-expectedOutput-of-300/dotnetbot.png b/...-and-expectedOutput-of-300-/dotnetbot.png → ...g-and-expectedOutput-of-300/dotnetbot.png