Reuse existing contract/expand extensions

Author: ff-gerard

src/Synercoding.Primitives/Extensions/RectangleExtensions.cs

@@ -5,32 +5,37 @@ namespace Synercoding.Primitives.Extensions;
 /// </summary>
 public static class RectangleExtensions
 {
+    /// <summary>
+    /// Contract a given <see cref="Rectangle"/> (make smaller).
+    /// </summary>
+    /// <param name="rectangle">The <see cref="Rectangle"/> to contract.</param>
+    /// <param name="value">The amount to contract of each side of the <see cref="Size"/></param>
+    /// <returns>A new contracted <see cref="Rectangle"/>.</returns>
+    public static Rectangle Contract(this Rectangle rectangle, Value value)
+        => rectangle.Contract(new Spacing(value));
+
+    /// <summary>
+    /// Expand a given <see cref="Rectangle"/> (make bigger).
+    /// </summary>
+    /// <param name="rectangle">The <see cref="Rectangle"/> to expand.</param>
+    /// <param name="value">The amount to expand to each side of the <see cref="Size"/></param>
+    /// <returns>A new expanded <see cref="Rectangle"/>.</returns>
+    public static Rectangle Expand(this Rectangle rectangle, Value value)
+        => rectangle.Expand(new Spacing(value));
+
     /// <summary>
     /// Contract a given <see cref="Rectangle"/> (make smaller).
     /// </summary>
     /// <param name="rectangle">The <see cref="Rectangle"/> to contract.</param>
     /// <param name="spacing">The amount of <see cref="Spacing"/> to contract on the sides.</param>
-    /// <returns>A new contacted <see cref="Rectangle"/>.</returns>
+    /// <returns>A new contracted <see cref="Rectangle"/>.</returns>
     public static Rectangle Contract(this Rectangle rectangle, Spacing spacing)
         => new Rectangle(
             llx: rectangle.LLX + spacing.Left,
             lly: rectangle.LLY + spacing.Bottom,
             urx: rectangle.URX - spacing.Right,
             ury: rectangle.URY - spacing.Top);
 
-    /// <summary>
-    /// Contract a given <see cref="Rectangle"/> (make smaller).
-    /// </summary>
-    /// <param name="rectangle">The <see cref="Rectangle"/> to contract.</param>
-    /// <param name="value">The amount of <see cref="Value"/> to contract on all sides.</param>
-    /// <returns>A new contacted <see cref="Rectangle"/>.</returns>
-    public static Rectangle Contract(this Rectangle rectangle, Value value)
-        => new Rectangle(
-            llx: rectangle.LLX + value,
-            lly: rectangle.LLY + value,
-            urx: rectangle.URX - value,
-            ury: rectangle.URY - value);
-
     /// <summary>
     /// Expand a given <see cref="Rectangle"/> (make bigger).
     /// </summary>
@@ -44,19 +49,6 @@ public static Rectangle Expand(this Rectangle rectangle, Spacing spacing)
             urx: rectangle.URX + spacing.Right,
             ury: rectangle.URY + spacing.Top);
 
-    /// <summary>
-    /// Expand a given <see cref="Rectangle"/> (make bigger).
-    /// </summary>
-    /// <param name="rectangle">The rectangle to expand</param>
-    /// <param name="value">The amount of <see cref="Value"/> to expand on all sides.</param>
-    /// <returns>A new expanded <see cref="Rectangle"/>.</returns>
-    public static Rectangle Expand(this Rectangle rectangle, Value value)
-        => new Rectangle(
-            llx: rectangle.LLX - value,
-            lly: rectangle.LLY - value,
-            urx: rectangle.URX + value,
-            ury: rectangle.URY + value);
-
     /// <summary>
     /// Get the raw values representing this <see cref="Rectangle"/> in a provided unit.
     /// </summary>

src/Synercoding.Primitives/Extensions/SizeExtensions.cs

@@ -5,12 +5,30 @@ namespace Synercoding.Primitives.Extensions;
 /// </summary>
 public static class SizeExtensions
 {
+    /// <summary>
+    /// Contract a given <see cref="Size"/> (make smaller).
+    /// </summary>
+    /// <param name="size">The <see cref="Size"/> to contract.</param>
+    /// <param name="value">The amount to contract of each side of the <see cref="Size"/></param>
+    /// <returns>A new contracted <see cref="Size"/>.</returns>
+    public static Size Contract(this Size size, Value value)
+        => size.Contract(new Spacing(value));
+
+    /// <summary>
+    /// Expand a given <see cref="Size"/> (make bigger).
+    /// </summary>
+    /// <param name="size">The <see cref="Size"/> to expand.</param>
+    /// <param name="value">The amount to expand to each side of the <see cref="Size"/></param>
+    /// <returns>A new expanded <see cref="Size"/>.</returns>
+    public static Size Expand(this Size size, Value value)
+        => size.Expand(new Spacing(value));
+
     /// <summary>
     /// Contract a given <see cref="Size"/> (make smaller).
     /// </summary>
     /// <param name="size">The <see cref="Size"/> to contract.</param>
     /// <param name="spacing">The amount of <see cref="Spacing"/> to contract on the sides.</param>
-    /// <returns>A new contacted <see cref="Size"/>.</returns>
+    /// <returns>A new contracted <see cref="Size"/>.</returns>
     public static Size Contract(this Size size, Spacing spacing)
         => new Size(
             width: size.Width - spacing.Left - spacing.Right,