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

Replace range with two args

Browse Source
This commit is contained in:
MM20 2022-04-25 19:19:31 +02:00
parent f5c727f3dd
commit 72f72c6a82
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
View File

@ -128,7 +128,7 @@ fun PullDownScaffold(
isSearchOpen && (offsetY.value > 0.dp || source == NestedScrollSource.Drag && searchScrollState.value - available.y < 0) -> { isSearchOpen && (offsetY.value > 0.dp || source == NestedScrollSource.Drag && searchScrollState.value - available.y < 0) -> {
val consumed = available.y - searchScrollState.value val consumed = available.y - searchScrollState.value
scope.launch { scope.launch {
offsetY.snapTo((offsetY.value + (consumed * 0.5f / dp).dp).coerceIn(0.dp..64.dp)) offsetY.snapTo((offsetY.value + (consumed * 0.5f / dp).dp).coerceIn(0.dp, 64.dp))
} }
consumed consumed
} }
@ -136,14 +136,14 @@ fun PullDownScaffold(
val consumed = val consumed =
available.y - (searchScrollState.maxValue - searchScrollState.value) available.y - (searchScrollState.maxValue - searchScrollState.value)
scope.launch { scope.launch {
offsetY.snapTo((offsetY.value + (consumed * 0.5f / dp).dp).coerceIn(-64.dp..0.dp)) offsetY.snapTo((offsetY.value + (consumed * 0.5f / dp).dp).coerceIn(-64.dp, 0.dp))
} }
consumed consumed
} }
!isSearchOpen && (offsetY.value > 0.dp || source == NestedScrollSource.Drag && widgetsScrollState.value - available.y < 0) -> { !isSearchOpen && (offsetY.value > 0.dp || source == NestedScrollSource.Drag && widgetsScrollState.value - available.y < 0) -> {
val consumed = available.y - widgetsScrollState.value val consumed = available.y - widgetsScrollState.value
scope.launch { scope.launch {
offsetY.snapTo((offsetY.value + (consumed * 0.5f / dp).dp).coerceIn(0.dp..64.dp)) offsetY.snapTo((offsetY.value + (consumed * 0.5f / dp).dp).coerceIn(0.dp, 64.dp))
} }
consumed consumed
} }