Skip to content

Commit a2811ad

Browse files
committed
[NDGL-30] chore: NDGL Typography 적용
1 parent fe31c29 commit a2811ad

4 files changed

Lines changed: 121 additions & 35 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ fun NDGLTheme(
5151

5252
MaterialTheme(
5353
colorScheme = colorScheme,
54-
typography = Typography,
5554
content = content
5655
)
5756
}

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

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
package com.yapp.ndgl.core.ui.theme
2+
3+
import androidx.compose.runtime.Immutable
4+
import androidx.compose.runtime.staticCompositionLocalOf
5+
import androidx.compose.ui.text.TextStyle
6+
import androidx.compose.ui.text.font.Font
7+
import androidx.compose.ui.text.font.FontFamily
8+
import androidx.compose.ui.text.font.FontWeight
9+
import androidx.compose.ui.unit.sp
10+
import com.yapp.ndgl.core.ui.R
11+
12+
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),
17+
)
18+
19+
@Immutable
20+
data class NDGLTypography(
21+
val titleLgBold: TextStyle = TextStyle(
22+
fontFamily = Pretendard,
23+
fontWeight = FontWeight.Bold,
24+
fontSize = 32.sp,
25+
),
26+
val titleLgSemiBold: TextStyle = TextStyle(
27+
fontFamily = Pretendard,
28+
fontWeight = FontWeight.SemiBold,
29+
fontSize = 32.sp,
30+
),
31+
32+
val titleMdBold: TextStyle = TextStyle(
33+
fontFamily = Pretendard,
34+
fontWeight = FontWeight.Bold,
35+
fontSize = 22.sp,
36+
),
37+
val titleMdSemiBold: TextStyle = TextStyle(
38+
fontFamily = Pretendard,
39+
fontWeight = FontWeight.SemiBold,
40+
fontSize = 22.sp,
41+
),
42+
43+
val subtitleLgSemiBold: TextStyle = TextStyle(
44+
fontFamily = Pretendard,
45+
fontWeight = FontWeight.SemiBold,
46+
fontSize = 20.sp,
47+
),
48+
val subtitleLgMedium: TextStyle = TextStyle(
49+
fontFamily = Pretendard,
50+
fontWeight = FontWeight.Medium,
51+
fontSize = 20.sp,
52+
),
53+
54+
val subtitleMdBold: TextStyle = TextStyle(
55+
fontFamily = Pretendard,
56+
fontWeight = FontWeight.Bold,
57+
fontSize = 18.sp,
58+
),
59+
val subtitleMdSemiBold: TextStyle = TextStyle(
60+
fontFamily = Pretendard,
61+
fontWeight = FontWeight.SemiBold,
62+
fontSize = 18.sp,
63+
),
64+
val subtitleMdMedium: TextStyle = TextStyle(
65+
fontFamily = Pretendard,
66+
fontWeight = FontWeight.Medium,
67+
fontSize = 18.sp,
68+
),
69+
70+
val bodyLgSemiBold: TextStyle = TextStyle(
71+
fontFamily = Pretendard,
72+
fontWeight = FontWeight.SemiBold,
73+
fontSize = 16.sp,
74+
),
75+
val bodyLgMedium: TextStyle = TextStyle(
76+
fontFamily = Pretendard,
77+
fontWeight = FontWeight.Medium,
78+
fontSize = 16.sp,
79+
),
80+
val bodyLgRegular: TextStyle = TextStyle(
81+
fontFamily = Pretendard,
82+
fontWeight = FontWeight.Normal,
83+
fontSize = 16.sp,
84+
),
85+
86+
val bodyMdSemiBold: TextStyle = TextStyle(
87+
fontFamily = Pretendard,
88+
fontWeight = FontWeight.SemiBold,
89+
fontSize = 14.sp,
90+
),
91+
val bodyMdMedium: TextStyle = TextStyle(
92+
fontFamily = Pretendard,
93+
fontWeight = FontWeight.Medium,
94+
fontSize = 14.sp,
95+
),
96+
val bodyMdRegular: TextStyle = TextStyle(
97+
fontFamily = Pretendard,
98+
fontWeight = FontWeight.Normal,
99+
fontSize = 14.sp,
100+
),
101+
102+
val bodySmSemiBold: TextStyle = TextStyle(
103+
fontFamily = Pretendard,
104+
fontWeight = FontWeight.SemiBold,
105+
fontSize = 12.sp,
106+
),
107+
val bodySmMedium: TextStyle = TextStyle(
108+
fontFamily = Pretendard,
109+
fontWeight = FontWeight.Medium,
110+
fontSize = 12.sp,
111+
),
112+
val bodySmRegular: TextStyle = TextStyle(
113+
fontFamily = Pretendard,
114+
fontWeight = FontWeight.Normal,
115+
fontSize = 12.sp,
116+
)
117+
)
118+
119+
internal val ndglTypography = NDGLTypography()
120+
121+
val LocalNDGLTypography = staticCompositionLocalOf { NDGLTypography() }
6.43 MB
Binary file not shown.

0 commit comments

Comments
 (0)