feat: Improve UX when forcing align center

Sleep 1 second after forcing align center Add tapic engine feedback
guoyingtao · May 11, 2021 · a49ba58 · a49ba58
1 parent 3da68be
commit a49ba58
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/Example/InchwormExample.xcodeproj/project.pbxproj b/Example/InchwormExample.xcodeproj/project.pbxproj
@@ -120,7 +120,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1110;
-				LastUpgradeCheck = 1110;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = Echo;
 				TargetAttributes = {
 					5F732C0D23579D89008B53DA = {
@@ -260,6 +260,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -320,6 +321,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,15 +2,15 @@ PODS:
   - Inchworm (0.1)
 
 DEPENDENCIES:
-  - Inchworm
+  - Inchworm (from `../`)
 
-SPEC REPOS:
-  trunk:
-    - Inchworm
+EXTERNAL SOURCES:
+  Inchworm:
+    :path: "../"
 
 SPEC CHECKSUMS:
   Inchworm: 116adb753cce2e9e1562eddedc40f41968e03530
 
-PODFILE CHECKSUM: 146d738dd50086fbb909ca09899271ab7a8f331e
+PODFILE CHECKSUM: a7def8051ef5ab440125446435f200dc6b359121
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.10.1
diff --git a/Inchworm/Source/Inchworm.swift b/Inchworm/Source/Inchworm.swift
@@ -43,6 +43,7 @@ public func createSlider(config: Config = Config(),
     public var indicatorSpan: CGFloat = 50
     public var slideRulerSpan: CGFloat = 50
     public var spaceBetweenIndicatorAndSlideRule: CGFloat = 10
+    public var forceAlignCenterFeedback = true
 
     public override init() {
 

diff --git a/Inchworm/Source/SlideRuler.swift b/Inchworm/Source/SlideRuler.swift
@@ -19,7 +19,7 @@ protocol SlideRulerDelegate {
 }
 
 class SlideRuler: UIView {
-
+    var forceAlignCenterFeedback = true
     let pointer = CALayer()
     let centralDot = CAShapeLayer()
     let slider = UIScrollView()
@@ -188,10 +188,29 @@ extension SlideRuler: UIScrollViewDelegate {
 
         let limit = frame.width / CGFloat((scaleBarNumber - 1) * 2)
         if abs(slider.contentOffset.x - frame.width / 2) < limit && abs(speed.x) < 10.0 {
+
             if !reset {
                 reset = true
-                let offset = CGPoint(x: frame.width / 2, y: 0)
-                scrollView.setContentOffset(offset, animated: false)
+
+                if forceAlignCenterFeedback {
+                    let generator = UIImpactFeedbackGenerator(style: .medium)
+                    generator.impactOccurred()
+                }
+
+                func forceAlignCenter() {
+                    let offset = CGPoint(x: frame.width / 2, y: 0)
+                    scrollView.setContentOffset(offset, animated: false)
+                    delegate?.didGetOffsetRatio(from: self, offsetRatio: 0)
+                }
+
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                    forceAlignCenter()
+                }
+
+                forceAlignCenter()
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.11) {
+                    usleep(1000000)
+                }
             }
         } else {
             reset = false

diff --git a/Inchworm/Source/Slider.swift b/Inchworm/Source/Slider.swift
@@ -88,6 +88,7 @@ public class Slider: UIView {
     func createSlideRuler() {
         slideRuler = SlideRuler(frame: CGRect(x: 0, y: baseContainer.frame.height / 2, width: baseContainer.frame.width, height: baseContainer.frame.height - config.slideRulerSpan))
         slideRuler.delegate = self
+        slideRuler.forceAlignCenterFeedback = config.forceAlignCenterFeedback
     }
 
     func handleConfigChange() {