fix: improve scrolling indicator container logic

guoyingtao · Jun 21, 2023 · 04cfd7e · 04cfd7e
1 parent f5e049a
commit 04cfd7e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/Inchworm/Source/ProcessIndicatorContainer.swift b/Inchworm/Source/ProcessIndicatorContainer.swift
@@ -118,7 +118,7 @@ class ProcessIndicatorContainer: UIView {
 
     func setActiveIndicatorIndex(_ index: Int = 0, animated: Bool = false) {
         guard index < progressIndicatorViewList.count else {
-            fatalError("Invalid index found")
+            return
         }
 
         activeIndicatorIndex = index
@@ -127,7 +127,7 @@ class ProcessIndicatorContainer: UIView {
             return
         }
 
-        indicator.active = true
+        indicator.isActive = true
 
         let slideContentSize = getSlideContentSize()
         let currentPositon = indicator.center
@@ -153,7 +153,7 @@ class ProcessIndicatorContainer: UIView {
 extension ProcessIndicatorContainer: UIScrollViewDelegate {
     func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
 
-        let kMaxIndex = progressIndicatorViewList.count
+        let kMaxIndex = progressIndicatorViewList.count - 1
 
         let targetX = scrollView.contentOffset.x + velocity.x * 60.0
         var targetIndex = 0
@@ -173,27 +173,32 @@ extension ProcessIndicatorContainer: UIScrollViewDelegate {
         if (targetIndex > kMaxIndex) {
             targetIndex = kMaxIndex
         }
-
-        targetContentOffset.pointee.x = CGFloat(targetIndex) * pageWidth;
-        setActiveIndicatorIndex(targetIndex)
 
-        guard let processIndicatorView = getActiveIndicator() else { return }
-        if processIndicatorView.status == .editingSelf {
+        if targetIndex != activeIndicatorIndex {
+            targetContentOffset.pointee.x = CGFloat(targetIndex) * pageWidth;
+            setActiveIndicatorIndex(targetIndex)
+            getActiveIndicator()?.handleTap()
+            deactiveInactiveIndicators()
+
+            guard let processIndicatorView = getActiveIndicator() else { return }
             didActive(processIndicatorView.progress)
         }
     }
 }
 
 extension ProcessIndicatorContainer: ProcessIndicatorViewDelegate {
+    private func deactiveInactiveIndicators() {
+        progressIndicatorViewList
+            .filter { $0.index != activeIndicatorIndex }
+            .forEach { $0.deactive() }
+    }
+
     func didActive(_ processIndicatorView: ProcessIndicatorView) {
         if activeIndicatorIndex != processIndicatorView.index {
             setActiveIndicatorIndex(processIndicatorView.index, animated: true)
         }
 
-        progressIndicatorViewList
-            .filter { $0.index != activeIndicatorIndex }
-            .forEach { $0.deactive() }
-
+        deactiveInactiveIndicators()
         didActive(processIndicatorView.progress)
     }
 

diff --git a/Inchworm/Source/ProcessIndicatorView.swift b/Inchworm/Source/ProcessIndicatorView.swift
@@ -41,7 +41,7 @@ class ProcessIndicatorView: UIView {
     var normalIconImage: CGImage?
     var dimmedIconImage: CGImage?
     var index = 0
-    var active = false
+    var isActive = false
 
     var progress: Float {
         get {
@@ -137,7 +137,7 @@ class ProcessIndicatorView: UIView {
     }
 
     func initialActiveStatus() {
-        active = true
+        isActive = true
 
         if progress != 0 {
             delegate?.didActive(self)
@@ -146,7 +146,7 @@ class ProcessIndicatorView: UIView {
     }
 
     func deactive() {
-        active = false
+        isActive = false
 
         if status != .tempReset {
             if viewModel.progress == 0 {
@@ -158,23 +158,23 @@ class ProcessIndicatorView: UIView {
     }
 
     @objc func handleTap() {
-        if active {
-            if status == .tempReset {
+        if isActive {
+            if status == .tempReset || status == .editingOthers {
                 status = .editingSelf
                 delegate?.didRemoveTempReset(self)
             } else {
                 status = .tempReset
                 delegate?.didTempReset(self)
             }
         } else {
-            active = true
+            isActive = true
             delegate?.didActive(self)
 
             if status == .tempReset {
                 delegate?.didTempReset(self)
+            } else {
+                status = .editingSelf
             }
-
-            status = .editingSelf
         }
     }