lostecho/Tomato
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(fonts): use double-storey 'g' for a stylistic look

Browse Source
This commit is contained in:
Nishant Mishra
2025-11-20 15:29:34 +05:30
parent c122902bfe
commit 4cbba0dade
1 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
app/src/main/java/org/nsh07/pomodoro/ui/theme/Type.kt
View File

@@ -28,21 +28,66 @@ import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600
val TYPOGRAPHY = Typography() val TYPOGRAPHY = Typography()
val Typography = Typography( val Typography = Typography(
displayLarge = TYPOGRAPHY.displayLarge.copy(fontFamily = googleFlex600), displayLarge = TYPOGRAPHY.displayLarge.copy(
displayMedium = TYPOGRAPHY.displayMedium.copy(fontFamily = googleFlex600), fontFamily = googleFlex600,
displaySmall = TYPOGRAPHY.displaySmall.copy(fontFamily = googleFlex600), fontFeatureSettings = "ss02, dlig"
headlineLarge = TYPOGRAPHY.headlineLarge.copy(fontFamily = googleFlex600), ),
headlineMedium = TYPOGRAPHY.headlineMedium.copy(fontFamily = googleFlex600), displayMedium = TYPOGRAPHY.displayMedium.copy(
headlineSmall = TYPOGRAPHY.headlineSmall.copy(fontFamily = googleFlex600), fontFamily = googleFlex600,
titleLarge = TYPOGRAPHY.titleLarge.copy(fontFamily = googleFlex400), fontFeatureSettings = "ss02, dlig"
titleMedium = TYPOGRAPHY.titleMedium.copy(fontFamily = googleFlex600), ),
titleSmall = TYPOGRAPHY.titleSmall.copy(fontFamily = googleFlex600), displaySmall = TYPOGRAPHY.displaySmall.copy(
bodyLarge = TYPOGRAPHY.bodyLarge.copy(fontFamily = googleFlex600), fontFamily = googleFlex600,
bodyMedium = TYPOGRAPHY.bodyMedium.copy(fontFamily = googleFlex400), fontFeatureSettings = "ss02, dlig"
bodySmall = TYPOGRAPHY.bodySmall.copy(fontFamily = googleFlex400), ),
labelLarge = TYPOGRAPHY.labelLarge.copy(fontFamily = googleFlex600), headlineLarge = TYPOGRAPHY.headlineLarge.copy(
labelMedium = TYPOGRAPHY.labelMedium.copy(fontFamily = googleFlex600), fontFamily = googleFlex600,
labelSmall = TYPOGRAPHY.labelSmall.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) @OptIn(ExperimentalTextApi::class)