Skip to content

Commit c0983fb

Browse files
committed
[NDGL-51] 폰트 시스템에 weight가 적용되지 않던 이슈 수정
1 parent d4ac157 commit c0983fb

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

core/ui/src/main/java/com/yapp/ndgl/core/ui/theme/Typography.kt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,27 @@ package com.yapp.ndgl.core.ui.theme
22

33
import androidx.compose.runtime.Immutable
44
import androidx.compose.runtime.staticCompositionLocalOf
5+
import androidx.compose.ui.text.ExperimentalTextApi
56
import androidx.compose.ui.text.TextStyle
67
import androidx.compose.ui.text.font.Font
78
import androidx.compose.ui.text.font.FontFamily
9+
import androidx.compose.ui.text.font.FontVariation
810
import androidx.compose.ui.text.font.FontWeight
911
import androidx.compose.ui.unit.sp
1012
import com.yapp.ndgl.core.ui.R
1113

1214
private val Pretendard = FontFamily(
13-
Font(R.font.pretendard, FontWeight.Normal),
14-
Font(R.font.pretendard, FontWeight.Medium),
15-
Font(R.font.pretendard, FontWeight.SemiBold),
16-
Font(R.font.pretendard, FontWeight.Bold),
15+
FontWeight.Normal.pretendardFont(),
16+
FontWeight.Medium.pretendardFont(),
17+
FontWeight.SemiBold.pretendardFont(),
18+
FontWeight.Bold.pretendardFont(),
19+
)
20+
21+
@OptIn(ExperimentalTextApi::class)
22+
private fun FontWeight.pretendardFont() = Font(
23+
R.font.pretendard,
24+
weight = this,
25+
variationSettings = FontVariation.Settings(FontVariation.weight(weight)),
1726
)
1827

1928
@Immutable

0 commit comments

Comments
 (0)