Make launcher icon badge clickable as well

2022-07-31 15:27:08 +02:00 · 2022-07-31 15:27:08 +02:00 · 7af9a44bfa
commit 7af9a44bfa
parent b9e65f3c9f
2 changed files with 9 additions and 2 deletions
--- a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
@ -89,7 +89,7 @@ fun BottomSheetDialog(
                available: Velocity
            ): Velocity {
                if (available.y < 0) {
-                    return super.onPreFling(available)
+                    return super.onPostFling(consumed, available)
                }
                swipeState.performFling(available.y)
                return available.copy(x = 0f)
--- a/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
@ -120,7 +120,14 @@ fun ShapedLauncherIcon(
                tonalElevation = 1.dp,
                modifier = Modifier
                    .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,
                shape = CircleShape
            ) {