Add paddingPercentage property that controls how much padding is added when calculating radii.

KDCircularProgress.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'KDCircularProgress'
-  s.version = '1.5.3'
+  s.version = '1.5.2'
   s.license = 'MIT'
   s.summary = 'A circular progress view with gradients written in Swift'
   s.homepage = 'https://github.com/kaandedeoglu/KDCircularProgress'

KDCircularProgress/KDCircularProgress.swift

@@ -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)
         }
     }
     
@@ -189,6 +197,7 @@ public class KDCircularProgress: UIView, CAAnimationDelegate {
     
     override public init(frame: CGRect) {
         super.init(frame: frame)
+        isUserInteractionEnabled = false
         setInitialValues()
         refreshValues()
         checkAndSetIBColors()
@@ -202,6 +211,7 @@ public class KDCircularProgress: UIView, CAAnimationDelegate {
     required public init(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)!
         translatesAutoresizingMaskIntoConstraints = false
+        isUserInteractionEnabled = false
         setInitialValues()
         refreshValues()
     }
@@ -216,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)
     }
@@ -274,7 +284,6 @@ public class KDCircularProgress: UIView, CAAnimationDelegate {
         animation.toValue = toAngle
         animation.duration = animationDuration
         animation.delegate = self
-        animation.isRemovedOnCompletion = false
         angle = toAngle
         animationCompletionBlock = completion
         
@@ -423,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)
@@ -439,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 {

README.md

@@ -63,7 +63,7 @@ carthage update
 
 Just drag `KDCircularProgress.swift` into your project.
 
-## Sample Code
+##Sample Code
 Below you can see code that creates and sets up a `KCircularProgress` instance. Which gives you a configuration that looks similar to the progress in the example images.
 
 ```swift
@@ -83,28 +83,42 @@ view.addSubview(progress)
 
 ## Properties
 
-#### progressColors: `[UIColor]`
+####progressColors: `[UIColor]`
 The colors used to generate the gradient of the progress. You can also set this using the variadic `setColors(UIColor...)` method. A gradient is used only if there is more than one color. A fill is used otherwise. The default is a white fill.
 
-#### angle: `Int`
+------
+
+####angle: `Int`
 The angle of the progress. Between 0 and 360 (inclusive). Simply change its value in order to change the visual progress of the component. Default is 0.
 
-#### startAngle: `Int`
+------
+
+####startAngle: `Int`
 The angle at which the progress will begin. Between 0 and 360 (inclusive), however you can pass any negative or positive values and the component will mod them automatically to the required range. Default is 0.
 
-#### clockwise: `Bool`
+------
+
+####clockwise: `Bool`
 Clockwise if true, Counter-clockwise if false. Default is true.
 
-#### roundedCorners: `Bool`
+------
+
+####roundedCorners: `Bool`
 When true, the ends of the progress track will be drawn with a half circle radius. Default is false.
 
-#### gradientRotateSpeed: `CGFloat`
+------
+
+####gradientRotateSpeed: `CGFloat`
 Describes how many times the underlying gradient will perform a 2π rotation for each full cycle of the progress. Integer values recommended. Default is 0.
 
-#### glowAmount: `CGFloat`
+------
+
+####glowAmount: `CGFloat`
 The intensity of the glow. Between 0 and 1.0. Default is 1.0.
 
-#### glowMode: `KDCircularProgressGlowMode`
+------
+
+####glowMode: `KDCircularProgressGlowMode`
 - **.forward** - The glow increases proportionaly to the angle. No glow at 0 degrees and full glow at 360 degrees.
 
 - **.reverse** - The glow increases inversely proportional to the angle. Full glow at 0 degrees and no glow at 360 degrees.
@@ -115,72 +129,105 @@ The intensity of the glow. Between 0 and 1.0. Default is 1.0.
 
 The default is **.forward**
 
-#### progressThickness: `CGFloat`
+------
+
+####progressThickness: `CGFloat`
 The thickness of the progress. Between 0 and 1. Default is 0.4
 
-#### trackThickness: `CGFloat`
+------
+
+####trackThickness: `CGFloat`
 The thickness of the background track. Between 0 and 1. Default is 0.5
 
-#### trackColor: `UIColor`
+------
+
+####trackColor: `UIColor`
 The color of the background track. Default is `UIColor.blackColor()`.
 
-#### progressInsideFillColor: `UIColor`
+------
+
+####progressInsideFillColor: `UIColor`
 The color of the center of the circle. Default is `UIColor.clearColor()`.
 
-## Methods
+------
+
+##Methods
 ```swift 
 override public init(frame: CGRect)
 ```
 Initialize with a frame. Please only use square frames.
 
+------
+
 ```swift 
 convenience public init(frame:CGRect, colors: UIColor...)
 ```
 Initialize with a frame and the gradient colors.
 
+------
+
 ```swift 
 public func set(colors: UIColor...)
 public func set(colors: [UIColor])
 ```
+
 Set the colors for the progress gradient.
 
+------
 
 ```swift
 public func animateFromAngle(fromAngle: Int, toAngle: Int, duration: NSTimeInterval, relativeDuration: Bool = true, completion: ((Bool) -> Void)?)
 ```
+
 Animate the progress from an initial value to a final value, with a completion block that fires after the animation is done.
+
 `relativeDuration` - specify if the duration is for the specific animation or is the duration that would make a full turn.
 
+------
 
 ```swift
 public func animateToAngle(toAngle: Int, duration: NSTimeInterval, completion: ((Bool) -> Void)?)
 ```
+
 Animate the progress from the current state to a target value.
 
+------
+
 ```swift 
 public func pauseAnimation()
 ```
+
 Pause the animation, if any.
 
+------
 
 ```swift 
 public func isAnimating() -> Bool
 ```
+
 Check if there's an active animation.
 
-## Misc
+##Misc
 Prefering light colors in the gradients gives better results. As mentioned before, use square frames. Rectangular frames are not tested and might produce unexpected results.
 
-## Contact
+##To-Do
+- [x] Add example project
+- [x] Carthage Support
+- [x] CocoaPods Support
+- [x] IBDesignable/IBInspectable support
+- [x] Adding a `progress` property as an alternative to `angle`
+- [ ] Clean up
+
+##Contact
 Drop me an email if you want discuss anything further.
 
 [Email](kaandedeoglu@me.com)
 
-## License
+##License
 
 The MIT License (MIT)
 
-Copyright (c) 2017 Kaan Dedeoglu
+Copyright (c) 2016 Kaan Dedeoglu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal