diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt index f7840693f7..a83c29e34b 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt @@ -32,7 +32,7 @@ fun TangemThemeRedesign(content: @Composable () -> Unit) { val tangemDimens3 = remember { TangemDimens3() } val tangemTypography3 = remember { TangemTypography3(InterFamily) } val tangemTypography2 = remember { TangemTypography2(InterFamily) } - val tangemTypography = remember { TangemTypography(InterFamily) } + val tangemTypography = remember { TangemTypography(InterFamily, useMediumForRegular = true) } MaterialTheme( colorScheme = tangemColorScheme(colors = rememberedColors), diff --git a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt index a86e82124c..21321045bc 100644 --- a/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt +++ b/core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt @@ -19,7 +19,10 @@ internal val RobotoFamily = FontFamily( @Immutable class TangemTypography internal constructor( fontFamily: FontFamily, + useMediumForRegular: Boolean = false, ) { + private val regularWeight: FontWeight = if (useMediumForRegular) FontWeight.Medium else FontWeight.Normal + val head: TextStyle = TextStyle( fontFamily = fontFamily, fontSize = 34.sp, @@ -34,7 +37,7 @@ class TangemTypography internal constructor( val h1: TextStyle = TextStyle( fontFamily = fontFamily, fontSize = 34.sp, - fontWeight = FontWeight.Normal, + fontWeight = regularWeight, letterSpacing = TextUnit(value = 0f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 44f, type = TextUnitType.Sp), lineHeightStyle = LineHeightStyle( @@ -89,7 +92,7 @@ class TangemTypography internal constructor( val body1: TextStyle = TextStyle( fontFamily = fontFamily, fontSize = 16.sp, - fontWeight = FontWeight.Normal, + fontWeight = regularWeight, letterSpacing = TextUnit(value = 0.5f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp), lineHeightStyle = LineHeightStyle( @@ -100,7 +103,7 @@ class TangemTypography internal constructor( val body2: TextStyle = TextStyle( fontFamily = fontFamily, fontSize = 14.sp, - fontWeight = FontWeight.Normal, + fontWeight = regularWeight, letterSpacing = TextUnit(value = 0.25f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp), lineHeightStyle = LineHeightStyle( @@ -133,7 +136,7 @@ class TangemTypography internal constructor( val caption2: TextStyle = TextStyle( fontFamily = fontFamily, fontSize = 12.sp, - fontWeight = FontWeight.Normal, + fontWeight = regularWeight, letterSpacing = TextUnit(value = 0.4f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp), lineHeightStyle = LineHeightStyle(