From b64175ff6ee275bcaa8a6c3925d29d5c17d5b074 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Fri, 25 Oct 2024 16:29:16 -0500
Subject: [PATCH] Update fab design (#4168)

---
 .../platform/components/fab/BitwardenFloatingActionButton.kt   | 1 +
 .../x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt | 3 ++-
 .../java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/fab/BitwardenFloatingActionButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/fab/BitwardenFloatingActionButton.kt
index ae018d37145..a4afa6c903f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/fab/BitwardenFloatingActionButton.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/fab/BitwardenFloatingActionButton.kt
@@ -26,6 +26,7 @@ fun BitwardenFloatingActionButton(
         containerColor = BitwardenTheme.colorScheme.filledButton.background,
         contentColor = BitwardenTheme.colorScheme.filledButton.foreground,
         onClick = onClick,
+        shape = BitwardenTheme.shapes.fab,
         modifier = modifier,
     ) {
         Icon(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
index 7edaa014d98..97d0a1e8e8c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
@@ -9,14 +9,15 @@ import androidx.compose.runtime.Immutable
 @Immutable
 data class BitwardenShapes(
     val actionCard: CornerBasedShape,
+    val bottomSheet: CornerBasedShape,
     val coachmark: CornerBasedShape,
     val content: CornerBasedShape,
     val contentBottom: CornerBasedShape,
     val contentTop: CornerBasedShape,
     val dialog: CornerBasedShape,
+    val fab: CornerBasedShape,
     val infoCallout: CornerBasedShape,
     val menu: CornerBasedShape,
     val segmentedControl: CornerBasedShape,
     val snackbar: CornerBasedShape,
-    val bottomSheet: CornerBasedShape,
 )
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt
index 5af465e7eaa..adf32c8c2f9 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt
@@ -9,14 +9,15 @@ import androidx.compose.ui.unit.dp
  */
 val bitwardenShapes: BitwardenShapes = BitwardenShapes(
     actionCard = RoundedCornerShape(size = 12.dp),
+    bottomSheet = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),
     coachmark = RoundedCornerShape(size = 8.dp),
     content = RoundedCornerShape(size = 8.dp),
     contentBottom = RoundedCornerShape(bottomStart = 8.dp, bottomEnd = 8.dp),
     contentTop = RoundedCornerShape(topStart = 8.dp, topEnd = 8.dp),
     dialog = RoundedCornerShape(size = 28.dp),
+    fab = CircleShape,
     infoCallout = RoundedCornerShape(size = 8.dp),
     menu = RoundedCornerShape(size = 4.dp),
     segmentedControl = CircleShape,
     snackbar = RoundedCornerShape(size = 8.dp),
-    bottomSheet = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),
 )