nik/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-09-19 04:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

wear: fix padding oscillation with hysteresis (expand <40, collapse >120) - padding delta can no longer retrigger itself

Browse Source
This commit is contained in:
callebtc 2026-07-28 21:40:51 +02:00
parent f64338a3b8
commit d4aa9b1644
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wear/src/main/java/com/bitchat/watch/ui/ChatScreen.kt
View File

@ -91,11 +91,20 @@ fun ChatScreen(onOpenPeople: () -> Unit, onOpenTextInput: () -> Unit) {
val buttonsVisible = rememberBottomBarVisibility(scrollState) val buttonsVisible = rememberBottomBarVisibility(scrollState)
val headerExpanded = scrollState.maxValue - scrollState.value > 60 val headerExpanded = scrollState.maxValue - scrollState.value > 60
// Full bottom clearance only at the newest message, so the last message sits comfortably // Full bottom clearance only near the newest message, so the last message sits comfortably
// above the floating buttons; collapses when scrolling up so history flows behind them. // above the floating buttons; collapses when scrolling up so history flows behind them.
val atNewest = scrollState.maxValue - scrollState.value < 40 // Hysteresis (expand <40, collapse >120) breaks the feedback loop: the 48dp padding delta
// changes maxValue, which would otherwise retrigger the condition every frame.
var padExpanded by remember { mutableStateOf(true) }
LaunchedEffect(scrollState) {
androidx.compose.runtime.snapshotFlow { scrollState.maxValue - scrollState.value }
.collect { dist ->
if (dist < 40) padExpanded = true
else if (dist > 120) padExpanded = false
}
}
val listBottomPadding by androidx.compose.animation.core.animateDpAsState( val listBottomPadding by androidx.compose.animation.core.animateDpAsState(
targetValue = if (atNewest) 56.dp else 8.dp, targetValue = if (padExpanded) 56.dp else 8.dp,
animationSpec = androidx.compose.animation.core.tween(BitchatMotion.STANDARD_MS), animationSpec = androidx.compose.animation.core.tween(BitchatMotion.STANDARD_MS),
label = "listBottomPad" label = "listBottomPad"
) )

11
wear/src/main/java/com/bitchat/watch/ui/DmScreen.kt
View File

@ -91,9 +91,16 @@ fun DmScreen(peerID: String, onOpenTextInput: () -> Unit) {
val buttonsVisible = rememberBottomBarVisibility(scrollState) val buttonsVisible = rememberBottomBarVisibility(scrollState)
val headerExpanded = scrollState.maxValue - scrollState.value > 60 val headerExpanded = scrollState.maxValue - scrollState.value > 60
val atNewest = scrollState.maxValue - scrollState.value < 40 var padExpanded by remember { mutableStateOf(true) }
LaunchedEffect(scrollState) {
androidx.compose.runtime.snapshotFlow { scrollState.maxValue - scrollState.value }
.collect { dist ->
if (dist < 40) padExpanded = true
else if (dist > 120) padExpanded = false
}
}
val listBottomPadding by androidx.compose.animation.core.animateDpAsState( val listBottomPadding by androidx.compose.animation.core.animateDpAsState(
targetValue = if (atNewest) 56.dp else 8.dp, targetValue = if (padExpanded) 56.dp else 8.dp,
animationSpec = androidx.compose.animation.core.tween(BitchatMotion.STANDARD_MS), animationSpec = androidx.compose.animation.core.tween(BitchatMotion.STANDARD_MS),
label = "listBottomPad" label = "listBottomPad"
) )