Android: force em values to use the X.em format by always dding a…

… decimal place
element-hq · Jul 31, 2024 · 0f15b23 · 0f15b23
1 parent 465d232
commit 0f15b23
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/assets/android/src/TypographyTokens.kt b/assets/android/src/TypographyTokens.kt
@@ -40,7 +40,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 22.sp,
         fontSize = 16.sp,
-        letterSpacing = 0.015625.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -49,7 +49,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 22.sp,
         fontSize = 16.sp,
-        letterSpacing = 0.015625.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -58,7 +58,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 20.sp,
         fontSize = 14.sp,
-        letterSpacing = 0.017857.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -67,7 +67,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 20.sp,
         fontSize = 14.sp,
-        letterSpacing = 0.017857.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -76,7 +76,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 17.sp,
         fontSize = 12.sp,
-        letterSpacing = 0.033333.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -85,7 +85,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 17.sp,
         fontSize = 12.sp,
-        letterSpacing = 0.033333.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -94,7 +94,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 15.sp,
         fontSize = 11.sp,
-        letterSpacing = 0.045454.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -103,7 +103,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 15.sp,
         fontSize = 11.sp,
-        letterSpacing = 0.045454.em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -112,7 +112,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W700,
         lineHeight = 34.sp,
         fontSize = 28.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -121,7 +121,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 34.sp,
         fontSize = 28.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -130,7 +130,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W700,
         lineHeight = 27.sp,
         fontSize = 22.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -139,7 +139,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 27.sp,
         fontSize = 22.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -148,7 +148,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 25.sp,
         fontSize = 20.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -157,7 +157,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 25.sp,
         fontSize = 20.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -166,7 +166,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W700,
         lineHeight = 41.sp,
         fontSize = 34.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -175,7 +175,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 41.sp,
         fontSize = 34.sp,
-        letterSpacing = 0em,
+        letterSpacing = 0.0.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )

diff --git a/src/transforms/kotlin/percentageToEm.ts b/src/transforms/kotlin/percentageToEm.ts
@@ -28,6 +28,6 @@ export default {
   },
   transform: (token: TransformedToken): string => {
     const val = Number.parseFloat(token.value.replace("%", ""));
-    return `${val / 100}.em`;
+    return `${(val / 100).toFixed(1)}.em`;
   },
 } satisfies Transform;
diff --git a/src/transforms/kotlin/typography.ts b/src/transforms/kotlin/typography.ts
@@ -31,7 +31,7 @@ export default {
           output += `${ARG_INDENT_LEVEL + textStylePropertiesMapping[propName]} = `;
           if (propName === "fontFamily") {
             output += "FontFamily.Default";
-          } else {
+          } else {  
             output += val;
           }
           output += ",\n";