development: prepare for release Material 2.3.8

Material.podspec

 Pod::Spec.new do |s|
   s.name = 'Material'
-  s.version = '2.3.7'
+  s.version = '2.3.8'
   s.license = 'BSD-3-Clause'
   s.summary = 'Material is an animation and graphics framework that is used to create beautiful applications.'
   s.homepage = 'http://materialswift.com'

Sources/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.7</string>
+	<string>2.3.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/iOS/Button.swift

@@ -37,18 +37,10 @@ open class Button: UIButton, Pulseable {
      allows the dropshadow effect on the backing layer, while clipping
      the image to a desired shape within the visualLayer.
      */
-	open internal(set) var visualLayer = CAShapeLayer()
+	open fileprivate(set) var visualLayer = CAShapeLayer()
 
     /// A Pulse reference.
-    internal var pulse = Pulse()
-    
-    /// The layer the pulse layers are added to.
-    internal var pulseLayer: CALayer {
-        return visualLayer as CALayer
-    }
-    
-    /// An Array of pulse layers.
-    internal var pulseLayers = [CAShapeLayer]()
+    open fileprivate(set) var pulse: Pulse!
     
     /// PulseAnimation value.
     open var pulseAnimation: PulseAnimation {
@@ -190,13 +182,12 @@ open class Button: UIButton, Pulseable {
     open func pulse(point: CGPoint? = nil) {
         let p = nil == point ? CGPoint(x: CGFloat(width / 2), y: CGFloat(height / 2)) : point!
         
-        var s = self
-        MotionPulse<Button>.expandAnimation(view: &s, point: p)
+        pulse.expandAnimation(point: p)
         Motion.delay(time: 0.35) { [weak self] in
-            guard var s = self else {
+            guard let s = self else {
                 return
             }
-            MotionPulse<Button>.contractAnimation(view: &s)
+            s.pulse.contractAnimation()
         }
     }
     
@@ -208,8 +199,7 @@ open class Button: UIButton, Pulseable {
      */
     open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-        var s = self
-        MotionPulse<Button>.expandAnimation(view: &s, point: layer.convert(touches.first!.location(in: self), from: layer))
+        pulse.expandAnimation(point: layer.convert(touches.first!.location(in: self), from: layer))
     }
     
     /**
@@ -220,8 +210,7 @@ open class Button: UIButton, Pulseable {
      */
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
-        var s = self
-        MotionPulse<Button>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
     
     /**
@@ -232,8 +221,7 @@ open class Button: UIButton, Pulseable {
      */
     open override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesCancelled(touches, with: event)
-        var s = self
-        MotionPulse<Button>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
     
     open func bringImageViewToFront() {
@@ -254,27 +242,29 @@ open class Button: UIButton, Pulseable {
 	open func prepare() {
         contentScaleFactor = Device.scale
         prepareVisualLayer()
+        preparePulse()
 	}
-	
-	/// Prepares the visualLayer property.
-	internal func prepareVisualLayer() {
+}
+
+extension Button {
+    /// Prepares the visualLayer property.
+    fileprivate func prepareVisualLayer() {
         visualLayer.zPosition = 0
-		visualLayer.masksToBounds = true
-		layer.addSublayer(visualLayer)
-	}
-	
-	/// Manages the layout for the visualLayer property.
-	internal func layoutVisualLayer() {
-		visualLayer.frame = bounds
-		visualLayer.cornerRadius = cornerRadius
-	}
+        visualLayer.masksToBounds = true
+        layer.addSublayer(visualLayer)
+    }
+    
+    /// Prepares the pulse motion.
+    fileprivate func preparePulse() {
+        pulse = Pulse(pulseView: self, pulseLayer: visualLayer)
+    }
     
     /**
      Prepares the Button with an image and tint
      - Parameter image: A UIImage.
      - Parameter tintColor: A UI
      */
-    private func prepare(with image: UIImage?, tintColor: UIColor) {
+    fileprivate func prepare(with image: UIImage?, tintColor: UIColor) {
         self.image = image
         self.tintColor = tintColor
     }
@@ -284,8 +274,16 @@ open class Button: UIButton, Pulseable {
      - Parameter title: A String.
      - Parameter titleColor: A UI
      */
-    private func prepare(with title: String?, titleColor: UIColor) {
+    fileprivate func prepare(with title: String?, titleColor: UIColor) {
         self.title = title
         self.titleColor = titleColor
     }
 }
+
+extension Button {
+    /// Manages the layout for the visualLayer property.
+    fileprivate func layoutVisualLayer() {
+        visualLayer.frame = bounds
+        visualLayer.cornerRadius = cornerRadius
+    }
+}

Sources/iOS/CollectionReusableView.swift

@@ -32,24 +32,16 @@ import UIKit
 
 @objc(CollectionReusableView)
 open class CollectionReusableView: UICollectionReusableView, Pulseable {
-	/**
+    /**
      A CAShapeLayer used to manage elements that would be affected by
      the clipToBounds property of the backing layer. For example, this
      allows the dropshadow effect on the backing layer, while clipping
      the image to a desired shape within the visualLayer.
      */
-	open internal(set) var visualLayer = CAShapeLayer()
-	
-    /// A Pulse reference.
-    internal var pulse = Pulse()
+    open fileprivate(set) var visualLayer = CAShapeLayer()
     
-    /// The layer the pulse layers are added to.
-    internal var pulseLayer: CALayer {
-        return visualLayer as CALayer
-    }
-
-    /// An Array of pulse layers.
-    internal var pulseLayers = [CAShapeLayer]()
+    /// A Pulse reference.
+    open fileprivate(set) var pulse: Pulse!
     
     /// PulseAnimation value.
     open var pulseAnimation: PulseAnimation {
@@ -82,7 +74,7 @@ open class CollectionReusableView: UICollectionReusableView, Pulseable {
             pulse.opacity = value
         }
     }
-	
+    
 	/**
      A property that manages an image for the visualLayer's contents
      property. Images should not be set to the backing layer's contents
@@ -244,13 +236,12 @@ open class CollectionReusableView: UICollectionReusableView, Pulseable {
     open func pulse(point: CGPoint? = nil) {
         let p = nil == point ? CGPoint(x: CGFloat(width / 2), y: CGFloat(height / 2)) : point!
         
-        var s = self
-        MotionPulse<CollectionReusableView>.expandAnimation(view: &s, point: p)
+        pulse.expandAnimation(point: p)
         Motion.delay(time: 0.35) { [weak self] in
-            guard var s = self else {
+            guard let s = self else {
                 return
             }
-            MotionPulse<CollectionReusableView>.contractAnimation(view: &s)
+            s.pulse.contractAnimation()
         }
     }
     
@@ -262,8 +253,7 @@ open class CollectionReusableView: UICollectionReusableView, Pulseable {
      */
     open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-        var s = self
-        MotionPulse<CollectionReusableView>.expandAnimation(view: &s, point: layer.convert(touches.first!.location(in: self), from: layer))
+        pulse.expandAnimation(point: layer.convert(touches.first!.location(in: self), from: layer))
     }
     
     /**
@@ -274,8 +264,7 @@ open class CollectionReusableView: UICollectionReusableView, Pulseable {
      */
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
-        var s = self
-        MotionPulse<CollectionReusableView>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
     
     /**
@@ -286,8 +275,7 @@ open class CollectionReusableView: UICollectionReusableView, Pulseable {
      */
     open override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesCancelled(touches, with: event)
-        var s = self
-        MotionPulse<CollectionReusableView>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
 	
 	/**
@@ -301,18 +289,28 @@ open class CollectionReusableView: UICollectionReusableView, Pulseable {
 		contentScaleFactor = Device.scale
 		pulseAnimation = .none
 		prepareVisualLayer()
-	}
-	
-	/// Prepares the visualLayer property.
-	internal func prepareVisualLayer() {
-		visualLayer.zPosition = 0
-		visualLayer.masksToBounds = true
-		layer.addSublayer(visualLayer)
-	}
-	
-	/// Manages the layout for the visualLayer property.
-	internal func layoutVisualLayer() {
-		visualLayer.frame = bounds
-		visualLayer.cornerRadius = cornerRadius
-	}
+        preparePulse()
+    }
+}
+
+extension CollectionReusableView {
+    /// Prepares the pulse motion.
+    fileprivate func preparePulse() {
+        pulse = Pulse(pulseView: self, pulseLayer: visualLayer)
+    }
+    
+    /// Prepares the visualLayer property.
+    fileprivate func prepareVisualLayer() {
+        visualLayer.zPosition = 0
+        visualLayer.masksToBounds = true
+        layer.addSublayer(visualLayer)
+    }
+}
+
+extension CollectionReusableView {
+    /// Manages the layout for the visualLayer property.
+    fileprivate func layoutVisualLayer() {
+        visualLayer.frame = bounds
+        visualLayer.cornerRadius = cornerRadius
+    }
 }

Sources/iOS/CollectionViewCell.swift

@@ -38,18 +38,10 @@ open class CollectionViewCell: UICollectionViewCell, Pulseable {
      allows the dropshadow effect on the backing layer, while clipping
      the image to a desired shape within the visualLayer.
      */
-    open internal(set) var visualLayer = CAShapeLayer()
-	
-    /// A Pulse reference.
-    internal var pulse = Pulse()
+    open fileprivate(set) var visualLayer = CAShapeLayer()
     
-    /// The layer the pulse layers are added to.
-    internal var pulseLayer: CALayer {
-        return visualLayer as CALayer
-    }
-
-    /// An Array of pulse layers.
-    internal var pulseLayers = [CAShapeLayer]()
+    /// A Pulse reference.
+    open fileprivate(set) var pulse: Pulse!
     
     /// PulseAnimation value.
     open var pulseAnimation: PulseAnimation {
@@ -251,13 +243,12 @@ open class CollectionViewCell: UICollectionViewCell, Pulseable {
     open func pulse(point: CGPoint? = nil) {
         let p = nil == point ? CGPoint(x: CGFloat(width / 2), y: CGFloat(height / 2)) : point!
         
-        var s = self
-        MotionPulse<CollectionViewCell>.expandAnimation(view: &s, point: p)
+        pulse.expandAnimation(point: p)
         Motion.delay(time: 0.35) { [weak self] in
-            guard var s = self else {
+            guard let s = self else {
                 return
             }
-            MotionPulse<CollectionViewCell>.contractAnimation(view: &s)
+            s.pulse.contractAnimation()
         }
     }
     
@@ -269,8 +260,7 @@ open class CollectionViewCell: UICollectionViewCell, Pulseable {
      */
     open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-        var s = self
-        MotionPulse<CollectionViewCell>.expandAnimation(view: &s, point: layer.convert(touches.first!.location(in: self), from: layer))
+        pulse.expandAnimation(point: layer.convert(touches.first!.location(in: self), from: layer))
     }
     
     /**
@@ -281,8 +271,7 @@ open class CollectionViewCell: UICollectionViewCell, Pulseable {
      */
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
-        var s = self
-        MotionPulse<CollectionViewCell>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
     
     /**
@@ -293,8 +282,7 @@ open class CollectionViewCell: UICollectionViewCell, Pulseable {
      */
     open override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesCancelled(touches, with: event)
-        var s = self
-        MotionPulse<CollectionViewCell>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
 	
 	/**
@@ -307,18 +295,28 @@ open class CollectionViewCell: UICollectionViewCell, Pulseable {
 	open func prepare() {
 		contentScaleFactor = Device.scale
 		prepareVisualLayer()
+        preparePulse()
 	}
-	
-	/// Prepares the visualLayer property.
-	internal func prepareVisualLayer() {
-		visualLayer.zPosition = 0
-		visualLayer.masksToBounds = true
-		layer.addSublayer(visualLayer)
-	}
-	
-	/// Manages the layout for the visualLayer property.
-	internal func layoutVisualLayer() {
-		visualLayer.frame = bounds
-		visualLayer.cornerRadius = cornerRadius
-	}
+}
+
+extension CollectionViewCell {
+    /// Prepares the pulse motion.
+    fileprivate func preparePulse() {
+        pulse = Pulse(pulseView: self, pulseLayer: visualLayer)
+    }
+    
+    /// Prepares the visualLayer property.
+    fileprivate func prepareVisualLayer() {
+        visualLayer.zPosition = 0
+        visualLayer.masksToBounds = true
+        layer.addSublayer(visualLayer)
+    }
+}
+
+extension CollectionViewCell {
+    /// Manages the layout for the visualLayer property.
+    fileprivate func layoutVisualLayer() {
+        visualLayer.frame = bounds
+        visualLayer.cornerRadius = cornerRadius
+    }
 }

Sources/iOS/Editor.swift

@@ -204,7 +204,7 @@ open class Editor: View {
     }
     
     /// Reference to the TextView.
-    open fileprivate(set) var textView: TextView!
+    open fileprivate(set) var textView: UITextView!
     
     /// A reference to an EditorDelegate.
     open weak var delegate: EditorDelegate?
@@ -287,7 +287,7 @@ extension Editor {
     
     /// Prepares the textView.
     fileprivate func prepareTextView() {
-        textView = TextView(textContainer: textContainer)
+        textView = UITextView(frame: .zero, textContainer: textContainer)
         textView.delegate = self
         addSubview(textView)
     }
@@ -312,7 +312,7 @@ extension Editor: TextStorageDelegate {
     }
 }
 
-extension Editor: TextViewDelegate {
+extension Editor: UITextViewDelegate {
     open func textViewShouldBeginEditing(_ textView: UITextView) -> Bool {
         return delegate?.editor?(editor: self, shouldBeginEditing: textView) ?? true
     }

Sources/iOS/Grid.swift

@@ -177,12 +177,12 @@ public struct Grid {
     }
     
     /// Begins a deferred block.
-    mutating public func begin() {
+    public mutating func begin() {
         deferred = true
     }
     
     /// Completes a deferred block.
-    mutating public func commit() {
+    public mutating func commit() {
         deferred = false
         reload()
     }

Sources/iOS/MotionPulse.swift

@@ -42,13 +42,7 @@ public enum PulseAnimation: Int {
     case pointWithBacking
 }
 
-internal protocol Pulseable {
-    /// The layer the pulse layers are added to.
-    var pulseLayer: CALayer { get }
-    
-    /// Pulse layers.
-    var pulseLayers: [CAShapeLayer] { get set }
-    
+public protocol Pulseable {
     /// A reference to the PulseAnimation.
     var pulseAnimation: PulseAnimation { get set }
     
@@ -59,26 +53,49 @@ internal protocol Pulseable {
     var pulseOpacity: CGFloat { get set }
 }
 
-internal struct Pulse {
+public struct Pulse {
+    /// A UIView that is Pulseable.
+    fileprivate weak var pulseView: UIView?
+    
+    /// The layer the pulse layers are added to.
+    fileprivate weak var pulseLayer: CALayer?
+    
+    /// Pulse layers.
+    fileprivate var layers = [CAShapeLayer]()
+    
     /// A reference to the PulseAnimation.
-    internal var animation = PulseAnimation.pointWithBacking
+    public var animation = PulseAnimation.pointWithBacking
     
     /// A UIColor.
-    internal var color = Color.grey.base
+    public var color = Color.grey.base
     
     /// The opcaity value for the pulse animation.
-    internal var opacity: CGFloat = 0.18
-}
+    public var opacity: CGFloat = 0.18
 
-internal struct MotionPulse<T: UIView> where T: Pulseable {
-	/**
+    /**
+     An initializer that takes a given view and pulse layer.
+     - Parameter pulseView: An optional UIView.
+     - Parameter pulseLayer: An optional CALayer.
+     */
+    internal init(pulseView: UIView?, pulseLayer: CALayer?) {
+        self.pulseView = pulseView
+        self.pulseLayer = pulseLayer
+    }
+    
+    /**
      Triggers the expanding animation.
-     - Parameter _ view: A Reference to the view to add the 
-     animations too.
      - Parameter point: A point to pulse from.
      */
-    internal static func expandAnimation(view: inout T, point: CGPoint) {
-        guard .none != view.pulseAnimation else {
+    public mutating func expandAnimation(point: CGPoint) {
+        guard let view = pulseView else {
+            return
+        }
+        
+        guard let layer = pulseLayer else {
+            return
+        }
+        
+        guard .none != animation else {
             return
         }
         
@@ -86,29 +103,29 @@ internal struct MotionPulse<T: UIView> where T: Pulseable {
         let pLayer = CAShapeLayer()
         
         bLayer.addSublayer(pLayer)
-        view.pulseLayer.addSublayer(bLayer)
+        layer.addSublayer(bLayer)
         bLayer.zPosition = 0
         pLayer.zPosition = 0
         
-        view.pulseLayers.insert(bLayer, at: 0)
+        layers.insert(bLayer, at: 0)
         
-        view.pulseLayer.masksToBounds = !(.centerRadialBeyondBounds == view.pulseAnimation || .radialBeyondBounds == view.pulseAnimation)
+        layer.masksToBounds = !(.centerRadialBeyondBounds == animation || .radialBeyondBounds == animation)
  
         let w = view.width
         let h = view.height
         
         Motion.disable(animations: { [
-            n = .center == view.pulseAnimation ? w < h ? w : h : w < h ? h : w,
-            frame = view.pulseLayer.bounds,
-            pulseAnimation = view.pulseAnimation,
-            pulseColor = view.pulseColor,
-            pulseOpacity = view.pulseOpacity
+            n = .center == animation ? w < h ? w : h : w < h ? h : w,
+            frame = layer.bounds,
+            animation = animation,
+            color = color,
+            opacity = opacity
             ] in
             
             bLayer.frame = frame
             pLayer.bounds = CGRect(x: 0, y: 0, width: n, height: n)
             
-            switch pulseAnimation {
+            switch animation {
             case .center, .centerWithBacking, .centerRadialBeyondBounds:
                 pLayer.position = CGPoint(x: w / 2, y: h / 2)
             default:
@@ -116,21 +133,21 @@ internal struct MotionPulse<T: UIView> where T: Pulseable {
             }
             
             pLayer.cornerRadius = n / 2
-            pLayer.backgroundColor = pulseColor.withAlphaComponent(pulseOpacity).cgColor
+            pLayer.backgroundColor = color.withAlphaComponent(opacity).cgColor
             pLayer.transform = CATransform3DMakeAffineTransform(CGAffineTransform(scaleX: 0, y: 0))
         })
         
         bLayer.setValue(false, forKey: "animated")
         
-        let duration: CFTimeInterval = .center == view.pulseAnimation ? 0.16125 : 0.325
+        let duration: CFTimeInterval = .center == animation ? 0.16125 : 0.325
         
-        switch view.pulseAnimation {
+        switch animation {
         case .centerWithBacking, .backing, .pointWithBacking:
-            bLayer.add(Motion.backgroundColor(color: view.pulseColor.withAlphaComponent(view.pulseOpacity / 2), duration: duration), forKey: nil)
+            bLayer.add(Motion.backgroundColor(color: color.withAlphaComponent(opacity / 2), duration: duration), forKey: nil)
         default:break
         }
         
-        switch view.pulseAnimation {
+        switch animation {
         case .center, .centerWithBacking, .centerRadialBeyondBounds, .radialBeyondBounds, .point, .pointWithBacking:
             pLayer.add(Motion.scale(by: 1, duration: duration), forKey: nil)
         default:break
@@ -141,14 +158,9 @@ internal struct MotionPulse<T: UIView> where T: Pulseable {
         }
 	}
 	
-	/**
-     Triggers the contracting animation.
-     - Parameter _ view: A Reference to the view to add the
-     animations too.
-     - Parameter pulse: A Pulse instance.
-     */
-    internal static func contractAnimation(view: inout T) {
-        guard let bLayer = view.pulseLayers.popLast() else {
+	/// Triggers the contracting animation.
+    public mutating func contractAnimation() {
+        guard let bLayer = layers.popLast() else {
             return
         }
         
@@ -156,24 +168,24 @@ internal struct MotionPulse<T: UIView> where T: Pulseable {
             return
         }
         
-        Motion.delay(time: animated ? 0 : 0.15) { [pulseAnimation = view.pulseAnimation, pulseColor = view.pulseColor] in
+        Motion.delay(time: animated ? 0 : 0.15) { [animation = animation, color = color] in
             guard let pLayer = bLayer.sublayers?.first as? CAShapeLayer else {
                 return
             }
             
             let duration = 0.325
             
-            switch pulseAnimation {
+            switch animation {
             case .centerWithBacking, .backing, .pointWithBacking:
-                bLayer.add(Motion.backgroundColor(color: pulseColor.withAlphaComponent(0), duration: duration), forKey: nil)
+                bLayer.add(Motion.backgroundColor(color: color.withAlphaComponent(0), duration: duration), forKey: nil)
             default:break
             }
             
-            switch pulseAnimation {
+            switch animation {
             case .center, .centerWithBacking, .centerRadialBeyondBounds, .radialBeyondBounds, .point, .pointWithBacking:
                 pLayer.add(Motion.animate(group: [
-                    Motion.scale(by: .center == pulseAnimation ? 1 : 1.325),
-                    Motion.backgroundColor(color: pulseColor.withAlphaComponent(0))
+                    Motion.scale(by: .center == animation ? 1 : 1.325),
+                    Motion.backgroundColor(color: color.withAlphaComponent(0))
                 ], duration: duration), forKey: nil)
             default:break
             }

Sources/iOS/PulseView.swift

@@ -32,15 +32,7 @@ import UIKit
 
 open class PulseView: View, Pulseable {
     /// A Pulse reference.
-    internal var pulse = Pulse()
-    
-    /// The layer the pulse layers are added to.
-    internal var pulseLayer: CALayer {
-        return visualLayer as CALayer
-    }
-    
-    /// An Array of pulse layers.
-    internal var pulseLayers = [CAShapeLayer]()
+    open fileprivate(set) var pulse: Pulse!
     
     /// PulseAnimation value.
     open var pulseAnimation: PulseAnimation {
@@ -82,13 +74,12 @@ open class PulseView: View, Pulseable {
     open func pulse(point: CGPoint? = nil) {
         let p = nil == point ? CGPoint(x: CGFloat(width / 2), y: CGFloat(height / 2)) : point!
         
-        var s = self
-        MotionPulse<PulseView>.expandAnimation(view: &s, point: p)
+        pulse.expandAnimation(point: p)
         Motion.delay(time: 0.35) { [weak self] in
-            guard var s = self else {
+            guard let s = self else {
                 return
             }
-            MotionPulse<PulseView>.contractAnimation(view: &s)
+            s.pulse.contractAnimation()
         }
     }
     
@@ -100,8 +91,7 @@ open class PulseView: View, Pulseable {
      */
     open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-        var s = self
-        MotionPulse<PulseView>.expandAnimation(view: &s, point: layer.convert(touches.first!.location(in: self), from: layer))
+        pulse.expandAnimation(point: layer.convert(touches.first!.location(in: self), from: layer))
     }
     
     /**
@@ -112,8 +102,7 @@ open class PulseView: View, Pulseable {
      */
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
-        var s = self
-        MotionPulse<PulseView>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
     
     /**
@@ -124,7 +113,25 @@ open class PulseView: View, Pulseable {
      */
     open override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesCancelled(touches, with: event)
-        var s = self
-        MotionPulse<PulseView>.contractAnimation(view: &s)
+        pulse.contractAnimation()
+    }
+    
+    /**
+     Prepares the view instance when intialized. When subclassing,
+     it is recommended to override the prepare method
+     to initialize property values and other setup operations.
+     The super.prepare method should always be called immediately
+     when subclassing.
+     */
+    open override func prepare() {
+        super.prepare()
+        preparePulse()
+    }
+}
+
+extension PulseView {
+    /// Prepares the pulse motion.
+    fileprivate func preparePulse() {
+        pulse = Pulse(pulseView: self, pulseLayer: visualLayer)
     }
 }

Sources/iOS/TableViewCell.swift

@@ -31,24 +31,16 @@
 import UIKit
 
 open class TableViewCell: UITableViewCell, Pulseable {
-	/**
+    /**
      A CAShapeLayer used to manage elements that would be affected by
      the clipToBounds property of the backing layer. For example, this
      allows the dropshadow effect on the backing layer, while clipping
      the image to a desired shape within the visualLayer.
      */
-	open internal(set) var visualLayer = CAShapeLayer()
-	
-    /// A Pulse reference.
-    internal var pulse = Pulse()
-    
-    /// The layer the pulse layers are added to.
-    internal var pulseLayer: CALayer {
-        return visualLayer as CALayer
-    }
+    open fileprivate(set) var visualLayer = CAShapeLayer()
     
-    /// An Array of pulse layers.
-    internal var pulseLayers = [CAShapeLayer]()
+    /// A Pulse reference.
+    open fileprivate(set) var pulse: Pulse!
     
     /// PulseAnimation value.
     open var pulseAnimation: PulseAnimation {
@@ -128,13 +120,12 @@ open class TableViewCell: UITableViewCell, Pulseable {
     open func pulse(point: CGPoint? = nil) {
         let p = nil == point ? CGPoint(x: CGFloat(width / 2), y: CGFloat(height / 2)) : point!
         
-        var s = self
-        MotionPulse<TableViewCell>.expandAnimation(view: &s, point: p)
+        pulse.expandAnimation(point: p)
         Motion.delay(time: 0.35) { [weak self] in
-            guard var s = self else {
+            guard let s = self else {
                 return
             }
-            MotionPulse<TableViewCell>.contractAnimation(view: &s)
+            s.pulse.contractAnimation()
         }
     }
     
@@ -146,8 +137,7 @@ open class TableViewCell: UITableViewCell, Pulseable {
      */
     open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesBegan(touches, with: event)
-        var s = self
-        MotionPulse<TableViewCell>.expandAnimation(view: &s, point: layer.convert(touches.first!.location(in: self), from: layer))
+        pulse.expandAnimation(point: layer.convert(touches.first!.location(in: self), from: layer))
     }
     
     /**
@@ -158,8 +148,7 @@ open class TableViewCell: UITableViewCell, Pulseable {
      */
     open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesEnded(touches, with: event)
-        var s = self
-        MotionPulse<TableViewCell>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
     
     /**
@@ -170,8 +159,7 @@ open class TableViewCell: UITableViewCell, Pulseable {
      */
     open override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent?) {
         super.touchesCancelled(touches, with: event)
-        var s = self
-        MotionPulse<TableViewCell>.contractAnimation(view: &s)
+        pulse.contractAnimation()
     }
 	
 	/**
@@ -189,18 +177,28 @@ open class TableViewCell: UITableViewCell, Pulseable {
 		textLabel?.isUserInteractionEnabled = false
 		detailTextLabel?.isUserInteractionEnabled = false
 		prepareVisualLayer()
+        preparePulse()
 	}
-	
-	/// Prepares the visualLayer property.
-	internal func prepareVisualLayer() {
-		visualLayer.zPosition = 0
-		visualLayer.masksToBounds = true
-		contentView.layer.addSublayer(visualLayer)
-	}
-	
-	/// Manages the layout for the visualLayer property.
-	internal func layoutVisualLayer() {
-		visualLayer.frame = bounds
-		visualLayer.cornerRadius = cornerRadius
-	}
+}
+
+extension TableViewCell {
+    /// Prepares the pulse motion.
+    fileprivate func preparePulse() {
+        pulse = Pulse(pulseView: self, pulseLayer: visualLayer)
+    }
+    
+    /// Prepares the visualLayer property.
+    fileprivate func prepareVisualLayer() {
+        visualLayer.zPosition = 0
+        visualLayer.masksToBounds = true
+        contentView.layer.addSublayer(visualLayer)
+    }
+}
+
+extension TableViewCell {
+    /// Manages the layout for the visualLayer property.
+    fileprivate func layoutVisualLayer() {
+        visualLayer.frame = bounds
+        visualLayer.cornerRadius = cornerRadius
+    }
 }