From 1e38a65216dd609dbac8b744880dca2f3d250d89 Mon Sep 17 00:00:00 2001 From: sanlorng Date: Fri, 17 May 2024 09:12:45 +0800 Subject: [PATCH] [fluent] update `Typography.caption` font weight that aligned WinUI figma design file. --- fluent/src/commonMain/kotlin/com/konyaco/fluent/Typography.kt | 2 +- .../kotlin/com/konyaco/fluent/component/MenuFlyout.kt | 2 +- .../kotlin/com/konyaco/fluent/component/RatingControl.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fluent/src/commonMain/kotlin/com/konyaco/fluent/Typography.kt b/fluent/src/commonMain/kotlin/com/konyaco/fluent/Typography.kt index 89309ecc..216dd116 100644 --- a/fluent/src/commonMain/kotlin/com/konyaco/fluent/Typography.kt +++ b/fluent/src/commonMain/kotlin/com/konyaco/fluent/Typography.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.unit.sp internal val LocalTypography = staticCompositionLocalOf { Typography( caption = TextStyle( - fontWeight = FontWeight.Light, + fontWeight = FontWeight.Normal, fontSize = 12.sp, lineHeight = 16.sp ), body = TextStyle( diff --git a/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/MenuFlyout.kt b/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/MenuFlyout.kt index 4ef63a4d..47a5821e 100644 --- a/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/MenuFlyout.kt +++ b/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/MenuFlyout.kt @@ -233,7 +233,7 @@ fun MenuFlyoutScope.MenuFlyoutItem( CompositionLocalProvider( LocalContentColor provides color.trainingColor, LocalContentAlpha provides color.trainingColor.alpha, - LocalTextStyle provides FluentTheme.typography.caption.copy(fontWeight = FontWeight.Normal) + LocalTextStyle provides FluentTheme.typography.caption ) { training?.invoke() } diff --git a/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/RatingControl.kt b/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/RatingControl.kt index 86442b36..0ad573d8 100644 --- a/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/RatingControl.kt +++ b/fluent/src/commonMain/kotlin/com/konyaco/fluent/component/RatingControl.kt @@ -184,7 +184,7 @@ fun RatingControl( }) } ProvideTextStyle( - FluentTheme.typography.caption.copy(color.captionColor, fontWeight = FontWeight.Normal) + FluentTheme.typography.caption.copy(color.captionColor) ) { CompositionLocalProvider( LocalContentColor provides color.captionColor