Merge pull request #15 from spacenation/integers

Support for integer types
spacenation · Apr 27, 2020 · b243f93 · b243f93
2 parents 135aef3 + 608a222
commit b243f93
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This package allows you to build highly customizable sliders and tracks for iOS,
 
 Add this swift package to your project
 ```
-git@github.com:SwiftUIExtensions/Sliders.git
+git@github.com:spacenation/swiftui-sliders.git
 ```
 
 Import and use
@@ -78,7 +78,6 @@ RangeSlider(range: $model.range2)
 - Xcode 11.0+
 
 ## Roadmap
-- Slider styles
 - Circular sliders and tracks
 
 ## Code Contributions

diff --git a/Sources/Sliders/PointSlider/PointSlider.swift b/Sources/Sliders/PointSlider/PointSlider.swift
@@ -36,3 +36,21 @@ extension PointSlider {
         )
     }
 }
+
+extension PointSlider {
+    public init<V>(x: Binding<V>, xBounds: ClosedRange<V> = 0...1, xStep: V.Stride = 1, y: Binding<V>, yBounds: ClosedRange<V> = 0...1, yStep: V.Stride = 1, onEditingChanged: @escaping (Bool) -> Void = { _ in }) where V : BinaryInteger, V.Stride : BinaryInteger {
+
+        self.init(
+            PointSliderStyleConfiguration(
+                x: Binding(get: { CGFloat(x.wrappedValue) }, set: { x.wrappedValue = V($0) }),
+                xBounds: CGFloat(xBounds.lowerBound)...CGFloat(xBounds.upperBound),
+                xStep: CGFloat(xStep),
+                y: Binding(get: { CGFloat(y.wrappedValue) }, set: { y.wrappedValue = V($0) }),
+                yBounds: CGFloat(yBounds.lowerBound)...CGFloat(yBounds.upperBound),
+                yStep: CGFloat(yStep),
+                onEditingChanged: onEditingChanged,
+                dragOffset: .constant(.init())
+            )
+        )
+    }
+}
diff --git a/Sources/Sliders/RangeSlider/RangeSlider.swift b/Sources/Sliders/RangeSlider/RangeSlider.swift
@@ -36,3 +36,21 @@ extension RangeSlider {
         )
     }
 }
+
+extension RangeSlider {
+    public init<V>(range: Binding<ClosedRange<V>>, in bounds: ClosedRange<V> = 0...1, step: V.Stride = 1, onEditingChanged: @escaping (Bool) -> Void = { _ in }) where V : BinaryInteger, V.Stride : BinaryInteger {
+
+        self.init(
+            RangeSliderStyleConfiguration(
+                range: Binding(
+                    get: { CGFloat(range.wrappedValue.lowerBound)...CGFloat(range.wrappedValue.upperBound) },
+                    set: { range.wrappedValue = V($0.lowerBound)...V($0.upperBound) }
+                ),
+                bounds: CGFloat(bounds.lowerBound)...CGFloat(bounds.upperBound),
+                step: CGFloat(step),
+                onEditingChanged: onEditingChanged,
+                dragOffset: .constant(0)
+            )
+        )
+    }
+}
diff --git a/Sources/Sliders/ValueSlider/ValueSlider.swift b/Sources/Sliders/ValueSlider/ValueSlider.swift
@@ -33,3 +33,17 @@ extension ValueSlider {
         )
     }
 }
+
+extension ValueSlider {
+    public init<V>(value: Binding<V>, in bounds: ClosedRange<V> = 0...1, step: V.Stride = 1, onEditingChanged: @escaping (Bool) -> Void = { _ in }) where V : BinaryInteger, V.Stride : BinaryInteger {
+        self.init(
+            ValueSliderStyleConfiguration(
+                value: Binding(get: { CGFloat(value.wrappedValue) }, set: { value.wrappedValue = V($0) }),
+                bounds: CGFloat(bounds.lowerBound)...CGFloat(bounds.upperBound),
+                step: CGFloat(step),
+                onEditingChanged: onEditingChanged,
+                dragOffset: .constant(0)
+            )
+        )
+    }
+}