13.8.5

Author: relatedcode

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [13.8.5](https://github.com/relatedcode/ProgressHUD/releases/tag/13.8.5)
+
+Released on 2023-10-13.
+
+#### Added
+
+- Introduced 9 new animations to offer a more engaging and visually captivating user experience.
+
+#### Changed
+
+- Refactored existing animation names, including adjustments to the `AnimationType` enum.
+- Split the animations-related source files for better maintainability and organization.
+- Updated a few of the existing animations in terms of shape, size, and duration.
+
 ## [13.8.4](https://github.com/relatedcode/ProgressHUD/releases/tag/13.8.4)
 
 Released on 2023-10-05.

ProgressHUD.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'ProgressHUD'
-  s.version = '13.8.4'
+  s.version = '13.8.5'
   s.license = 'MIT'
 
   s.summary = 'A lightweight and easy-to-use Progress HUD for iOS.'

ProgressHUD/Sources/Animations/ProgressHUD+ActivityIndicator.swift

@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2023 Related Code - https://relatedcode.com
+//
+// 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 UIKit
+
+// MARK: - Activity Indicator
+extension ProgressHUD {
+
+	func animationActivityIndicator(_ view: UIView, _ color: UIColor) {
+		let spinner = UIActivityIndicatorView(style: .large)
+		let scale = view.frame.size.width / spinner.frame.size.width
+		spinner.transform = CGAffineTransform(scaleX: scale, y: scale)
+		spinner.frame = view.bounds
+		spinner.color = color
+		spinner.hidesWhenStopped = true
+		spinner.startAnimating()
+		view.addSubview(spinner)
+	}
+}

ProgressHUD/Sources/Animations/ProgressHUD+BallVerticalBounce.swift

@@ -0,0 +1,114 @@
+//
+// Copyright (c) 2023 Related Code - https://relatedcode.com
+//
+// 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 UIKit
+
+// MARK: - Ball Vertical Bounce
+extension ProgressHUD {
+
+	func animationBallVerticalBounce(_ view: UIView, _ color: UIColor) {
+		let line = CAShapeLayer()
+		line.strokeColor = color.cgColor
+		line.lineWidth = view.frame.height / 15
+		line.lineCap = .round
+		line.fillColor = UIColor.clear.cgColor
+		view.layer.addSublayer(line)
+		let speed = 0.07
+
+		let animationDownCurve = CAKeyframeAnimation(keyPath: "path")
+		animationDownCurve.timingFunction = CAMediaTimingFunction(name: .easeOut)
+		animationDownCurve.duration = 2.1 * speed
+		animationDownCurve.values = [initialCurvePath(in: view).cgPath, downCurvePath(in: view).cgPath]
+		animationDownCurve.autoreverses = true
+		animationDownCurve.beginTime = 2.9 * speed
+
+		let animationTopCurve = CAKeyframeAnimation(keyPath: "path")
+		animationTopCurve.timingFunction = CAMediaTimingFunction(name: .easeOut)
+		animationTopCurve.duration = 0.4 * speed
+		animationTopCurve.values = [initialCurvePath(in: view).cgPath, topCurvePath(in: view).cgPath]
+		animationTopCurve.autoreverses = true
+		animationTopCurve.beginTime = 7.1 * speed
+
+		let animationGroup = CAAnimationGroup()
+		animationGroup.animations = [animationDownCurve, animationTopCurve]
+		animationGroup.duration = 10 * speed
+		animationGroup.repeatCount = .infinity
+
+		line.add(animationGroup, forKey: "pathAnimation")
+		line.path = initialCurvePath(in: view).cgPath
+
+		createBallAnimation(in: view, with: color, speed: speed)
+	}
+
+	private func initialCurvePath(in view: UIView) -> UIBezierPath {
+		let width = view.frame.size.width
+		let height = view.frame.size.height + view.frame.size.height / 3
+		let path = UIBezierPath()
+		path.move(to: CGPoint(x: 0, y: height / 2))
+		path.addQuadCurve(to: CGPoint(x: width, y: height / 2), controlPoint: CGPoint(x: width / 2, y: height / 2))
+		return path
+	}
+
+	private func downCurvePath(in view: UIView) -> UIBezierPath {
+		let width = view.frame.size.width
+		let height = view.frame.size.height + view.frame.size.height / 3
+		let path = UIBezierPath()
+		path.move(to: CGPoint(x: 0, y: height / 2))
+		path.addQuadCurve(to: CGPoint(x: width, y: height / 2), controlPoint: CGPoint(x: width / 2, y: height / 1.3))
+		return path
+	}
+
+	private func topCurvePath(in view: UIView) -> UIBezierPath {
+		let width = view.frame.size.width
+		let height = view.frame.size.height + view.frame.size.height / 3
+		let path = UIBezierPath()
+		path.move(to: CGPoint(x: 0, y: height / 2))
+		path.addQuadCurve(to: CGPoint(x: width, y: height / 2), controlPoint: CGPoint(x: width / 2, y: height / 2.3))
+		return path
+	}
+
+	private func createBallAnimation(in view: UIView, with color: UIColor, speed: Double) {
+		let width = view.frame.size.width
+		let height = view.frame.size.height
+		let size = width / 4
+		let yPosition = height - height / 3
+
+		let circle = drawCircleWith(CGSize(width: size, height: size), color)
+		circle.frame = CGRect(x: width / 2 - size / 2, y: height / 20, width: size, height: size)
+
+		let animation = CABasicAnimation(keyPath: "transform.translation.y")
+		animation.fromValue = 0
+		animation.toValue = yPosition - size / 2
+		animation.duration = 5.0 * speed
+		animation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+		animation.autoreverses = true
+		animation.repeatCount = .infinity
+
+		circle.add(animation, forKey: "animation")
+		view.layer.addSublayer(circle)
+	}
+
+	private func drawCircleWith(_ size: CGSize, _ color: UIColor) -> CALayer {
+		let path = UIBezierPath()
+		let radius = size.width / 4
+		let center = CGPoint(x: size.width / 2, y: size.height / 2)
+		path.addArc(withCenter: center, radius: radius, startAngle: 0, endAngle: 2 * CGFloat.pi, clockwise: true)
+
+		let layer = CAShapeLayer()
+		layer.fillColor = nil
+		layer.strokeColor = color.cgColor
+		layer.lineWidth = size.width / 2
+		layer.backgroundColor = nil
+		layer.path = path.cgPath
+
+		return layer
+	}
+}

ProgressHUD/Sources/Animations/ProgressHUD+BarSweepToggle.swift

@@ -0,0 +1,77 @@
+//
+// Copyright (c) 2023 Related Code - https://relatedcode.com
+//
+// 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 UIKit
+
+// MARK: - Bar Sweep Toggle
+extension ProgressHUD {
+
+	func animationBarSweepToggle(_ view: UIView, _ color: UIColor) {
+		let height = view.frame.size.height
+		let width = view.frame.size.width
+
+		let border = 5.0
+		let duration = 0.9
+		let heightBar = height / 6
+		let widthBar = width - heightBar / 2
+
+		let pathBar = UIBezierPath()
+		pathBar.move(to: CGPoint(x: heightBar / 2, y: height / 2))
+		pathBar.addLine(to: CGPoint(x: widthBar / 2, y: height / 2))
+
+		let layerBar = CAShapeLayer()
+		layerBar.path = pathBar.cgPath
+		layerBar.strokeColor = color.cgColor
+		layerBar.lineWidth = heightBar
+		layerBar.lineCap = .round
+		view.layer.addSublayer(layerBar)
+
+		let animationGroup = CAAnimationGroup()
+		animationGroup.duration = duration
+		animationGroup.autoreverses = true
+		animationGroup.repeatCount = .infinity
+
+		let animationStrokeEnd = CABasicAnimation(keyPath: "strokeEnd")
+		animationStrokeEnd.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+		animationStrokeEnd.fromValue = 0.0
+		animationStrokeEnd.toValue = 1.0
+		animationStrokeEnd.duration = duration / 2
+
+		let animationStrokeStart = CABasicAnimation(keyPath: "strokeStart")
+		animationStrokeStart.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+		animationStrokeStart.fromValue = 0.0
+		animationStrokeStart.toValue = 1.0
+		animationStrokeStart.duration = duration / 2
+		animationStrokeStart.beginTime = duration / 2
+
+		animationGroup.animations = [animationStrokeEnd, animationStrokeStart]
+		layerBar.add(animationGroup, forKey: "group")
+
+		let animationPosition = CABasicAnimation(keyPath: "transform.translation.x")
+		animationPosition.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+		animationPosition.fromValue = 0
+		animationPosition.toValue = widthBar / 2
+		animationPosition.duration = duration
+		animationPosition.autoreverses = true
+		animationPosition.repeatCount = .infinity
+		layerBar.add(animationPosition, forKey: "position")
+
+		let frame = CGRect(x: -border, y: (height - heightBar) / 2 - border, width: width + 2 * border, height: heightBar + 2 * border)
+
+		let pathBorder = UIBezierPath(roundedRect: frame, cornerRadius: height)
+		let layerBorder = CAShapeLayer()
+		layerBorder.path = pathBorder.cgPath
+		layerBorder.strokeColor = color.cgColor
+		layerBorder.fillColor = UIColor.clear.cgColor
+		layerBorder.lineWidth = border
+		view.layer.addSublayer(layerBorder)
+	}
+}

ProgressHUD/Sources/Animations/ProgressHUD+CircleArcDotSpin.swift

@@ -0,0 +1,90 @@
+//
+// Copyright (c) 2023 Related Code - https://relatedcode.com
+//
+// 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 UIKit
+
+// MARK: - Circle Arc Dot Spin
+extension ProgressHUD {
+
+	func animationCircleArcDotSpin(_ view: UIView, _ color: UIColor) {
+		let space = view.frame.width / 8
+		let x = view.bounds.minX + space / 2
+		let y = view.bounds.minY + space / 2
+		let width = view.frame.width - space
+		let height = view.frame.height - space
+		let containerView = UIView(frame: CGRect(x: x, y: y, width: width, height: height))
+		view.addSubview(containerView)
+
+		let center = CGPoint(x: containerView.bounds.midX, y: containerView.bounds.midY)
+		let radius = containerView.frame.width / 2
+		let count = 8
+		let duration = 4.0
+		let size = radius / 3
+
+		for i in 0..<count {
+			let angle = (CGFloat(i) / CGFloat(count)) * (2 * .pi)
+			let x = center.x + radius * cos(angle)
+			let y = center.y + radius * sin(angle)
+
+			let circle = UIView(frame: CGRect(x: x - size / 2, y: y - size / 2, width: size, height: size))
+			circle.backgroundColor = color
+			circle.layer.cornerRadius = size / 2
+			containerView.addSubview(circle)
+
+			let animation = CAKeyframeAnimation(keyPath: "position")
+			animation.path = UIBezierPath(arcCenter: center, radius: radius, startAngle: angle, endAngle: angle + 2 * .pi, clockwise: true).cgPath
+			animation.duration = duration
+			animation.repeatCount = .infinity
+			animation.calculationMode = .paced
+			circle.layer.add(animation, forKey: "circleAnimation")
+		}
+
+		animateArcRotation(containerView, color)
+	}
+
+	private func animateArcRotation(_ view: UIView, _ color: UIColor) {
+		let width = view.frame.size.width
+		let height = view.frame.size.height
+		let center = CGPoint(x: width / 2, y: height / 2)
+
+		let animationRotation = CABasicAnimation(keyPath: "transform.rotation")
+		animationRotation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+		animationRotation.byValue = 4 * Float.pi
+		animationRotation.duration = 1.6
+
+		let animationStrokeEnd = CABasicAnimation(keyPath: "strokeEnd")
+		animationStrokeEnd.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+		animationStrokeEnd.fromValue = 0.5
+		animationStrokeEnd.toValue = 1
+		animationStrokeEnd.duration = 0.8
+		animationStrokeEnd.autoreverses = true
+		animationStrokeEnd.isRemovedOnCompletion = false
+
+		let animationGroup = CAAnimationGroup()
+		animationGroup.animations = [animationRotation, animationStrokeEnd]
+		animationGroup.duration = 1.6
+		animationGroup.repeatCount = .infinity
+		animationGroup.fillMode = .forwards
+
+		let path = UIBezierPath(arcCenter: center, radius: width / 2, startAngle: -.pi / 2, endAngle: 0, clockwise: true)
+
+		let layer = CAShapeLayer()
+		layer.frame = CGRect(x: 0, y: 0, width: width, height: height)
+		layer.path = path.cgPath
+		layer.fillColor = nil
+		layer.strokeColor = color.cgColor
+		layer.lineWidth = view.frame.width / 6
+		layer.lineCap = .round
+
+		layer.add(animationGroup, forKey: "animation")
+		view.layer.addSublayer(layer)
+	}
+}