Chore: Simplify bitwarden shapes (#7445)

This commit is contained in:
David Perez authored and GitHub committed 2026-10-05 16:55:33 +00:00
1 parent 464f0dd05a
commit 6bd31ec05d
2 files changed
+23 -22

No files matched your search

@@ -1,30 +1,30 @@
package com.bitwarden.ui.platform.theme.shape
import androidx.compose.foundation.shape.CornerBasedShape
import androidx.compose.runtime.Immutable
import androidx.compose.ui.graphics.Shape
/**
* Defines all the shapes for the app.
*/
@Immutable
data class BitwardenShapes(
val actionCard: CornerBasedShape,
val badge: CornerBasedShape,
val bottomSheet: CornerBasedShape,
val button: CornerBasedShape,
val coachmark: CornerBasedShape,
val content: CornerBasedShape,
val contentBottom: CornerBasedShape,
val contentMiddle: CornerBasedShape,
val contentTop: CornerBasedShape,
val dialog: CornerBasedShape,
val fab: CornerBasedShape,
val fabItem: CornerBasedShape,
val infoCallout: CornerBasedShape,
val menu: CornerBasedShape,
val progressIndicator: CornerBasedShape,
val row: CornerBasedShape,
val segmentedControl: CornerBasedShape,
val snackbar: CornerBasedShape,
val favicon: CornerBasedShape,
val actionCard: Shape,
val badge: Shape,
val bottomSheet: Shape,
val button: Shape,
val coachmark: Shape,
val content: Shape,
val contentBottom: Shape,
val contentMiddle: Shape,
val contentTop: Shape,
val dialog: Shape,
val fab: Shape,
val fabItem: Shape,
val infoCallout: Shape,
val menu: Shape,
val progressIndicator: Shape,
val row: Shape,
val segmentedControl: Shape,
val snackbar: Shape,
val favicon: Shape,
)
@@ -2,6 +2,7 @@ package com.bitwarden.ui.platform.theme.shape
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.unit.dp
/**
@@ -15,7 +16,7 @@ val bitwardenShapes: BitwardenShapes = BitwardenShapes(
coachmark = RoundedCornerShape(size = 8.dp),
content = RoundedCornerShape(size = 8.dp),
contentBottom = RoundedCornerShape(bottomStart = 8.dp, bottomEnd = 8.dp),
contentMiddle = RoundedCornerShape(0.dp),
contentMiddle = RectangleShape,
contentTop = RoundedCornerShape(topStart = 8.dp, topEnd = 8.dp),
dialog = RoundedCornerShape(size = 28.dp),
fab = CircleShape,
@@ -23,7 +24,7 @@ val bitwardenShapes: BitwardenShapes = BitwardenShapes(
infoCallout = RoundedCornerShape(size = 8.dp),
menu = RoundedCornerShape(size = 4.dp),
progressIndicator = CircleShape,
row = RoundedCornerShape(size = 0.dp),
row = RectangleShape,
segmentedControl = CircleShape,
snackbar = RoundedCornerShape(size = 8.dp),
favicon = CircleShape,