Merge pull request #4 from Awalz/master

Pull latest changes
Finger-Ink · Oct 28, 2020 · f9cb6cc · f9cb6cc
2 parents f56862d + 11fae52
commit f9cb6cc
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 10 deletions.
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,16 @@
+// swift-tools-version:5.3
+
+import PackageDescription
+
+let package = Package(
+    name: "SwiftyDraw",
+    platforms: [
+        .iOS(.v9)
+    ],
+    products: [
+        .library(name: "SwiftyDraw", targets: ["SwiftyDraw"])
+    ],
+    targets: [
+        .target(name: "SwiftyDraw", path: "Source")
+    ]
+)
diff --git a/Source/SwiftyDraw.swift b/Source/SwiftyDraw.swift
@@ -524,3 +524,38 @@ extension SwiftyDrawView : UIPencilInteractionDelegate{
         }
     }
 }
+
+extension SwiftyDrawView.DrawItem: Codable {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        let pathData = try container.decode(Data.self, forKey: .path)
+        let uiBezierPath = try NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(pathData) as! UIBezierPath
+        path = uiBezierPath.cgPath as! CGMutablePath
+
+        brush = try container.decode(Brush.self, forKey: .brush)
+        isFillPath = try container.decode(Bool.self, forKey: .isFillPath)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+
+        let uiBezierPath = UIBezierPath(cgPath: path)
+        var pathData: Data?
+        if #available(iOS 11.0, *) {
+            pathData = try NSKeyedArchiver.archivedData(withRootObject: uiBezierPath, requiringSecureCoding: false)
+        } else {
+            pathData = NSKeyedArchiver.archivedData(withRootObject: uiBezierPath)
+        }
+        try container.encode(pathData!, forKey: .path)
+
+        try container.encode(brush, forKey: .brush)
+        try container.encode(isFillPath, forKey: .isFillPath)
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case brush
+        case path
+        case isFillPath
+    }
+}
diff --git a/SwiftyDraw.podspec b/SwiftyDraw.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftyDraw'
-  s.version          = '2.3'
+  s.version          = '2.4.1'
   s.summary          = 'A simple, core graphics drawing framework written in Swift'
 
   s.description      = <<-DESC
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.source           = { :git => 'https://github.com/Awalz/SwiftyDraw.git', :tag => s.version }
   s.social_media_url = 'https://twitter.com/linusgeffarth'
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '9.0'
   s.swift_version = '5.0'
 
   s.source_files = 'Source/**/*'

diff --git a/SwiftyDrawExample/SwiftyDrawExample/ViewController.swift b/SwiftyDrawExample/SwiftyDrawExample/ViewController.swift
@@ -34,7 +34,7 @@ class ViewController: UIViewController {
     @IBAction func selectedColor(_ button: UIButton) {
         guard let color = button.backgroundColor else { return }
         drawView.brush.color = Color(color)
-        drawView.brush.blendMode = .normal
+        deactivateEraser()
     }
 
     @IBAction func undo() {
@@ -55,20 +55,16 @@ class ViewController: UIViewController {
     @IBAction func toggleEraser() {
         if drawView.brush.blendMode == .normal {
             //Switch to clear
-            drawView.brush.blendMode = .clear
-            eraserButton.tintColor = .red
-            eraserButton.setTitle("deactivate eraser", for: .normal)
+            activateEraser()
         } else {
             //Switch to normal
-            drawView.brush.blendMode = .normal
-            eraserButton.tintColor = self.view.tintColor
-            eraserButton.setTitle("activate eraser", for: .normal)
+            deactivateEraser()
         }
     }
 
     @IBAction func clearCanvas() {
         drawView.clear()
-        drawView.brush.blendMode = .normal
+        deactivateEraser()
     }
 
     @IBAction func setDrawMode() {
@@ -109,7 +105,19 @@ class ViewController: UIViewController {
 
     @IBAction func changedOpacity(_ slider: UISlider) {
         drawView.brush.opacity = CGFloat(slider.value)
+        deactivateEraser()
+    }
+
+    func activateEraser() {
+        drawView.brush.blendMode = .clear
+        eraserButton.tintColor = .red
+        eraserButton.setTitle("deactivate eraser", for: .normal)
+    }
+
+    func deactivateEraser() {
         drawView.brush.blendMode = .normal
+        eraserButton.tintColor = self.view.tintColor
+        eraserButton.setTitle("activate eraser", for: .normal)
     }
 }