GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2026-05-29 18:21:06 +02:00
parent 8b6b924c51
commit 9e3a352ff6
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/ui/src/main/java/com/tangem/core/ui/res/TangemThemeRedesign.kt
View file

@ -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),

11
core/ui/src/main/java/com/tangem/core/ui/res/TangemTypography.kt
View file

@ -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(