@marioschmidt/design-system-tokens 1.0.63 → 1.0.65

package/dist/android/compose/brands/bild/components/Article/ArticleTokens.kt

@@ -1,7 +1,7 @@
 /**
  * Do not edit directly, this file was auto-generated.
  *
- * BILD Design System Tokens v1.0.63
+ * BILD Design System Tokens v1.0.65
  * Generated by Style Dictionary
  *
  * Component: Article | Brand: Bild
@@ -20,6 +20,10 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+import com.bild.designsystem.shared.DesignTextStyle
+import com.bild.designsystem.shared.DesignTextCase
 
 /**
  * Article Design Tokens
@@ -32,12 +36,12 @@ import androidx.compose.ui.unit.TextUnit
 object ArticleTokens {
 
     // ══════════════════════════════════════════════════════════════
-    // SIZING (WindowSizeClass)
+    // SIZING (Material 3 WindowSizeClass)
     // ══════════════════════════════════════════════════════════════
     object Sizing {
         /**
          * Returns sizing tokens for the current window size class.
-         * Automatically resolves to Compact or Regular based on DesignSystemTheme.sizeClass
+         * Automatically resolves to Compact, Medium, or Expanded based on DesignSystemTheme.sizeClass
          *
          * Usage:
          *   val fontSize = ArticleTokens.Sizing.current().labelFontSize
@@ -45,7 +49,8 @@ object ArticleTokens {
         @Composable
         fun current(): SizingTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
@@ -96,7 +101,29 @@ object ArticleTokens {
             override val articleInfoboxInlineSpace = 16.dp
             override val articleInfoboxStackSpace = 16.dp
         }
-        object Regular : SizingTokens {
+        object Medium : SizingTokens {
+            override val aricleMobile1ColGridImageMarginSpace = 72.dp
+            override val articleTopMarginSpace = 12.dp
+            override val articleKickerFontSize = 22.sp
+            override val articleHeadlineFontSize = 72.sp
+            override val articleGalleryAteaserWidth = 260.dp
+            override val articleImageCaptionFontSize = 18.sp
+            override val articleImageSourceFontSize = 16.sp
+            override val articleImageCaptionLineHeight = 24.75.sp
+            override val articleImageSourceLineHeight = 21.sp
+            override val articleContentStackSpace = 24.dp
+            override val articleHeadingsStackSpace = 12.dp
+            override val articleImageLandscapeInlineSpace = 12.dp
+            override val articleMetaFontFamily = "Gotham"
+            override val articleMetaFontSize = 14.sp
+            override val articleContentInlineSpace = 72.dp
+            override val articleHeadingsInlineSpace = 72.dp
+            override val articleImagePortaitInlineSpace = 72.dp
+            override val articleImageContainerStackSpace = 12.dp
+            override val articleInfoboxInlineSpace = 24.dp
+            override val articleInfoboxStackSpace = 24.dp
+        }
+        object Expanded : SizingTokens {
             override val aricleMobile1ColGridImageMarginSpace = 72.dp
             override val articleTopMarginSpace = 16.dp
             override val articleKickerFontSize = 30.sp
@@ -121,12 +148,12 @@ object ArticleTokens {
     }
 
     // ══════════════════════════════════════════════════════════════
-    // TYPOGRAPHY
+    // TYPOGRAPHY (Material 3 WindowSizeClass)
     // ══════════════════════════════════════════════════════════════
     object Typography {
         /**
          * Returns typography tokens for the current window size class.
-         * Automatically resolves to Compact or Regular based on DesignSystemTheme.sizeClass
+         * Automatically resolves to Compact, Medium, or Expanded based on DesignSystemTheme.sizeClass
          *
          * Usage:
          *   val fontFamily = ArticleTokens.Typography.current().labelFontFamily
@@ -134,93 +161,41 @@ object ArticleTokens {
         @Composable
         fun current(): TypographyTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
-         * Interface for typography tokens
+         * Interface for typography tokens (DesignTextStyle composite objects)
          */
         interface TypographyTokens {
-            val articleKickerFontFamily: String
-            val articleKickerFontWeight: Int
-            val articleKickerFontSize: TextUnit
-            val articleKickerLineHeight: TextUnit
-            val articleKickerTextCase: String
-            val articleImageCaptionFontFamily: String
-            val articleImageCaptionFontWeight: Int
-            val articleImageCaptionFontSize: TextUnit
-            val articleImageCaptionLineHeight: TextUnit
-            val articleImageCaptionLetterSpacing: TextUnit
-            val articleImageCaptionTextCase: String
-            val articleHeadlineFontFamily: String
-            val articleHeadlineFontWeight: Int
-            val articleHeadlineFontSize: TextUnit
-            val articleHeadlineLineHeight: TextUnit
-            val articleHeadlineTextCase: String
-            val articleMetaSourceFontFamily: String
-            val articleMetaSourceFontWeight: Int
-            val articleMetaSourceFontSize: TextUnit
-            val articleMetaSourceLineHeight: TextUnit
-            val articleMetaSourceTextCase: String
-            val articleTimeStampFontFamily: String
-            val articleTimeStampFontWeight: Int
-            val articleTimeStampFontSize: TextUnit
-            val articleTimeStampTextCase: String
+            val articleKicker: DesignTextStyle
+            val articleImageCaption: DesignTextStyle
+            val articleHeadline: DesignTextStyle
+            val articleMetaSource: DesignTextStyle
+            val articleTimeStamp: DesignTextStyle
         }
 
         object Compact : TypographyTokens {
-            override val articleKickerFontFamily = "Gotham XNarrow"
-            override val articleKickerFontWeight = 700
-            override val articleKickerFontSize = 18.sp
-            override val articleKickerLineHeight = 19.8.sp
-            override val articleKickerTextCase = "ORIGINAL"
-            override val articleImageCaptionFontFamily = "Gotham XNarrow"
-            override val articleImageCaptionFontWeight = 700
-            override val articleImageCaptionFontSize = 16.sp
-            override val articleImageCaptionLineHeight = 19.5.sp
-            override val articleImageCaptionLetterSpacing = 0f.sp
-            override val articleImageCaptionTextCase = "ORIGINAL"
-            override val articleHeadlineFontFamily = "Gotham Condensed"
-            override val articleHeadlineFontWeight = 900
-            override val articleHeadlineFontSize = 40.sp
-            override val articleHeadlineLineHeight = 40.sp
-            override val articleHeadlineTextCase = "ORIGINAL"
-            override val articleMetaSourceFontFamily = "Gotham XNarrow"
-            override val articleMetaSourceFontWeight = 400
-            override val articleMetaSourceFontSize = 16.sp
-            override val articleMetaSourceLineHeight = 21.sp
-            override val articleMetaSourceTextCase = "ORIGINAL"
-            override val articleTimeStampFontFamily = "Gotham"
-            override val articleTimeStampFontWeight = 800
-            override val articleTimeStampFontSize = 12.sp
-            override val articleTimeStampTextCase = "ORIGINAL"
+            override val articleKicker = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 18.sp, lineHeight = 19.8.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleImageCaption = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 16.sp, lineHeight = 19.5.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleHeadline = DesignTextStyle(fontFamily = "Gotham Condensed", fontWeight = FontWeight.Black, fontSize = 40.sp, lineHeight = 40.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleMetaSource = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleTimeStamp = DesignTextStyle(fontFamily = "Gotham", fontWeight = FontWeight.ExtraBold, fontSize = 12.sp, lineHeight = 12.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
         }
-        object Regular : TypographyTokens {
-            override val articleKickerFontFamily = "Gotham XNarrow"
-            override val articleKickerFontWeight = 700
-            override val articleKickerFontSize = 30.sp
-            override val articleKickerLineHeight = 30.sp
-            override val articleKickerTextCase = "ORIGINAL"
-            override val articleImageCaptionFontFamily = "Gotham XNarrow"
-            override val articleImageCaptionFontWeight = 700
-            override val articleImageCaptionFontSize = 18.sp
-            override val articleImageCaptionLineHeight = 24.75.sp
-            override val articleImageCaptionLetterSpacing = 0f.sp
-            override val articleImageCaptionTextCase = "ORIGINAL"
-            override val articleHeadlineFontFamily = "Gotham Condensed"
-            override val articleHeadlineFontWeight = 900
-            override val articleHeadlineFontSize = 100.sp
-            override val articleHeadlineLineHeight = 100.sp
-            override val articleHeadlineTextCase = "ORIGINAL"
-            override val articleMetaSourceFontFamily = "Gotham XNarrow"
-            override val articleMetaSourceFontWeight = 400
-            override val articleMetaSourceFontSize = 18.sp
-            override val articleMetaSourceLineHeight = 23.sp
-            override val articleMetaSourceTextCase = "ORIGINAL"
-            override val articleTimeStampFontFamily = "Gotham"
-            override val articleTimeStampFontWeight = 800
-            override val articleTimeStampFontSize = 16.sp
-            override val articleTimeStampTextCase = "ORIGINAL"
+        object Medium : TypographyTokens {
+            override val articleKicker = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 22.sp, lineHeight = 22.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleImageCaption = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 18.sp, lineHeight = 24.75.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleHeadline = DesignTextStyle(fontFamily = "Gotham Condensed", fontWeight = FontWeight.Black, fontSize = 72.sp, lineHeight = 72.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleMetaSource = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleTimeStamp = DesignTextStyle(fontFamily = "Gotham", fontWeight = FontWeight.ExtraBold, fontSize = 14.sp, lineHeight = 14.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+        }
+        object Expanded : TypographyTokens {
+            override val articleKicker = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 30.sp, lineHeight = 30.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleImageCaption = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 18.sp, lineHeight = 24.75.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleHeadline = DesignTextStyle(fontFamily = "Gotham Condensed", fontWeight = FontWeight.Black, fontSize = 100.sp, lineHeight = 100.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleMetaSource = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 18.sp, lineHeight = 23.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val articleTimeStamp = DesignTextStyle(fontFamily = "Gotham", fontWeight = FontWeight.ExtraBold, fontSize = 16.sp, lineHeight = 16.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
         }
     }
 }

package/dist/android/compose/brands/bild/components/AudioPlayer/AudioPlayerTokens.kt

@@ -1,7 +1,7 @@
 /**
  * Do not edit directly, this file was auto-generated.
  *
- * BILD Design System Tokens v1.0.63
+ * BILD Design System Tokens v1.0.65
  * Generated by Style Dictionary
  *
  * Component: AudioPlayer | Brand: Bild
@@ -19,6 +19,10 @@ import com.bild.designsystem.shared.WindowSizeClass
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+import com.bild.designsystem.shared.DesignTextStyle
+import com.bild.designsystem.shared.DesignTextCase
 
 /**
  * AudioPlayer Design Tokens
@@ -31,12 +35,12 @@ import androidx.compose.ui.unit.TextUnit
 object AudioPlayerTokens {
 
     // ══════════════════════════════════════════════════════════════
-    // SIZING (WindowSizeClass)
+    // SIZING (Material 3 WindowSizeClass)
     // ══════════════════════════════════════════════════════════════
     object Sizing {
         /**
          * Returns sizing tokens for the current window size class.
-         * Automatically resolves to Compact or Regular based on DesignSystemTheme.sizeClass
+         * Automatically resolves to Compact, Medium, or Expanded based on DesignSystemTheme.sizeClass
          *
          * Usage:
          *   val fontSize = AudioPlayerTokens.Sizing.current().labelFontSize
@@ -44,7 +48,8 @@ object AudioPlayerTokens {
         @Composable
         fun current(): SizingTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
@@ -57,18 +62,21 @@ object AudioPlayerTokens {
         object Compact : SizingTokens {
             override val audioPlayerFontSize = 16.sp
         }
-        object Regular : SizingTokens {
+        object Medium : SizingTokens {
+            override val audioPlayerFontSize = 16.sp
+        }
+        object Expanded : SizingTokens {
             override val audioPlayerFontSize = 18.sp
         }
     }
 
     // ══════════════════════════════════════════════════════════════
-    // TYPOGRAPHY
+    // TYPOGRAPHY (Material 3 WindowSizeClass)
     // ══════════════════════════════════════════════════════════════
     object Typography {
         /**
          * Returns typography tokens for the current window size class.
-         * Automatically resolves to Compact or Regular based on DesignSystemTheme.sizeClass
+         * Automatically resolves to Compact, Medium, or Expanded based on DesignSystemTheme.sizeClass
          *
          * Usage:
          *   val fontFamily = AudioPlayerTokens.Typography.current().labelFontFamily
@@ -76,33 +84,25 @@ object AudioPlayerTokens {
         @Composable
         fun current(): TypographyTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
-         * Interface for typography tokens
+         * Interface for typography tokens (DesignTextStyle composite objects)
          */
         interface TypographyTokens {
-            val audioPlayerLabelFontFamily: String
-            val audioPlayerLabelFontWeight: Int
-            val audioPlayerLabelFontSize: TextUnit
-            val audioPlayerLabelLineHeight: TextUnit
-            val audioPlayerLabelTextCase: String
+            val audioPlayerLabel: DesignTextStyle
         }
 
         object Compact : TypographyTokens {
-            override val audioPlayerLabelFontFamily = "Gotham XNarrow"
-            override val audioPlayerLabelFontWeight = 700
-            override val audioPlayerLabelFontSize = 16.sp
-            override val audioPlayerLabelLineHeight = 16.sp
-            override val audioPlayerLabelTextCase = "ORIGINAL"
+            override val audioPlayerLabel = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 16.sp, lineHeight = 16.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+        }
+        object Medium : TypographyTokens {
+            override val audioPlayerLabel = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 16.sp, lineHeight = 16.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
         }
-        object Regular : TypographyTokens {
-            override val audioPlayerLabelFontFamily = "Gotham XNarrow"
-            override val audioPlayerLabelFontWeight = 700
-            override val audioPlayerLabelFontSize = 18.sp
-            override val audioPlayerLabelLineHeight = 18.sp
-            override val audioPlayerLabelTextCase = "ORIGINAL"
+        object Expanded : TypographyTokens {
+            override val audioPlayerLabel = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 18.sp, lineHeight = 18.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
         }
     }
 }

package/dist/android/compose/brands/bild/components/Avatar/AvatarTokens.kt

@@ -1,7 +1,7 @@
 /**
  * Do not edit directly, this file was auto-generated.
  *
- * BILD Design System Tokens v1.0.63
+ * BILD Design System Tokens v1.0.65
  * Generated by Style Dictionary
  *
  * Component: Avatar | Brand: Bild
@@ -21,6 +21,10 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+import com.bild.designsystem.shared.DesignTextStyle
+import com.bild.designsystem.shared.DesignTextCase
 
 /**
  * Avatar Design Tokens
@@ -65,12 +69,12 @@ object AvatarTokens {
     }
 
     // ══════════════════════════════════════════════════════════════
-    // SIZING (WindowSizeClass)
+    // SIZING (Material 3 WindowSizeClass)
     // ══════════════════════════════════════════════════════════════
     object Sizing {
         /**
          * Returns sizing tokens for the current window size class.
-         * Automatically resolves to Compact or Regular based on DesignSystemTheme.sizeClass
+         * Automatically resolves to Compact, Medium, or Expanded based on DesignSystemTheme.sizeClass
          *
          * Usage:
          *   val fontSize = AvatarTokens.Sizing.current().labelFontSize
@@ -78,7 +82,8 @@ object AvatarTokens {
         @Composable
         fun current(): SizingTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
@@ -103,7 +108,16 @@ object AvatarTokens {
             override val avatarLaneGapSpace = 16.dp
             override val appAvatarFontFamily = "Gotham"
         }
-        object Regular : SizingTokens {
+        object Medium : SizingTokens {
+            override val avatarLabelFontSize = 16.sp
+            override val avatarArticleSize = 48.dp
+            override val avatarAuthorPageSize = 130.dp
+            override val avatarFontFamily = "Gotham XNarrow"
+            override val avatarLabelLineHeight = 21.sp
+            override val avatarLaneGapSpace = 24.dp
+            override val appAvatarFontFamily = "Gotham"
+        }
+        object Expanded : SizingTokens {
             override val avatarLabelFontSize = 18.sp
             override val avatarArticleSize = 48.dp
             override val avatarAuthorPageSize = 130.dp
@@ -115,12 +129,12 @@ object AvatarTokens {
     }
 
     // ══════════════════════════════════════════════════════════════
-    // TYPOGRAPHY
+    // TYPOGRAPHY (Material 3 WindowSizeClass)
     // ══════════════════════════════════════════════════════════════
     object Typography {
         /**
          * Returns typography tokens for the current window size class.
-         * Automatically resolves to Compact or Regular based on DesignSystemTheme.sizeClass
+         * Automatically resolves to Compact, Medium, or Expanded based on DesignSystemTheme.sizeClass
          *
          * Usage:
          *   val fontFamily = AvatarTokens.Typography.current().labelFontFamily
@@ -128,105 +142,41 @@ object AvatarTokens {
         @Composable
         fun current(): TypographyTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
-         * Interface for typography tokens
+         * Interface for typography tokens (DesignTextStyle composite objects)
          */
         interface TypographyTokens {
-            val appAvatarFontFamily: String
-            val appAvatarFontWeight: Int
-            val appAvatarFontSize: TextUnit
-            val appAvatarLetterSpacing: TextUnit
-            val appAvatarTextCase: String
-            val avatarDefaultFontFamily: String
-            val avatarDefaultFontWeight: Int
-            val avatarDefaultFontSize: TextUnit
-            val avatarDefaultLineHeight: TextUnit
-            val avatarDefaultLetterSpacing: TextUnit
-            val avatarDefaultTextCase: String
-            val avatarHoverFontFamily: String
-            val avatarHoverFontWeight: Int
-            val avatarHoverFontSize: TextUnit
-            val avatarHoverLineHeight: TextUnit
-            val avatarHoverLetterSpacing: TextUnit
-            val avatarHoverTextCase: String
-            val avatarSecondaryInfoFontFamily: String
-            val avatarSecondaryInfoFontWeight: Int
-            val avatarSecondaryInfoFontSize: TextUnit
-            val avatarSecondaryInfoLineHeight: TextUnit
-            val avatarSecondaryInfoLetterSpacing: TextUnit
-            val avatarSecondaryInfoTextCase: String
-            val avatarSecondaryInfoHoverFontFamily: String
-            val avatarSecondaryInfoHoverFontWeight: Int
-            val avatarSecondaryInfoHoverFontSize: TextUnit
-            val avatarSecondaryInfoHoverLineHeight: TextUnit
-            val avatarSecondaryInfoHoverLetterSpacing: TextUnit
-            val avatarSecondaryInfoHoverTextCase: String
+            val appAvatar: DesignTextStyle
+            val avatarDefault: DesignTextStyle
+            val avatarHover: DesignTextStyle
+            val avatarSecondaryInfo: DesignTextStyle
+            val avatarSecondaryInfoHover: DesignTextStyle
         }
 
         object Compact : TypographyTokens {
-            override val appAvatarFontFamily = "Gotham"
-            override val appAvatarFontWeight = 800
-            override val appAvatarFontSize = 12.sp
-            override val appAvatarLetterSpacing = 0f.sp
-            override val appAvatarTextCase = "UPPER"
-            override val avatarDefaultFontFamily = "Gotham XNarrow"
-            override val avatarDefaultFontWeight = 700
-            override val avatarDefaultFontSize = 16.sp
-            override val avatarDefaultLineHeight = 21.sp
-            override val avatarDefaultLetterSpacing = 0f.sp
-            override val avatarDefaultTextCase = "ORIGINAL"
-            override val avatarHoverFontFamily = "Gotham XNarrow"
-            override val avatarHoverFontWeight = 700
-            override val avatarHoverFontSize = 16.sp
-            override val avatarHoverLineHeight = 21.sp
-            override val avatarHoverLetterSpacing = 0f.sp
-            override val avatarHoverTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoFontFamily = "Gotham XNarrow"
-            override val avatarSecondaryInfoFontWeight = 400
-            override val avatarSecondaryInfoFontSize = 16.sp
-            override val avatarSecondaryInfoLineHeight = 21.sp
-            override val avatarSecondaryInfoLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoHoverFontFamily = "Gotham XNarrow"
-            override val avatarSecondaryInfoHoverFontWeight = 400
-            override val avatarSecondaryInfoHoverFontSize = 16.sp
-            override val avatarSecondaryInfoHoverLineHeight = 21.sp
-            override val avatarSecondaryInfoHoverLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoHoverTextCase = "ORIGINAL"
+            override val appAvatar = DesignTextStyle(fontFamily = "Gotham", fontWeight = FontWeight.ExtraBold, fontSize = 12.sp, lineHeight = 12.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val avatarDefault = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarHover = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val avatarSecondaryInfo = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarSecondaryInfoHover = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
         }
-        object Regular : TypographyTokens {
-            override val appAvatarFontFamily = "Gotham"
-            override val appAvatarFontWeight = 800
-            override val appAvatarFontSize = 16.sp
-            override val appAvatarLetterSpacing = 0f.sp
-            override val appAvatarTextCase = "UPPER"
-            override val avatarDefaultFontFamily = "Gotham XNarrow"
-            override val avatarDefaultFontWeight = 700
-            override val avatarDefaultFontSize = 18.sp
-            override val avatarDefaultLineHeight = 23.sp
-            override val avatarDefaultLetterSpacing = 0f.sp
-            override val avatarDefaultTextCase = "ORIGINAL"
-            override val avatarHoverFontFamily = "Gotham XNarrow"
-            override val avatarHoverFontWeight = 700
-            override val avatarHoverFontSize = 18.sp
-            override val avatarHoverLineHeight = 23.sp
-            override val avatarHoverLetterSpacing = 0f.sp
-            override val avatarHoverTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoFontFamily = "Gotham XNarrow"
-            override val avatarSecondaryInfoFontWeight = 400
-            override val avatarSecondaryInfoFontSize = 18.sp
-            override val avatarSecondaryInfoLineHeight = 23.sp
-            override val avatarSecondaryInfoLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoHoverFontFamily = "Gotham XNarrow"
-            override val avatarSecondaryInfoHoverFontWeight = 400
-            override val avatarSecondaryInfoHoverFontSize = 18.sp
-            override val avatarSecondaryInfoHoverLineHeight = 23.sp
-            override val avatarSecondaryInfoHoverLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoHoverTextCase = "ORIGINAL"
+        object Medium : TypographyTokens {
+            override val appAvatar = DesignTextStyle(fontFamily = "Gotham", fontWeight = FontWeight.ExtraBold, fontSize = 14.sp, lineHeight = 14.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val avatarDefault = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarHover = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val avatarSecondaryInfo = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarSecondaryInfoHover = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+        }
+        object Expanded : TypographyTokens {
+            override val appAvatar = DesignTextStyle(fontFamily = "Gotham", fontWeight = FontWeight.ExtraBold, fontSize = 16.sp, lineHeight = 16.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val avatarDefault = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 18.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarHover = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Bold, fontSize = 18.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val avatarSecondaryInfo = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 18.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarSecondaryInfoHover = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 18.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
         }
     }
 }