Fix the issue #31: the thumb jumps when the minimumValue > 0 (#58)

HamzaGhazouani · Oct 20, 2019 · 1b31f26 · 1b31f26
1 parent 511b62e
commit 1b31f26
Show file tree

Hide file tree

Showing 15 changed files with 405 additions and 87 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -0,0 +1,2 @@
+exclude_patterns:
+- "Example/"
diff --git a/Example/HGCircularSlider.xcodeproj/project.pbxproj b/Example/HGCircularSlider.xcodeproj/project.pbxproj
@@ -19,6 +19,8 @@
 		607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; };
 		607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; };
 		607FACEC1AFB9204008FA782 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACEB1AFB9204008FA782 /* Tests.swift */; };
+		BB409EA9235C82CE006DC844 /* CircularSliderHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB409EA7235C82CA006DC844 /* CircularSliderHelperTests.swift */; };
+		BB409EAB235C8ACE006DC844 /* CircularSliderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB409EAA235C8ACE006DC844 /* CircularSliderTests.swift */; };
 		BDF84380A076F46A79D0C634 /* Pods_HGCircularSlider_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41A4019E034E0265198683A8 /* Pods_HGCircularSlider_Example.framework */; };
 /* End PBXBuildFile section */
 
@@ -55,6 +57,8 @@
 		6C7918EC49141F7F4652E8F1 /* Pods_HGCircularSlider_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HGCircularSlider_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		99A3B0410141275989079EB6 /* Pods-HGCircularSlider_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HGCircularSlider_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-HGCircularSlider_Tests/Pods-HGCircularSlider_Tests.release.xcconfig"; sourceTree = "<group>"; };
 		9BA305BCC009CE17283FE799 /* Pods-HGCircularSlider_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HGCircularSlider_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-HGCircularSlider_Example/Pods-HGCircularSlider_Example.release.xcconfig"; sourceTree = "<group>"; };
+		BB409EA7235C82CA006DC844 /* CircularSliderHelperTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CircularSliderHelperTests.swift; sourceTree = "<group>"; };
+		BB409EAA235C8ACE006DC844 /* CircularSliderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularSliderTests.swift; sourceTree = "<group>"; };
 		E7D1A678D25EC3365B800DB3 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		EEE4816CB037512E066C24A8 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -141,6 +145,8 @@
 		607FACE81AFB9204008FA782 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				BB409EA7235C82CA006DC844 /* CircularSliderHelperTests.swift */,
+				BB409EAA235C8ACE006DC844 /* CircularSliderTests.swift */,
 				607FACEB1AFB9204008FA782 /* Tests.swift */,
 				607FACE91AFB9204008FA782 /* Supporting Files */,
 			);
@@ -356,6 +362,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				607FACEC1AFB9204008FA782 /* Tests.swift in Sources */,
+				BB409EAB235C8ACE006DC844 /* CircularSliderTests.swift in Sources */,
+				BB409EA9235C82CE006DC844 /* CircularSliderHelperTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Example/HGCircularSlider.xcodeproj/xcshareddata/xcschemes/HGCircularSlider-Example.xcscheme b/Example/HGCircularSlider.xcodeproj/xcshareddata/xcschemes/HGCircularSlider-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+            BuildableName = "HGCircularSlider_Example.app"
+            BlueprintName = "HGCircularSlider_Example"
+            ReferencedContainer = "container:HGCircularSlider.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +62,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "HGCircularSlider_Example.app"
-            BlueprintName = "HGCircularSlider_Example"
-            ReferencedContainer = "container:HGCircularSlider.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
             ReferencedContainer = "container:HGCircularSlider.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - HGCircularSlider (2.1.0)
+  - HGCircularSlider (2.2.0)
 
 DEPENDENCIES:
   - HGCircularSlider (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  HGCircularSlider: 76cd7ce7b7865d93210bd9e45f53dcab6917f9ad
+  HGCircularSlider: afb1942743a2df156dcc7a3500216e523e14266b
 
 PODFILE CHECKSUM: 5935efe45bed5ee625cec9162a170ce99849ca5c
 
-COCOAPODS: 1.7.4
+COCOAPODS: 1.7.5
diff --git a/Example/Pods/Local Podspecs/HGCircularSlider.podspec.json b/Example/Pods/Local Podspecs/HGCircularSlider.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/HGCircularSlider/HGCircularSlider-Info.plist b/Example/Pods/Target Support Files/HGCircularSlider/HGCircularSlider-Info.plist
diff --git a/Example/Tests/CircularSliderHelperTests.swift b/Example/Tests/CircularSliderHelperTests.swift
@@ -47,4 +47,26 @@ class CircularSliderHelperTests: XCTestCase {
         let angle  = CircularSliderHelper.scaleValue(value, fromInterval: valuesInterval, toInterval: cirlceInterval).toDegrees
         XCTAssertEqual(angle, 180)
     }
+
+    func testValueFromRangeToAnotherRangeMinValueEqualToZero() {
+        let oldRange = Interval(min: 0, max: 100)
+        let newRange = Interval(min: 10, max: 20)
+
+        let value: CGFloat = 10
+
+        let newValue = CircularSliderHelper.scaleValue(value, fromInterval: oldRange, toInterval: newRange)
+
+        XCTAssertEqual(newValue, 11)
+    }
+
+    func testValueFromRangeToAnotherRangeMinValueGratherThanZero() {
+           let oldRange = Interval(min: 5, max: 30)
+           let newRange = Interval(min: 0, max: 100)
+
+           let value: CGFloat = 10
+
+           let newValue = CircularSliderHelper.scaleValue(value, fromInterval: oldRange, toInterval: newRange)
+
+           XCTAssertEqual(newValue, 20)
+       }
 }