Version correction

.codebeatsettings

@@ -1,10 +0,0 @@
-{
-  "SWIFT": {
-    "TOO_MANY_IVARS": [8, 12, 16, 20],
-    "TOO_MANY_FUNCTIONS": [46, 55, 65, 85],
-    "ARITY" : [5, 6, 7, 8],
-    "ABC": [15, 25, 50, 70],
-    "TOTAL_COMPLEXITY": [100, 180, 280, 400],
-    "TOTAL_LOC": [200, 250, 320, 450]
-  }
-}

.jazzy_cmd.yaml

@@ -1 +0,0 @@
-jazzy --podspec JOCircularSlider.podspec

Example/JOCircularSlider.xcodeproj/project.pbxproj

@@ -13,15 +13,10 @@
 		607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
 		607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
 		9A9536F8A95805979063DD22 /* Pods_JOCircularSlider_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CC0EF1308BF44BE0466D9BF /* Pods_JOCircularSlider_Example.framework */; };
-		AF4F276921BB942500D39C60 /* .jazzy_cmd.yaml in Resources */ = {isa = PBXBuildFile; fileRef = AF4F276821BB942500D39C60 /* .jazzy_cmd.yaml */; };
 		AF737E2421B89B2B00BFBE5E /* GradientView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF737E2321B89B2B00BFBE5E /* GradientView.swift */; };
 		AF737E2621B89F8000BFBE5E /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF737E2521B89F8000BFBE5E /* Utils.swift */; };
 		AF737E2921B8D60400BFBE5E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AF737E2721B8D60400BFBE5E /* LaunchScreen.storyboard */; };
 		AF737E2B21B8D71900BFBE5E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AF737E2A21B8D71900BFBE5E /* Assets.xcassets */; };
-		AFB6605421BB1F2000E22629 /* .codebeatsettings in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605321BB1F2000E22629 /* .codebeatsettings */; };
-		AFB6605821BB1F3300E22629 /* .swift-version in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605521BB1F3300E22629 /* .swift-version */; };
-		AFB6605921BB1F3300E22629 /* .travis.yml in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605621BB1F3300E22629 /* .travis.yml */; };
-		AFB6605A21BB1F3300E22629 /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = AFB6605721BB1F3300E22629 /* .gitignore */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -49,15 +44,10 @@
 		857FCA310632359F6C66CC65 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		9ED6373888E3CDF94E3F8213 /* Pods-JOCircularSlider_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Tests/Pods-JOCircularSlider_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		A310FF740AC505A50DEF761C /* Pods-JOCircularSlider_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Tests/Pods-JOCircularSlider_Tests.release.xcconfig"; sourceTree = "<group>"; };
-		AF4F276821BB942500D39C60 /* .jazzy_cmd.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .jazzy_cmd.yaml; path = ../.jazzy_cmd.yaml; sourceTree = "<group>"; };
 		AF737E2321B89B2B00BFBE5E /* GradientView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientView.swift; sourceTree = "<group>"; };
 		AF737E2521B89F8000BFBE5E /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
 		AF737E2821B8D60400BFBE5E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		AF737E2A21B8D71900BFBE5E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		AFB6605321BB1F2000E22629 /* .codebeatsettings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .codebeatsettings; path = ../.codebeatsettings; sourceTree = "<group>"; };
-		AFB6605521BB1F3300E22629 /* .swift-version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ".swift-version"; path = "../.swift-version"; sourceTree = "<group>"; };
-		AFB6605621BB1F3300E22629 /* .travis.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .travis.yml; path = ../.travis.yml; sourceTree = "<group>"; };
-		AFB6605721BB1F3300E22629 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .gitignore; path = ../.gitignore; sourceTree = "<group>"; };
 		B53C2541DC14B9F694325C57 /* Pods-JOCircularSlider_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Example/Pods-JOCircularSlider_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		D0CC336CBAD390916FD5F8FE /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		D1B349DAD0AE068D7095DAFC /* Pods-JOCircularSlider_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JOCircularSlider_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-JOCircularSlider_Example/Pods-JOCircularSlider_Example.release.xcconfig"; sourceTree = "<group>"; };
@@ -171,11 +161,6 @@
 				7B49D36A49F9D30C4E298C6D /* JOCircularSlider.podspec */,
 				857FCA310632359F6C66CC65 /* README.md */,
 				D0CC336CBAD390916FD5F8FE /* LICENSE */,
-				AFB6605321BB1F2000E22629 /* .codebeatsettings */,
-				AFB6605721BB1F3300E22629 /* .gitignore */,
-				AFB6605521BB1F3300E22629 /* .swift-version */,
-				AFB6605621BB1F3300E22629 /* .travis.yml */,
-				AF4F276821BB942500D39C60 /* .jazzy_cmd.yaml */,
 			);
 			name = "Podspec Metadata";
 			sourceTree = "<group>";
@@ -268,14 +253,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				AFB6605921BB1F3300E22629 /* .travis.yml in Resources */,
-				AFB6605A21BB1F3300E22629 /* .gitignore in Resources */,
 				AF737E2921B8D60400BFBE5E /* LaunchScreen.storyboard in Resources */,
 				AF737E2B21B8D71900BFBE5E /* Assets.xcassets in Resources */,
 				607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */,
-				AF4F276921BB942500D39C60 /* .jazzy_cmd.yaml in Resources */,
-				AFB6605421BB1F2000E22629 /* .codebeatsettings in Resources */,
-				AFB6605821BB1F3300E22629 /* .swift-version in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Example/JOCircularSlider.xcodeproj/xcshareddata/xcschemes/JOCircularSlider-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1000"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/JOCircularSlider/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -335,7 +335,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0930;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 0930;
 			};
 			buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -559,7 +559,6 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
-				SWIFT_COMPILATION_MODE = wholemodule;
 				SYMROOT = "${SRCROOT}/../build";
 			};
 			name = Release;

Example/Pods/Target Support Files/JOCircularSlider/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/Pods/Target Support Files/Pods-JOCircularSlider_Example/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/Pods/Target Support Files/Pods-JOCircularSlider_Tests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

JOCircularSlider.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'JOCircularSlider'
-    s.version          = '1.0.5'
+    s.version          = '1.0.3'
     s.summary          = 'A highly customisable and reusable iOS circular slider.'
 
     # This description is used to generate tags and improve search results.
@@ -33,8 +33,6 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = '10.0'
 
     s.source_files = 'JOCircularSlider/Classes/**/*'
-
-    s.documentation_url = 'http://ouraigua.com/github/jocircularslider/docs/index.html'
   
     # s.resource_bundles = {
     #   'JOCircularSlider' => ['JOCircularSlider/Assets/*.png']

JOCircularSlider/Classes/CircularSlider.swift

@@ -31,7 +31,7 @@ public struct Constants {
     public static let dotBlueColor = UIColor(red: 31/255.0, green: 206/255.0, blue: 252/255.0, alpha: 1)
     public static let dotRedColor = UIColor(red: 248/255.0, green: 16/255.0, blue: 32/255.0, alpha: 1)
     public static let dotOrangeColor = UIColor(red: 1, green: 128/255.0, blue: 0, alpha: 1)
-    public static let dotGrayColor = lightColor4
+    public static let dotGrayColor = UIColor(red: 206/255.0, green: 206/255.0, blue: 206/255.0, alpha: 1)
     public static let dotShadowOffset = CGSize(width: 2, height: 2)
 
     public static let outerMultiplier  : CGFloat = 0.86
@@ -44,22 +44,26 @@ open class CircularSlider: UIControl {
 
     // MARK: - Public API
 
-    @IBInspectable open var color1: UIColor {
+    @IBInspectable
+    open var color1: UIColor {
         get { return renderer.knobView.color1 }
         set { renderer.knobView.color1 = newValue }
     }
 
-    @IBInspectable open var color2: UIColor {
+    @IBInspectable
+    open var color2: UIColor {
         get { return renderer.knobView.color2 }
         set { renderer.knobView.color2 = newValue}
     }
 
-    @IBInspectable open var color3: UIColor {
+    @IBInspectable
+    open var color3: UIColor {
         get { return renderer.knobView.color3 }
         set { renderer.knobView.color3 = newValue}
     }
 
-    @IBInspectable open var color4: UIColor {
+    @IBInspectable
+    open var color4: UIColor {
         get { return renderer.knobView.color4 }
         set {
             renderer.knobView.color4 = newValue
@@ -67,7 +71,8 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var highlightColor: UIColor {
+    @IBInspectable
+    open var highlightColor: UIColor {
         get { return renderer.knobView.highlightColor }
         set {
             renderer.knobView.highlightColor = newValue
@@ -78,7 +83,8 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var knobOuterCircleMultiplier: CGFloat {
+    @IBInspectable
+    open var knobOuterCircleMultiplier: CGFloat {
         get { return renderer.knobView.outerCircleMultiplier }
         set {
             renderer.knobView.outerCircleMultiplier = newValue
@@ -87,69 +93,82 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var knobMiddleCircleMultiplier: CGFloat {
+    @IBInspectable
+    open var knobMiddleCircleMultiplier: CGFloat {
         get { return renderer.knobView.middleCircleMultiplier }
         set {
             renderer.knobView.middleCircleMultiplier = newValue
         }
     }
 
-    @IBInspectable open var knobInnerCircleMultiplier: CGFloat {
+    @IBInspectable
+    open var knobInnerCircleMultiplier: CGFloat {
         get { return renderer.knobView.innerCircleMultiplier }
         set { renderer.knobView.innerCircleMultiplier = newValue }
     }
 
-    @IBInspectable open var knobShadowOpacity: Float {
+    @IBInspectable
+    open var knobShadowOpacity: Float {
         get { return renderer.knobView.shadowOpacity }
         set { renderer.knobView.shadowOpacity = newValue }
     }
 
-    @IBInspectable open var pointerDistanceFromInnerCircleEdge: CGFloat {
+    @IBInspectable
+    open var pointerDistanceFromInnerCircleEdge: CGFloat {
         get { return renderer.pointerViewDistanceFromEdge }
         set { renderer.pointerViewDistanceFromEdge = newValue }
     }
 
-    @IBInspectable open var pointerSizeMultiplier: CGFloat {
+    @IBInspectable
+    open var pointerSizeMultiplier: CGFloat {
         get { return renderer.pointerViewMultiplier }
         set { renderer.pointerViewMultiplier = newValue }
     }
 
-    @IBInspectable open var pointerColor1: UIColor {
+    @IBInspectable
+    open var pointerColor1: UIColor {
         get { return renderer.pointerView.color1 }
         set { renderer.pointerView.color1 = newValue }
     }
 
-    @IBInspectable open var pointerColor2: UIColor {
+    @IBInspectable
+    open var pointerColor2: UIColor {
         get { return renderer.pointerView.color2 }
         set { renderer.pointerView.color2 = newValue }
     }
 
-    @IBInspectable open var textIsHidden: Bool {
+    @IBInspectable
+    open var textIsHidden: Bool {
         get { return renderer.textFieldIsHidden }
         set { renderer.textFieldIsHidden = newValue}
     }
 
-    @IBInspectable open var textFontSizeMultiplier: CGFloat {
+    @IBInspectable
+    open var textFontSizeMultiplier: CGFloat {
         get { return renderer.fontSizeMultiplier }
         set { renderer.fontSizeMultiplier = newValue}
     }
 
-    @IBInspectable open var textColor: UIColor {
+    @IBInspectable
+    open var textColor: UIColor {
         get { return renderer.textField.textColor! }
         set { renderer.textField.textColor = newValue}
     }
 
-    @IBInspectable open var maxidotViewIsHidden: Bool {
+    @IBInspectable
+    open var maxidotViewIsHidden: Bool {
         get { return renderer.maxiDotView.isHidden }
         set { renderer.maxiDotView.isHidden = newValue }
     }
 
-    @IBInspectable open var maxidotOffColor: UIColor {
+    @IBInspectable
+    open var maxidotOffColor: UIColor {
         get { return renderer.maxiDotView.offColor }
         set { renderer.maxiDotView.offColor = newValue }
     }
 
-    @IBInspectable open var maxidotOnColor: UIColor {
+    @IBInspectable
+    open var maxidotOnColor: UIColor {
         get { return renderer.maxiDotView.onColor }
         set {
             renderer.maxiDotView.onColor = newValue
@@ -158,12 +177,14 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var maxidotMaxColor: UIColor {
+    @IBInspectable
+    open var maxidotMaxColor: UIColor {
         get { return renderer.maxiDotView.maxColor }
         set { renderer.maxiDotView.maxColor = newValue }
     }
 
-    @IBInspectable open var maxidotCount: Int {
+    @IBInspectable
+    open var maxidotCount: Int {
         get { return renderer.maxiDotView.maxiDotCount }
         set {
             let value = newValue % 2 == 0 ? newValue + 1 : newValue
@@ -174,37 +195,44 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var maxidotRadiusMultiplier: CGFloat {
+    @IBInspectable
+    open var maxidotRadiusMultiplier: CGFloat {
         get { return renderer.maxiDotView.dotRadiusMultiplier }
         set { renderer.maxiDotView.dotRadiusMultiplier = newValue }
     }
 
-    @IBInspectable open var maxidotInset: CGFloat {
+    @IBInspectable
+    open var maxidotInset: CGFloat {
         get { return renderer.maxiDotView.dotInset }
         set { renderer.maxiDotView.dotInset = newValue }
     }
 
-    @IBInspectable open var maxidotMaxDotCount: Int {
+    @IBInspectable
+    open var maxidotMaxDotCount: Int {
         get { return renderer.maxiDotView.maxDotCount }
         set { renderer.maxiDotView.maxDotCount = newValue }
     }
 
-    @IBInspectable open var minidotViewIsHidden: Bool {
+    @IBInspectable
+    open var minidotViewIsHidden: Bool {
         get { return renderer.miniDotView.isHidden }
         set { renderer.miniDotView.isHidden = newValue }
     }
 
-    @IBInspectable open var minidotColor: UIColor {
+    @IBInspectable
+    open var minidotColor: UIColor {
         get { return renderer.miniDotView.offColor }
         set { renderer.miniDotView.offColor = newValue }
     }
 
-    @IBInspectable open var minidotHighlightColor: UIColor {
+    @IBInspectable
+    open var minidotHighlightColor: UIColor {
         get { return renderer.miniDotView.highlightColor ?? .white }
         set { renderer.miniDotView.highlightColor = newValue }
     }
 
-    @IBInspectable open var minidotCountPerSegment: Int {
+    @IBInspectable
+    open var minidotCountPerSegment: Int {
         get { return renderer.miniDotView.dotCountPerSegment }
         set {
             renderer.miniDotView.dotCountPerSegment = newValue
@@ -212,22 +240,26 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var minidotRadiusMultiplier: CGFloat {
+    @IBInspectable
+    open var minidotRadiusMultiplier: CGFloat {
         get { return renderer.miniDotView.dotRadiusMultiplier }
         set { renderer.miniDotView.dotRadiusMultiplier = newValue }
     }
 
-    @IBInspectable open var minidotInset: CGFloat {
+    @IBInspectable
+    open var minidotInset: CGFloat {
         get { return renderer.miniDotView.dotInset }
         set { renderer.miniDotView.dotInset = newValue }
     }
 
-    @IBInspectable open var minidotHideHighlight: Bool {
+    @IBInspectable
+    open var minidotHideHighlight: Bool {
         get { return renderer.miniDotView.highlightColor != nil }
         set { renderer.miniDotView.highlightColor = newValue ? highlightColor : nil }
     }
 
-    @IBInspectable open var minimumValue: CGFloat {
+    @IBInspectable
+    open var minimumValue: CGFloat {
         get { return CGFloat(renderer.minimumValue) }
         set {
             renderer.minimumValue = Float(newValue)
@@ -235,7 +267,8 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var maximumValue: CGFloat {
+    @IBInspectable
+    open var maximumValue: CGFloat {
         get { return CGFloat(renderer.maximumValue) }
         set {
             renderer.maximumValue = Float(newValue)
@@ -243,17 +276,20 @@ open class CircularSlider: UIControl {
         }
     }
 
-    @IBInspectable open var startAngle: CGFloat {
+    @IBInspectable
+    open var startAngle: CGFloat {
         get { return renderer.startAngle.toDegree }
         set { renderer.startAngle = newValue.toRadian }
     }
 
-    @IBInspectable open var endAngle: CGFloat {
+    @IBInspectable
+    open var endAngle: CGFloat {
         get { return renderer.endAngle.toDegree }
         set { renderer.endAngle = newValue.toRadian }
     }
 
-    @IBInspectable open var isClockwise: Bool {
+    @IBInspectable
+    open var isClockwise: Bool {
         get { return renderer.isClockwise }
         set { renderer.isClockwise = newValue }
     }
@@ -283,34 +319,6 @@ open class CircularSlider: UIControl {
         renderer.update(bounds, value: value)
     }
 
-    // MARK: - Touches
-
-    override open func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
-        super.touchesBegan(touches, with: event)
-        guard let location = touches.first?.location(in: self) else { return }
-
-        let distanceToOrigin = location - centerPoint
-        lastTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
-    }
-
-    override open func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
-        super.touchesMoved(touches, with: event)
-        guard let location = touches.first?.location(in: self) else { return }
-
-        let distanceToOrigin = location - centerPoint
-        let currentTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
-
-        let angelDelta = currentTouchAngle - lastTouchAngle // in degree
-        lastTouchAngle = currentTouchAngle
-
-        let angleRange = angleDifferenceInDegree(from: startAngle, to: endAngle, isClockwise: isClockwise)
-
-        let angelDeltaAsPercentage = Float(angelDelta / angleRange)
-        guard abs(angelDeltaAsPercentage) < 1 else { return }
-        let newValue  = isClockwise ? value + angelDeltaAsPercentage : value - angelDeltaAsPercentage
-        setValue(newValue, isPercentage: true)
-    }
-    
     // MARK: - Public
 
     open func setValue(_ newValue: Float, isPercentage: Bool = false) {
@@ -341,6 +349,35 @@ open class CircularSlider: UIControl {
     open func setTextShadow(color: UIColor, opacity: Float = 1, offset: CGSize = CGSize(width: 1, height: 1), radius: CGFloat = 0) {
         renderer.setTextShadow(color: color, opacity: opacity, offset: offset, radius: radius)
     }
+
+    // MARK: - Touches
+
+    override open func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+        super.touchesBegan(touches, with: event)
+        guard let location = touches.first?.location(in: self) else { return }
+
+        let distanceToOrigin = location - centerPoint
+        lastTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
+    }
+
+    override open func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
+        super.touchesMoved(touches, with: event)
+        guard let location = touches.first?.location(in: self) else { return }
+
+        let distanceToOrigin = location - centerPoint
+        let currentTouchAngle = atan2(distanceToOrigin.y, distanceToOrigin.x).toDegree
+
+        let angelDelta = currentTouchAngle - lastTouchAngle // in degree
+        lastTouchAngle = currentTouchAngle
+
+        let angleRange = angleDifferenceInDegree(from: startAngle, to: endAngle, isClockwise: isClockwise)
+
+        let angelDeltaAsPercentage = Float(angelDelta / angleRange)
+        guard abs(angelDeltaAsPercentage) < 1 else { return }
+        let newValue  = isClockwise ? value + angelDeltaAsPercentage : value - angelDeltaAsPercentage
+        setValue(newValue, isPercentage: true)
+    }
+
 }
 
 class Renderer {
@@ -423,28 +460,28 @@ private extension Renderer {
         circularSlider?.addSubview(knobView)
         knobView.translatesAutoresizingMaskIntoConstraints = false
         let views = ["view": knobView]
-        let verticalConstraint = NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views)
-        let horizontalConstraint = NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views)
-        circularSlider?.addConstraints(verticalConstraint + horizontalConstraint)
+        circularSlider?.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views))
+        circularSlider?.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|", options: .init(rawValue: 0), metrics: nil, views: views))
     }
 
     func addPointerView() {
         circularSlider?.addSubview(pointerView)
     }
 
-    func addInputAccessoryView() {
-        let width = UIScreen.main.bounds.width
-        let toolBar = UIToolbar(frame: CGRect(origin: .zero, size: CGSize(width: width, height: 48)))
-        toolBar.barStyle = .blackTranslucent
-        let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
-        let done = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(keyboardDoneButtonTapped))
-        done.tintColor = .lightGray
-        toolBar.items = [done, flexibleSpace]
-        toolBar.sizeToFit()
-        textField.inputAccessoryView = toolBar
-    }
-
     func addTextField() {
+
+        func addInputAccessoryView() {
+            let width = UIScreen.main.bounds.width
+            let toolBar = UIToolbar(frame: CGRect(origin: .zero, size: CGSize(width: width, height: 48)))
+            toolBar.barStyle = .blackTranslucent
+            let flexibleSpace = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+            let done = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(keyboardDoneButtonTapped))
+            done.tintColor = .lightGray
+            toolBar.items = [done, flexibleSpace]
+            toolBar.sizeToFit()
+            textField.inputAccessoryView = toolBar
+        }
+
         textField.backgroundColor = .clear
         textField.layer.cornerRadius = 3
         textField.textAlignment = .center

JOCircularSlider/Classes/DotView.swift

@@ -78,20 +78,37 @@ class DotView: UIView {
 
     override func layoutSubviews() {
         super.layoutSubviews()
+
+        var radius = (bounds.width/2) - dotRadius - dotInset
+        if let outerCircleRadius = outerCircleRadius {
+            radius = outerCircleRadius + dotRadius + dotInset
+        }
+
         guard let sublayers = layer.sublayers else { return }
-
-        let radius = outerCircleRadius == nil ? (bounds.width/2) - dotRadius - dotInset : outerCircleRadius! + dotRadius + dotInset
-
         for i in 0..<sublayers.count {
-            guard let dotLayer = sublayers[i] as? DotLayer else { continue }
             if type == .mini && (i % dotCountPerSegment == 0) {
                 continue
             }
             let angle = startAngle + ((CGFloat(i) * unitAngle) * (isClockwise ? 1 : -1))
-            dotLayer.frame = CGRect(x: cos(angle) * radius - dotRadius,
-                                    y: sin(angle) * radius - dotRadius,
-                                    width: dotRadius * 2,
-                                    height: dotRadius * 2)
+            let x = cos(angle) * radius - dotRadius
+            let y = sin(angle) * radius - dotRadius
+            let width = dotRadius * 2
+
+            guard let dotLayer = sublayers[i] as? DotLayer else { continue }
+            dotLayer.frame = CGRect(x: x, y: y, width: width, height: width)
+
+            //            switch type {
+            //            case .mini:
+            //                dotLayer.color = offColor
+            //                dotLayer.highlightColor = highlightColor
+            //            case .maxi:
+            //                dotLayer.highlightColor = highlightColor
+            //                if i <= currentIndex {
+            //                    dotLayer.color = (i >= dotCount - maxDotCount) ? maxColor :  onColor
+            //                } else {
+            //                    dotLayer.color = offColor
+            //                }
+            //            }
         }
         currentIndex = -1
         updateColors(using: value)
@@ -103,22 +120,47 @@ class DotView: UIView {
     }
 
     func updateColors(using value: Float) {
+
         guard type == .maxi else { return }
         let index = Int(value * Float(dotCount - 1))
         guard index != currentIndex else { return }
         currentIndex = index
         self.value = value
-        guard let sublayers = layer.sublayers else { return }
-        var hue: CGFloat = 0; var saturation: CGFloat = 0 ; var brightness: CGFloat = 0
+
+        var hue: CGFloat = 0
+        var saturation: CGFloat = 0
+        var brightness: CGFloat = 0
         onColor.getHue(&hue, saturation: &saturation, brightness: &brightness, alpha: nil)
+
+        //print("first: \(hue)")
+
+
+        guard let sublayers = layer.sublayers else { return }
         var j: CGFloat = 0
         for i in 0..<sublayers.count {
             guard let dotLayer = sublayers[i] as? DotLayer else { continue }
-            guard i <= currentIndex else { dotLayer.color = offColor; continue }
-            guard i >= dotCount - maxDotCount else { dotLayer.color = onColor; continue }
-            let newHue = hue > 0.5 ? hue + (j * ((1.0 - hue)/CGFloat(maxDotCount-1))) : hue - (j * (hue/CGFloat(maxDotCount-1)))
-            dotLayer.color = UIColor(hue: newHue , saturation: saturation, brightness: brightness, alpha: 1)
-            j += 1.0
+            if i <= currentIndex {
+                if i >= dotCount - maxDotCount {
+                    var newHue: CGFloat
+                    if hue > 0.5 {
+                        newHue = hue + (j * ((1.0 - hue)/CGFloat(maxDotCount-1)))
+                    } else {
+                        newHue = hue - (j * (hue/CGFloat(maxDotCount-1)))
+                    }
+                    j += 1.0
+                    //print("new: \(newHue)")
+                    let newMaxColor = UIColor(hue: newHue , saturation: saturation, brightness: brightness, alpha: 1)
+                    dotLayer.color = newMaxColor
+                }
+                else {
+                    dotLayer.color = onColor
+                }
+                //dotLayer.color = (i >= dotCount - maxDotCount) ? maxColor : onColor
+
+            }
+            else {
+                dotLayer.color = offColor
+            }
         }
     }
 }

JOCircularSlider/Classes/Extensions.swift

@@ -53,3 +53,11 @@ extension CALayer {
         return UIBezierPath(ovalIn: bounds.insetBy(dx: bounds.width * multiplier, dy: bounds.height * multiplier))
     }
 }
+
+extension UIView {
+
+    func circlePath(with multiplier: CGFloat) -> UIBezierPath {
+        let multiplier = (1 - max(0, min(multiplier, 1))) / 2.0
+        return UIBezierPath(ovalIn: bounds.insetBy(dx: bounds.width * multiplier, dy: bounds.height * multiplier))
+    }
+}

JOCircularSlider/Classes/KnobView.swift

@@ -66,7 +66,7 @@ class KnobView: UIView {
             }
             middleCircle.multiplier = middleCircleMultiplier
             glowCircleLayer.multiplier = middleCircleMultiplier
-            middleCircleShadow.path = layer.circlePath(with: middleCircleMultiplier).cgPath
+            middleCircleShadow.path = circlePath(with: middleCircleMultiplier).cgPath
         }
     }
     var innerCircleMultiplier: CGFloat = Constants.innerMultiplier {
@@ -148,7 +148,7 @@ class KnobView: UIView {
         middleCircle.frame = bounds
         innerCircle.frame = bounds
 
-        middleCircleShadow.path = layer.circlePath(with: middleCircleMultiplier).cgPath
+        middleCircleShadow.path = circlePath(with: middleCircleMultiplier).cgPath
         glowCircleLayer.frame = bounds
 
     }
@@ -163,6 +163,9 @@ class KnobView: UIView {
         layer.insertSublayer(glowCircleLayer, above: outerCircle)
         layer.insertSublayer(middleCircleShadow, above: glowCircleLayer)
         layer.insertSublayer(middleCircle, above: middleCircleShadow)
+        //        layer.insertSublayer(middleCircleShadow, above: outerCircle)
+        //        layer.insertSublayer(glowCircleLayer, above: middleCircleShadow)
+        //        layer.insertSublayer(middleCircle, above: glowCircleLayer)
 
         layer.insertSublayer(innerCircle, above: middleCircle)
     }

README.md

@@ -1,25 +1,26 @@
-![](https://raw.githubusercontent.com/ouraigua/JOCircularSlider/master/Screenshots/banner.gif) 
+# JOCircularSlider
 
 [![Version](https://img.shields.io/cocoapods/v/JOCircularSlider.svg?style=flat)](https://cocoapods.org/pods/JOCircularSlider)
+[![License](https://img.shields.io/cocoapods/l/JOCircularSlider.svg?style=flat)](https://cocoapods.org/pods/JOCircularSlider)
 [![Platform](https://img.shields.io/cocoapods/p/JOCircularSlider.svg?style=flat)](https://cocoapods.org/pods/JOCircularSlider)
 [![Language](https://img.shields.io/badge/language-Swift-orange.svg?style=flat)]()
-[![License](https://img.shields.io/cocoapods/l/JOCircularSlider.svg?style=flat)](https://cocoapods.org/pods/JOCircularSlider)
-[![Twitter: @ouraigua](https://img.shields.io/badge/twitter-@ouraigua-blue.svg?style=flat)](https://twitter.com/ouraigua)
+[![Twitter: @ouraigua](https://img.shields.io/badge/contact-@ouraigua-blue.svg?style=flat)](https://twitter.com/ouraigua)
 [![Readme Score](http://readme-score-api.herokuapp.com/score.svg?url=https://github.com/ouraigua/jocircularslider)](http://clayallsopp.github.io/readme-score?url=https://github.com/ouraigua/jocircularslider)
 [![codebeat badge](https://codebeat.co/badges/c4db03f5-903a-4b0e-84bb-98362fc5bd7a)](https://codebeat.co/projects/github-com-ouraigua-jocircularslider-master)
 
-# JOCircularSlider
+## Overview
 
 JOCircularSlider is a highly customisable and reusable iOS circular slider that mimics the behaviour of a knob control.
 It uses no preset images and every one of its components is drawn completely in code making it extremely adaptable to every design and theme.  
 
+
 ## Example
 
 To run the example project, clone the repo, and run `pod install` from the Example directory first.
 
-![](https://raw.githubusercontent.com/ouraigua/JOCircularSlider/master/Screenshots/shot1.gif) 
-![](https://raw.githubusercontent.com/ouraigua/JOCircularSlider/master/Screenshots/shot2.gif) 
-![](https://raw.githubusercontent.com/ouraigua/JOCircularSlider/master/Screenshots/shot3.gif)
+![](https://github.com/ouraigua/JOCircularSlider/blob/master/Screenshots/shot1.gif) 
+![](https://github.com/ouraigua/JOCircularSlider/blob/master/Screenshots/shot2.gif) 
+![](https://github.com/ouraigua/JOCircularSlider/blob/master/Screenshots/shot3.gif)
 
 ## Requirements
 
@@ -44,13 +45,13 @@ import JOCircularSlider
 Drag a UIView to your storyboard, change its class of to CircularSlider and start visually customising the design to your liking.
 All the parameters are IBInspectable, so you can configure the slider straight from the attribute inspector tab, without having to write a single line of code.
 
-![](https://raw.githubusercontent.com/ouraigua/JOCircularSlider/master/Screenshots/shot4.gif)
+![](https://github.com/ouraigua/JOCircularSlider/blob/master/Screenshots/shot4.gif)
 
 2. Programatically:
 
 ```swift
-import JOCircularSlider
 
+import JOCircularSlider
 let circularSlider = CircularSlider(frame: aFrame)
 circularSlider.startAngle = 230
 circularSlider.endAngle = 310
@@ -60,30 +61,6 @@ circularSlider.isClockwise = false
 ```
 These are just few of the many params you can configure for the slider.
 
-The slider's `value` property is read-only.
-```swift
-/**
-    returns a value in the range 0.0 (minimumValue) to 1.0 (maximumValue). 
-    The default value of this property is 0.0. 
-*/
-open private (set) var value: Float = 0
-```
-To set the slider's value use the following:
-```swift
-/**
-    Set the `value`.
-    - parameter newValue:      if `isPercentage` then new value must be in the range 0.0 to 1.0
-    - parameter isPercentage:  specifies if newValue is in the range [0.0, 1.0] or not
-*/
-open func setValue(_ newValue: Float, isPercentage: Bool = false)
-```
-
-To Control the text's appearance, use these:
-```swift
-open func setTextFont(named: String, textColor: UIColor, multiplier: CGFloat)
-open func setTextShadow(color: UIColor, opacity: Float = 1, offset: CGSize = CGSize(width: 1, height: 1), radius: CGFloat = 0)
-```
-
 ## References
 
 The project is Inspired by:
@@ -97,3 +74,4 @@ Jalal Ouraigua, ouraigua@icloud.com
 ## License
 
 JOCircularSlider is available under the MIT license. See the LICENSE file for more info.
+