Update README.md

Readme.md fixed

MacToggle/Extension+NSView.swift

@@ -0,0 +1,42 @@
+//
+//  Extension+NSView.swift
+//  RichAppz
+//
+//  Copyright © 2016-2017 RichAppz Limited. All rights reserved.
+//  richappz.com - (rich@richappz.com)
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+
+import Cocoa
+
+extension NSView {
+
+    var backgroundColor: NSColor? {
+        get {
+            guard let layer = layer, let backgroundColor = layer.backgroundColor else { return nil }
+            return NSColor(cgColor: backgroundColor)
+        }
+        set {
+            wantsLayer = true
+            layer?.backgroundColor = newValue?.cgColor
+        }
+    }
+
+}

MacToggle/MacToggle.swift

@@ -26,16 +26,18 @@
 
 import Cocoa
 
+@IBDesignable
 class MacToggle: NSView {
 
     //================================================================================
     // MARK: Properties
     //================================================================================
 
-    fileprivate let height: CGFloat
-    fileprivate let width: CGFloat
+    fileprivate var height: CGFloat = 44
+    fileprivate var width: CGFloat {
+        get { return height+(height*0.6) }
+    }
 
-    fileprivate var isAnimating = false
     fileprivate var leftConstraint: NSLayoutConstraint?
     fileprivate var heightConstraint: NSLayoutConstraint?
     fileprivate var widthConstraint: NSLayoutConstraint?
@@ -51,7 +53,7 @@ class MacToggle: NSView {
         let view = NSView()
 
         let shadow = NSShadow()
-        shadow.shadowColor = NSColor.agblack.withAlphaComponent(0.4)
+        shadow.shadowColor = NSColor.black.withAlphaComponent(0.4)
         shadow.shadowOffset = CGSize(width: 0, height: -2)
         shadow.shadowBlurRadius = 2
 
@@ -78,6 +80,10 @@ class MacToggle: NSView {
         }
     }
 
+    fileprivate var toggleSize: CGFloat {
+        get { return height-(outlineWidth*2) }
+    }
+
     //================================================================================
     // MARK: Callback
     //================================================================================
@@ -88,27 +94,30 @@ class MacToggle: NSView {
     // MARK: Public Parameters
     //================================================================================
 
-    public var isOn = false {
+    @IBInspectable public var isOn = false {
         didSet { animate() }
     }
 
-    public var hasToggleBorder = true {
+    /// Change the toggle border on and off
+    @IBInspectable public var hasToggleBorder = true {
         didSet { circle.layer?.borderWidth = hasToggleBorder ? toggleBorderWidth : 0 }
     }
 
-    // MARK: Size Settings
-    public var outlineWidth: CGFloat = 2 {
+    /// Change the width of the outline border
+    @IBInspectable public var outlineWidth: CGFloat = 2 {
         didSet {
             backVw.layer?.borderWidth = outlineWidth
             layoutSwitch(resetingLayout: true)
         }
     }
 
-    public var toggleBorderWidth: CGFloat = 2 {
+    /// Change the width of the border on the toggle
+    @IBInspectable public var toggleBorderWidth: CGFloat = 2 {
         didSet { circle.layer?.borderWidth = hasToggleBorder ? toggleBorderWidth : 0 }
     }
 
-    public var radius: CGFloat {
+    /// Change the radius of the complete toggle
+    @IBInspectable public var radius: CGFloat {
         get {
             if let r = _radius { return r }
             return (height-(outlineWidth*2))/2
@@ -120,20 +129,23 @@ class MacToggle: NSView {
     }
 
 
-    // MARK: Color Settings
-    public var outlineColor: NSColor = .lightGray {
+    /// Change the color of the outline border
+    @IBInspectable public var outlineColor: NSColor = .lightGray {
         didSet { backVw.layer?.borderColor = outlineColor.cgColor }
     }
 
-    public var fillColor: NSColor = .lightGray {
+    /// Change the color of the fill when the toggle is on
+    @IBInspectable public var fillColor: NSColor = .lightGray {
         didSet { if isOn { backVw.layer?.borderColor = fillColor.cgColor } }
     }
 
-    public var toggleColor: NSColor = .white {
+    /// Change the color of the toggle center
+    @IBInspectable public var toggleColor: NSColor = .white {
         didSet { circle.backgroundColor = toggleColor }
     }
 
-    public var backColor: NSColor = .white {
+    /// Change the background color of the complete toggle (visible when switch is off)
+    @IBInspectable public var backColor: NSColor = .white {
         didSet { backVw.backgroundColor = backColor }
     }
 
@@ -142,13 +154,43 @@ class MacToggle: NSView {
     //================================================================================
 
     required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
+        super.init(coder: coder)
+        drawView()
     }
 
-    init(height: CGFloat = 44) {
+    required init(height: CGFloat = 44) {
         self.height = height
-        self.width = height+(height*0.6)
         super.init(frame: .zero)
+        drawView()
+    }
+
+    override func mouseDown(with event: NSEvent) {
+        let push: Double = Double(outlineWidth + width) - Double(height)
+        NSAnimationContext.runAnimationGroup({ (context) in
+            context.duration = 0.3
+            context.allowsImplicitAnimation = true
+
+            let adjustment = (toggleSize/4)
+            widthConstraint?.isActive = false
+            widthConstraint = circle.widthAnchor.constraint(equalToConstant: toggleSize+adjustment)
+            widthConstraint?.isActive = true
+
+            if isOn {
+                leftConstraint?.constant = CGFloat(push)-adjustment
+            }
+            animator().layoutSubtreeIfNeeded()
+        })
+    }
+
+    override func mouseUp(with event: NSEvent) {
+        isOn = !isOn
+    }
+
+    //================================================================================
+    // MARK: Helpers
+    //================================================================================
+
+    fileprivate func drawView() {
         backVw.backgroundColor = backColor
 
         addSubview(backVw)
@@ -175,14 +217,6 @@ class MacToggle: NSView {
         layoutSwitch()
     }
 
-    override func mouseDown(with event: NSEvent) {
-        isOn = !isOn
-    }
-
-    //================================================================================
-    // MARK: Helpers
-    //================================================================================
-
     fileprivate func layoutSwitch(resetingLayout: Bool = false) {
         if resetingLayout {
             leftConstraint?.constant = outlineWidth
@@ -205,22 +239,26 @@ class MacToggle: NSView {
     }
 
     fileprivate func animate() {
-        if isAnimating { return }
-        isAnimating = true
+        acceptsTouchEvents = false
+        let push: Double = Double(outlineWidth + width) - Double(height)
+
         NSAnimationContext.runAnimationGroup({ (context) in
-            context.duration = Size.mediumAnimation
+            context.duration = 0.3
             context.allowsImplicitAnimation = true
 
             backVw.animator().layer?.borderWidth = isOn ? (height/2) : outlineWidth
             backVw.animator().layer?.borderColor = isOn ? fillColor.cgColor : outlineColor.cgColor
 
-            let push: Double = Double(outlineWidth + width) - Double(height)
+            widthConstraint?.isActive = false
+            widthConstraint = circle.widthAnchor.constraint(equalToConstant: toggleSize)
+            widthConstraint?.isActive = true
+            
             leftConstraint?.constant = isOn ? CGFloat(push) : outlineWidth
             animator().layoutSubtreeIfNeeded()
         }) {
-            self.isAnimating = false
+            self.acceptsTouchEvents = true
             self.callback?(self.isOn)
         }
     }
-
+    
 }

README.md

@@ -1,22 +1,19 @@
-<br>
+![Banner](Resources/logo.png)
 
-<center>![Banner](Resources/logo.png)</center>
+# MacToggle
 
-<br>
+Create Mac OS toggles with the user interaction, design and animation of the iOS UISwitch. Completely configurable through quick understandable code. With access to the source, you are able to add more custom features if you want. If their are any tweaks that you feel should be enabled then send me over a PR and I will have a look. **Swift 3 Ready**
 
-#MacToggle
+![Banner](Resources/mactoggle.gif)
 
-Create Mac OS toggles with the user interaction, desisn and animation of the iOS UISwitch. Completely configurable through quick understandable code. With access to the source, you are able to add more custom features if you want. If their are any tweaks that you feel should be enabled then send me over a PR and I will have a look. **Swift 3 Ready**
+## Setup
 
-##Setup
+Nothing complicated, copy the MacToggle folder over to your project.
 
-Nothing complicated, download the MacToggle.swift file and add it to your project.
 
-<br>
+## Sample Code
 
-##Sample Code
-
-```
+```swift
 let toggle: MacToggle = {
 	let view = MacToggle()
 	view.isOn = true
@@ -24,21 +21,16 @@ let toggle: MacToggle = {
 	return view
 }()
 ```
-There a plenty of settings you can play with, have fun and create the designs that you require for your Mac OS developments. Here are a couple of designs, for some ideas:
+There are plenty of settings you can play with, have fun and create the designs that you require for your Mac OS developments. Here are a couple of designs, for ideas:
 
-<br>
 
-<center>![Banner](Resources/switch-1.png)</center>
 
-<br>
+![Banner](Resources/switch-1.png)
 
-<center>![Banner](Resources/switch-2.png)</center>
+![Banner](Resources/switch-2.png)
 
-<br>
+![Banner](Resources/switch-3.png)
 
-<center>![Banner](Resources/switch-3.png)</center>
-
-<br>
 
 ## Support
 
@@ -46,20 +38,18 @@ If you have any issues with the MacToggle, the shoot me an email <a href="mailto
 
 ## Todo
 
-- Morphing animations to match iOS UISwitch. 
 - Dragging on the toggle.
 - Label support.
 
-<br>
 
 # License
 
 ***Available Under the MIT License***
 
->Copyright (c) 2016-2017 Rich Abery
+>Copyright (c) 2016-2019 Rich Mucha
 >                    
 >Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
                     
 >The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
                     
->THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.