github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-07-30 17:07:52 -05:00
Code Issues 2.4k Packages Projects Releases 129 Wiki Activity

[PM-21655] Migrate BitwardenShapes to ui module (#5197)

Browse Source
This commit is contained in:
Patrick Honkonen
2025-05-15 13:47:05 +00:00
committed by GitHub
parent 8a0f67c0e9
commit b71b01d48d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt
+2 -2
View File
@@ -25,8 +25,8 @@ import com.bitwarden.ui.platform.theme.color.darkBitwardenColorScheme
import com.bitwarden.ui.platform.theme.color.dynamicBitwardenColorScheme
import com.bitwarden.ui.platform.theme.color.lightBitwardenColorScheme
import com.bitwarden.ui.platform.theme.color.toMaterialColorScheme
import com.x8bit.bitwarden.ui.platform.theme.shape.BitwardenShapes
import com.x8bit.bitwarden.ui.platform.theme.shape.bitwardenShapes
import com.bitwarden.ui.platform.theme.shape.BitwardenShapes
import com.bitwarden.ui.platform.theme.shape.bitwardenShapes
import com.x8bit.bitwarden.ui.platform.theme.type.BitwardenTypography
import com.x8bit.bitwarden.ui.platform.theme.type.bitwardenTypography
import com.x8bit.bitwarden.ui.platform.theme.type.toMaterialTypography
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/BitwardenShapes.kt
-26
View File
@@ -1,26 +0,0 @@
package com.x8bit.bitwarden.ui.platform.theme.shape
import androidx.compose.foundation.shape.CornerBasedShape
import androidx.compose.runtime.Immutable
/**
* Defines all the shapes for the app.
*/
@Immutable
data class BitwardenShapes(
val actionCard: CornerBasedShape,
val bottomSheet: CornerBasedShape,
val coachmark: CornerBasedShape,
val content: CornerBasedShape,
val contentBottom: CornerBasedShape,
val contentMiddle: CornerBasedShape,
val contentTop: CornerBasedShape,
val dialog: CornerBasedShape,
val fab: CornerBasedShape,
val infoCallout: CornerBasedShape,
val menu: CornerBasedShape,
val progressIndicator: CornerBasedShape,
val segmentedControl: CornerBasedShape,
val snackbar: CornerBasedShape,
val favicon: CornerBasedShape,
)
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/shape/Shapes.kt
-26
View File
@@ -1,26 +0,0 @@
package com.x8bit.bitwarden.ui.platform.theme.shape
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.ui.unit.dp
/**
* The default [BitwardenShapes] for the app.
*/
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),
contentMiddle = RoundedCornerShape(0.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),
progressIndicator = CircleShape,
segmentedControl = CircleShape,
snackbar = RoundedCornerShape(size = 8.dp),
favicon = CircleShape,
)