Remove animation, add delegate default impl

batanus · Apr 10, 2023 · 2a8b82d · 2a8b82d
1 parent d71d6bc
commit 2a8b82d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/DMScrollBar/DMScrollBarDelegate.swift b/DMScrollBar/DMScrollBarDelegate.swift
@@ -17,6 +17,8 @@ public protocol DMScrollBarDelegate: AnyObject {
 // MARK: - DMScrollBarDelegate extension for Table View
 
 public extension DMScrollBarDelegate {
+    func infoLabelText(forContentOffset contentOffset: CGFloat, scrollIndicatorOffset: CGFloat) -> String? { nil }
+
     func scrollBarText(forContentOffset contentOffset: CGFloat, scrollIndicatorOffset: CGFloat) -> String? { nil }
 
     /// This is a convenience method to get the header title for the section at the specified content offset. This method will not work for table views with custom headers

diff --git a/DMScrollBar/ScrollBarIndicator.swift b/DMScrollBar/ScrollBarIndicator.swift
@@ -82,9 +82,8 @@ final class ScrollBarIndicator: UIView {
     ) {
         guard let scrollBarLabelText = scrollBarLabelText, textConfig != nil else { return hideIndicatorLabel() }
         if scrollBarLabelText == indicatorLabel?.text { return }
-        let animationDuration: TimeInterval = 0.15
-        indicatorLabel?.setup(text: scrollBarLabelText, direction: direction, duration: animationDuration)
-        UIView.animate(withDuration: animationDuration, animations: layoutIfNeeded)
+        indicatorLabel?.setup(text: scrollBarLabelText, direction: direction)
+        indicatorImageLabelStackView.layoutIfNeeded()
         generateHapticFeedback(style: .light)
     }
 

diff --git a/DMScrollBar/ScrollBarInfoView.swift b/DMScrollBar/ScrollBarInfoView.swift
@@ -51,9 +51,8 @@ final class ScrollBarInfoView: UIView {
 
     func updateText(text: String, direction: CATransitionSubtype?) {
         if text == offsetLabel.text { return }
-        let animationDuration: TimeInterval = 0.15
-        offsetLabel.setup(text: text, direction: direction, duration: animationDuration)
-        UIView.animate(withDuration: animationDuration, animations: layoutIfNeeded)
+        offsetLabel.setup(text: text, direction: direction)
+        layoutIfNeeded()
         generateHapticFeedback(style: .light)
     }
 }
diff --git a/DMScrollBar/Utils/UILabel+Utils.swift b/DMScrollBar/Utils/UILabel+Utils.swift
@@ -2,13 +2,13 @@ import UIKit
 import QuartzCore
 
 extension UILabel {
-    func setup(text: String, direction: CATransitionSubtype?, duration: TimeInterval) {
+    func setup(text: String, direction: CATransitionSubtype?) {
         if let direction {
             let animation = CATransition()
             animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
             animation.type = CATransitionType.push
             animation.subtype = direction
-            animation.duration = duration
+            animation.duration = 0.15
             layer.add(animation, forKey: "pushTextChange")
         }
         self.text = text