From 75b83f2ba48fe19ae391dff119930ae497c07b58 Mon Sep 17 00:00:00 2001 From: Harold Martin Date: Fri, 24 Jun 2016 13:56:32 -0700 Subject: [PATCH] Began Swift 3 conversion, outstanding issues with isSelected --- DOFavoriteButton/DOFavoriteButton.swift | 161 ++++++++++++------------ 1 file changed, 81 insertions(+), 80 deletions(-) diff --git a/DOFavoriteButton/DOFavoriteButton.swift b/DOFavoriteButton/DOFavoriteButton.swift index 4b7e9b8..bbc178d 100644 --- a/DOFavoriteButton/DOFavoriteButton.swift +++ b/DOFavoriteButton/DOFavoriteButton.swift @@ -3,6 +3,7 @@ // DOFavoriteButton // // Created by Daiki Okumura on 2015/07/09. +// Swift 3 conversion by Harold Martin on 2016/06/24 // Copyright (c) 2015 Daiki Okumura. All rights reserved. // // This software is released under the MIT License. @@ -22,15 +23,15 @@ public class DOFavoriteButton: UIButton { } @IBInspectable public var imageColorOn: UIColor! = UIColor(red: 255/255, green: 172/255, blue: 51/255, alpha: 1.0) { didSet { - if (selected) { - imageShape.fillColor = imageColorOn.CGColor + if (isSelected) { + imageShape.fillColor = imageColorOn.cgColor } } } @IBInspectable public var imageColorOff: UIColor! = UIColor(red: 136/255, green: 153/255, blue: 166/255, alpha: 1.0) { didSet { - if (!selected) { - imageShape.fillColor = imageColorOff.CGColor + if (!isSelected) { + imageShape.fillColor = imageColorOff.cgColor } } } @@ -39,7 +40,7 @@ public class DOFavoriteButton: UIButton { private var circleMask: CAShapeLayer! @IBInspectable public var circleColor: UIColor! = UIColor(red: 255/255, green: 172/255, blue: 51/255, alpha: 1.0) { didSet { - circleShape.fillColor = circleColor.CGColor + circleShape.fillColor = circleColor.cgColor } } @@ -47,7 +48,7 @@ public class DOFavoriteButton: UIButton { @IBInspectable public var lineColor: UIColor! = UIColor(red: 250/255, green: 120/255, blue: 68/255, alpha: 1.0) { didSet { for line in lines { - line.strokeColor = lineColor.CGColor + line.strokeColor = lineColor.cgColor } } } @@ -70,11 +71,11 @@ public class DOFavoriteButton: UIButton { } } - override public var selected : Bool { + override public var isSelected: Bool { didSet { - if (selected != oldValue) { - if selected { - imageShape.fillColor = imageColorOn.CGColor + if (isSelected != oldValue) { + if isSelected { + imageShape.fillColor = imageColorOn.cgColor } else { deselect() } @@ -83,7 +84,7 @@ public class DOFavoriteButton: UIButton { } public convenience init() { - self.init(frame: CGRectZero) + self.init(frame: CGRect.zero) } public override convenience init(frame: CGRect) { @@ -103,12 +104,12 @@ public class DOFavoriteButton: UIButton { addTargets() } - private func createLayers(image image: UIImage!) { + private func createLayers(image: UIImage!) { self.layer.sublayers = nil - let imageFrame = CGRectMake(frame.size.width / 2 - frame.size.width / 4, frame.size.height / 2 - frame.size.height / 4, frame.size.width / 2, frame.size.height / 2) - let imgCenterPoint = CGPointMake(CGRectGetMidX(imageFrame), CGRectGetMidY(imageFrame)) - let lineFrame = CGRectMake(imageFrame.origin.x - imageFrame.width / 4, imageFrame.origin.y - imageFrame.height / 4 , imageFrame.width * 1.5, imageFrame.height * 1.5) + let imageFrame = CGRect(x: frame.size.width / 2 - frame.size.width / 4, y: frame.size.height / 2 - frame.size.height / 4, width: frame.size.width / 2, height: frame.size.height / 2) + let imgCenterPoint = CGPoint(x: imageFrame.midX, y: imageFrame.midY) + let lineFrame = CGRect(x: imageFrame.origin.x - imageFrame.width / 4, y: imageFrame.origin.y - imageFrame.height / 4 , width: imageFrame.width * 1.5, height: imageFrame.height * 1.5) //=============== // circle layer @@ -116,8 +117,8 @@ public class DOFavoriteButton: UIButton { circleShape = CAShapeLayer() circleShape.bounds = imageFrame circleShape.position = imgCenterPoint - circleShape.path = UIBezierPath(ovalInRect: imageFrame).CGPath - circleShape.fillColor = circleColor.CGColor + circleShape.path = UIBezierPath(ovalIn: imageFrame).cgPath + circleShape.fillColor = circleColor.cgColor circleShape.transform = CATransform3DMakeScale(0.0, 0.0, 1.0) self.layer.addSublayer(circleShape) @@ -128,8 +129,8 @@ public class DOFavoriteButton: UIButton { circleShape.mask = circleMask let maskPath = UIBezierPath(rect: imageFrame) - maskPath.addArcWithCenter(imgCenterPoint, radius: 0.1, startAngle: CGFloat(0.0), endAngle: CGFloat(M_PI * 2), clockwise: true) - circleMask.path = maskPath.CGPath + maskPath.addArc(withCenter: imgCenterPoint, radius: 0.1, startAngle: CGFloat(0.0), endAngle: CGFloat(M_PI * 2), clockwise: true) + circleMask.path = maskPath.cgPath //=============== // line layer @@ -141,13 +142,13 @@ public class DOFavoriteButton: UIButton { line.position = imgCenterPoint line.masksToBounds = true line.actions = ["strokeStart": NSNull(), "strokeEnd": NSNull()] - line.strokeColor = lineColor.CGColor + line.strokeColor = lineColor.cgColor line.lineWidth = 1.25 line.miterLimit = 1.25 line.path = { - let path = CGPathCreateMutable() - CGPathMoveToPoint(path, nil, CGRectGetMidX(lineFrame), CGRectGetMidY(lineFrame)) - CGPathAddLineToPoint(path, nil, lineFrame.origin.x + lineFrame.width / 2, lineFrame.origin.y) + let path = CGMutablePath() + path.moveTo(nil, x: lineFrame.midX, y: lineFrame.midY) + path.addLineTo(nil, x: lineFrame.origin.x + lineFrame.width / 2, y: lineFrame.origin.y) return path }() line.lineCap = kCALineCapRound @@ -166,13 +167,13 @@ public class DOFavoriteButton: UIButton { imageShape = CAShapeLayer() imageShape.bounds = imageFrame imageShape.position = imgCenterPoint - imageShape.path = UIBezierPath(rect: imageFrame).CGPath - imageShape.fillColor = imageColorOff.CGColor + imageShape.path = UIBezierPath(rect: imageFrame).cgPath + imageShape.fillColor = imageColorOff.cgColor imageShape.actions = ["fillColor": NSNull()] self.layer.addSublayer(imageShape) imageShape.mask = CALayer() - imageShape.mask!.contents = image.CGImage + imageShape.mask!.contents = image.cgImage imageShape.mask!.bounds = imageFrame imageShape.mask!.position = imgCenterPoint @@ -181,14 +182,14 @@ public class DOFavoriteButton: UIButton { //============================== circleTransform.duration = 0.333 // 0.0333 * 10 circleTransform.values = [ - NSValue(CATransform3D: CATransform3DMakeScale(0.0, 0.0, 1.0)), // 0/10 - NSValue(CATransform3D: CATransform3DMakeScale(0.5, 0.5, 1.0)), // 1/10 - NSValue(CATransform3D: CATransform3DMakeScale(1.0, 1.0, 1.0)), // 2/10 - NSValue(CATransform3D: CATransform3DMakeScale(1.2, 1.2, 1.0)), // 3/10 - NSValue(CATransform3D: CATransform3DMakeScale(1.3, 1.3, 1.0)), // 4/10 - NSValue(CATransform3D: CATransform3DMakeScale(1.37, 1.37, 1.0)), // 5/10 - NSValue(CATransform3D: CATransform3DMakeScale(1.4, 1.4, 1.0)), // 6/10 - NSValue(CATransform3D: CATransform3DMakeScale(1.4, 1.4, 1.0)) // 10/10 + NSValue(caTransform3D: CATransform3DMakeScale(0.0, 0.0, 1.0)), // 0/10 + NSValue(caTransform3D: CATransform3DMakeScale(0.5, 0.5, 1.0)), // 1/10 + NSValue(caTransform3D: CATransform3DMakeScale(1.0, 1.0, 1.0)), // 2/10 + NSValue(caTransform3D: CATransform3DMakeScale(1.2, 1.2, 1.0)), // 3/10 + NSValue(caTransform3D: CATransform3DMakeScale(1.3, 1.3, 1.0)), // 4/10 + NSValue(caTransform3D: CATransform3DMakeScale(1.37, 1.37, 1.0)), // 5/10 + NSValue(caTransform3D: CATransform3DMakeScale(1.4, 1.4, 1.0)), // 6/10 + NSValue(caTransform3D: CATransform3DMakeScale(1.4, 1.4, 1.0)) // 10/10 ] circleTransform.keyTimes = [ 0.0, // 0/10 @@ -203,15 +204,15 @@ public class DOFavoriteButton: UIButton { circleMaskTransform.duration = 0.333 // 0.0333 * 10 circleMaskTransform.values = [ - NSValue(CATransform3D: CATransform3DIdentity), // 0/10 - NSValue(CATransform3D: CATransform3DIdentity), // 2/10 - NSValue(CATransform3D: CATransform3DMakeScale(imageFrame.width * 1.25, imageFrame.height * 1.25, 1.0)), // 3/10 - NSValue(CATransform3D: CATransform3DMakeScale(imageFrame.width * 2.688, imageFrame.height * 2.688, 1.0)), // 4/10 - NSValue(CATransform3D: CATransform3DMakeScale(imageFrame.width * 3.923, imageFrame.height * 3.923, 1.0)), // 5/10 - NSValue(CATransform3D: CATransform3DMakeScale(imageFrame.width * 4.375, imageFrame.height * 4.375, 1.0)), // 6/10 - NSValue(CATransform3D: CATransform3DMakeScale(imageFrame.width * 4.731, imageFrame.height * 4.731, 1.0)), // 7/10 - NSValue(CATransform3D: CATransform3DMakeScale(imageFrame.width * 5.0, imageFrame.height * 5.0, 1.0)), // 9/10 - NSValue(CATransform3D: CATransform3DMakeScale(imageFrame.width * 5.0, imageFrame.height * 5.0, 1.0)) // 10/10 + NSValue(caTransform3D: CATransform3DIdentity), // 0/10 + NSValue(caTransform3D: CATransform3DIdentity), // 2/10 + NSValue(caTransform3D: CATransform3DMakeScale(imageFrame.width * 1.25, imageFrame.height * 1.25, 1.0)), // 3/10 + NSValue(caTransform3D: CATransform3DMakeScale(imageFrame.width * 2.688, imageFrame.height * 2.688, 1.0)), // 4/10 + NSValue(caTransform3D: CATransform3DMakeScale(imageFrame.width * 3.923, imageFrame.height * 3.923, 1.0)), // 5/10 + NSValue(caTransform3D: CATransform3DMakeScale(imageFrame.width * 4.375, imageFrame.height * 4.375, 1.0)), // 6/10 + NSValue(caTransform3D: CATransform3DMakeScale(imageFrame.width * 4.731, imageFrame.height * 4.731, 1.0)), // 7/10 + NSValue(caTransform3D: CATransform3DMakeScale(imageFrame.width * 5.0, imageFrame.height * 5.0, 1.0)), // 9/10 + NSValue(caTransform3D: CATransform3DMakeScale(imageFrame.width * 5.0, imageFrame.height * 5.0, 1.0)) // 10/10 ] circleMaskTransform.keyTimes = [ 0.0, // 0/10 @@ -295,23 +296,23 @@ public class DOFavoriteButton: UIButton { //============================== imageTransform.duration = 1.0 //0.0333 * 30 imageTransform.values = [ - NSValue(CATransform3D: CATransform3DMakeScale(0.0, 0.0, 1.0)), // 0/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.0, 0.0, 1.0)), // 3/30 - NSValue(CATransform3D: CATransform3DMakeScale(1.2, 1.2, 1.0)), // 9/30 - NSValue(CATransform3D: CATransform3DMakeScale(1.25, 1.25, 1.0)), // 10/30 - NSValue(CATransform3D: CATransform3DMakeScale(1.2, 1.2, 1.0)), // 11/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.9, 0.9, 1.0)), // 14/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.875, 0.875, 1.0)), // 15/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.875, 0.875, 1.0)), // 16/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.9, 0.9, 1.0)), // 17/30 - NSValue(CATransform3D: CATransform3DMakeScale(1.013, 1.013, 1.0)), // 20/30 - NSValue(CATransform3D: CATransform3DMakeScale(1.025, 1.025, 1.0)), // 21/30 - NSValue(CATransform3D: CATransform3DMakeScale(1.013, 1.013, 1.0)), // 22/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.96, 0.96, 1.0)), // 25/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.95, 0.95, 1.0)), // 26/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.96, 0.96, 1.0)), // 27/30 - NSValue(CATransform3D: CATransform3DMakeScale(0.99, 0.99, 1.0)), // 29/30 - NSValue(CATransform3D: CATransform3DIdentity) // 30/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.0, 0.0, 1.0)), // 0/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.0, 0.0, 1.0)), // 3/30 + NSValue(caTransform3D: CATransform3DMakeScale(1.2, 1.2, 1.0)), // 9/30 + NSValue(caTransform3D: CATransform3DMakeScale(1.25, 1.25, 1.0)), // 10/30 + NSValue(caTransform3D: CATransform3DMakeScale(1.2, 1.2, 1.0)), // 11/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.9, 0.9, 1.0)), // 14/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.875, 0.875, 1.0)), // 15/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.875, 0.875, 1.0)), // 16/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.9, 0.9, 1.0)), // 17/30 + NSValue(caTransform3D: CATransform3DMakeScale(1.013, 1.013, 1.0)), // 20/30 + NSValue(caTransform3D: CATransform3DMakeScale(1.025, 1.025, 1.0)), // 21/30 + NSValue(caTransform3D: CATransform3DMakeScale(1.013, 1.013, 1.0)), // 22/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.96, 0.96, 1.0)), // 25/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.95, 0.95, 1.0)), // 26/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.96, 0.96, 1.0)), // 27/30 + NSValue(caTransform3D: CATransform3DMakeScale(0.99, 0.99, 1.0)), // 29/30 + NSValue(caTransform3D: CATransform3DIdentity) // 30/30 ] imageTransform.keyTimes = [ 0.0, // 0/30 @@ -338,51 +339,51 @@ public class DOFavoriteButton: UIButton { //=============== // add target //=============== - self.addTarget(self, action: "touchDown:", forControlEvents: UIControlEvents.TouchDown) - self.addTarget(self, action: "touchUpInside:", forControlEvents: UIControlEvents.TouchUpInside) - self.addTarget(self, action: "touchDragExit:", forControlEvents: UIControlEvents.TouchDragExit) - self.addTarget(self, action: "touchDragEnter:", forControlEvents: UIControlEvents.TouchDragEnter) - self.addTarget(self, action: "touchCancel:", forControlEvents: UIControlEvents.TouchCancel) + self.addTarget(self, action: "touchDown:", for: UIControlEvents.touchDown) + self.addTarget(self, action: "touchUpInside:", for: UIControlEvents.touchUpInside) + self.addTarget(self, action: "touchDragExit:", for: UIControlEvents.touchDragExit) + self.addTarget(self, action: "touchDragEnter:", for: UIControlEvents.touchDragEnter) + self.addTarget(self, action: "touchCancel:", for: UIControlEvents.touchCancel) } - func touchDown(sender: DOFavoriteButton) { + func touchDown(_ sender: DOFavoriteButton) { self.layer.opacity = 0.4 } - func touchUpInside(sender: DOFavoriteButton) { + func touchUpInside(_ sender: DOFavoriteButton) { self.layer.opacity = 1.0 } - func touchDragExit(sender: DOFavoriteButton) { + func touchDragExit(_ sender: DOFavoriteButton) { self.layer.opacity = 1.0 } - func touchDragEnter(sender: DOFavoriteButton) { + func touchDragEnter(_ sender: DOFavoriteButton) { self.layer.opacity = 0.4 } - func touchCancel(sender: DOFavoriteButton) { + func touchCancel(_ sender: DOFavoriteButton) { self.layer.opacity = 1.0 } public func select() { - selected = true - imageShape.fillColor = imageColorOn.CGColor + // self.isSelected = true + imageShape.fillColor = imageColorOn.cgColor CATransaction.begin() - circleShape.addAnimation(circleTransform, forKey: "transform") - circleMask.addAnimation(circleMaskTransform, forKey: "transform") - imageShape.addAnimation(imageTransform, forKey: "transform") + circleShape.add(circleTransform, forKey: "transform") + circleMask.add(circleMaskTransform, forKey: "transform") + imageShape.add(imageTransform, forKey: "transform") for i in 0 ..< 5 { - lines[i].addAnimation(lineStrokeStart, forKey: "strokeStart") - lines[i].addAnimation(lineStrokeEnd, forKey: "strokeEnd") - lines[i].addAnimation(lineOpacity, forKey: "opacity") + lines[i].add(lineStrokeStart, forKey: "strokeStart") + lines[i].add(lineStrokeEnd, forKey: "strokeEnd") + lines[i].add(lineOpacity, forKey: "opacity") } CATransaction.commit() } public func deselect() { - selected = false - imageShape.fillColor = imageColorOff.CGColor + // isSelected = false + imageShape.fillColor = imageColorOff.cgColor // remove all animations circleShape.removeAllAnimations()