From 92605c988e5becfca9c1e28bbb2fe37b2fcf35c6 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 31 May 2024 10:28:22 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../tangem/core/ui/res/TangemTypography.kt | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) 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 eb48e1cd50..9c029684fe 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 @@ -5,6 +5,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnitType import androidx.compose.ui.unit.sp @@ -23,6 +24,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.SemiBold, letterSpacing = TextUnit(value = 0f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 44f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val h1: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -30,6 +35,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Normal, letterSpacing = TextUnit(value = 0f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 44f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val h2: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -37,6 +46,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Medium, letterSpacing = TextUnit(value = 0.18f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 32f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val h3: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -44,6 +57,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Medium, letterSpacing = TextUnit(value = 0.15f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val subtitle1: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -51,13 +68,21 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Medium, letterSpacing = TextUnit(value = 0.15f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val subtitle2: TextStyle = TextStyle( fontFamily = RobotoFamily, fontSize = 14.sp, fontWeight = FontWeight.Medium, - letterSpacing = TextUnit(value = 0.5f, type = TextUnitType.Sp), + letterSpacing = TextUnit(value = 0.1f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val body1: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -65,6 +90,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Normal, letterSpacing = TextUnit(value = 0.5f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 24f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val body2: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -72,6 +101,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Normal, letterSpacing = TextUnit(value = 0.25f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val button: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -79,6 +112,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Medium, letterSpacing = TextUnit(value = 0.1f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 20f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val caption1: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -86,6 +123,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Medium, letterSpacing = TextUnit(value = 0.4f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val caption2: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -93,6 +134,10 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Normal, letterSpacing = TextUnit(value = 0.4f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), val overline: TextStyle = TextStyle( fontFamily = RobotoFamily, @@ -100,5 +145,9 @@ data class TangemTypography internal constructor( fontWeight = FontWeight.Medium, letterSpacing = TextUnit(value = 1.5f, type = TextUnitType.Sp), lineHeight = TextUnit(value = 16f, type = TextUnitType.Sp), + lineHeightStyle = LineHeightStyle( + alignment = LineHeightStyle.Alignment.Center, + trim = LineHeightStyle.Trim.None, + ), ), ) \ No newline at end of file