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

Make launcher icon badge clickable as well

Browse Source
This commit is contained in:
MM20 2022-07-31 15:27:08 +02:00
parent b9e65f3c9f
commit 7af9a44bfa
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ fun BottomSheetDialog(
available: Velocity available: Velocity
): Velocity { ): Velocity {
if (available.y < 0) { if (available.y < 0) {
return super.onPreFling(available) return super.onPostFling(consumed, available)
} }
swipeState.performFling(available.y) swipeState.performFling(available.y)
return available.copy(x = 0f) return available.copy(x = 0f)

9
ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
View File

@ -120,7 +120,14 @@ fun ShapedLauncherIcon(
tonalElevation = 1.dp, tonalElevation = 1.dp,
modifier = Modifier modifier = Modifier
.size(size * 0.33f) .size(size * 0.33f)
.align(Alignment.BottomEnd), .align(Alignment.BottomEnd)
.combinedClickable(
enabled = onClick != null || onLongClick != null,
onClick = {
onClick?.invoke()
},
onLongClick = onLongClick,
),
color = MaterialTheme.colorScheme.secondary, color = MaterialTheme.colorScheme.secondary,
shape = CircleShape shape = CircleShape
) { ) {