Set text direction by language characteristic

Change-Id: I9d9180446adea0e34b61f1cfb5d424bf264f130a
pull/2037/head
Jaehwa Noh 8 months ago
parent ade8065442
commit e601d3d6cc

@ -35,40 +35,40 @@ internal val NiaTypography = Typography(
fontSize = 57.sp, fontSize = 57.sp,
lineHeight = 64.sp, lineHeight = 64.sp,
letterSpacing = (-0.25).sp, letterSpacing = (-0.25).sp,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
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,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
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,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
headlineLarge = TextStyle( headlineLarge = TextStyle(
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Normal,
fontSize = 32.sp, fontSize = 32.sp,
lineHeight = 40.sp, lineHeight = 40.sp,
letterSpacing = 0.sp, letterSpacing = 0.sp,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
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,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
headlineSmall = TextStyle( headlineSmall = TextStyle(
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Normal,
@ -79,8 +79,8 @@ internal val NiaTypography = Typography(
alignment = Alignment.Bottom, alignment = Alignment.Bottom,
trim = Trim.None, trim = Trim.None,
), ),
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
titleLarge = TextStyle( titleLarge = TextStyle(
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
@ -91,24 +91,24 @@ internal val NiaTypography = Typography(
alignment = Alignment.Bottom, alignment = Alignment.Bottom,
trim = Trim.LastLineBottom, trim = Trim.LastLineBottom,
), ),
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
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,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
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,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
// Default text style // Default text style
bodyLarge = TextStyle( bodyLarge = TextStyle(
@ -120,24 +120,24 @@ internal val NiaTypography = Typography(
alignment = Alignment.Center, alignment = Alignment.Center,
trim = Trim.None, trim = Trim.None,
), ),
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
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,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
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,
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
// Used for Button // Used for Button
labelLarge = TextStyle( labelLarge = TextStyle(
@ -149,8 +149,8 @@ internal val NiaTypography = Typography(
alignment = Alignment.Center, alignment = Alignment.Center,
trim = Trim.LastLineBottom, trim = Trim.LastLineBottom,
), ),
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
// Used for Navigation items // Used for Navigation items
labelMedium = TextStyle( labelMedium = TextStyle(
@ -162,8 +162,8 @@ internal val NiaTypography = Typography(
alignment = Alignment.Center, alignment = Alignment.Center,
trim = Trim.LastLineBottom, trim = Trim.LastLineBottom,
), ),
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
// Used for Tag // Used for Tag
labelSmall = TextStyle( labelSmall = TextStyle(
@ -175,7 +175,7 @@ internal val NiaTypography = Typography(
alignment = Alignment.Center, alignment = Alignment.Center,
trim = Trim.LastLineBottom, trim = Trim.LastLineBottom,
), ),
textDirection = TextDirection.Ltr, textDirection = TextDirection.ContentOrLtr,
textAlign = TextAlign.Left, textAlign = TextAlign.Start,
), ),
) )

Loading…
Cancel
Save