diff --git a/PullToRefreshKit.podspec b/PullToRefreshKit.podspec index edc7b70..b7b10dd 100644 --- a/PullToRefreshKit.podspec +++ b/PullToRefreshKit.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'PullToRefreshKit' - s.version = '0.4.0' + s.version = '0.5.0' s.summary = 'A refresh library written with pure Swift 3' s.description = <<-DESC This is a pull to refresh library written by pure Swift 3. Using it you can add pull to refresh,pull to load more,pull left/right to view details within one line. Besides,it is quite easy to write a custom refresh view when using this lib. diff --git a/PullToRefreshKit/CurveRefreshHeader.swift b/PullToRefreshKit/CurveRefreshHeader.swift index 1e797b7..20bd076 100644 --- a/PullToRefreshKit/CurveRefreshHeader.swift +++ b/PullToRefreshKit/CurveRefreshHeader.swift @@ -43,7 +43,7 @@ class CurveRefreshHeader: UIView,RefreshableHeader{ func stateDidChanged(_ oldState: RefreshHeaderState, newState: RefreshHeaderState) { if newState == .pulling && oldState == .idle{ UIView.animate(withDuration: 0.4, animations: { - self.imageView.transform = CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) + self.imageView.transform = CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) }) } if newState == .idle{ diff --git a/PullToRefreshKit/TaoBaoRefreshHeader.swift b/PullToRefreshKit/TaoBaoRefreshHeader.swift index cf306d1..c30bf78 100644 --- a/PullToRefreshKit/TaoBaoRefreshHeader.swift +++ b/PullToRefreshKit/TaoBaoRefreshHeader.swift @@ -53,8 +53,8 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{ func setUpCircleLayer(){ let bezierPath = UIBezierPath(arcCenter: CGPoint(x: 20, y: 20), radius: 12.0, - startAngle:CGFloat(-M_PI/2), - endAngle: CGFloat(M_PI_2 * 3), + startAngle:-CGFloat.pi/2, + endAngle: CGFloat.pi/2.0 * 3.0, clockwise: true) self.circleLayer.path = bezierPath.cgPath self.circleLayer.strokeColor = UIColor.lightGray.cgColor @@ -87,7 +87,7 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{ func didBeginRefreshingState(){ self.circleLayer.strokeEnd = 0.95 let rotateAnimation = CABasicAnimation(keyPath: "transform.rotation.z") - rotateAnimation.toValue = NSNumber(value: M_PI * 2.0 as Double) + rotateAnimation.toValue = NSNumber(value: Double.pi * 2.0) rotateAnimation.duration = 0.6 rotateAnimation.isCumulative = true rotateAnimation.repeatCount = 10000000 diff --git a/PullToRefreshKit/YoukuRefreshHeader.swift b/PullToRefreshKit/YoukuRefreshHeader.swift index fb8da02..c7dd4d8 100644 --- a/PullToRefreshKit/YoukuRefreshHeader.swift +++ b/PullToRefreshKit/YoukuRefreshHeader.swift @@ -56,7 +56,7 @@ class YoukuRefreshHeader:UIView,RefreshableHeader{ func stateDidChanged(_ oldState: RefreshHeaderState, newState: RefreshHeaderState) { if newState == .pulling && oldState == .idle{ UIView.animate(withDuration: 0.4, animations: { - self.iconImageView.transform = CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) + self.iconImageView.transform = CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) }) } if newState == .idle{ @@ -70,7 +70,7 @@ class YoukuRefreshHeader:UIView,RefreshableHeader{ self.iconImageView.isHidden = true self.rotatingImageView.isHidden = false let rotateAnimation = CABasicAnimation(keyPath: "transform.rotation.z") - rotateAnimation.toValue = NSNumber(value: M_PI * 2.0 as Double) + rotateAnimation.toValue = NSNumber(value: Double.pi * 2.0) rotateAnimation.duration = 0.8 rotateAnimation.isCumulative = true rotateAnimation.repeatCount = 10000000 diff --git a/Source/Classes/ElasticRefreshControl.swift b/Source/Classes/ElasticRefreshControl.swift index ea56697..1bb94e1 100644 --- a/Source/Classes/ElasticRefreshControl.swift +++ b/Source/Classes/ElasticRefreshControl.swift @@ -105,7 +105,7 @@ open class ElasticRefreshControl: UIView { let downCenter = CGPoint(x: centerX, y: totalHeight - downRadius - margin) //偏移的角度 - let offSetAngle:CGFloat = CGFloat(M_PI_2 / 12.0) + let offSetAngle:CGFloat = CGFloat.pi / 2.0 / 12.0 //计算上面圆的左/右的交点坐标 let upP1 = CGPoint(x: upCenter.x - upRadius * cosCGFloat(offSetAngle), y: upCenter.y + upRadius * sinCGFloat(offSetAngle)) let upP2 = CGPoint(x: upCenter.x + upRadius * cosCGFloat(offSetAngle), y: upCenter.y + upRadius * sinCGFloat(offSetAngle)) @@ -119,17 +119,17 @@ open class ElasticRefreshControl: UIView { //实际绘制 context?.setFillColor(elasticTintColor.cgColor) - context?.addArc(center: upCenter, radius: upRadius, startAngle: CGFloat(-M_PI)-offSetAngle, endAngle: offSetAngle, clockwise: false) + context?.addArc(center: upCenter, radius: upRadius, startAngle: -CGFloat.pi - offSetAngle, endAngle: offSetAngle, clockwise: false) context?.move(to: CGPoint(x: upP1.x, y: upP1.y)) context?.addQuadCurve(to: downP1, control: controPonintLeft) - context?.addArc(center: downCenter, radius: downRadius, startAngle: CGFloat(-M_PI)-offSetAngle, endAngle: offSetAngle, clockwise: true) + context?.addArc(center: downCenter, radius: downRadius, startAngle: -CGFloat.pi - offSetAngle, endAngle: offSetAngle, clockwise: true) context?.addQuadCurve(to: upP2, control: controPonintRight) context?.fillPath() //绘制箭头 context?.setStrokeColor(arrowColor.cgColor) context?.setLineWidth(lineWidth) - context?.addArc(center: upCenter, radius: arrowRadius, startAngle: 0, endAngle: CGFloat(M_PI * 1.5), clockwise: false) + context?.addArc(center: upCenter, radius: arrowRadius, startAngle: 0, endAngle: CGFloat.pi * 1.5, clockwise: false) context?.strokePath() context?.setFillColor(arrowColor.cgColor) diff --git a/Source/Classes/Header.swift b/Source/Classes/Header.swift index cfc17ff..59d553d 100644 --- a/Source/Classes/Header.swift +++ b/Source/Classes/Header.swift @@ -84,12 +84,12 @@ open class DefaultRefreshHeader:UIView,RefreshableHeader, Tintable { return } UIView.animate(withDuration: 0.4, animations: { - self.imageView.transform = CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) + self.imageView.transform = CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) }) } if oldState == RefreshHeaderState.pulling && newState == RefreshHeaderState.idle { textLabel.text = textDic[.pullToRefresh] - guard self.imageView.transform == CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) else{ + guard self.imageView.transform == CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) else{ return } UIView.animate(withDuration: 0.4, animations: { diff --git a/Source/Classes/Left.swift b/Source/Classes/Left.swift index fe25314..d9ec932 100644 --- a/Source/Classes/Left.swift +++ b/Source/Classes/Left.swift @@ -62,12 +62,12 @@ open class DefaultRefreshLeft:UIView, RefreshableLeftRight, Tintable { return } UIView.animate(withDuration: 0.4, animations: { - self.imageView.transform = CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) + self.imageView.transform = CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) }) textLabel.text = textDic[.releaseToAction] } if percent <= 1.0{ - guard self.imageView.transform == CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) else{ + guard self.imageView.transform == CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) else{ return } textLabel.text = textDic[.scrollToAction] diff --git a/Source/Classes/Right.swift b/Source/Classes/Right.swift index 4787bd4..94fd3db 100644 --- a/Source/Classes/Right.swift +++ b/Source/Classes/Right.swift @@ -55,12 +55,12 @@ open class DefaultRefreshRight:UIView, RefreshableLeftRight, Tintable { return } UIView.animate(withDuration: 0.4, animations: { - self.imageView.transform = CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) + self.imageView.transform = CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) }) textLabel.text = textDic[.releaseToAction] } if percent <= 1.0{ - guard self.imageView.transform == CGAffineTransform(rotationAngle: CGFloat(-M_PI+0.000001)) else{ + guard self.imageView.transform == CGAffineTransform(rotationAngle: -CGFloat.pi+0.000001) else{ return } textLabel.text = textDic[.scrollToAction]