Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add core typography tokens for Android #3

Merged
merged 2 commits into from
Feb 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions assets/android/kotlin/CpdDark.kt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,35 @@ object DarkDesignTokens {
val cpdColorGray300 = Color(0xffe2e6ea)
val cpdColorGray200 = Color(0xffeef1f3)
val cpdColorGray100 = Color(0xfff7f8f9)
val cpdFontLetterSpacingHeadingXl = 0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output, once again looks wrong. I'll do the same exercise with the Android team

val cpdFontLetterSpacingHeadingLg = 0
val cpdFontLetterSpacingHeadingMd = 0
val cpdFontLetterSpacingHeadingSm = 0
val cpdFontLetterSpacingBodyLg = 0.25px
val cpdFontLetterSpacingBodyMd = 0.25px
val cpdFontLetterSpacingBodySm = 0.4px
val cpdFontLetterSpacingBodyXs = 0.5px
val cpdFontSizeHeadingXl = 34
val cpdFontSizeHeadingLg = 28
val cpdFontSizeHeadingMd = 22
val cpdFontSizeHeadingSm = 20
val cpdFontSizeBodyLg = 16
val cpdFontSizeBodyMd = 14
val cpdFontSizeBodySm = 12
val cpdFontSizeBodyXs = 11
val cpdFontLineHeightHeadingXlRegular = 41
val cpdFontLineHeightHeadingLgRegular = 34
val cpdFontLineHeightHeadingMdRegular = 27
val cpdFontLineHeightHeadingSmRegular = 25
val cpdFontLineHeightBodyLgRegular = 22
val cpdFontLineHeightBodyMdRegular = 20
val cpdFontLineHeightBodySmRegular = 17
val cpdFontLineHeightBodyXsRegular = 15
val cpdFontWeightBold = 700
val cpdFontWeightMedium = 500
val cpdFontWeightRegular = 400
val cpdFontFamilyMono = Roboto Mono
val cpdFontFamilySans = Roboto
val cpdBorderWidth0_5 = 0.5
val cpdBorderWidth4 = 4
val cpdBorderWidth2 = 2
Expand All @@ -175,6 +204,22 @@ object DarkDesignTokens {
val cpdSpace6X = 24
val cpdSpace0X = 0
val cpdSpaceScale = 4
val cpdFontHeadingXlBold = cpdFontWeightBold cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingXlRegular = cpdFontWeightRegular cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingLgBold = cpdFontWeightBold cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingLgRegular = cpdFontWeightRegular cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingMdBold = cpdFontWeightBold cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingMdRegular = cpdFontWeightRegular cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingSmMedium = cpdFontWeightMedium cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontHeadingSmRegular = cpdFontWeightRegular cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontBodyLgMedium = cpdFontWeightMedium cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyLgRegular = cpdFontWeightRegular cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyMdMedium = cpdFontWeightMedium cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodyMdRegular = cpdFontWeightRegular cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodySmMedium = cpdFontWeightMedium cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodySmRegular = cpdFontWeightRegular cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodyXsMedium = cpdFontWeightMedium cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdFontBodyXsRegular = cpdFontWeightRegular cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdSpace64X = cpdSpaceScale * 64
val cpdSpace48X = cpdSpaceScale * 48
val cpdSpace40X = cpdSpaceScale * 40
Expand Down
45 changes: 45 additions & 0 deletions assets/android/kotlin/CpdDarkHc.kt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,35 @@ object DarkHcDesignTokens {
val cpdColorGray300 = Color(0xff1a2939)
val cpdColorGray200 = Color(0xff11202f)
val cpdColorGray100 = Color(0xff0c1b29)
val cpdFontLetterSpacingHeadingXl = 0
val cpdFontLetterSpacingHeadingLg = 0
val cpdFontLetterSpacingHeadingMd = 0
val cpdFontLetterSpacingHeadingSm = 0
val cpdFontLetterSpacingBodyLg = 0.25px
val cpdFontLetterSpacingBodyMd = 0.25px
val cpdFontLetterSpacingBodySm = 0.4px
val cpdFontLetterSpacingBodyXs = 0.5px
val cpdFontSizeHeadingXl = 34
val cpdFontSizeHeadingLg = 28
val cpdFontSizeHeadingMd = 22
val cpdFontSizeHeadingSm = 20
val cpdFontSizeBodyLg = 16
val cpdFontSizeBodyMd = 14
val cpdFontSizeBodySm = 12
val cpdFontSizeBodyXs = 11
val cpdFontLineHeightHeadingXlRegular = 41
val cpdFontLineHeightHeadingLgRegular = 34
val cpdFontLineHeightHeadingMdRegular = 27
val cpdFontLineHeightHeadingSmRegular = 25
val cpdFontLineHeightBodyLgRegular = 22
val cpdFontLineHeightBodyMdRegular = 20
val cpdFontLineHeightBodySmRegular = 17
val cpdFontLineHeightBodyXsRegular = 15
val cpdFontWeightBold = 700
val cpdFontWeightMedium = 500
val cpdFontWeightRegular = 400
val cpdFontFamilyMono = Roboto Mono
val cpdFontFamilySans = Roboto
val cpdBorderWidth0_5 = 0.5
val cpdBorderWidth4 = 4
val cpdBorderWidth2 = 2
Expand All @@ -175,6 +204,22 @@ object DarkHcDesignTokens {
val cpdSpace6X = 24
val cpdSpace0X = 0
val cpdSpaceScale = 4
val cpdFontHeadingXlBold = cpdFontWeightBold cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingXlRegular = cpdFontWeightRegular cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingLgBold = cpdFontWeightBold cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingLgRegular = cpdFontWeightRegular cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingMdBold = cpdFontWeightBold cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingMdRegular = cpdFontWeightRegular cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingSmMedium = cpdFontWeightMedium cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontHeadingSmRegular = cpdFontWeightRegular cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontBodyLgMedium = cpdFontWeightMedium cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyLgRegular = cpdFontWeightRegular cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyMdMedium = cpdFontWeightMedium cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodyMdRegular = cpdFontWeightRegular cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodySmMedium = cpdFontWeightMedium cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodySmRegular = cpdFontWeightRegular cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodyXsMedium = cpdFontWeightMedium cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdFontBodyXsRegular = cpdFontWeightRegular cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdSpace64X = cpdSpaceScale * 64
val cpdSpace48X = cpdSpaceScale * 48
val cpdSpace40X = cpdSpaceScale * 40
Expand Down
45 changes: 45 additions & 0 deletions assets/android/kotlin/CpdLight.kt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,35 @@ object LightDesignTokens {
val cpdColorGray300 = Color(0xffeef1f3)
val cpdColorGray200 = Color(0xfff7f8f9)
val cpdColorGray100 = Color(0xfffbfbfc)
val cpdFontLetterSpacingHeadingXl = 0
val cpdFontLetterSpacingHeadingLg = 0
val cpdFontLetterSpacingHeadingMd = 0
val cpdFontLetterSpacingHeadingSm = 0
val cpdFontLetterSpacingBodyLg = 0.25px
val cpdFontLetterSpacingBodyMd = 0.25px
val cpdFontLetterSpacingBodySm = 0.4px
val cpdFontLetterSpacingBodyXs = 0.5px
val cpdFontSizeHeadingXl = 34
val cpdFontSizeHeadingLg = 28
val cpdFontSizeHeadingMd = 22
val cpdFontSizeHeadingSm = 20
val cpdFontSizeBodyLg = 16
val cpdFontSizeBodyMd = 14
val cpdFontSizeBodySm = 12
val cpdFontSizeBodyXs = 11
val cpdFontLineHeightHeadingXlRegular = 41
val cpdFontLineHeightHeadingLgRegular = 34
val cpdFontLineHeightHeadingMdRegular = 27
val cpdFontLineHeightHeadingSmRegular = 25
val cpdFontLineHeightBodyLgRegular = 22
val cpdFontLineHeightBodyMdRegular = 20
val cpdFontLineHeightBodySmRegular = 17
val cpdFontLineHeightBodyXsRegular = 15
val cpdFontWeightBold = 700
val cpdFontWeightMedium = 500
val cpdFontWeightRegular = 400
val cpdFontFamilyMono = Roboto Mono
val cpdFontFamilySans = Roboto
val cpdBorderWidth0_5 = 0.5
val cpdBorderWidth4 = 4
val cpdBorderWidth2 = 2
Expand All @@ -175,6 +204,22 @@ object LightDesignTokens {
val cpdSpace6X = 24
val cpdSpace0X = 0
val cpdSpaceScale = 4
val cpdFontHeadingXlBold = cpdFontWeightBold cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingXlRegular = cpdFontWeightRegular cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingLgBold = cpdFontWeightBold cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingLgRegular = cpdFontWeightRegular cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingMdBold = cpdFontWeightBold cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingMdRegular = cpdFontWeightRegular cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingSmMedium = cpdFontWeightMedium cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontHeadingSmRegular = cpdFontWeightRegular cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontBodyLgMedium = cpdFontWeightMedium cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyLgRegular = cpdFontWeightRegular cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyMdMedium = cpdFontWeightMedium cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodyMdRegular = cpdFontWeightRegular cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodySmMedium = cpdFontWeightMedium cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodySmRegular = cpdFontWeightRegular cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodyXsMedium = cpdFontWeightMedium cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdFontBodyXsRegular = cpdFontWeightRegular cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdSpace64X = cpdSpaceScale * 64
val cpdSpace48X = cpdSpaceScale * 48
val cpdSpace40X = cpdSpaceScale * 40
Expand Down
45 changes: 45 additions & 0 deletions assets/android/kotlin/CpdLightHc.kt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,35 @@ object LightHcDesignTokens {
val cpdColorGray300 = Color(0xff11202f)
val cpdColorGray200 = Color(0xff0c1b29)
val cpdColorGray100 = Color(0xff081725)
val cpdFontLetterSpacingHeadingXl = 0
val cpdFontLetterSpacingHeadingLg = 0
val cpdFontLetterSpacingHeadingMd = 0
val cpdFontLetterSpacingHeadingSm = 0
val cpdFontLetterSpacingBodyLg = 0.25px
val cpdFontLetterSpacingBodyMd = 0.25px
val cpdFontLetterSpacingBodySm = 0.4px
val cpdFontLetterSpacingBodyXs = 0.5px
val cpdFontSizeHeadingXl = 34
val cpdFontSizeHeadingLg = 28
val cpdFontSizeHeadingMd = 22
val cpdFontSizeHeadingSm = 20
val cpdFontSizeBodyLg = 16
val cpdFontSizeBodyMd = 14
val cpdFontSizeBodySm = 12
val cpdFontSizeBodyXs = 11
val cpdFontLineHeightHeadingXlRegular = 41
val cpdFontLineHeightHeadingLgRegular = 34
val cpdFontLineHeightHeadingMdRegular = 27
val cpdFontLineHeightHeadingSmRegular = 25
val cpdFontLineHeightBodyLgRegular = 22
val cpdFontLineHeightBodyMdRegular = 20
val cpdFontLineHeightBodySmRegular = 17
val cpdFontLineHeightBodyXsRegular = 15
val cpdFontWeightBold = 700
val cpdFontWeightMedium = 500
val cpdFontWeightRegular = 400
val cpdFontFamilyMono = Roboto Mono
val cpdFontFamilySans = Roboto
val cpdBorderWidth0_5 = 0.5
val cpdBorderWidth4 = 4
val cpdBorderWidth2 = 2
Expand All @@ -175,6 +204,22 @@ object LightHcDesignTokens {
val cpdSpace6X = 24
val cpdSpace0X = 0
val cpdSpaceScale = 4
val cpdFontHeadingXlBold = cpdFontWeightBold cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingXlRegular = cpdFontWeightRegular cpdFontSizeHeadingXl/cpdFontLineHeightHeadingXlRegular cpdFontFamilySans
val cpdFontHeadingLgBold = cpdFontWeightBold cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingLgRegular = cpdFontWeightRegular cpdFontSizeHeadingLg/cpdFontLineHeightHeadingLgRegular cpdFontFamilySans
val cpdFontHeadingMdBold = cpdFontWeightBold cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingMdRegular = cpdFontWeightRegular cpdFontSizeHeadingMd/cpdFontLineHeightHeadingMdRegular cpdFontFamilySans
val cpdFontHeadingSmMedium = cpdFontWeightMedium cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontHeadingSmRegular = cpdFontWeightRegular cpdFontSizeHeadingSm/cpdFontLineHeightHeadingSmRegular cpdFontFamilySans
val cpdFontBodyLgMedium = cpdFontWeightMedium cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyLgRegular = cpdFontWeightRegular cpdFontSizeBodyLg/cpdFontLineHeightBodyLgRegular cpdFontFamilySans
val cpdFontBodyMdMedium = cpdFontWeightMedium cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodyMdRegular = cpdFontWeightRegular cpdFontSizeBodyMd/cpdFontLineHeightBodyMdRegular cpdFontFamilySans
val cpdFontBodySmMedium = cpdFontWeightMedium cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodySmRegular = cpdFontWeightRegular cpdFontSizeBodySm/cpdFontLineHeightBodySmRegular cpdFontFamilySans
val cpdFontBodyXsMedium = cpdFontWeightMedium cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdFontBodyXsRegular = cpdFontWeightRegular cpdFontSizeBodyXs/cpdFontLineHeightBodyXsRegular cpdFontFamilySans
val cpdSpace64X = cpdSpaceScale * 64
val cpdSpace48X = cpdSpaceScale * 48
val cpdSpace40X = cpdSpaceScale * 40
Expand Down
2 changes: 1 addition & 1 deletion tokens/cross-platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@
}
}
}
}
}
Loading