Merge pull request #36 from

TodayTix · Oct 10, 2024 · 2bb8113 · 2bb8113
1 parent 09d171d
commit 2bb8113
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 50 deletions.
diff --git a/designTokens/src/main/java/com/todaytix/designtokens/compose/ComposeTokens.kt b/designTokens/src/main/java/com/todaytix/designtokens/compose/ComposeTokens.kt
@@ -8,9 +8,9 @@ import androidx.compose.ui.text.style.TextDecoration
 
 val fontFamiliesHeading = "Gellix"
 val fontFamiliesBody = "Aktiv Grotesk App"
-val lineHeightsHeading = 1.25
-val lineHeightsBodySmall = 1.6
-val lineHeightsBodyMedium = 1.6
+val lineHeightsHeading = 1.15
+val lineHeightsBodySmall = 1.45
+val lineHeightsBodyMedium = 1.45
 val lineHeightsTextField = 1.25
 val letterSpacingDefault = 0.sp
 val letterSpacingIncreased = 0.01.sp

diff --git a/designTokens/src/main/java/com/todaytix/designtokens/compose/ComposeTokensColors.kt b/designTokens/src/main/java/com/todaytix/designtokens/compose/ComposeTokensColors.kt
@@ -1,7 +1,7 @@
 
 
 // Do not edit directly
-// Generated on Thu, 28 Mar 2024 19:41:01 GMT
+// Generated on Thu, 10 Oct 2024 00:31:47 GMT
 
 
 

diff --git a/designTokens/src/main/java/com/todaytix/designtokens/compose/ComposeTokensTypography.kt b/designTokens/src/main/java/com/todaytix/designtokens/compose/ComposeTokensTypography.kt
@@ -9,12 +9,12 @@ import com.TodayTixGroup.designtokens.R
 val h1Sm = TextStyle(
 	fontFamily = FontFamily(Font(R.font.gellix_bold)),
 	fontSize = 49.sp,
-	lineHeight = 61.3.sp
+	lineHeight = 56.4.sp
 )
 val h1Md = TextStyle(
 	fontFamily = FontFamily(Font(R.font.gellix_bold)),
 	fontSize = 56.sp,
-	lineHeight = 70.sp
+	lineHeight = 64.4.sp
 )
 val h2Sm = TextStyle(
 	fontFamily = FontFamily(Font(R.font.gellix_bold)),
@@ -51,90 +51,90 @@ val h5Md = TextStyle(
 val h6Sm = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 20.sp,
-	lineHeight = 32.sp
+	lineHeight = 29.sp
 )
 val h6Md = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 23.sp,
-	lineHeight = 36.8.sp
+	lineHeight = 33.4.sp
 )
 val h7Sm = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 18.sp,
-	lineHeight = 28.8.sp
+	lineHeight = 26.1.sp
 )
 val h7Md = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 21.sp,
-	lineHeight = 33.6.sp
+	lineHeight = 30.5.sp
 )
 val bodyPrimaryRegularSmall = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
 	fontSize = 16.sp,
-	lineHeight = 25.6.sp
+	lineHeight = 23.2.sp
 )
 val bodyPrimaryRegularMedium = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
 	fontSize = 18.sp,
-	lineHeight = 28.8.sp
+	lineHeight = 26.1.sp
 )
 val bodyPrimaryBoldSmall = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 16.sp,
-	lineHeight = 25.6.sp
+	lineHeight = 23.2.sp
 )
 val bodyPrimaryBoldMedium = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 18.sp,
-	lineHeight = 28.8.sp
+	lineHeight = 26.1.sp
 )
 val bodySecondaryRegularSmall = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
 	fontSize = 14.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 22.4.sp
+	lineHeight = 20.3.sp
 )
 val bodySecondaryRegularMedium = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
 	fontSize = 16.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 25.6.sp
+	lineHeight = 23.2.sp
 )
 val bodySecondaryBoldSmall = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 14.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 22.4.sp
+	lineHeight = 20.3.sp
 )
 val bodySecondaryBoldMedium = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 16.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 25.6.sp
+	lineHeight = 23.2.sp
 )
 val bodyTertiaryRegularSmall = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
 	fontSize = 12.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 19.2.sp
+	lineHeight = 17.4.sp
 )
 val bodyTertiaryRegularMedium = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
 	fontSize = 14.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 22.4.sp
+	lineHeight = 20.3.sp
 )
 val bodyTertiaryBoldSmall = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 12.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 19.2.sp
+	lineHeight = 17.4.sp
 )
 val bodyTertiaryBoldMedium = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 14.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 22.4.sp
+	lineHeight = 20.3.sp
 )
 val buttonPrimary = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
@@ -158,7 +158,7 @@ val textFieldLabel = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),
 	fontSize = 12.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 19.2.sp
+	lineHeight = 17.4.sp
 )
 val textFieldInput = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
@@ -170,7 +170,7 @@ val textFieldHelper = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_regular)),
 	fontSize = 12.sp,
 	letterSpacing = 0.01.sp,
-	lineHeight = 19.2.sp
+	lineHeight = 17.4.sp
 )
 val calendarDaysRow = TextStyle(
 	fontFamily = FontFamily(Font(R.font.aktivgrotesk_bold)),

diff --git a/designTokens/src/todaytix/res/values/xml-gradient-tokens.xml b/designTokens/src/todaytix/res/values/xml-gradient-tokens.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Do not edit directly
-  Generated on Thu, 28 Mar 2024 19:41:01 GMT
+  Generated on Thu, 10 Oct 2024 00:31:47 GMT
 -->
 <resources>
 	<color name="light_button_button_primary_start_color">#FF0F57</color>

diff --git a/designTokens/src/todaytix/res/values/xml-tokens.xml b/designTokens/src/todaytix/res/values/xml-tokens.xml
@@ -2,7 +2,7 @@
 
 <!--
   Do not edit directly
-  Generated on Thu, 28 Mar 2024 19:41:01 GMT
+  Generated on Thu, 10 Oct 2024 00:31:47 GMT
 -->
 <resources>
   <color name="light_text_text_primary">#ff0b0b10</color>
@@ -176,9 +176,9 @@
   <color name="dark_skeleton_skeleton_element">#ff646374</color>
   <string name="font_families_heading">Gellix</string>
   <string name="font_families_body">Aktiv Grotesk App</string>
-  <dimen name="line_heights_heading">1.25</dimen>
-  <dimen name="line_heights_body_small">1.6</dimen>
-  <dimen name="line_heights_body_medium">1.6</dimen>
+  <dimen name="line_heights_heading">1.15</dimen>
+  <dimen name="line_heights_body_small">1.45</dimen>
+  <dimen name="line_heights_body_medium">1.45</dimen>
   <dimen name="line_heights_text_field">1.25</dimen>
   <dimen name="letter_spacing_default">0</dimen>
   <dimen name="letter_spacing_increased">0.01</dimen>

diff --git a/designTokens/src/todaytix/res/values/xml-typography-tokens.xml b/designTokens/src/todaytix/res/values/xml-typography-tokens.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Do not edit directly
-  Generated on Thu, 28 Mar 2024 19:41:01 GMT
+  Generated on Thu, 10 Oct 2024 00:31:47 GMT
 -->
 <resources>
 	<style name="h1_sm">
 		<item name="fontFamily">@font/gellix_bold</item>
 		<item name="android:textSize">49sp</item>
-		<item name="android:lineSpacingMultiplier">1.25</item>
+		<item name="android:lineSpacingMultiplier">1.15</item>
 	</style>
 	<style name="h1_md">
 		<item name="fontFamily">@font/gellix_bold</item>
 		<item name="android:textSize">56sp</item>
-		<item name="android:lineSpacingMultiplier">1.25</item>
+		<item name="android:lineSpacingMultiplier">1.15</item>
 	</style>
 	<style name="h2_sm">
 		<item name="fontFamily">@font/gellix_bold</item>
@@ -49,88 +49,88 @@
 	<style name="h6_sm">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
 		<item name="android:textSize">20sp</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 	</style>
 	<style name="h6_md">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
 		<item name="android:textSize">23sp</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 	</style>
 	<style name="h7_sm">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
 		<item name="android:textSize">18sp</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 	</style>
 	<style name="h7_md">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
 		<item name="android:textSize">21sp</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 	</style>
 	<style name="body_primary_regular_small">
 		<item name="fontFamily">@font/aktivgrotesk_regular</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">16sp</item>
 	</style>
 	<style name="body_primary_regular_medium">
 		<item name="fontFamily">@font/aktivgrotesk_regular</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">18sp</item>
 	</style>
 	<style name="body_primary_bold_small">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">16sp</item>
 	</style>
 	<style name="body_primary_bold_medium">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">18sp</item>
 	</style>
 	<style name="body_secondary_regular_small">
 		<item name="fontFamily">@font/aktivgrotesk_regular</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
 	<style name="body_secondary_regular_medium">
 		<item name="fontFamily">@font/aktivgrotesk_regular</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">16sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
 	<style name="body_secondary_bold_small">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
 	<style name="body_secondary_bold_medium">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">16sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
 	<style name="body_tertiary_regular_small">
 		<item name="fontFamily">@font/aktivgrotesk_regular</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
 	<style name="body_tertiary_regular_medium">
 		<item name="fontFamily">@font/aktivgrotesk_regular</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
 	<style name="body_tertiary_bold_small">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
 	<style name="body_tertiary_bold_medium">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
@@ -154,7 +154,7 @@
 	</style>
 	<style name="text_field_label">
 		<item name="fontFamily">@font/aktivgrotesk_bold</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>
@@ -166,7 +166,7 @@
 	</style>
 	<style name="text_field_helper">
 		<item name="fontFamily">@font/aktivgrotesk_regular</item>
-		<item name="android:lineSpacingMultiplier">1.6</item>
+		<item name="android:lineSpacingMultiplier">1.45</item>
 		<item name="android:textSize">12sp</item>
 		<item name="android:letterSpacing">0.01</item>
 	</style>