mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-02-17 12:30:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add sensitiveInfoSmall/sensitiveInfoMedium fonts (#423)

Browse source
This commit is contained in:
Brian Yencho 2023-12-20 10:20:58 -06:00 • committed by Álison Fernandes
parent 21f51c90ad
commit c4d4c1d76b
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreen.kt
View file

@ -326,7 +326,7 @@ private fun FingerPrintPhraseDialog(
Text( Text(
text = fingerprintPhrase(), text = fingerprintPhrase(),
color = LocalNonMaterialColors.current.fingerprint, color = LocalNonMaterialColors.current.fingerprint,
style = LocalNonMaterialTypography.current.fingerprint, style = LocalNonMaterialTypography.current.sensitiveInfoSmall,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) )
} }

17
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/Type.kt
View file

@ -194,7 +194,7 @@ val Typography: Typography = Typography(
) )
val nonMaterialTypography: NonMaterialTypography = NonMaterialTypography( val nonMaterialTypography: NonMaterialTypography = NonMaterialTypography(
fingerprint = TextStyle( sensitiveInfoSmall = TextStyle(
fontSize = 14.sp, fontSize = 14.sp,
lineHeight = 20.sp, lineHeight = 20.sp,
fontFamily = FontFamily(Font(R.font.roboto_regular_mono)), fontFamily = FontFamily(Font(R.font.roboto_regular_mono)),
@ -206,6 +206,18 @@ val nonMaterialTypography: NonMaterialTypography = NonMaterialTypography(
), ),
platformStyle = PlatformTextStyle(includeFontPadding = false), platformStyle = PlatformTextStyle(includeFontPadding = false),
), ),
sensitiveInfoMedium = TextStyle(
fontSize = 16.sp,
lineHeight = 24.sp,
fontFamily = FontFamily(Font(R.font.roboto_regular_mono)),
fontWeight = FontWeight.W400,
letterSpacing = 0.5.sp,
lineHeightStyle = LineHeightStyle(
alignment = LineHeightStyle.Alignment.Center,
trim = LineHeightStyle.Trim.None,
),
platformStyle = PlatformTextStyle(includeFontPadding = false),
),
labelMediumProminent = TextStyle( labelMediumProminent = TextStyle(
fontSize = 12.sp, fontSize = 12.sp,
lineHeight = 16.sp, lineHeight = 16.sp,
@ -224,6 +236,7 @@ val nonMaterialTypography: NonMaterialTypography = NonMaterialTypography(
* Models typography that live outside of the Material Theme spec. * Models typography that live outside of the Material Theme spec.
*/ */
data class NonMaterialTypography( data class NonMaterialTypography(
val fingerprint: TextStyle,
val labelMediumProminent: TextStyle, val labelMediumProminent: TextStyle,
val sensitiveInfoSmall: TextStyle,
val sensitiveInfoMedium: TextStyle,
) )