|
|
@ -25,112 +25,95 @@ import androidx.compose.ui.unit.sp
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* Now in Android typography.
|
|
|
|
* Now in Android typography.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
val platformTextStyle = PlatformTextStyle(includeFontPadding = true)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
internal val NiaTypography = Typography(
|
|
|
|
internal val NiaTypography = Typography(
|
|
|
|
displayLarge = TextStyle(
|
|
|
|
displayLarge = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 57.sp,
|
|
|
|
fontSize = 57.sp,
|
|
|
|
lineHeight = 64.sp,
|
|
|
|
lineHeight = 64.sp,
|
|
|
|
letterSpacing = (-0.25).sp,
|
|
|
|
letterSpacing = (-0.25).sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
displayMedium = TextStyle(
|
|
|
|
displayMedium = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 45.sp,
|
|
|
|
fontSize = 45.sp,
|
|
|
|
lineHeight = 52.sp,
|
|
|
|
lineHeight = 52.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
displaySmall = TextStyle(
|
|
|
|
displaySmall = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 36.sp,
|
|
|
|
fontSize = 36.sp,
|
|
|
|
lineHeight = 44.sp,
|
|
|
|
lineHeight = 44.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
headlineLarge = TextStyle(
|
|
|
|
headlineLarge = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 32.sp,
|
|
|
|
fontSize = 64.sp,
|
|
|
|
lineHeight = 40.sp,
|
|
|
|
lineHeight = 40.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
headlineMedium = TextStyle(
|
|
|
|
headlineMedium = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 28.sp,
|
|
|
|
fontSize = 28.sp,
|
|
|
|
lineHeight = 36.sp,
|
|
|
|
lineHeight = 36.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
headlineSmall = TextStyle(
|
|
|
|
headlineSmall = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 24.sp,
|
|
|
|
fontSize = 24.sp,
|
|
|
|
lineHeight = 32.sp,
|
|
|
|
lineHeight = 32.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
titleLarge = TextStyle(
|
|
|
|
titleLarge = TextStyle(
|
|
|
|
fontWeight = FontWeight.Bold,
|
|
|
|
fontWeight = FontWeight.Bold,
|
|
|
|
fontSize = 22.sp,
|
|
|
|
fontSize = 22.sp,
|
|
|
|
lineHeight = 28.sp,
|
|
|
|
lineHeight = 28.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
titleMedium = TextStyle(
|
|
|
|
titleMedium = TextStyle(
|
|
|
|
fontWeight = FontWeight.Bold,
|
|
|
|
fontWeight = FontWeight.Bold,
|
|
|
|
fontSize = 18.sp,
|
|
|
|
fontSize = 18.sp,
|
|
|
|
lineHeight = 24.sp,
|
|
|
|
lineHeight = 24.sp,
|
|
|
|
letterSpacing = 0.1.sp,
|
|
|
|
letterSpacing = 0.1.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
titleSmall = TextStyle(
|
|
|
|
titleSmall = TextStyle(
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontSize = 14.sp,
|
|
|
|
fontSize = 14.sp,
|
|
|
|
lineHeight = 20.sp,
|
|
|
|
lineHeight = 20.sp,
|
|
|
|
letterSpacing = 0.1.sp,
|
|
|
|
letterSpacing = 0.1.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
bodyLarge = TextStyle(
|
|
|
|
bodyLarge = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 16.sp,
|
|
|
|
fontSize = 16.sp,
|
|
|
|
lineHeight = 24.sp,
|
|
|
|
lineHeight = 24.sp,
|
|
|
|
letterSpacing = 0.5.sp,
|
|
|
|
letterSpacing = 0.5.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
bodyMedium = TextStyle(
|
|
|
|
bodyMedium = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 14.sp,
|
|
|
|
fontSize = 14.sp,
|
|
|
|
lineHeight = 20.sp,
|
|
|
|
lineHeight = 20.sp,
|
|
|
|
letterSpacing = 0.25.sp,
|
|
|
|
letterSpacing = 0.25.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
bodySmall = TextStyle(
|
|
|
|
bodySmall = TextStyle(
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontWeight = FontWeight.Normal,
|
|
|
|
fontSize = 12.sp,
|
|
|
|
fontSize = 12.sp,
|
|
|
|
lineHeight = 16.sp,
|
|
|
|
lineHeight = 16.sp,
|
|
|
|
letterSpacing = 0.4.sp,
|
|
|
|
letterSpacing = 0.4.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
labelLarge = TextStyle(
|
|
|
|
labelLarge = TextStyle(
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontSize = 14.sp,
|
|
|
|
fontSize = 14.sp,
|
|
|
|
lineHeight = 20.sp,
|
|
|
|
lineHeight = 20.sp,
|
|
|
|
letterSpacing = 0.1.sp,
|
|
|
|
letterSpacing = 0.1.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
labelMedium = TextStyle(
|
|
|
|
labelMedium = TextStyle(
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontSize = 12.sp,
|
|
|
|
fontSize = 12.sp,
|
|
|
|
lineHeight = 16.sp,
|
|
|
|
lineHeight = 16.sp,
|
|
|
|
letterSpacing = 0.5.sp,
|
|
|
|
letterSpacing = 0.5.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
labelSmall = TextStyle(
|
|
|
|
labelSmall = TextStyle(
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontWeight = FontWeight.Medium,
|
|
|
|
fontSize = 10.sp,
|
|
|
|
fontSize = 10.sp,
|
|
|
|
lineHeight = 16.sp,
|
|
|
|
lineHeight = 16.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
letterSpacing = 0.sp,
|
|
|
|
platformStyle = platformTextStyle,
|
|
|
|
|
|
|
|
),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
)
|
|
|
|