Update for visionOS

batanus · Nov 17, 2023 · d36020d · d36020d
2 parents 6e7fbf4 + 29a5f27
commit d36020d
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 12 deletions.
diff --git a/DMScrollBar/DMScrollBar.swift b/DMScrollBar/DMScrollBar.swift
@@ -270,7 +270,10 @@ public class DMScrollBar: UIView {
         switch (isSignificantVelocity, isOffsetInScrollBounds) {
         case (true, true): startDeceleration(withVelocity: velocity)
         case (true, false): bounceScrollViewToBoundsIfNeeded(velocity: velocity)
-        case (false, true): generateHapticFeedback()
+        case (false, true):
+            #if !os(visionOS)
+            generateHapticFeedback()
+            #endif
         case (false, false): bounceScrollViewToBoundsIfNeeded(velocity: .zero)
         }
     }
@@ -282,10 +285,14 @@ public class DMScrollBar: UIView {
             gestureInteractionStarted()
         case .cancelled where panGestureRecognizer?.state.isInactive == true:
             gestureInteractionEnded(willDecelerate: false)
+            #if !os(visionOS)
             generateHapticFeedback()
+            #endif
         case .ended, .failed:
             gestureInteractionEnded(willDecelerate: false)
+            #if !os(visionOS)
             generateHapticFeedback()
+            #endif
         default: break
         }
     }
@@ -294,7 +301,9 @@ public class DMScrollBar: UIView {
         let scrollOffset = scrollOffsetFromScrollIndicatorOffset(scrollIndicatorTopConstraint?.constant ?? 0)
         updateAdditionalInfoViewState(forScrollOffset: scrollOffset, previousOffset: nil)
         invalidateHideTimer()
+        #if !os(visionOS)
         generateHapticFeedback()
+        #endif
         updateScrollIndicatorText(
             forScrollOffset: scrollOffset,
             previousOffset: nil,
@@ -326,15 +335,23 @@ public class DMScrollBar: UIView {
         }
     }
 
-    // MARK: - Decelartion & Bounce animations
+    // MARK: - Deceleration & Bounce animations
+
+    private var scale: CGFloat {
+        #if os(visionOS)
+        1
+        #else
+        UIScreen.main.scale
+        #endif
+    }
 
     private func startDeceleration(withVelocity velocity: CGPoint) {
         guard let scrollView else { return }
         let parameters = DecelerationTimingParameters(
             initialValue: scrollIndicatorTopOffset,
             initialVelocity: velocity,
             decelerationRate: UIScrollView.DecelerationRate.normal.rawValue,
-            threshold: 0.5 / UIScreen.main.scale
+            threshold: 0.5 / scale
         )
 
         let destination = parameters.destination
@@ -380,7 +397,7 @@ public class DMScrollBar: UIView {
         var previousScrollViewOffsetBounds = self.scrollViewOffsetBounds
         var restOffset = scrollView.contentOffset.clamped(to: self.scrollViewOffsetBounds)
         let displacement = scrollView.contentOffset - restOffset
-        let threshold = 0.5 / UIScreen.main.scale
+        let threshold = 0.5 / scale
         var previousSafeInset = scrollView.safeAreaInsets
 
         let parameters = SpringTimingParameters(
@@ -422,8 +439,8 @@ public class DMScrollBar: UIView {
             return 0
         }()
         if overscroll == 0 { return }
-        let additionalStiffnes = (overscroll / scrollView.frame.height) * 400
-        bounce(withVelocity: velocity, spring: Spring(mass: 1, stiffness: 100 + additionalStiffnes, dampingRatio: 1))
+        let additionalStiffness = (overscroll / scrollView.frame.height) * 400
+        bounce(withVelocity: velocity, spring: Spring(mass: 1, stiffness: 100 + additionalStiffness, dampingRatio: 1))
     }
 
     private func invalidateDecelerateAnimation() {
@@ -622,7 +639,7 @@ public class DMScrollBar: UIView {
     }
 }
 
-// MARK: - UIGestureRecognizerDelegateg
+// MARK: - UIGestureRecognizerDelegate
 
 extension DMScrollBar: UIGestureRecognizerDelegate {
     public func gestureRecognizer(

diff --git a/DMScrollBar/DMScrollBarConfiguration.swift b/DMScrollBar/DMScrollBarConfiguration.swift
@@ -11,7 +11,7 @@ extension DMScrollBar {
         /// Indicates if scroll view should decelerate when ending scroll bar interaction with velocity
         public let shouldDecelerate: Bool
 
-        /// Inficator configuration, which is placed on the right side
+        /// Indicator configuration, which is placed on the right side
         public let indicator: Indicator
 
         /// Info label configuration, which appears during indicator scrolling. If nil - the info label will be hidden
@@ -311,7 +311,7 @@ extension DMScrollBar.Configuration {
         /// Indicates maximum width of info label. If nil is passed - the info label will grow maximum to the leading side of the screen
         public let maximumWidth: CGFloat?
 
-        /// Info label corenrs which should be rounded
+        /// Info label corners which should be rounded
         public let roundedCorners: RoundedCorners
 
         /// Info label show/hide animation settings
@@ -327,7 +327,7 @@ extension DMScrollBar.Configuration {
         ///   - backgroundColor: Background color of the info label
         ///   - textInsets: Indicates text insets from the info label to its background
         ///   - maximumWidth: Indicates maximum width of info label. If nil is passed - the info label will grow maximum to the leading side of the screen
-        ///   - roundedCorners: Info label corenrs which should be rounded
+        ///   - roundedCorners: Info label corners which should be rounded
         ///   - animation: Info label show/hide animation settings
         ///   - accessibilityIdentifier: Accessibility identifier of the info label
         public init(

diff --git a/DMScrollBar/ScrollBarIndicator.swift b/DMScrollBar/ScrollBarIndicator.swift
@@ -86,7 +86,9 @@ final class ScrollBarIndicator: UIView {
         if scrollBarLabelText == indicatorLabel?.text { return }
         indicatorLabel?.setup(text: scrollBarLabelText, direction: direction)
         indicatorImageLabelStackView.layoutIfNeeded()
+        #if !os(visionOS)
         generateHapticFeedback(style: .light)
+        #endif
     }
 
     // MARK: - Private

diff --git a/DMScrollBar/ScrollBarInfoView.swift b/DMScrollBar/ScrollBarInfoView.swift
@@ -55,6 +55,8 @@ final class ScrollBarInfoView: UIView {
         if text == offsetLabel.text { return }
         offsetLabel.setup(text: text, direction: direction)
         layoutIfNeeded()
+        #if !os(visionOS)
         generateHapticFeedback(style: .light)
+        #endif
     }
 }
diff --git a/DMScrollBar/Utils/ConvenienceFunctions.swift b/DMScrollBar/Utils/ConvenienceFunctions.swift
@@ -28,6 +28,7 @@ func setupConstraint(constraint: inout NSLayoutConstraint?, build: ((CGFloat) ->
     setupConstraint(constraint: &constraint, build: build, value: value, priority: priority)
 }
 
+@available(visionOS, unavailable)
 func generateHapticFeedback(style: UIImpactFeedbackGenerator.FeedbackStyle = .heavy) {
     UIImpactFeedbackGenerator(style: style).impactOccurred()
 }
diff --git a/DMScrollBar/Utils/UIScrollView+Utils.swift b/DMScrollBar/Utils/UIScrollView+Utils.swift
@@ -8,9 +8,13 @@ private enum AssociatedKeys {
 public extension UIScrollView {
     var scrollBar: DMScrollBar? {
         get {
-            objc_getAssociatedObject(self, &AssociatedKeys.scrollBar) as? DMScrollBar
+            withUnsafePointer(to: &AssociatedKeys.scrollBar) {
+                objc_getAssociatedObject(self, $0) as? DMScrollBar
+            }
         } set {
-            objc_setAssociatedObject(self, &AssociatedKeys.scrollBar, newValue, .OBJC_ASSOCIATION_ASSIGN)
+            withUnsafePointer(to: &AssociatedKeys.scrollBar) {
+                objc_setAssociatedObject(self, $0, newValue, .OBJC_ASSOCIATION_ASSIGN)
+            }
         }
     }