From 4cbba0dadebae5abb0dd022d0c6134d6e58e5f5b Mon Sep 17 00:00:00 2001 From: Nishant Mishra Date: Thu, 20 Nov 2025 15:29:34 +0530 Subject: [PATCH] feat(fonts): use double-storey 'g' for a stylistic look --- .../java/org/nsh07/pomodoro/ui/theme/Type.kt | 75 +++++++++++++++---- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt index b53d6e5..b526d70 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt @@ -28,21 +28,66 @@ import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600 val TYPOGRAPHY = Typography() val Typography = Typography( - displayLarge = TYPOGRAPHY.displayLarge.copy(fontFamily = googleFlex600), - displayMedium = TYPOGRAPHY.displayMedium.copy(fontFamily = googleFlex600), - displaySmall = TYPOGRAPHY.displaySmall.copy(fontFamily = googleFlex600), - headlineLarge = TYPOGRAPHY.headlineLarge.copy(fontFamily = googleFlex600), - headlineMedium = TYPOGRAPHY.headlineMedium.copy(fontFamily = googleFlex600), - headlineSmall = TYPOGRAPHY.headlineSmall.copy(fontFamily = googleFlex600), - titleLarge = TYPOGRAPHY.titleLarge.copy(fontFamily = googleFlex400), - titleMedium = TYPOGRAPHY.titleMedium.copy(fontFamily = googleFlex600), - titleSmall = TYPOGRAPHY.titleSmall.copy(fontFamily = googleFlex600), - bodyLarge = TYPOGRAPHY.bodyLarge.copy(fontFamily = googleFlex600), - bodyMedium = TYPOGRAPHY.bodyMedium.copy(fontFamily = googleFlex400), - bodySmall = TYPOGRAPHY.bodySmall.copy(fontFamily = googleFlex400), - labelLarge = TYPOGRAPHY.labelLarge.copy(fontFamily = googleFlex600), - labelMedium = TYPOGRAPHY.labelMedium.copy(fontFamily = googleFlex600), - labelSmall = TYPOGRAPHY.labelSmall.copy(fontFamily = googleFlex600) + displayLarge = TYPOGRAPHY.displayLarge.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + displayMedium = TYPOGRAPHY.displayMedium.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + displaySmall = TYPOGRAPHY.displaySmall.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + headlineLarge = TYPOGRAPHY.headlineLarge.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + headlineMedium = TYPOGRAPHY.headlineMedium.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + headlineSmall = TYPOGRAPHY.headlineSmall.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + titleLarge = TYPOGRAPHY.titleLarge.copy( + fontFamily = googleFlex400, + fontFeatureSettings = "ss02, dlig" + ), + titleMedium = TYPOGRAPHY.titleMedium.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + titleSmall = TYPOGRAPHY.titleSmall.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + bodyLarge = TYPOGRAPHY.bodyLarge.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + bodyMedium = TYPOGRAPHY.bodyMedium.copy( + fontFamily = googleFlex400, + fontFeatureSettings = "ss02, dlig" + ), + bodySmall = TYPOGRAPHY.bodySmall.copy( + fontFamily = googleFlex400, + fontFeatureSettings = "ss02, dlig" + ), + labelLarge = TYPOGRAPHY.labelLarge.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + labelMedium = TYPOGRAPHY.labelMedium.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ), + labelSmall = TYPOGRAPHY.labelSmall.copy( + fontFamily = googleFlex600, + fontFeatureSettings = "ss02, dlig" + ) ) @OptIn(ExperimentalTextApi::class)