Skip to content

Commit 8cd52a7

Browse files
authored
[PM-37916] feat: Add titleExtraLarge typography and apply to Premium header (#6962)
1 parent 7b94daf commit 8cd52a7

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ private fun SubscriptionHeader(
665665
Row(verticalAlignment = Alignment.CenterVertically) {
666666
Text(
667667
text = stringResource(id = BitwardenString.premium_plan_name),
668-
style = BitwardenTheme.typography.titleLarge,
668+
style = BitwardenTheme.typography.titleExtraLarge,
669669
color = BitwardenTheme.colorScheme.text.primary,
670670
)
671671
status?.let {

ui/src/main/kotlin/com/bitwarden/ui/platform/theme/type/BitwardenTypography.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ data class BitwardenTypography(
1414
val headlineLarge: TextStyle,
1515
val headlineMedium: TextStyle,
1616
val headlineSmall: TextStyle,
17+
val titleExtraLarge: TextStyle,
1718
val titleLarge: TextStyle,
1819
val titleMedium: TextStyle,
1920
val titleSmall: TextStyle,

ui/src/main/kotlin/com/bitwarden/ui/platform/theme/type/Typography.kt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,18 @@ val bitwardenTypography: BitwardenTypography = BitwardenTypography(
9797
),
9898
platformStyle = PlatformTextStyle(includeFontPadding = false),
9999
),
100+
titleExtraLarge = TextStyle(
101+
fontSize = 24.sp,
102+
lineHeight = 28.sp,
103+
fontFamily = FontFamily(Font(R.font.dm_sans_semi_bold)),
104+
fontWeight = FontWeight.W600,
105+
letterSpacing = 0.sp,
106+
lineHeightStyle = LineHeightStyle(
107+
alignment = LineHeightStyle.Alignment.Center,
108+
trim = LineHeightStyle.Trim.None,
109+
),
110+
platformStyle = PlatformTextStyle(includeFontPadding = false),
111+
),
100112
titleLarge = TextStyle(
101113
fontSize = 19.sp,
102114
lineHeight = 28.sp,
@@ -316,11 +328,14 @@ private fun BitwardenTypography_preview() {
316328
Text(text = "Headline large", style = bitwardenTypography.headlineLarge)
317329
Text(text = "Headline medium", style = bitwardenTypography.headlineMedium)
318330
Text(text = "Headline small", style = bitwardenTypography.headlineSmall)
331+
Text(text = "Title extra large", style = bitwardenTypography.titleExtraLarge)
319332
Text(text = "Title large", style = bitwardenTypography.titleLarge)
320333
Text(text = "Title medium", style = bitwardenTypography.titleMedium)
321334
Text(text = "Title small", style = bitwardenTypography.titleSmall)
322335
Text(text = "Body large", style = bitwardenTypography.bodyLarge)
336+
Text(text = "Body large emphasis", style = bitwardenTypography.bodyLargeEmphasis)
323337
Text(text = "Body medium", style = bitwardenTypography.bodyMedium)
338+
Text(text = "Body medium emphasis", style = bitwardenTypography.bodyMediumEmphasis)
324339
Text(text = "Body small", style = bitwardenTypography.bodySmall)
325340
Text(text = "Label large", style = bitwardenTypography.labelLarge)
326341
Text(text = "Label medium", style = bitwardenTypography.labelMedium)

0 commit comments

Comments
 (0)