Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "sysui-typography" into tm-qpr-dev am: d964925ed8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500381

Change-Id: I0dbe7832bb19ee02db38b0cb153dc912b64b2b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jordan Demeulenaere
2022-12-12 12:52:05 +00:00
committed by Automerger Merge Worker
parent 3eb0ba03eb d964925ed8
commit ef818aeab8
5 changed files with 242 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/compose/core/src/com/android/systemui/compose/theme/SystemUITheme.kt
View File

@@ -22,8 +22,13 @@ import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import com.android.systemui.compose.theme.typography.SystemUITypography import com.android.systemui.compose.theme.typography.TypeScaleTokens
import com.android.systemui.compose.theme.typography.TypefaceNames
import com.android.systemui.compose.theme.typography.TypefaceTokens
import com.android.systemui.compose.theme.typography.TypographyTokens
import com.android.systemui.compose.theme.typography.systemUITypography
/** The Material 3 theme that should wrap all SystemUI Composables. */ /** The Material 3 theme that should wrap all SystemUI Composables. */
@Composable @Composable
@@ -41,8 +46,13 @@ fun SystemUITheme(
dynamicLightColorScheme(context) dynamicLightColorScheme(context)
} }
val androidColorScheme = AndroidColorScheme(context) val androidColorScheme = AndroidColorScheme(context)
val typefaceNames = remember(context) { TypefaceNames.get(context) }
val typography =
remember(typefaceNames) {
systemUITypography(TypographyTokens(TypeScaleTokens(TypefaceTokens(typefaceNames))))
}
MaterialTheme(colorScheme, typography = SystemUITypography) { MaterialTheme(colorScheme, typography = typography) {
CompositionLocalProvider( CompositionLocalProvider(
LocalAndroidColorScheme provides androidColorScheme, LocalAndroidColorScheme provides androidColorScheme,
) { ) {

35
packages/SystemUI/compose/core/src/com/android/systemui/compose/theme/typography/SystemUITypography.kt
View File

@@ -25,21 +25,22 @@ import androidx.compose.material3.Typography
* Do not use directly and call [MaterialTheme.typography] instead to access the different text * Do not use directly and call [MaterialTheme.typography] instead to access the different text
* styles. * styles.
*/ */
internal val SystemUITypography = internal fun systemUITypography(typographyTokens: TypographyTokens): Typography {
Typography( return Typography(
displayLarge = TypographyTokens.DisplayLarge, displayLarge = typographyTokens.displayLarge,
displayMedium = TypographyTokens.DisplayMedium, displayMedium = typographyTokens.displayMedium,
displaySmall = TypographyTokens.DisplaySmall, displaySmall = typographyTokens.displaySmall,
headlineLarge = TypographyTokens.HeadlineLarge, headlineLarge = typographyTokens.headlineLarge,
headlineMedium = TypographyTokens.HeadlineMedium, headlineMedium = typographyTokens.headlineMedium,
headlineSmall = TypographyTokens.HeadlineSmall, headlineSmall = typographyTokens.headlineSmall,
titleLarge = TypographyTokens.TitleLarge, titleLarge = typographyTokens.titleLarge,
titleMedium = TypographyTokens.TitleMedium, titleMedium = typographyTokens.titleMedium,
titleSmall = TypographyTokens.TitleSmall, titleSmall = typographyTokens.titleSmall,
bodyLarge = TypographyTokens.BodyLarge, bodyLarge = typographyTokens.bodyLarge,
bodyMedium = TypographyTokens.BodyMedium, bodyMedium = typographyTokens.bodyMedium,
bodySmall = TypographyTokens.BodySmall, bodySmall = typographyTokens.bodySmall,
labelLarge = TypographyTokens.LabelLarge, labelLarge = typographyTokens.labelLarge,
labelMedium = TypographyTokens.LabelMedium, labelMedium = typographyTokens.labelMedium,
labelSmall = TypographyTokens.LabelSmall, labelSmall = typographyTokens.labelSmall,
) )
}

152
packages/SystemUI/compose/core/src/com/android/systemui/compose/theme/typography/TypeScaleTokens.kt
View File

@@ -18,80 +18,80 @@ package com.android.systemui.compose.theme.typography
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
object TypeScaleTokens { internal class TypeScaleTokens(typefaceTokens: TypefaceTokens) {
val BodyLargeFont = TypefaceTokens.Plain val bodyLargeFont = typefaceTokens.plain
val BodyLargeLineHeight = 24.0.sp val bodyLargeLineHeight = 24.0.sp
val BodyLargeSize = 16.sp val bodyLargeSize = 16.sp
val BodyLargeTracking = 0.0.sp val bodyLargeTracking = 0.0.sp
val BodyLargeWeight = TypefaceTokens.WeightRegular val bodyLargeWeight = TypefaceTokens.WeightRegular
val BodyMediumFont = TypefaceTokens.Plain val bodyMediumFont = typefaceTokens.plain
val BodyMediumLineHeight = 20.0.sp val bodyMediumLineHeight = 20.0.sp
val BodyMediumSize = 14.sp val bodyMediumSize = 14.sp
val BodyMediumTracking = 0.0.sp val bodyMediumTracking = 0.0.sp
val BodyMediumWeight = TypefaceTokens.WeightRegular val bodyMediumWeight = TypefaceTokens.WeightRegular
val BodySmallFont = TypefaceTokens.Plain val bodySmallFont = typefaceTokens.plain
val BodySmallLineHeight = 16.0.sp val bodySmallLineHeight = 16.0.sp
val BodySmallSize = 12.sp val bodySmallSize = 12.sp
val BodySmallTracking = 0.1.sp val bodySmallTracking = 0.1.sp
val BodySmallWeight = TypefaceTokens.WeightRegular val bodySmallWeight = TypefaceTokens.WeightRegular
val DisplayLargeFont = TypefaceTokens.Brand val displayLargeFont = typefaceTokens.brand
val DisplayLargeLineHeight = 64.0.sp val displayLargeLineHeight = 64.0.sp
val DisplayLargeSize = 57.sp val displayLargeSize = 57.sp
val DisplayLargeTracking = 0.0.sp val displayLargeTracking = 0.0.sp
val DisplayLargeWeight = TypefaceTokens.WeightRegular val displayLargeWeight = TypefaceTokens.WeightRegular
val DisplayMediumFont = TypefaceTokens.Brand val displayMediumFont = typefaceTokens.brand
val DisplayMediumLineHeight = 52.0.sp val displayMediumLineHeight = 52.0.sp
val DisplayMediumSize = 45.sp val displayMediumSize = 45.sp
val DisplayMediumTracking = 0.0.sp val displayMediumTracking = 0.0.sp
val DisplayMediumWeight = TypefaceTokens.WeightRegular val displayMediumWeight = TypefaceTokens.WeightRegular
val DisplaySmallFont = TypefaceTokens.Brand val displaySmallFont = typefaceTokens.brand
val DisplaySmallLineHeight = 44.0.sp val displaySmallLineHeight = 44.0.sp
val DisplaySmallSize = 36.sp val displaySmallSize = 36.sp
val DisplaySmallTracking = 0.0.sp val displaySmallTracking = 0.0.sp
val DisplaySmallWeight = TypefaceTokens.WeightRegular val displaySmallWeight = TypefaceTokens.WeightRegular
val HeadlineLargeFont = TypefaceTokens.Brand val headlineLargeFont = typefaceTokens.brand
val HeadlineLargeLineHeight = 40.0.sp val headlineLargeLineHeight = 40.0.sp
val HeadlineLargeSize = 32.sp val headlineLargeSize = 32.sp
val HeadlineLargeTracking = 0.0.sp val headlineLargeTracking = 0.0.sp
val HeadlineLargeWeight = TypefaceTokens.WeightRegular val headlineLargeWeight = TypefaceTokens.WeightRegular
val HeadlineMediumFont = TypefaceTokens.Brand val headlineMediumFont = typefaceTokens.brand
val HeadlineMediumLineHeight = 36.0.sp val headlineMediumLineHeight = 36.0.sp
val HeadlineMediumSize = 28.sp val headlineMediumSize = 28.sp
val HeadlineMediumTracking = 0.0.sp val headlineMediumTracking = 0.0.sp
val HeadlineMediumWeight = TypefaceTokens.WeightRegular val headlineMediumWeight = TypefaceTokens.WeightRegular
val HeadlineSmallFont = TypefaceTokens.Brand val headlineSmallFont = typefaceTokens.brand
val HeadlineSmallLineHeight = 32.0.sp val headlineSmallLineHeight = 32.0.sp
val HeadlineSmallSize = 24.sp val headlineSmallSize = 24.sp
val HeadlineSmallTracking = 0.0.sp val headlineSmallTracking = 0.0.sp
val HeadlineSmallWeight = TypefaceTokens.WeightRegular val headlineSmallWeight = TypefaceTokens.WeightRegular
val LabelLargeFont = TypefaceTokens.Plain val labelLargeFont = typefaceTokens.plain
val LabelLargeLineHeight = 20.0.sp val labelLargeLineHeight = 20.0.sp
val LabelLargeSize = 14.sp val labelLargeSize = 14.sp
val LabelLargeTracking = 0.0.sp val labelLargeTracking = 0.0.sp
val LabelLargeWeight = TypefaceTokens.WeightMedium val labelLargeWeight = TypefaceTokens.WeightMedium
val LabelMediumFont = TypefaceTokens.Plain val labelMediumFont = typefaceTokens.plain
val LabelMediumLineHeight = 16.0.sp val labelMediumLineHeight = 16.0.sp
val LabelMediumSize = 12.sp val labelMediumSize = 12.sp
val LabelMediumTracking = 0.1.sp val labelMediumTracking = 0.1.sp
val LabelMediumWeight = TypefaceTokens.WeightMedium val labelMediumWeight = TypefaceTokens.WeightMedium
val LabelSmallFont = TypefaceTokens.Plain val labelSmallFont = typefaceTokens.plain
val LabelSmallLineHeight = 16.0.sp val labelSmallLineHeight = 16.0.sp
val LabelSmallSize = 11.sp val labelSmallSize = 11.sp
val LabelSmallTracking = 0.1.sp val labelSmallTracking = 0.1.sp
val LabelSmallWeight = TypefaceTokens.WeightMedium val labelSmallWeight = TypefaceTokens.WeightMedium
val TitleLargeFont = TypefaceTokens.Brand val titleLargeFont = typefaceTokens.brand
val TitleLargeLineHeight = 28.0.sp val titleLargeLineHeight = 28.0.sp
val TitleLargeSize = 22.sp val titleLargeSize = 22.sp
val TitleLargeTracking = 0.0.sp val titleLargeTracking = 0.0.sp
val TitleLargeWeight = TypefaceTokens.WeightRegular val titleLargeWeight = TypefaceTokens.WeightRegular
val TitleMediumFont = TypefaceTokens.Plain val titleMediumFont = typefaceTokens.plain
val TitleMediumLineHeight = 24.0.sp val titleMediumLineHeight = 24.0.sp
val TitleMediumSize = 16.sp val titleMediumSize = 16.sp
val TitleMediumTracking = 0.0.sp val titleMediumTracking = 0.0.sp
val TitleMediumWeight = TypefaceTokens.WeightMedium val titleMediumWeight = TypefaceTokens.WeightMedium
val TitleSmallFont = TypefaceTokens.Plain val titleSmallFont = typefaceTokens.plain
val TitleSmallLineHeight = 20.0.sp val titleSmallLineHeight = 20.0.sp
val TitleSmallSize = 14.sp val titleSmallSize = 14.sp
val TitleSmallTracking = 0.0.sp val titleSmallTracking = 0.0.sp
val TitleSmallWeight = TypefaceTokens.WeightMedium val titleSmallWeight = TypefaceTokens.WeightMedium
} }

55
packages/SystemUI/compose/core/src/com/android/systemui/compose/theme/typography/TypefaceTokens.kt
View File

@@ -18,22 +18,57 @@
package com.android.systemui.compose.theme.typography package com.android.systemui.compose.theme.typography
import android.content.Context
import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.font.DeviceFontFamilyName import androidx.compose.ui.text.font.DeviceFontFamilyName
import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
val brandFont = DeviceFontFamilyName("google-sans") internal class TypefaceTokens(typefaceNames: TypefaceNames) {
val plainFont = DeviceFontFamilyName("google-sans-text") companion object {
val WeightMedium = FontWeight.Medium
val WeightRegular = FontWeight.Normal
}
object TypefaceTokens { private val brandFont = DeviceFontFamilyName(typefaceNames.brand)
private val plainFont = DeviceFontFamilyName(typefaceNames.plain)
val WeightMedium = FontWeight.Medium val brand =
val WeightRegular = FontWeight.Normal FontFamily(
Font(brandFont, weight = WeightMedium),
val Brand = Font(brandFont, weight = WeightRegular),
FontFamily(Font(brandFont, weight = WeightMedium), Font(brandFont, weight = WeightRegular)) )
val Plain = val plain =
FontFamily(Font(plainFont, weight = WeightMedium), Font(plainFont, weight = WeightRegular)) FontFamily(
Font(plainFont, weight = WeightMedium),
Font(plainFont, weight = WeightRegular),
)
}
internal data class TypefaceNames
private constructor(
val brand: String,
val plain: String,
) {
private enum class Config(val configName: String, val default: String) {
Brand("config_headlineFontFamily", "sans-serif"),
Plain("config_bodyFontFamily", "sans-serif"),
}
companion object {
fun get(context: Context): TypefaceNames {
return TypefaceNames(
brand = getTypefaceName(context, Config.Brand),
plain = getTypefaceName(context, Config.Plain),
)
}
private fun getTypefaceName(context: Context, config: Config): String {
return context
.getString(context.resources.getIdentifier(config.configName, "string", "android"))
.takeIf { it.isNotEmpty() }
?: config.default
}
}
} }

182
packages/SystemUI/compose/core/src/com/android/systemui/compose/theme/typography/TypographyTokens.kt
View File

@@ -18,125 +18,125 @@ package com.android.systemui.compose.theme.typography
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle
object TypographyTokens { internal class TypographyTokens(typeScaleTokens: TypeScaleTokens) {
val BodyLarge = val bodyLarge =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.BodyLargeFont, fontFamily = typeScaleTokens.bodyLargeFont,
fontWeight = TypeScaleTokens.BodyLargeWeight, fontWeight = typeScaleTokens.bodyLargeWeight,
fontSize = TypeScaleTokens.BodyLargeSize, fontSize = typeScaleTokens.bodyLargeSize,
lineHeight = TypeScaleTokens.BodyLargeLineHeight, lineHeight = typeScaleTokens.bodyLargeLineHeight,
letterSpacing = TypeScaleTokens.BodyLargeTracking, letterSpacing = typeScaleTokens.bodyLargeTracking,
) )
val BodyMedium = val bodyMedium =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.BodyMediumFont, fontFamily = typeScaleTokens.bodyMediumFont,
fontWeight = TypeScaleTokens.BodyMediumWeight, fontWeight = typeScaleTokens.bodyMediumWeight,
fontSize = TypeScaleTokens.BodyMediumSize, fontSize = typeScaleTokens.bodyMediumSize,
lineHeight = TypeScaleTokens.BodyMediumLineHeight, lineHeight = typeScaleTokens.bodyMediumLineHeight,
letterSpacing = TypeScaleTokens.BodyMediumTracking, letterSpacing = typeScaleTokens.bodyMediumTracking,
) )
val BodySmall = val bodySmall =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.BodySmallFont, fontFamily = typeScaleTokens.bodySmallFont,
fontWeight = TypeScaleTokens.BodySmallWeight, fontWeight = typeScaleTokens.bodySmallWeight,
fontSize = TypeScaleTokens.BodySmallSize, fontSize = typeScaleTokens.bodySmallSize,
lineHeight = TypeScaleTokens.BodySmallLineHeight, lineHeight = typeScaleTokens.bodySmallLineHeight,
letterSpacing = TypeScaleTokens.BodySmallTracking, letterSpacing = typeScaleTokens.bodySmallTracking,
) )
val DisplayLarge = val displayLarge =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.DisplayLargeFont, fontFamily = typeScaleTokens.displayLargeFont,
fontWeight = TypeScaleTokens.DisplayLargeWeight, fontWeight = typeScaleTokens.displayLargeWeight,
fontSize = TypeScaleTokens.DisplayLargeSize, fontSize = typeScaleTokens.displayLargeSize,
lineHeight = TypeScaleTokens.DisplayLargeLineHeight, lineHeight = typeScaleTokens.displayLargeLineHeight,
letterSpacing = TypeScaleTokens.DisplayLargeTracking, letterSpacing = typeScaleTokens.displayLargeTracking,
) )
val DisplayMedium = val displayMedium =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.DisplayMediumFont, fontFamily = typeScaleTokens.displayMediumFont,
fontWeight = TypeScaleTokens.DisplayMediumWeight, fontWeight = typeScaleTokens.displayMediumWeight,
fontSize = TypeScaleTokens.DisplayMediumSize, fontSize = typeScaleTokens.displayMediumSize,
lineHeight = TypeScaleTokens.DisplayMediumLineHeight, lineHeight = typeScaleTokens.displayMediumLineHeight,
letterSpacing = TypeScaleTokens.DisplayMediumTracking, letterSpacing = typeScaleTokens.displayMediumTracking,
) )
val DisplaySmall = val displaySmall =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.DisplaySmallFont, fontFamily = typeScaleTokens.displaySmallFont,
fontWeight = TypeScaleTokens.DisplaySmallWeight, fontWeight = typeScaleTokens.displaySmallWeight,
fontSize = TypeScaleTokens.DisplaySmallSize, fontSize = typeScaleTokens.displaySmallSize,
lineHeight = TypeScaleTokens.DisplaySmallLineHeight, lineHeight = typeScaleTokens.displaySmallLineHeight,
letterSpacing = TypeScaleTokens.DisplaySmallTracking, letterSpacing = typeScaleTokens.displaySmallTracking,
) )
val HeadlineLarge = val headlineLarge =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.HeadlineLargeFont, fontFamily = typeScaleTokens.headlineLargeFont,
fontWeight = TypeScaleTokens.HeadlineLargeWeight, fontWeight = typeScaleTokens.headlineLargeWeight,
fontSize = TypeScaleTokens.HeadlineLargeSize, fontSize = typeScaleTokens.headlineLargeSize,
lineHeight = TypeScaleTokens.HeadlineLargeLineHeight, lineHeight = typeScaleTokens.headlineLargeLineHeight,
letterSpacing = TypeScaleTokens.HeadlineLargeTracking, letterSpacing = typeScaleTokens.headlineLargeTracking,
) )
val HeadlineMedium = val headlineMedium =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.HeadlineMediumFont, fontFamily = typeScaleTokens.headlineMediumFont,
fontWeight = TypeScaleTokens.HeadlineMediumWeight, fontWeight = typeScaleTokens.headlineMediumWeight,
fontSize = TypeScaleTokens.HeadlineMediumSize, fontSize = typeScaleTokens.headlineMediumSize,
lineHeight = TypeScaleTokens.HeadlineMediumLineHeight, lineHeight = typeScaleTokens.headlineMediumLineHeight,
letterSpacing = TypeScaleTokens.HeadlineMediumTracking, letterSpacing = typeScaleTokens.headlineMediumTracking,
) )
val HeadlineSmall = val headlineSmall =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.HeadlineSmallFont, fontFamily = typeScaleTokens.headlineSmallFont,
fontWeight = TypeScaleTokens.HeadlineSmallWeight, fontWeight = typeScaleTokens.headlineSmallWeight,
fontSize = TypeScaleTokens.HeadlineSmallSize, fontSize = typeScaleTokens.headlineSmallSize,
lineHeight = TypeScaleTokens.HeadlineSmallLineHeight, lineHeight = typeScaleTokens.headlineSmallLineHeight,
letterSpacing = TypeScaleTokens.HeadlineSmallTracking, letterSpacing = typeScaleTokens.headlineSmallTracking,
) )
val LabelLarge = val labelLarge =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.LabelLargeFont, fontFamily = typeScaleTokens.labelLargeFont,
fontWeight = TypeScaleTokens.LabelLargeWeight, fontWeight = typeScaleTokens.labelLargeWeight,
fontSize = TypeScaleTokens.LabelLargeSize, fontSize = typeScaleTokens.labelLargeSize,
lineHeight = TypeScaleTokens.LabelLargeLineHeight, lineHeight = typeScaleTokens.labelLargeLineHeight,
letterSpacing = TypeScaleTokens.LabelLargeTracking, letterSpacing = typeScaleTokens.labelLargeTracking,
) )
val LabelMedium = val labelMedium =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.LabelMediumFont, fontFamily = typeScaleTokens.labelMediumFont,
fontWeight = TypeScaleTokens.LabelMediumWeight, fontWeight = typeScaleTokens.labelMediumWeight,
fontSize = TypeScaleTokens.LabelMediumSize, fontSize = typeScaleTokens.labelMediumSize,
lineHeight = TypeScaleTokens.LabelMediumLineHeight, lineHeight = typeScaleTokens.labelMediumLineHeight,
letterSpacing = TypeScaleTokens.LabelMediumTracking, letterSpacing = typeScaleTokens.labelMediumTracking,
) )
val LabelSmall = val labelSmall =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.LabelSmallFont, fontFamily = typeScaleTokens.labelSmallFont,
fontWeight = TypeScaleTokens.LabelSmallWeight, fontWeight = typeScaleTokens.labelSmallWeight,
fontSize = TypeScaleTokens.LabelSmallSize, fontSize = typeScaleTokens.labelSmallSize,
lineHeight = TypeScaleTokens.LabelSmallLineHeight, lineHeight = typeScaleTokens.labelSmallLineHeight,
letterSpacing = TypeScaleTokens.LabelSmallTracking, letterSpacing = typeScaleTokens.labelSmallTracking,
) )
val TitleLarge = val titleLarge =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.TitleLargeFont, fontFamily = typeScaleTokens.titleLargeFont,
fontWeight = TypeScaleTokens.TitleLargeWeight, fontWeight = typeScaleTokens.titleLargeWeight,
fontSize = TypeScaleTokens.TitleLargeSize, fontSize = typeScaleTokens.titleLargeSize,
lineHeight = TypeScaleTokens.TitleLargeLineHeight, lineHeight = typeScaleTokens.titleLargeLineHeight,
letterSpacing = TypeScaleTokens.TitleLargeTracking, letterSpacing = typeScaleTokens.titleLargeTracking,
) )
val TitleMedium = val titleMedium =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.TitleMediumFont, fontFamily = typeScaleTokens.titleMediumFont,
fontWeight = TypeScaleTokens.TitleMediumWeight, fontWeight = typeScaleTokens.titleMediumWeight,
fontSize = TypeScaleTokens.TitleMediumSize, fontSize = typeScaleTokens.titleMediumSize,
lineHeight = TypeScaleTokens.TitleMediumLineHeight, lineHeight = typeScaleTokens.titleMediumLineHeight,
letterSpacing = TypeScaleTokens.TitleMediumTracking, letterSpacing = typeScaleTokens.titleMediumTracking,
) )
val TitleSmall = val titleSmall =
TextStyle( TextStyle(
fontFamily = TypeScaleTokens.TitleSmallFont, fontFamily = typeScaleTokens.titleSmallFont,
fontWeight = TypeScaleTokens.TitleSmallWeight, fontWeight = typeScaleTokens.titleSmallWeight,
fontSize = TypeScaleTokens.TitleSmallSize, fontSize = typeScaleTokens.titleSmallSize,
lineHeight = TypeScaleTokens.TitleSmallLineHeight, lineHeight = typeScaleTokens.titleSmallLineHeight,
letterSpacing = TypeScaleTokens.TitleSmallTracking, letterSpacing = typeScaleTokens.titleSmallTracking,
) )
} }