refactor: extract all text styles

Author: ovitrif

app/src/main/java/to/bitkit/ui/components/Text.kt

@@ -23,17 +23,13 @@ fun Display(
     modifier: Modifier = Modifier,
     fontWeight: FontWeight = FontWeight.Black,
     fontSize: TextUnit = 44.sp,
-    lineHeight: TextUnit = 44.sp,
     color: Color = MaterialTheme.colorScheme.primary,
 ) {
     Text(
         text = text.uppercase(),
-        style = TextStyle(
+        style = AppTextStyles.Display.merge(
             fontWeight = fontWeight,
             fontSize = fontSize,
-            lineHeight = lineHeight,
-            letterSpacing = (-1).sp,
-            fontFamily = InterFontFamily,
             color = color,
         ),
         modifier = modifier,
@@ -44,19 +40,11 @@ fun Display(
 fun Display(
     text: AnnotatedString,
     modifier: Modifier = Modifier,
-    fontWeight: FontWeight = FontWeight.Black,
-    fontSize: TextUnit = 44.sp,
-    lineHeight: TextUnit = 44.sp,
     color: Color = MaterialTheme.colorScheme.primary,
 ) {
     Text(
         text = text.toUpperCase(),
-        style = TextStyle(
-            fontWeight = fontWeight,
-            fontSize = fontSize,
-            lineHeight = lineHeight,
-            letterSpacing = (-1).sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.Display.merge(
             color = color,
         ),
         modifier = modifier,
@@ -67,17 +55,11 @@ fun Display(
 fun Headline(
     text: AnnotatedString,
     modifier: Modifier = Modifier,
-    lineHeight: TextUnit = 30.sp,
     color: Color = MaterialTheme.colorScheme.primary,
 ) {
     Text(
         text = text.toUpperCase(),
-        style = TextStyle(
-            fontWeight = FontWeight.Black,
-            fontSize = 30.sp,
-            lineHeight = lineHeight,
-            letterSpacing = (-1).sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.Headline.merge(
             color = color,
         ),
         modifier = modifier,
@@ -88,17 +70,14 @@ fun Headline(
 fun Headline20(
     text: AnnotatedString,
     modifier: Modifier = Modifier,
-    lineHeight: TextUnit = 20.sp,
-    color: Color = Colors.White,
+    color: Color = MaterialTheme.colorScheme.primary,
 ) {
     Text(
         text = text.toUpperCase(),
-        style = TextStyle(
-            fontWeight = FontWeight.Black,
+        style = AppTextStyles.Headline.merge(
             fontSize = 20.sp,
-            lineHeight = lineHeight,
+            lineHeight = 20.sp,
             letterSpacing = (-.5).sp,
-            fontFamily = InterFontFamily,
             color = color,
         ),
         modifier = modifier,
@@ -173,12 +152,7 @@ fun BodyM(
 ) {
     Text(
         text = text,
-        style = TextStyle(
-            fontWeight = FontWeight.Normal,
-            fontSize = 17.sp,
-            lineHeight = 22.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.BodyM.merge(
             color = color,
             textAlign = textAlign,
         ),
@@ -239,12 +213,7 @@ fun BodyMB(
 ) {
     Text(
         text = text,
-        style = TextStyle(
-            fontWeight = FontWeight.Bold,
-            fontSize = 17.sp,
-            lineHeight = 22.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.BodyMB.merge(
             color = color,
             textAlign = textAlign,
         ),
@@ -327,17 +296,13 @@ fun BodySB(
     text: String,
     modifier: Modifier = Modifier,
     color: Color = MaterialTheme.colorScheme.primary,
+    textAlign: TextAlign = TextAlign.Start,
 ) {
     Text(
         text = text,
-        style = TextStyle(
-            fontWeight = FontWeight.Bold,
-            fontSize = 15.sp,
-            lineHeight = 20.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.BodySB.merge(
             color = color,
-            textAlign = TextAlign.Start,
+            textAlign = textAlign,
         ),
         modifier = modifier,
     )
@@ -348,17 +313,13 @@ fun Text13Up(
     text: String,
     modifier: Modifier = Modifier,
     color: Color = MaterialTheme.colorScheme.primary,
+    textAlign: TextAlign = TextAlign.Start,
 ) {
     Text(
         text = text.uppercase(),
-        style = TextStyle(
-            fontWeight = FontWeight.Medium,
-            fontSize = 13.sp,
-            lineHeight = 18.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.CaptionM.merge(
             color = color,
-            textAlign = TextAlign.Start,
+            textAlign = textAlign,
         ),
         modifier = modifier,
     )
@@ -375,12 +336,7 @@ fun Caption(
 ) {
     Text(
         text = text,
-        style = TextStyle(
-            fontWeight = FontWeight.Normal,
-            fontSize = 13.sp,
-            lineHeight = 18.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.Caption.merge(
             color = color,
             textAlign = textAlign,
         ),
@@ -420,12 +376,7 @@ fun CaptionB(
 ) {
     Text(
         text = text,
-        style = TextStyle(
-            fontWeight = FontWeight.SemiBold,
-            fontSize = 13.sp,
-            lineHeight = 18.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.CaptionB.merge(
             color = color,
             textAlign = textAlign,
         ),
@@ -444,12 +395,7 @@ fun Caption13Up(
 ) {
     Text(
         text = text.uppercase(),
-        style = TextStyle(
-            fontWeight = FontWeight.Medium,
-            fontSize = 13.sp,
-            lineHeight = 18.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.CaptionM.merge(
             color = color,
             textAlign = textAlign,
         ),
@@ -468,12 +414,7 @@ fun Footnote(
 ) {
     Text(
         text = text,
-        style = TextStyle(
-            fontWeight = FontWeight.Medium,
-            fontSize = 12.sp,
-            lineHeight = 16.sp,
-            letterSpacing = 0.4.sp,
-            fontFamily = InterFontFamily,
+        style = AppTextStyles.FootnoteM.merge(
             color = color,
             textAlign = textAlign,
         ),

app/src/main/java/to/bitkit/ui/theme/Type.kt

@@ -44,6 +44,20 @@ val Typography = Typography(
 )
 
 object AppTextStyles {
+    val Display = TextStyle(
+        fontWeight = FontWeight.Black,
+        fontSize = 44.sp,
+        lineHeight = 44.sp,
+        letterSpacing = (-1).sp,
+        fontFamily = InterFontFamily,
+    )
+    val Headline = TextStyle(
+        fontWeight = FontWeight.Black,
+        fontSize = 30.sp,
+        lineHeight = 30.sp,
+        letterSpacing = (-1).sp,
+        fontFamily = InterFontFamily,
+    )
     val Title = TextStyle(
         fontWeight = FontWeight.Bold,
         fontSize = 22.sp,
@@ -57,28 +71,74 @@ object AppTextStyles {
         letterSpacing = 0.4.sp,
         fontFamily = InterFontFamily,
     )
-    val BodyS = TextStyle(
+    val BodyM = TextStyle(
         fontWeight = FontWeight.Normal,
-        fontSize = 15.sp,
-        lineHeight = 20.sp,
+        fontSize = 17.sp,
+        lineHeight = 22.sp,
         letterSpacing = 0.4.sp,
         fontFamily = InterFontFamily,
-        textAlign = TextAlign.Start,
     )
     val BodyMSB = TextStyle(
         fontWeight = FontWeight.SemiBold,
         fontSize = 17.sp,
         lineHeight = 22.sp,
         letterSpacing = 0.4.sp,
         fontFamily = InterFontFamily,
-        textAlign = TextAlign.Start,
+    )
+    val BodyMB = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 17.sp,
+        lineHeight = 22.sp,
+        letterSpacing = 0.4.sp,
+        fontFamily = InterFontFamily,
+    )
+    val BodyS = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 15.sp,
+        lineHeight = 20.sp,
+        letterSpacing = 0.4.sp,
+        fontFamily = InterFontFamily,
     )
     val BodySSB = TextStyle(
         fontWeight = FontWeight.SemiBold,
         fontSize = 15.sp,
         lineHeight = 20.sp,
         letterSpacing = 0.4.sp,
         fontFamily = InterFontFamily,
-        textAlign = TextAlign.Start,
+    )
+    val BodySB = TextStyle(
+        fontWeight = FontWeight.Bold,
+        fontSize = 15.sp,
+        lineHeight = 20.sp,
+        letterSpacing = 0.4.sp,
+        fontFamily = InterFontFamily,
+    )
+    val Caption = TextStyle(
+        fontWeight = FontWeight.Normal,
+        fontSize = 13.sp,
+        lineHeight = 18.sp,
+        letterSpacing = 0.4.sp,
+        fontFamily = InterFontFamily,
+    )
+    val CaptionM = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 13.sp,
+        lineHeight = 18.sp,
+        letterSpacing = 0.4.sp,
+        fontFamily = InterFontFamily,
+    )
+    val CaptionB = TextStyle(
+        fontWeight = FontWeight.SemiBold,
+        fontSize = 13.sp,
+        lineHeight = 18.sp,
+        letterSpacing = 0.4.sp,
+        fontFamily = InterFontFamily,
+    )
+    val FootnoteM = TextStyle(
+        fontWeight = FontWeight.Medium,
+        fontSize = 12.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.4.sp,
+        fontFamily = InterFontFamily,
     )
 }