@marioschmidt/design-system-tokens 1.0.63 → 1.0.64

package/dist/android/compose/brands/advertorial/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.64
  * Generated by Style Dictionary
  *
  * Component: Avatar | Brand: Advertorial
@@ -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
 
 /**
  * Avatar Design Tokens
@@ -32,12 +36,12 @@ import androidx.compose.ui.unit.TextUnit
 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
@@ -45,7 +49,8 @@ object AvatarTokens {
         @Composable
         fun current(): SizingTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
@@ -70,7 +75,16 @@ object AvatarTokens {
             override val avatarLaneGapSpace = 16.dp
             override val appAvatarFontFamily = "Lucida Grande"
         }
-        object Regular : SizingTokens {
+        object Medium : SizingTokens {
+            override val avatarLabelFontSize = 13.sp
+            override val avatarArticleSize = 48.dp
+            override val avatarAuthorPageSize = 130.dp
+            override val avatarFontFamily = "Lucida Grande"
+            override val avatarLabelLineHeight = 21.sp
+            override val avatarLaneGapSpace = 24.dp
+            override val appAvatarFontFamily = "Lucida Grande"
+        }
+        object Expanded : SizingTokens {
             override val avatarLabelFontSize = 15.sp
             override val avatarArticleSize = 48.dp
             override val avatarAuthorPageSize = 130.dp
@@ -82,12 +96,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
@@ -95,105 +109,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 = "Lucida Grande"
-            override val appAvatarFontWeight = 800
-            override val appAvatarFontSize = 12.sp
-            override val appAvatarLetterSpacing = 0f.sp
-            override val appAvatarTextCase = "UPPER"
-            override val avatarDefaultFontFamily = "Lucida Grande"
-            override val avatarDefaultFontWeight = 700
-            override val avatarDefaultFontSize = 13.sp
-            override val avatarDefaultLineHeight = 21.sp
-            override val avatarDefaultLetterSpacing = 0f.sp
-            override val avatarDefaultTextCase = "ORIGINAL"
-            override val avatarHoverFontFamily = "Lucida Grande"
-            override val avatarHoverFontWeight = 700
-            override val avatarHoverFontSize = 13.sp
-            override val avatarHoverLineHeight = 21.sp
-            override val avatarHoverLetterSpacing = 0f.sp
-            override val avatarHoverTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoFontFamily = "Lucida Grande"
-            override val avatarSecondaryInfoFontWeight = 400
-            override val avatarSecondaryInfoFontSize = 13.sp
-            override val avatarSecondaryInfoLineHeight = 21.sp
-            override val avatarSecondaryInfoLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoHoverFontFamily = "Lucida Grande"
-            override val avatarSecondaryInfoHoverFontWeight = 400
-            override val avatarSecondaryInfoHoverFontSize = 13.sp
-            override val avatarSecondaryInfoHoverLineHeight = 21.sp
-            override val avatarSecondaryInfoHoverLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoHoverTextCase = "ORIGINAL"
+            override val appAvatar = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.ExtraBold, fontSize = 12.sp, lineHeight = 12.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val avatarDefault = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val avatarSecondaryInfo = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarSecondaryInfoHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
         }
-        object Regular : TypographyTokens {
-            override val appAvatarFontFamily = "Lucida Grande"
-            override val appAvatarFontWeight = 800
-            override val appAvatarFontSize = 16.sp
-            override val appAvatarLetterSpacing = 0f.sp
-            override val appAvatarTextCase = "UPPER"
-            override val avatarDefaultFontFamily = "Lucida Grande"
-            override val avatarDefaultFontWeight = 700
-            override val avatarDefaultFontSize = 15.sp
-            override val avatarDefaultLineHeight = 23.sp
-            override val avatarDefaultLetterSpacing = 0f.sp
-            override val avatarDefaultTextCase = "ORIGINAL"
-            override val avatarHoverFontFamily = "Lucida Grande"
-            override val avatarHoverFontWeight = 700
-            override val avatarHoverFontSize = 15.sp
-            override val avatarHoverLineHeight = 23.sp
-            override val avatarHoverLetterSpacing = 0f.sp
-            override val avatarHoverTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoFontFamily = "Lucida Grande"
-            override val avatarSecondaryInfoFontWeight = 400
-            override val avatarSecondaryInfoFontSize = 15.sp
-            override val avatarSecondaryInfoLineHeight = 23.sp
-            override val avatarSecondaryInfoLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoTextCase = "ORIGINAL"
-            override val avatarSecondaryInfoHoverFontFamily = "Lucida Grande"
-            override val avatarSecondaryInfoHoverFontWeight = 400
-            override val avatarSecondaryInfoHoverFontSize = 15.sp
-            override val avatarSecondaryInfoHoverLineHeight = 23.sp
-            override val avatarSecondaryInfoHoverLetterSpacing = 0f.sp
-            override val avatarSecondaryInfoHoverTextCase = "ORIGINAL"
+        object Medium : TypographyTokens {
+            override val appAvatar = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.ExtraBold, fontSize = 14.sp, lineHeight = 14.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val avatarDefault = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val avatarSecondaryInfo = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarSecondaryInfoHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 13.sp, lineHeight = 21.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+        }
+        object Expanded : TypographyTokens {
+            override val appAvatar = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.ExtraBold, fontSize = 16.sp, lineHeight = 16.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val avatarDefault = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val avatarSecondaryInfo = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 15.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val avatarSecondaryInfoHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 15.sp, lineHeight = 23.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
         }
     }
 }

package/dist/android/compose/brands/advertorial/components/Badge/BadgeTokens.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.64
  * Generated by Style Dictionary
  *
  * Component: Badge | Brand: Advertorial
@@ -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
 
 /**
  * Badge Design Tokens
@@ -32,12 +36,12 @@ import androidx.compose.ui.unit.TextUnit
 object BadgeTokens {
 
     // ══════════════════════════════════════════════════════════════
-    // 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 = BadgeTokens.Sizing.current().labelFontSize
@@ -45,7 +49,8 @@ object BadgeTokens {
         @Composable
         fun current(): SizingTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
@@ -62,7 +67,12 @@ object BadgeTokens {
             override val badgesInnerInlineSpace = 4.dp
             override val adLabelBadgeHeightSize = 30.dp
         }
-        object Regular : SizingTokens {
+        object Medium : SizingTokens {
+            override val badgesInnerStackSpace = 2.dp
+            override val badgesInnerInlineSpace = 4.dp
+            override val adLabelBadgeHeightSize = 30.dp
+        }
+        object Expanded : SizingTokens {
             override val badgesInnerStackSpace = 2.dp
             override val badgesInnerInlineSpace = 4.dp
             override val adLabelBadgeHeightSize = 30.dp
@@ -70,12 +80,12 @@ object BadgeTokens {
     }
 
     // ══════════════════════════════════════════════════════════════
-    // 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 = BadgeTokens.Typography.current().labelFontFamily
@@ -83,45 +93,29 @@ object BadgeTokens {
         @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 videoAdBadgeFontFamily: String
-            val videoAdBadgeFontWeight: Int
-            val videoAdBadgeFontSize: TextUnit
-            val videoAdBadgeTextCase: String
-            val videoTimeBadgeFontFamily: String
-            val videoTimeBadgeFontWeight: Int
-            val videoTimeBadgeFontSize: TextUnit
-            val videoTimeBadgeLineHeight: TextUnit
-            val videoTimeBadgeTextCase: String
+            val videoAdBadge: DesignTextStyle
+            val videoTimeBadge: DesignTextStyle
         }
 
         object Compact : TypographyTokens {
-            override val videoAdBadgeFontFamily = "Gotham XNarrow"
-            override val videoAdBadgeFontWeight = 400
-            override val videoAdBadgeFontSize = 14.sp
-            override val videoAdBadgeTextCase = "UPPER"
-            override val videoTimeBadgeFontFamily = "Lucida Grande"
-            override val videoTimeBadgeFontWeight = 400
-            override val videoTimeBadgeFontSize = 16.sp
-            override val videoTimeBadgeLineHeight = 21.sp
-            override val videoTimeBadgeTextCase = "ORIGINAL"
+            override val videoAdBadge = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 14.sp, lineHeight = 14.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val videoTimeBadge = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 21.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+        }
+        object Medium : TypographyTokens {
+            override val videoAdBadge = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 16.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val videoTimeBadge = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 18.sp, lineHeight = 23.8.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
         }
-        object Regular : TypographyTokens {
-            override val videoAdBadgeFontFamily = "Gotham XNarrow"
-            override val videoAdBadgeFontWeight = 400
-            override val videoAdBadgeFontSize = 16.sp
-            override val videoAdBadgeTextCase = "UPPER"
-            override val videoTimeBadgeFontFamily = "Lucida Grande"
-            override val videoTimeBadgeFontWeight = 400
-            override val videoTimeBadgeFontSize = 18.sp
-            override val videoTimeBadgeLineHeight = 23.8.sp
-            override val videoTimeBadgeTextCase = "ORIGINAL"
+        object Expanded : TypographyTokens {
+            override val videoAdBadge = DesignTextStyle(fontFamily = "Gotham XNarrow", fontWeight = FontWeight.Normal, fontSize = 16.sp, lineHeight = 16.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Uppercase, textDecoration = TextDecoration.None)
+            override val videoTimeBadge = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Normal, fontSize = 18.sp, lineHeight = 23.8.sp, letterSpacing = 0.sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
         }
     }
 }

package/dist/android/compose/brands/advertorial/components/Breadcrumb/BreadcrumbTokens.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.64
  * Generated by Style Dictionary
  *
  * Component: Breadcrumb | Brand: Advertorial
@@ -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
 
 /**
  * Breadcrumb Design Tokens
@@ -32,12 +36,12 @@ import androidx.compose.ui.unit.TextUnit
 object BreadcrumbTokens {
 
     // ══════════════════════════════════════════════════════════════
-    // 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 = BreadcrumbTokens.Sizing.current().labelFontSize
@@ -45,7 +49,8 @@ object BreadcrumbTokens {
         @Composable
         fun current(): SizingTokens = when (DesignSystemTheme.sizeClass) {
             WindowSizeClass.Compact -> Compact
-            WindowSizeClass.Regular -> Regular
+            WindowSizeClass.Medium -> Medium
+            WindowSizeClass.Expanded -> Expanded
         }
 
         /**
@@ -72,7 +77,17 @@ object BreadcrumbTokens {
             override val breadcrumbFontWeight = 700
             override val breadcrumbStackSpace = 14.dp
         }
-        object Regular : SizingTokens {
+        object Medium : SizingTokens {
+            override val breadcrumbFontSize = 15.sp
+            override val breadcrumbFontFamily = "Lucida Grande"
+            override val breadcrumbArrowLeftInlineSpace1 = 3.dp
+            override val breadcrumbArrowRightInlineSpace2 = 5.dp
+            override val breadcrumbInlineSpace = 12.dp
+            override val breadcrumbLineHeight = 15.sp
+            override val breadcrumbFontWeight = 700
+            override val breadcrumbStackSpace = 14.dp
+        }
+        object Expanded : SizingTokens {
             override val breadcrumbFontSize = 12.sp
             override val breadcrumbFontFamily = "Lucida Grande"
             override val breadcrumbArrowLeftInlineSpace1 = 3.dp
@@ -85,12 +100,12 @@ object BreadcrumbTokens {
     }
 
     // ══════════════════════════════════════════════════════════════
-    // 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 = BreadcrumbTokens.Typography.current().labelFontFamily
@@ -98,72 +113,33 @@ object BreadcrumbTokens {
         @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 breadcrumbFontFamily: String
-            val breadcrumbFontWeight: Int
-            val breadcrumbFontSize: TextUnit
-            val breadcrumbLineHeight: TextUnit
-            val breadcrumbLetterSpacing: TextUnit
-            val breadcrumbTextCase: String
-            val breadcrumbLinkFontFamily: String
-            val breadcrumbLinkFontWeight: Int
-            val breadcrumbLinkFontSize: TextUnit
-            val breadcrumbLinkLineHeight: TextUnit
-            val breadcrumbLinkLetterSpacing: TextUnit
-            val breadcrumbLinkTextCase: String
-            val breadcrumbLinkHoverFontFamily: String
-            val breadcrumbLinkHoverFontWeight: Int
-            val breadcrumbLinkHoverFontSize: TextUnit
-            val breadcrumbLinkHoverLineHeight: TextUnit
-            val breadcrumbLinkHoverLetterSpacing: TextUnit
-            val breadcrumbLinkHoverTextCase: String
+            val breadcrumb: DesignTextStyle
+            val breadcrumbLink: DesignTextStyle
+            val breadcrumbLinkHover: DesignTextStyle
         }
 
         object Compact : TypographyTokens {
-            override val breadcrumbFontFamily = "Lucida Grande"
-            override val breadcrumbFontWeight = 700
-            override val breadcrumbFontSize = 15.sp
-            override val breadcrumbLineHeight = 15.sp
-            override val breadcrumbLetterSpacing = 0f.sp
-            override val breadcrumbTextCase = "ORIGINAL"
-            override val breadcrumbLinkFontFamily = "Lucida Grande"
-            override val breadcrumbLinkFontWeight = 700
-            override val breadcrumbLinkFontSize = 15.sp
-            override val breadcrumbLinkLineHeight = 15.sp
-            override val breadcrumbLinkLetterSpacing = 0f.sp
-            override val breadcrumbLinkTextCase = "ORIGINAL"
-            override val breadcrumbLinkHoverFontFamily = "Lucida Grande"
-            override val breadcrumbLinkHoverFontWeight = 700
-            override val breadcrumbLinkHoverFontSize = 15.sp
-            override val breadcrumbLinkHoverLineHeight = 15.sp
-            override val breadcrumbLinkHoverLetterSpacing = 0f.sp
-            override val breadcrumbLinkHoverTextCase = "ORIGINAL"
+            override val breadcrumb = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 15.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val breadcrumbLink = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 15.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val breadcrumbLinkHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 15.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
         }
-        object Regular : TypographyTokens {
-            override val breadcrumbFontFamily = "Lucida Grande"
-            override val breadcrumbFontWeight = 700
-            override val breadcrumbFontSize = 12.sp
-            override val breadcrumbLineHeight = 12.sp
-            override val breadcrumbLetterSpacing = 0f.sp
-            override val breadcrumbTextCase = "ORIGINAL"
-            override val breadcrumbLinkFontFamily = "Lucida Grande"
-            override val breadcrumbLinkFontWeight = 700
-            override val breadcrumbLinkFontSize = 12.sp
-            override val breadcrumbLinkLineHeight = 12.sp
-            override val breadcrumbLinkLetterSpacing = 0f.sp
-            override val breadcrumbLinkTextCase = "ORIGINAL"
-            override val breadcrumbLinkHoverFontFamily = "Lucida Grande"
-            override val breadcrumbLinkHoverFontWeight = 700
-            override val breadcrumbLinkHoverFontSize = 12.sp
-            override val breadcrumbLinkHoverLineHeight = 12.sp
-            override val breadcrumbLinkHoverLetterSpacing = 0f.sp
-            override val breadcrumbLinkHoverTextCase = "ORIGINAL"
+        object Medium : TypographyTokens {
+            override val breadcrumb = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 15.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val breadcrumbLink = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 15.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val breadcrumbLinkHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 15.sp, lineHeight = 15.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+        }
+        object Expanded : TypographyTokens {
+            override val breadcrumb = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 12.sp, lineHeight = 12.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.None)
+            override val breadcrumbLink = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 12.sp, lineHeight = 12.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
+            override val breadcrumbLinkHover = DesignTextStyle(fontFamily = "Lucida Grande", fontWeight = FontWeight.Bold, fontSize = 12.sp, lineHeight = 12.sp, letterSpacing = (0).sp, textCase = DesignTextCase.Original, textDecoration = TextDecoration.Underline)
         }
     }
 }