lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't dismiss bottom sheets when anchors change

Browse Source
This commit is contained in:
MM20 2023-09-02 18:39:48 +02:00
parent 09e76d3c28
commit a544b85b67
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
View File

@ -222,14 +222,22 @@ fun BottomSheetDialog(
oldValue == SwipeState.Full && hasPeekAnchor -> SwipeState.Peek oldValue == SwipeState.Full && hasPeekAnchor -> SwipeState.Peek
else -> SwipeState.Dismiss else -> SwipeState.Dismiss
} }
val newAnchors = DraggableAnchors {
SwipeState.Dismiss at 0f
if (hasPeekAnchor) SwipeState.Peek at -min(
maxHeightPx * 0.5f,
sheetHeight
)
if (hasFullAnchor) SwipeState.Full at -min(maxHeightPx, sheetHeight)
}
draggableState.updateAnchors( draggableState.updateAnchors(
DraggableAnchors { newAnchors,
SwipeState.Dismiss at 0f with(draggableState) {
if (hasPeekAnchor) SwipeState.Peek at -min( (if (!offset.isNaN()) {
maxHeightPx * 0.5f, newAnchors.closestAnchor(offset) ?: targetValue
sheetHeight } else targetValue).let {
) if (it == SwipeState.Dismiss && targetValue != SwipeState.Dismiss && hasPeekAnchor) SwipeState.Peek else it
if (hasFullAnchor) SwipeState.Full at -min(maxHeightPx, sheetHeight) }
}, },
) )
if (newValue != oldValue) { if (newValue != oldValue) {