fix: 小幅度下拉时触发刷新

app/src/main/java/com/huanchengfly/tieba/post/ui/page/forum/ForumPage.kt

@@ -1172,22 +1172,18 @@ private val <T> SwipeableState<T>.LoadPreDownPostUpNestedScrollConnection: Neste
 
         override suspend fun onPreFling(available: Velocity): Velocity {
             val toFling = Offset(available.x, available.y).toFloat()
-            return if (toFling > 0) {
+            return if (toFling < 0 && offset.value > minBound) {
                 performFling(velocity = toFling)
                 // since we go to the anchor with tween settling, consume all for the best UX
-                // available
+                available
-                Velocity.Zero
             } else {
                 Velocity.Zero
             }
         }
 
-        override suspend fun onPostFling(
+        override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
-            consumed: Velocity,
-            available: Velocity,
-        ): Velocity {
             performFling(velocity = Offset(available.x, available.y).toFloat())
-            return Velocity.Zero
+            return available
         }
 
         private fun Float.toOffset(): Offset = Offset(0f, this)

app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/LoadMore.kt

@@ -247,22 +247,18 @@ private val <T> SwipeableState<T>.LoadPreUpPostDownNestedScrollConnection: Neste
 
         override suspend fun onPreFling(available: Velocity): Velocity {
             val toFling = Offset(available.x, available.y).toFloat()
-            return if (toFling > 0) {
+            return if (toFling > 0 && offset.value < maxBound) {
                 performFling(velocity = toFling)
                 // since we go to the anchor with tween settling, consume all for the best UX
-                // available
+                available
-                Velocity.Zero
             } else {
                 Velocity.Zero
             }
         }
 
-        override suspend fun onPostFling(
+        override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
-            consumed: Velocity,
-            available: Velocity
-        ): Velocity {
             performFling(velocity = Offset(available.x, available.y).toFloat())
-            return Velocity.Zero
+            return available
         }
 
         private fun Float.toOffset(): Offset = Offset(0f, this)

app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Swipeable.kt

@@ -83,12 +83,12 @@ open class SwipeableState<T>(
     val overflow: State<Float> get() = overflowState
 
     // Use `Float.NaN` as a placeholder while the state is uninitialised.
-    private val offsetState = mutableStateOf(0f)
+    private val offsetState = mutableFloatStateOf(0f)
-    private val overflowState = mutableStateOf(0f)
+    private val overflowState = mutableFloatStateOf(0f)
 
     // the source of truth for the "real"(non ui) position
     // basically position in bounds + overflow
-    private val absoluteOffset = mutableStateOf(0f)
+    private val absoluteOffset = mutableFloatStateOf(0f)
 
     // current animation target, if animating, otherwise null
     private val animationTarget = mutableStateOf<Float?>(null)
@@ -110,8 +110,8 @@ open class SwipeableState<T>(
             requireNotNull(initialOffset) {
                 "The initial value must have an associated anchor."
             }
-            offsetState.value = initialOffset
+            offsetState.floatValue = initialOffset
-            absoluteOffset.value = initialOffset
+            absoluteOffset.floatValue = initialOffset
         }
     }
 
@@ -166,29 +166,29 @@ open class SwipeableState<T>(
 
     internal var thresholds: (Float, Float) -> Float by mutableStateOf({ _, _ -> 0f })
 
-    internal var velocityThreshold by mutableStateOf(0f)
+    internal var velocityThreshold by mutableFloatStateOf(0f)
 
     internal var resistance: ResistanceConfig? by mutableStateOf(null)
 
     internal val draggableState = DraggableState {
-        val newAbsolute = absoluteOffset.value + it
+        val newAbsolute = absoluteOffset.floatValue + it
         val clamped = newAbsolute.coerceIn(minBound, maxBound)
         val overflow = newAbsolute - clamped
         val resistanceDelta = resistance?.computeResistance(overflow) ?: 0f
-        offsetState.value = clamped + resistanceDelta
+        offsetState.floatValue = clamped + resistanceDelta
-        overflowState.value = overflow
+        overflowState.floatValue = overflow
-        absoluteOffset.value = newAbsolute
+        absoluteOffset.floatValue = newAbsolute
     }
 
     private suspend fun snapInternalToOffset(target: Float) {
         draggableState.drag {
-            dragBy(target - absoluteOffset.value)
+            dragBy(target - absoluteOffset.floatValue)
         }
     }
 
     private suspend fun animateInternalToOffset(target: Float, spec: AnimationSpec<Float>) {
         draggableState.drag {
-            var prevValue = absoluteOffset.value
+            var prevValue = absoluteOffset.floatValue
             animationTarget.value = target
             isAnimationRunning = true
             try {
@@ -306,7 +306,7 @@ open class SwipeableState<T>(
                 }
                 animateInternalToOffset(targetOffset, anim)
             } finally {
-                val endOffset = absoluteOffset.value
+                val endOffset = absoluteOffset.floatValue
                 val endValue = anchors
                     // fighting rounding error once again, anchor should be as close as 0.5 pixels
                     .filterKeys { anchorOffset -> abs(anchorOffset - endOffset) < 0.5f }
@@ -364,9 +364,9 @@ open class SwipeableState<T>(
      * @return the amount of [delta] consumed
      */
     fun performDrag(delta: Float): Float {
-        val potentiallyConsumed = absoluteOffset.value + delta
+        val potentiallyConsumed = absoluteOffset.floatValue + delta
         val clamped = potentiallyConsumed.coerceIn(minBound, maxBound)
-        val deltaToConsume = clamped - absoluteOffset.value
+        val deltaToConsume = clamped - absoluteOffset.floatValue
         if (abs(deltaToConsume) > 0) {
             draggableState.dispatchRawDelta(deltaToConsume)
         }
@@ -410,9 +410,7 @@ class SwipeProgress<T>(
 
         if (from != other.from) return false
         if (to != other.to) return false
-        if (fraction != other.fraction) return false
+        return fraction == other.fraction
-
-        return true
     }
 
     override fun hashCode(): Int {