Update fab design (#4168)

bitwarden · Oct 25, 2024 · b64175f · b64175f
1 parent 164cc09
commit b64175f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...main/java/com/x8bit/bitwarden/ui/platform/components/fab/BitwardenFloatingActionButton.kt b/...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
@@ -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
@@ -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),
 )