scale SVG

Author: swhitty

Examples/Sources/GalleryView.swift

@@ -58,7 +58,7 @@ struct GalleryView: View {
         ScrollView {
             LazyVStack(spacing: 20) {
                 ForEach(images, id: \.self) { image in
-                    SVGView(svg: image)
+                    SVGView(svg: image.scale(x: 3, y: 1))
                         .aspectRatio(contentMode: .fit)
                         .padding([.leading, .trailing], 10)
                 }

SwiftDraw/SVG.swift

@@ -35,11 +35,11 @@ import Foundation
 import CoreGraphics
 
 public struct SVG: Hashable {
-    public let size: CGSize
+    public private(set) var size: CGSize
 
     // Array of commands that render the image
     // see: Renderer.swift
-    let commands: [RendererCommand<CGTypes>]
+    var commands: [RendererCommand<CGTypes>]
 
     public init?(fileURL url: URL, options: SVG.Options = .default) {
         do {
@@ -78,8 +78,34 @@ public struct SVG: Hashable {
     }
 }
 
-@available(*, unavailable, renamed: "SVG")
-public enum Image { }
+extension SVG {
+
+    public func scale(_ factor: CGFloat) -> SVG {
+        scale(x: factor, y: factor)
+    }
+
+    public func scale(x: CGFloat, y: CGFloat) -> SVG {
+        var copy = self
+
+        copy.commands.insert(.scale(sx: x, sy: y), at: 0)
+        copy.size = CGSize(
+            width: size.width * x,
+            height: size.height * y
+        )
+        return copy
+    }
+}
+
+extension SVG {
+
+    public mutating func scaled(_ factor: CGFloat) {
+        self = scale(factor)
+    }
+
+    public mutating func scaled(x: CGFloat, y: CGFloat) {
+        self = scale(x: x, y: y)
+    }
+}
 
 extension SVG {
 
@@ -103,6 +129,9 @@ extension SVG {
     }
 }
 
+@available(*, unavailable, renamed: "SVG")
+public enum Image { }
+
 #else
 
 public struct SVG {

SwiftDrawTests/SVGTests.swift

@@ -85,6 +85,19 @@ final class SVGTests: XCTestCase {
         XCTAssertEqual(reloaded.scale, 1)
     }
 #endif
+
+    func testScale() {
+        let image = SVG.makeLines()
+
+        XCTAssertEqual(image.size, CGSize(width: 100, height: 100))
+        XCTAssertEqual(image.scale(2).size, CGSize(width: 200, height: 200))
+        XCTAssertEqual(image.scale(0.5).size, CGSize(width: 50, height: 50))
+        XCTAssertEqual(image.scale(x: 2, y: 3).size, CGSize(width: 200, height: 300))
+
+        var copy = image
+        copy.scaled(5)
+        XCTAssertEqual(copy.size, CGSize(width: 500, height: 500))
+    }
 }
 
 private extension SVG {