release 0.5.1. Added minimum distance and fixed bug where you would b…

…e unable to move sliders if they were on top of each other and at the minimum value. Fixed bug where if the minimum and maximum values were the same it was giving a NaN error. Now returns 0.

Examples/SwiftRangeSliderExample/Podfile

@@ -3,6 +3,6 @@
 use_frameworks!
 
 target 'SwiftRangeSliderExample' do
-  pod 'RappleColorPicker'
-  pod 'SwiftRangeSlider'
+    pod 'RappleColorPicker'
+    pod 'SwiftRangeSlider'
 end

Examples/SwiftRangeSliderExample/Podfile.lock

@@ -1,15 +1,19 @@
 PODS:
   - RappleColorPicker (1.2.5)
-  - SwiftRangeSlider (0.2.2)
+  - SwiftRangeSlider (0.5.0)
 
 DEPENDENCIES:
   - RappleColorPicker
-  - SwiftRangeSlider
+  - SwiftRangeSlider (from `~/Documents/Programming/Mobile/Pods/SwiftRangeSlider`)
+
+EXTERNAL SOURCES:
+  SwiftRangeSlider:
+    :path: ~/Documents/Programming/Mobile/Pods/SwiftRangeSlider
 
 SPEC CHECKSUMS:
   RappleColorPicker: a65830bf046b27e45f7d9fcbe8f70c11c85a32d6
-  SwiftRangeSlider: eba9c63d16027fbe38c7845f0d35a243b96a00bc
+  SwiftRangeSlider: 97f3b77bf4e1c362f1098800a54a2eddcfafccd4
 
-PODFILE CHECKSUM: 9c89086eec65e07f35c8b5e0bc6f716929b99709
+PODFILE CHECKSUM: a6ec3acdb63abddbefce9d0c219ed991b694d743
 
 COCOAPODS: 1.1.1

SwiftRangeSlider.podspec

@@ -6,7 +6,7 @@ s.name = "SwiftRangeSlider"
 s.summary = "A Swift implementation of a custom UIControl for selecting a range of values on a slider bar."
 s.requires_arc = true
 
-s.version = "0.5.0"
+s.version = "0.5.1"
 s.license = { :type => "MIT", :file => "LICENSE" }
 s.author = { "Brian Corbin" => "[email protected]" }
 s.homepage = "https://github.com/BrianCorbin/SwiftRangeSlider"

SwiftRangeSlider/RangeSlider.swift

@@ -9,6 +9,12 @@
 import UIKit
 import QuartzCore
 
+enum Knob {
+  case Neither
+  case Lower
+  case Upper
+  case Both
+}
 
 ///Class that represents the RangeSlider object.
 @IBDesignable open class RangeSlider: UIControl {
@@ -21,13 +27,21 @@ import QuartzCore
       updateLayerFrames()
     }
   }
+
   ///The maximum value selectable on the RangeSlider
   @IBInspectable open var maximumValue: Double = 1.0 {
     didSet {
       updateLayerFrames()
     }
   }
 
+  ///The minimum difference in value between the knobs
+  @IBInspectable open var minimumDistance: Double = 0.0 {
+    didSet {
+      updateLayerFrames()
+    }
+  }
+
   ///The current lower value selected on the RangeSlider
   @IBInspectable open var lowerValue: Double = 0.2 {
     didSet {
@@ -97,6 +111,7 @@ import QuartzCore
   }
 
   var previousLocation = CGPoint()
+  var previouslySelectedKnob = Knob.Neither
 
   let trackLayer = RangeSliderTrackLayer()
   let lowerThumbLayer = RangeSliderThumbLayer()
@@ -173,7 +188,15 @@ import QuartzCore
     CATransaction.commit()
   }
 
+
+  /**
+   Returns the position of the knob to be placed on the slider given the value it should be on the slider
+ */
   func positionForValue(_ value: Double) -> Double {
+    if maximumValue == minimumValue {
+      return 0
+    }
+
     return Double(bounds.width - thumbWidth) * (value - minimumValue) /
       (maximumValue - minimumValue) + Double(thumbWidth / 2.0)
   }
@@ -190,13 +213,31 @@ import QuartzCore
   override open func beginTracking(_ touch: UITouch, with event: UIEvent?) -> Bool {
     previousLocation = touch.location(in: self)
 
+    if lowerThumbLayer.frame.contains(previousLocation) && upperThumbLayer.frame.contains(previousLocation) && (previouslySelectedKnob == Knob.Lower || previouslySelectedKnob == Knob.Neither) {
+      lowerThumbLayer.highlighted = true
+      previouslySelectedKnob = Knob.Lower
+      return true
+    }
+
+    if lowerThumbLayer.frame.contains(previousLocation) && upperThumbLayer.frame.contains(previousLocation) && previouslySelectedKnob == Knob.Upper {
+      upperThumbLayer.highlighted = true
+      previouslySelectedKnob = Knob.Upper
+      return true
+    }
+
     if lowerThumbLayer.frame.contains(previousLocation) {
       lowerThumbLayer.highlighted = true
-    } else if upperThumbLayer.frame.contains(previousLocation) {
+      previouslySelectedKnob = Knob.Lower
+      return true
+    }
+
+    if upperThumbLayer.frame.contains(previousLocation) {
       upperThumbLayer.highlighted = true
+      previouslySelectedKnob = Knob.Upper
+      return true
     }
 
-    return lowerThumbLayer.highlighted || upperThumbLayer.highlighted
+    return false
   }
 
   /**
@@ -215,10 +256,10 @@ import QuartzCore
 
     if lowerThumbLayer.highlighted {
       lowerValue += deltaValue
-      lowerValue = boundValue(lowerValue, toLowerValue: minimumValue, upperValue: upperValue)
+      lowerValue = boundValue(lowerValue, toLowerValue: minimumValue, upperValue: (upperValue - minimumDistance))
     } else if upperThumbLayer.highlighted {
       upperValue += deltaValue
-      upperValue = boundValue(upperValue, toLowerValue: lowerValue, upperValue: maximumValue)
+      upperValue = boundValue(upperValue, toLowerValue: (lowerValue + minimumDistance), upperValue: maximumValue)
     }
 
     sendActions(for: .valueChanged)