Merge pull request #62 from rob-nash/master

Added demo playground
Fixed rendering bug.

.gitignore

@@ -6,3 +6,4 @@ M13Checkbox.xcodeproj/xcuserdata/
 M13Checkbox.xcworkspace/
 Pods/
 Podfile.lock
+Playground/LaunchMe.xcworkspace/xcuserdata/*

Playground/Playground.playground/Contents.swift

@@ -0,0 +1,14 @@
+//: Playground - noun: a place where people can play
+
+import M13Checkbox
+import PlaygroundSupport
+
+let checkbox = M13Checkbox(frame: CGRect(x: 0.0, y: 0.0, width: 250.0, height: 250.0))
+checkbox.backgroundColor = .white
+checkbox.tintColor = .yellow
+checkbox.secondaryTintColor = .green
+checkbox.secondaryCheckmarkTintColor = .red
+checkbox.checkmarkLineWidth = 2.0
+checkbox.stateChangeAnimation = .bounce(.fill)
+
+PlaygroundPage.current.liveView = checkbox

Playground/Playground.playground/contents.xcplayground

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<playground version='5.0' target-platform='ios'>
+    <timeline fileName='timeline.xctimeline'/>
+</playground>

Readme.md

@@ -118,6 +118,10 @@ Check out the demo app to change the properties of the checkbox and see the chan
 
 ##Getting Started
 
+###Demo
+
+To see a working playground in action, run the workspace located at path Playground/LaunchMe.xcworkspace. You may need to run the framework scheme and wait for Xcode to process the files, before the playground begins. Open the assistant editor for a live preview of the UI.
+
 ### Installation
 
 #### Cocoapods

Sources/M13CheckboxPathPresets.swift

@@ -102,8 +102,8 @@ internal class M13CheckboxPathPresets {
                 let d = size * cos(theta) * (cos(theta) - sin(theta))
                 let e = 2.0 * cornerRadius * sin(theta) * (cos(theta) + sin(theta))
 
-                let x = 0.25 * (a + (2.0 * (b + sqrt(c)) * cos(theta)))
-                let y = 0.50 * (d + e - (sqrt(c) * sin(theta)))
+                let x = 0.25 * (a + (2.0 * (b + sqrt(c)) * cos(theta))) + (boxLineWidth / 2.0)
+                let y = 0.50 * (d + e - (sqrt(c) * sin(theta))) + (boxLineWidth / 2.0)
 
                 return CGPoint(x: x, y: y)
             }
@@ -141,22 +141,22 @@ internal class M13CheckboxPathPresets {
         let subX1 = (b * cd) + pow(e1 + e2, 2.0)
         let subY1 = pow(h1 + h2, 2.0) + (b * (d1 + i + j))
 
-        let x = (0.5 * (a1 + a2 + (0.5 * sqrt(subX1)))) / f
-        let y = (g1 + g2 - (0.25 * sqrt(subY1))) / f
+        let x = (0.5 * (a1 + a2 + (0.5 * sqrt(subX1))) + (boxLineWidth / 2.0)) / f
+        let y = (g1 + g2 - (0.25 * sqrt(subY1)) + (boxLineWidth / 2.0)) / f
 
         return CGPoint(x: x, y: y)
     }
 
     var checkmarkMiddlePoint: CGPoint {
         let r = boxType == .circle ? checkmarkProperties.middlePointRadius.circle : checkmarkProperties.middlePointRadius.box
         let o = boxType == .circle ? checkmarkProperties.middlePointOffset.circle : checkmarkProperties.middlePointOffset.box
-        return CGPoint(x: (size / 2.0) + (size * o), y: (size / 2.0 ) + (size * r))
+        return CGPoint(x: (size / 2.0) + (size * o) + (boxLineWidth / 2.0), y: (size / 2.0 ) + (size * r) + (boxLineWidth / 2.0))
     }
 
     var checkmarkShortArmEndPoint: CGPoint {
         let r = boxType == .circle ? checkmarkProperties.shortArmRadius.circle : checkmarkProperties.shortArmRadius.box
         let o = boxType == .circle ? checkmarkProperties.shortArmOffset.circle : checkmarkProperties.shortArmOffset.box
-        return CGPoint(x: (size / 2.0) - (size * r), y: (size / 2.0) + (size * o))
+        return CGPoint(x: (size / 2.0) - (size * r) + (boxLineWidth / 2.0), y: (size / 2.0) + (size * o) + (boxLineWidth / 2.0))
     }
 
     //----------------------------

Sources/Managers/M13CheckboxBounceManager.swift

@@ -214,9 +214,11 @@ internal class M13CheckboxBounceManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = paths.pathForBox().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath

Sources/Managers/M13CheckboxDotManager.swift

@@ -218,9 +218,11 @@ internal class M13CheckboxDotManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = (paths as! M13CheckboxDotPathPresets).pathForDot().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath

Sources/Managers/M13CheckboxExpandManager.swift

@@ -206,9 +206,11 @@ internal class M13CheckboxExpandManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = paths.pathForBox().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath

Sources/Managers/M13CheckboxFadeManager.swift

@@ -206,9 +206,11 @@ internal class M13CheckboxFadeManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = paths.pathForBox().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath

Sources/Managers/M13CheckboxFillManager.swift

@@ -188,9 +188,11 @@ internal class M13CheckboxFillManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = paths.pathForBox().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath

Sources/Managers/M13CheckboxFlatManager.swift

@@ -223,9 +223,11 @@ internal class M13CheckboxFlatManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = paths.pathForBox().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath

Sources/Managers/M13CheckboxSpiralManager.swift

@@ -232,9 +232,11 @@ internal class M13CheckboxSpiralManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = paths.pathForBox().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath

Sources/Managers/M13CheckboxStrokeManager.swift

@@ -185,9 +185,11 @@ internal class M13CheckboxStrokeManager: M13CheckboxManager {
 
     override func layoutLayers() {
         // Frames
-        unselectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        selectedBoxLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
-        markLayer.frame = CGRect(x: 0.0, y: 0.0, width: paths.size, height: paths.size)
+        let x: CGFloat = paths.boxLineWidth / 2.0
+        let y: CGFloat = paths.boxLineWidth / 2.0
+        unselectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        selectedBoxLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
+        markLayer.frame = CGRect(x: x, y: y, width: paths.size, height: paths.size)
         // Paths
         unselectedBoxLayer.path = paths.pathForBox().cgPath
         selectedBoxLayer.path = paths.pathForBox().cgPath