Skip to content

Add border to trackThickness #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salvatoreboemia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add border to trackThickness #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions KDCircularProgress/KDCircularProgress.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ public class KDCircularProgress: UIView, CAAnimationDelegate {
private var radius: CGFloat = 0 {
didSet {
progressLayer.radius = radius
progressLayer.setNeedsDisplay()
}
}

@IBInspectable public var paddingPercentage: CGFloat = 20 {
didSet {
paddingPercentage = Utility.clamp(value: paddingPercentage, minMax: (0, 100))
radius = (frame.size.width/2.0) * ((100 - paddingPercentage) / 100)
}
}

Expand Down Expand Up @@ -218,11 +226,11 @@ public class KDCircularProgress: UIView, CAAnimationDelegate {

public override func layoutSubviews() {
super.layoutSubviews()
radius = (frame.size.width/2.0) * 0.8
radius = (frame.size.width/2.0) * ((100 - paddingPercentage) / 100)
}

private func setInitialValues() {
radius = (frame.size.width/2.0) * 0.8 //We always apply a 20% padding, stopping glows from being clipped
radius = (frame.size.width/2.0) * ((100 - paddingPercentage) / 100)
backgroundColor = .clear
set(colors: .white, .cyan)
}
Expand Down Expand Up @@ -424,8 +432,25 @@ public class KDCircularProgress: UIView, CAAnimationDelegate {

let trackLineWidth = radius * trackThickness
let progressLineWidth = radius * progressThickness

let trackRadius: CGFloat
let progressRadius: CGFloat

if trackLineWidth < progressLineWidth {
trackRadius = radius - trackLineWidth/2 - (progressLineWidth - trackLineWidth)/2
progressRadius = radius - progressLineWidth/2
// trackLineWidth -= (progressLineWidth - trackLineWidth)/2
} else if progressLineWidth < trackLineWidth {
progressRadius = radius - progressLineWidth/2 - (trackLineWidth - progressLineWidth)/2
trackRadius = radius - trackLineWidth/2
// progressLineWidth -= (trackLineWidth - progressLineWidth)/2
} else {
progressRadius = radius - progressLineWidth/2
trackRadius = radius - trackLineWidth/2
}

let arcRadius = max(radius - trackLineWidth/2, radius - progressLineWidth/2)
ctx.addArc(center: CGPoint(x: width/2.0, y: height/2.0), radius: arcRadius, startAngle: 0, endAngle: CGFloat.pi * 2, clockwise: false)
ctx.addArc(center: CGPoint(x: width/2.0, y: height/2.0), radius: trackRadius, startAngle: 0, endAngle: CGFloat.pi * 2, clockwise: false)
trackColor.set()
ctx.setStrokeColor(trackColor.cgColor)
ctx.setFillColor(progressInsideFillColor.cgColor)
Expand All @@ -440,7 +465,7 @@ public class KDCircularProgress: UIView, CAAnimationDelegate {
let fromAngle = Conversion.degreesToRadians(value: CGFloat(-startAngle))
let toAngle = Conversion.degreesToRadians(value: CGFloat((clockwise == true ? -reducedAngle : reducedAngle) - startAngle))

imageCtx?.addArc(center: CGPoint(x: width/2.0, y: height/2.0), radius: arcRadius, startAngle: fromAngle, endAngle: toAngle, clockwise: clockwise)
imageCtx?.addArc(center: CGPoint(x: width/2.0, y: height/2.0), radius: progressRadius, startAngle: fromAngle, endAngle: toAngle, clockwise: clockwise)

let glowValue = GlowConstants.glowAmount(forAngle: reducedAngle, glowAmount: glowAmount, glowMode: glowMode, size: width)
if glowValue > 0 {
Expand Down