Skip to content

Commit 4cbba0d

Browse files
committed
feat(fonts): use double-storey 'g' for a stylistic look
1 parent c122902 commit 4cbba0d

File tree

1 file changed

+60
-15
lines changed
  • app/src/main/java/org/nsh07/pomodoro/ui/theme

1 file changed

+60
-15
lines changed

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

Lines changed: 60 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,66 @@ import org.nsh07.pomodoro.ui.theme.AppFonts.googleFlex600
2828
val TYPOGRAPHY = Typography()
2929

3030
val Typography = Typography(
31-
displayLarge = TYPOGRAPHY.displayLarge.copy(fontFamily = googleFlex600),
32-
displayMedium = TYPOGRAPHY.displayMedium.copy(fontFamily = googleFlex600),
33-
displaySmall = TYPOGRAPHY.displaySmall.copy(fontFamily = googleFlex600),
34-
headlineLarge = TYPOGRAPHY.headlineLarge.copy(fontFamily = googleFlex600),
35-
headlineMedium = TYPOGRAPHY.headlineMedium.copy(fontFamily = googleFlex600),
36-
headlineSmall = TYPOGRAPHY.headlineSmall.copy(fontFamily = googleFlex600),
37-
titleLarge = TYPOGRAPHY.titleLarge.copy(fontFamily = googleFlex400),
38-
titleMedium = TYPOGRAPHY.titleMedium.copy(fontFamily = googleFlex600),
39-
titleSmall = TYPOGRAPHY.titleSmall.copy(fontFamily = googleFlex600),
40-
bodyLarge = TYPOGRAPHY.bodyLarge.copy(fontFamily = googleFlex600),
41-
bodyMedium = TYPOGRAPHY.bodyMedium.copy(fontFamily = googleFlex400),
42-
bodySmall = TYPOGRAPHY.bodySmall.copy(fontFamily = googleFlex400),
43-
labelLarge = TYPOGRAPHY.labelLarge.copy(fontFamily = googleFlex600),
44-
labelMedium = TYPOGRAPHY.labelMedium.copy(fontFamily = googleFlex600),
45-
labelSmall = TYPOGRAPHY.labelSmall.copy(fontFamily = googleFlex600)
31+
displayLarge = TYPOGRAPHY.displayLarge.copy(
32+
fontFamily = googleFlex600,
33+
fontFeatureSettings = "ss02, dlig"
34+
),
35+
displayMedium = TYPOGRAPHY.displayMedium.copy(
36+
fontFamily = googleFlex600,
37+
fontFeatureSettings = "ss02, dlig"
38+
),
39+
displaySmall = TYPOGRAPHY.displaySmall.copy(
40+
fontFamily = googleFlex600,
41+
fontFeatureSettings = "ss02, dlig"
42+
),
43+
headlineLarge = TYPOGRAPHY.headlineLarge.copy(
44+
fontFamily = googleFlex600,
45+
fontFeatureSettings = "ss02, dlig"
46+
),
47+
headlineMedium = TYPOGRAPHY.headlineMedium.copy(
48+
fontFamily = googleFlex600,
49+
fontFeatureSettings = "ss02, dlig"
50+
),
51+
headlineSmall = TYPOGRAPHY.headlineSmall.copy(
52+
fontFamily = googleFlex600,
53+
fontFeatureSettings = "ss02, dlig"
54+
),
55+
titleLarge = TYPOGRAPHY.titleLarge.copy(
56+
fontFamily = googleFlex400,
57+
fontFeatureSettings = "ss02, dlig"
58+
),
59+
titleMedium = TYPOGRAPHY.titleMedium.copy(
60+
fontFamily = googleFlex600,
61+
fontFeatureSettings = "ss02, dlig"
62+
),
63+
titleSmall = TYPOGRAPHY.titleSmall.copy(
64+
fontFamily = googleFlex600,
65+
fontFeatureSettings = "ss02, dlig"
66+
),
67+
bodyLarge = TYPOGRAPHY.bodyLarge.copy(
68+
fontFamily = googleFlex600,
69+
fontFeatureSettings = "ss02, dlig"
70+
),
71+
bodyMedium = TYPOGRAPHY.bodyMedium.copy(
72+
fontFamily = googleFlex400,
73+
fontFeatureSettings = "ss02, dlig"
74+
),
75+
bodySmall = TYPOGRAPHY.bodySmall.copy(
76+
fontFamily = googleFlex400,
77+
fontFeatureSettings = "ss02, dlig"
78+
),
79+
labelLarge = TYPOGRAPHY.labelLarge.copy(
80+
fontFamily = googleFlex600,
81+
fontFeatureSettings = "ss02, dlig"
82+
),
83+
labelMedium = TYPOGRAPHY.labelMedium.copy(
84+
fontFamily = googleFlex600,
85+
fontFeatureSettings = "ss02, dlig"
86+
),
87+
labelSmall = TYPOGRAPHY.labelSmall.copy(
88+
fontFamily = googleFlex600,
89+
fontFeatureSettings = "ss02, dlig"
90+
)
4691
)
4792

4893
@OptIn(ExperimentalTextApi::class)

0 commit comments

Comments
 (0)