diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt index a70846e074..f7ca9885ce 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ElementTypography.kt @@ -18,95 +18,6 @@ package io.element.android.libraries.designsystem.theme import androidx.compose.ui.text.PlatformTextStyle import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp -import com.airbnb.android.showkase.annotation.ShowkaseTypography - -/** - * TODO Provide the typo to Material3 theme. - */ -@ShowkaseTypography(name = "H1", group = "Element") -val h1Default: TextStyle = TextStyle( - fontFamily = FontFamily.SansSerif, - fontWeight = FontWeight.Bold, - fontSize = 24.sp -) - -@ShowkaseTypography(name = "Body1", group = "Element") -val body1Default: TextStyle = TextStyle( - fontFamily = FontFamily.SansSerif, - fontWeight = FontWeight.Normal, - fontSize = 16.sp -) - -@ShowkaseTypography(name = "BodySmall", group = "Element") -val bodySmallDefault: TextStyle = TextStyle( - fontFamily = FontFamily.SansSerif, - fontWeight = FontWeight.Normal, - fontSize = 14.sp -) - -@ShowkaseTypography(name = "bodyMedium", group = "Element") -val bodyMediumDefault: TextStyle = TextStyle( - fontFamily = FontFamily.SansSerif, - fontWeight = FontWeight.Normal, - fontSize = 18.sp -) - -@ShowkaseTypography(name = "Body Large", group = "Element") -val bodyLargeDefault: TextStyle = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp -) - -@ShowkaseTypography(name = "Headline Small", group = "Element") -val headlineSmallDefault: TextStyle = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Bold, - fontSize = 24.sp, - lineHeight = 30.sp, - letterSpacing = 1.sp -) - -@ShowkaseTypography(name = "Headline Medium", group = "Element") -val headlineMediumDefault: TextStyle = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Bold, - fontSize = 28.sp, - lineHeight = 34.sp, - letterSpacing = 1.sp -) - -@ShowkaseTypography(name = "Headline Large", group = "Element") -val headlineLargeDefault: TextStyle = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Bold, - fontSize = 32.sp, - lineHeight = 38.sp, - letterSpacing = 1.sp -) - -@ShowkaseTypography(name = "titleSmall", group = "Element") -val titleSmallDefault: TextStyle = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 14.sp, - lineHeight = 20.sp, - letterSpacing = 0.5.sp -) - -@ShowkaseTypography(name = "titleMedium", group = "Element") -val titleMediumDefault: TextStyle = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 18.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp -) // Temporary style for text that needs to be aligned without weird font padding issues. `includeFontPadding` will default to false in a future version of // compose, at which point this can be removed.