Skip to content

Commit 4a3ade2

Browse files
nsh07nsh07
committed
feat(ui): update fonts
1 parent e5ba7ee commit 4a3ade2

File tree

9 files changed

+51
-34
lines changed

9 files changed

+51
-34
lines changed

‎composeApp/src/wasmJsMain/composeResources/font/dm_serif_text.ttf‎

-72.3 KB
Binary file not shown.

‎composeApp/src/wasmJsMain/composeResources/font/google_sans_flex_400.ttf‎

104 KB
Binary file not shown.

‎composeApp/src/wasmJsMain/composeResources/font/google_sans_flex_600.ttf‎

99.4 KB
Binary file not shown.

‎composeApp/src/wasmJsMain/composeResources/font/inter_variable.ttf‎

-843 KB
Binary file not shown.

‎composeApp/src/wasmJsMain/kotlin/org/nsh07/nsh07/ui/homeScreen/ExperienceCard.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.compose.ui.Alignment
1616
import androidx.compose.ui.Modifier
1717
import androidx.compose.ui.draw.clip
1818
import androidx.compose.ui.platform.LocalUriHandler
19-
import androidx.compose.ui.text.font.FontWeight
2019
import androidx.compose.ui.text.intl.Locale
2120
import androidx.compose.ui.text.toUpperCase
2221
import androidx.compose.ui.unit.Dp
@@ -80,9 +79,9 @@ fun ExperienceCardDurationText(experience: Experience, modifier: Modifier = Modi
8079
fun ExperienceCardMainContent(experience: Experience, modifier: Modifier = Modifier) {
8180
Column(modifier) {
8281
FlowRow(itemVerticalAlignment = Alignment.CenterVertically) {
83-
Text(experience.position, style = typography.bodyLarge, fontWeight = FontWeight.Medium)
84-
Text(" $bullet ", style = typography.bodyLarge, fontWeight = FontWeight.Medium)
85-
Text(experience.company, style = typography.bodyLarge, fontWeight = FontWeight.Medium)
82+
Text(experience.position, style = typography.bodyLarge)
83+
Text(" $bullet ", style = typography.bodyLarge)
84+
Text(experience.company, style = typography.bodyLarge)
8685
Icon(
8786
painterResource(Res.drawable.open_in_browser),
8887
null,

‎composeApp/src/wasmJsMain/kotlin/org/nsh07/nsh07/ui/homeScreen/HomeScreenContent.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import androidx.compose.ui.Modifier
1616
import androidx.compose.ui.platform.LocalUriHandler
1717
import androidx.compose.ui.platform.UriHandler
1818
import androidx.compose.ui.text.*
19-
import androidx.compose.ui.text.font.FontWeight
2019
import androidx.compose.ui.unit.Dp
2120
import androidx.compose.ui.unit.dp
2221
import androidx.compose.ui.unit.sp
@@ -42,6 +41,7 @@ fun NameAndDesc(horizontalPadding: Dp = 0.dp) {
4241
Text(
4342
"I build performant, beautiful apps for mobile and desktop.",
4443
style = typography.bodyLarge,
44+
fontFamily = typography.bodyMedium.fontFamily,
4545
color = colorScheme.onSurfaceVariant,
4646
modifier = Modifier.widthIn(max = 320.dp).padding(horizontal = horizontalPadding)
4747
)
@@ -143,6 +143,7 @@ fun LazyListScope.mainContent(
143143
Text(
144144
it,
145145
style = typography.bodyLarge,
146+
fontFamily = typography.bodyMedium.fontFamily,
146147
color = colorScheme.onSurfaceVariant,
147148
modifier = Modifier.padding(start = cardPadding, bottom = 16.dp, end = cardPadding)
148149
)
@@ -163,7 +164,7 @@ fun LazyListScope.mainContent(
163164
.padding(start = cardPadding)
164165
.clickable { uriHandler.openUri("https://www.linkedin.com/in/nsh07/") }
165166
) {
166-
Text("View LinkedIn profile ", style = typography.bodyLarge, fontWeight = FontWeight.SemiBold)
167+
Text("View LinkedIn profile ", style = typography.bodyLarge)
167168
Icon(painterResource(Res.drawable.open_in_browser), null, Modifier.size(16.dp))
168169
}
169170
Spacer(Modifier.height(112.dp))
@@ -189,7 +190,7 @@ fun LazyListScope.mainContent(
189190
.padding(start = cardPadding)
190191
.clickable { uriHandler.openUri("https://github.com/nsh07") }
191192
) {
192-
Text("View all projects on GitHub ", style = typography.bodyLarge, fontWeight = FontWeight.SemiBold)
193+
Text("View all projects on GitHub ", style = typography.bodyLarge)
193194
Icon(painterResource(Res.drawable.open_in_browser), null, Modifier.size(16.dp))
194195
}
195196
Spacer(Modifier.height(112.dp))

‎composeApp/src/wasmJsMain/kotlin/org/nsh07/nsh07/ui/homeScreen/ProjectCard.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import androidx.compose.ui.draw.clip
1717
import androidx.compose.ui.graphics.Shape
1818
import androidx.compose.ui.layout.ContentScale
1919
import androidx.compose.ui.platform.LocalUriHandler
20-
import androidx.compose.ui.text.font.FontWeight
2120
import androidx.compose.ui.unit.Dp
2221
import androidx.compose.ui.unit.dp
2322
import coil3.compose.SubcomposeAsyncImage
@@ -118,7 +117,7 @@ fun ProjectMainContent(
118117
) {
119118
Column(modifier) {
120119
FlowRow(itemVerticalAlignment = Alignment.CenterVertically) {
121-
Text(project.name, style = typography.bodyLarge, fontWeight = FontWeight.Medium)
120+
Text(project.name, style = typography.bodyLarge)
122121
Icon(
123122
painterResource(Res.drawable.open_in_browser),
124123
null,

‎composeApp/src/wasmJsMain/kotlin/org/nsh07/nsh07/ui/theme/Theme.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fun Nsh07Theme(
9595

9696
MaterialExpressiveTheme(
9797
colorScheme = colorScheme,
98-
typography = AppTypography(),
98+
typography = AppTypography,
9999
content = content
100100
)
101101
}

‎composeApp/src/wasmJsMain/kotlin/org/nsh07/nsh07/ui/theme/Type.kt‎

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,52 @@ import androidx.compose.runtime.Composable
55
import androidx.compose.ui.text.font.FontFamily
66

77
import nsh07.composeapp.generated.resources.Res
8-
import nsh07.composeapp.generated.resources.dm_serif_text
9-
import nsh07.composeapp.generated.resources.inter_variable
8+
import nsh07.composeapp.generated.resources.google_sans_flex_400
9+
import nsh07.composeapp.generated.resources.google_sans_flex_600
1010
import org.jetbrains.compose.resources.Font
1111

1212
// Default Material 3 typography values
1313
val baseline = Typography()
1414

15-
@Composable
16-
fun AppTypography() = Typography().run {
17-
val bodyFontFamily = FontFamily(Font(Res.font.inter_variable))
15+
val AppTypography
16+
@Composable get() = Typography().run {
17+
val bodyFontFamily = FontFamily(Font(Res.font.google_sans_flex_400))
1818

19-
val displayFontFamily = FontFamily(Font(Res.font.dm_serif_text))
19+
val displayFontFamily = FontFamily(Font(Res.font.google_sans_flex_600))
2020

21-
copy(
22-
displayLarge = baseline.displayLarge.copy(fontFamily = displayFontFamily),
23-
displayMedium = baseline.displayMedium.copy(fontFamily = displayFontFamily),
24-
displaySmall = baseline.displaySmall.copy(fontFamily = displayFontFamily),
25-
headlineLarge = baseline.headlineLarge.copy(fontFamily = displayFontFamily),
26-
headlineMedium = baseline.headlineMedium.copy(fontFamily = displayFontFamily),
27-
headlineSmall = baseline.headlineSmall.copy(fontFamily = displayFontFamily),
28-
titleLarge = baseline.titleLarge.copy(fontFamily = displayFontFamily),
29-
titleMedium = baseline.titleMedium.copy(fontFamily = displayFontFamily),
30-
titleSmall = baseline.titleSmall.copy(fontFamily = displayFontFamily),
31-
bodyLarge = baseline.bodyLarge.copy(fontFamily = bodyFontFamily),
32-
bodyMedium = baseline.bodyMedium.copy(fontFamily = bodyFontFamily),
33-
bodySmall = baseline.bodySmall.copy(fontFamily = bodyFontFamily),
34-
labelLarge = baseline.labelLarge.copy(fontFamily = bodyFontFamily),
35-
labelMedium = baseline.labelMedium.copy(fontFamily = bodyFontFamily),
36-
labelSmall = baseline.labelSmall.copy(fontFamily = bodyFontFamily)
37-
)
38-
}
21+
copy(
22+
displayLarge = baseline.displayLarge.copy(
23+
fontFamily = displayFontFamily,
24+
fontFeatureSettings = "ss02, dlig"
25+
),
26+
displayMedium = baseline.displayMedium.copy(
27+
fontFamily = displayFontFamily,
28+
fontFeatureSettings = "ss02, dlig"
29+
),
30+
displaySmall = baseline.displaySmall.copy(
31+
fontFamily = displayFontFamily,
32+
fontFeatureSettings = "ss02, dlig"
33+
),
34+
headlineLarge = baseline.headlineLarge.copy(
35+
fontFamily = displayFontFamily,
36+
fontFeatureSettings = "ss02, dlig"
37+
),
38+
headlineMedium = baseline.headlineMedium.copy(
39+
fontFamily = displayFontFamily,
40+
fontFeatureSettings = "ss02, dlig"
41+
),
42+
headlineSmall = baseline.headlineSmall.copy(
43+
fontFamily = displayFontFamily,
44+
fontFeatureSettings = "ss02, dlig"
45+
),
46+
titleLarge = baseline.titleLarge.copy(fontFamily = displayFontFamily, fontFeatureSettings = "ss02, dlig"),
47+
titleMedium = baseline.titleMedium.copy(fontFamily = displayFontFamily, fontFeatureSettings = "ss02, dlig"),
48+
titleSmall = baseline.titleSmall.copy(fontFamily = displayFontFamily, fontFeatureSettings = "ss02, dlig"),
49+
bodyLarge = baseline.bodyLarge.copy(fontFamily = displayFontFamily, fontFeatureSettings = "ss02, dlig"),
50+
bodyMedium = baseline.bodyMedium.copy(fontFamily = bodyFontFamily, fontFeatureSettings = "ss02, dlig"),
51+
bodySmall = baseline.bodySmall.copy(fontFamily = bodyFontFamily, fontFeatureSettings = "ss02, dlig"),
52+
labelLarge = baseline.labelLarge.copy(fontFamily = bodyFontFamily, fontFeatureSettings = "ss02, dlig"),
53+
labelMedium = baseline.labelMedium.copy(fontFamily = bodyFontFamily, fontFeatureSettings = "ss02, dlig"),
54+
labelSmall = baseline.labelSmall.copy(fontFamily = bodyFontFamily, fontFeatureSettings = "ss02, dlig")
55+
)
56+
}

0 commit comments

Comments
 (0)