From 7af9a44bfa0142e6c5c4a184f69d3b1dea6bf5c4 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sun, 31 Jul 2022 15:27:08 +0200
Subject: [PATCH] Make launcher icon badge clickable as well

---
 .../de/mm20/launcher2/ui/component/BottomSheetDialog.kt  | 2 +-
 .../de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
index d86b0a29..34ba35cb 100644
--- 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)
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt
index 9587b6d0..f2742e20 100644
--- 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
             ) {