fix multi fingers fails detect up point event

Author: s1rius

ptr-compose/src/main/java/wtf/s1/ui/nsptr/compose/NSPtrGesture.kt

@@ -5,24 +5,19 @@ import androidx.compose.foundation.gestures.forEachGesture
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.*
 import androidx.compose.ui.util.fastAll
-import androidx.compose.ui.util.fastAny
-import kotlinx.coroutines.coroutineScope
-
 
 suspend fun PointerInputScope.detectDownAndUp(
     onDown: (Offset) -> Unit,
     onUpOrCancel: (Offset?) -> Unit
 ) {
     forEachGesture {
-        coroutineScope {
-            awaitPointerEventScope {
-                awaitFirstDown(false).also {
-                    onDown(it.position)
-                }
-
-                val up = waitForUpOrCancel()
-                onUpOrCancel.invoke(up?.position)
+        awaitPointerEventScope {
+            awaitFirstDown(false).also {
+                onDown(it.position)
             }
+
+            val up = waitForUpOrCancel()
+            onUpOrCancel(up?.position)
         }
     }
 }
@@ -35,12 +30,12 @@ suspend fun AwaitPointerEventScope.waitForUpOrCancel(): PointerInputChange? {
             return event.changes[0]
         }
 
-        if (event.changes.fastAny { it.isOutOfBounds(size) }) {
+        if (event.changes.fastAll { it.isOutOfBounds(size) }) {
             return null // Canceled
         }
 
         val final = awaitPointerEvent(PointerEventPass.Final)
-        if (final.changes.fastAny { !it.pressed }) {
+        if (final.changes.fastAll { !it.pressed }) {
             return final.changes[0]
         }
     }

ptr-compose/src/main/java/wtf/s1/ui/nsptr/compose/NSPtrLayout.kt

@@ -34,7 +34,7 @@ sealed class PtrComponent {
 class NSPtrState(
     val contentInitPosition: Dp = 0.dp,
     val contentRefreshPosition: Dp = 54.dp,
-    @Stable val pullFriction: Float = 0.56f,
+    val pullFriction: Float = 0.56f,
     coroutineScope: CoroutineScope,
     onRefresh: (suspend (NSPtrState) -> Unit)? = null,
 ) {
@@ -63,8 +63,8 @@ class NSPtrState(
                         animateContentTo(contentInitPositionPx)
                     }
                     is SideEffect.OnRefreshing -> {
-                        animateContentTo(contentRefreshPositionPx)
                         onRefresh?.invoke(this@NSPtrState)
+                        animateContentTo(contentRefreshPositionPx)
                     }
                     else -> {