Rosetta/mobile-android
3
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Починил повторное появление реквестов при прокрутке в чат-листе

Browse Source
This commit is contained in:
k1ngsterr1
2026-03-19 19:22:23 +05:00
parent 420ea6e560
commit 2602084764
1 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
View File

@@ -1802,8 +1802,6 @@ fun ChatsListScreen(
remember(localDensity) { with(localDensity) { 56.dp.toPx() } }
val requestsHideThresholdPx =
remember(localDensity) { with(localDensity) { 16.dp.toPx() } }
val topOffsetTolerancePx =
remember(localDensity) { with(localDensity) { 3.dp.toPx() } }
AnimatedContent(
targetState = showDownloadsScreen,
@@ -2099,16 +2097,13 @@ fun ChatsListScreen(
requestsCount,
requestsRevealThresholdPx,
requestsHideThresholdPx,
topOffsetTolerancePx,
hapticFeedback
) {
var accumulatedPullDown = 0f
var hapticSent = false
object : androidx.compose.ui.input.nestedscroll.NestedScrollConnection {
fun isAtTop(): Boolean {
return chatListState.firstVisibleItemIndex == 0 &&
chatListState.firstVisibleItemScrollOffset <=
topOffsetTolerancePx.roundToInt()
return !chatListState.canScrollBackward
}
override fun onPreScroll(
@@ -2130,41 +2125,12 @@ fun ChatsListScreen(
if (isRequestsVisible) {
isRequestsVisible = false
}
}
return androidx.compose.ui.geometry.Offset.Zero
}
override fun onPostScroll(
consumed: androidx.compose.ui.geometry.Offset,
available: androidx.compose.ui.geometry.Offset,
source: androidx.compose.ui.input.nestedscroll.NestedScrollSource
): androidx.compose.ui.geometry.Offset {
if (source != androidx.compose.ui.input.nestedscroll.NestedScrollSource.Drag ||
requestsCount <= 0
) {
accumulatedPullDown = 0f
hapticSent = false
return androidx.compose.ui.geometry.Offset.Zero
}
if (isRequestsVisible) {
accumulatedPullDown = 0f
hapticSent = false
return androidx.compose.ui.geometry.Offset.Zero
}
val pullDownDelta =
if (available.y > 0f && isAtTop())
available.y
else 0f
if (pullDownDelta > 0f) {
} else if (available.y > 0f && !isRequestsVisible && isAtTop()) {
// Pull down from top should always reopen requests.
accumulatedPullDown =
(accumulatedPullDown +
pullDownDelta)
(accumulatedPullDown + available.y)
.coerceAtMost(
requestsRevealThresholdPx *
2f
requestsRevealThresholdPx * 2f
)
if (accumulatedPullDown >= requestsRevealThresholdPx) {
isRequestsVisible = true
@@ -2176,7 +2142,7 @@ fun ChatsListScreen(
hapticSent = true
}
}
} else if (available.y < 0f || !isAtTop()) {
} else if (available.y <= 0f || !isAtTop()) {
accumulatedPullDown = 0f
hapticSent = false
}