Skip to content

Commit dda6186

Browse files
l5x5ll5x5l
committed
FIX: textStyle사용시 반복적으로 copy가 호출되어 매번 새 객체가 생성될 수 있는 부분 수정
1 parent 72c4f4d commit dda6186

1 file changed

Lines changed: 47 additions & 23 deletions

File tree

  • core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/typography

‎core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/typography/Type.kt‎

Lines changed: 47 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94,39 +94,63 @@ class BitnagilTypography internal constructor(
9494
lineHeight = 20,
9595
),
9696
) {
97-
val headline1Bold: TextStyle @Composable get() = _headline1.copy(fontWeight = FontWeight.Bold).toDpTextStyle
98-
val headline1Medium: TextStyle @Composable get() = _headline1.copy(fontWeight = FontWeight.Medium).toDpTextStyle
97+
private val _headline1Bold = _headline1.copy(fontWeight = FontWeight.Bold)
98+
private val _headline1Medium = _headline1.copy(fontWeight = FontWeight.Medium)
99+
private val _headline2Bold = _headline2.copy(fontWeight = FontWeight.Bold)
100+
private val _headline2Medium = _headline2.copy(fontWeight = FontWeight.Medium)
101+
private val _title1Bold = _title1.copy(fontWeight = FontWeight.Bold)
102+
private val _title1SemiBold = _title1.copy(fontWeight = FontWeight.SemiBold)
103+
private val _title1Medium = _title1.copy(fontWeight = FontWeight.Medium)
104+
private val _title2Bold = _title2.copy(fontWeight = FontWeight.Bold)
105+
private val _title2Medium = _title2.copy(fontWeight = FontWeight.Medium)
106+
private val _title3SemiBold = _title3.copy(fontWeight = FontWeight.SemiBold)
107+
private val _title3Medium = _title3.copy(fontWeight = FontWeight.Medium)
108+
private val _subtitle1SemiBold = _subtitle1.copy(fontWeight = FontWeight.SemiBold)
109+
private val _subtitle1Medium = _subtitle1.copy(fontWeight = FontWeight.Medium)
110+
private val _body1SemiBold = _body1.copy(fontWeight = FontWeight.SemiBold)
111+
private val _body1Medium = _body1.copy(fontWeight = FontWeight.Medium)
112+
private val _body2SemiBold = _body2.copy(fontWeight = FontWeight.SemiBold)
113+
private val _body2Medium = _body2.copy(fontWeight = FontWeight.Medium)
114+
private val _caption1SemiBold = _caption1.copy(fontWeight = FontWeight.SemiBold)
115+
private val _caption1Medium = _caption1.copy(fontWeight = FontWeight.Medium)
116+
private val _caption1UnderlineSemiBold = _caption1Underline.copy(fontWeight = FontWeight.SemiBold)
117+
private val _caption1UnderlineMedium = _caption1Underline.copy(fontWeight = FontWeight.Medium)
118+
private val _caption2SemiBold = _caption2.copy(fontWeight = FontWeight.SemiBold)
119+
private val _caption2Medium = _caption2.copy(fontWeight = FontWeight.Medium)
120+
121+
val headline1Bold: TextStyle @Composable get() = _headline1Bold.toDpTextStyle
122+
val headline1Medium: TextStyle @Composable get() = _headline1Medium.toDpTextStyle
99123
val headline1Regular: TextStyle @Composable get() = _headline1.toDpTextStyle
100-
val headline2Bold: TextStyle @Composable get() = _headline2.copy(fontWeight = FontWeight.Bold).toDpTextStyle
101-
val headline2Medium: TextStyle @Composable get() = _headline2.copy(fontWeight = FontWeight.Medium).toDpTextStyle
124+
val headline2Bold: TextStyle @Composable get() = _headline2Bold.toDpTextStyle
125+
val headline2Medium: TextStyle @Composable get() = _headline2Medium.toDpTextStyle
102126
val headline2Regular: TextStyle @Composable get() = _headline2.toDpTextStyle
103-
val title1Bold: TextStyle @Composable get() = _title1.copy(fontWeight = FontWeight.Bold).toDpTextStyle
104-
val title1SemiBold: TextStyle @Composable get() = _title1.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
105-
val title1Medium: TextStyle @Composable get() = _title1.copy(fontWeight = FontWeight.Medium).toDpTextStyle
127+
val title1Bold: TextStyle @Composable get() = _title1Bold.toDpTextStyle
128+
val title1SemiBold: TextStyle @Composable get() = _title1SemiBold.toDpTextStyle
129+
val title1Medium: TextStyle @Composable get() = _title1Medium.toDpTextStyle
106130
val title1Regular: TextStyle @Composable get() = _title1.toDpTextStyle
107-
val title2Bold: TextStyle @Composable get() = _title2.copy(fontWeight = FontWeight.Bold).toDpTextStyle
108-
val title2Medium: TextStyle @Composable get() = _title2.copy(fontWeight = FontWeight.Medium).toDpTextStyle
131+
val title2Bold: TextStyle @Composable get() = _title2Bold.toDpTextStyle
132+
val title2Medium: TextStyle @Composable get() = _title2Medium.toDpTextStyle
109133
val title2Regular: TextStyle @Composable get() = _title2.toDpTextStyle
110-
val title3SemiBold: TextStyle @Composable get() = _title3.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
111-
val title3Medium: TextStyle @Composable get() = _title3.copy(fontWeight = FontWeight.Medium).toDpTextStyle
134+
val title3SemiBold: TextStyle @Composable get() = _title3SemiBold.toDpTextStyle
135+
val title3Medium: TextStyle @Composable get() = _title3Medium.toDpTextStyle
112136
val title3Regular: TextStyle @Composable get() = _title3.toDpTextStyle
113-
val subtitle1SemiBold: TextStyle @Composable get() = _subtitle1.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
114-
val subtitle1Medium: TextStyle @Composable get() = _subtitle1.copy(fontWeight = FontWeight.Medium).toDpTextStyle
137+
val subtitle1SemiBold: TextStyle @Composable get() = _subtitle1SemiBold.toDpTextStyle
138+
val subtitle1Medium: TextStyle @Composable get() = _subtitle1Medium.toDpTextStyle
115139
val subtitle1Regular: TextStyle @Composable get() = _subtitle1.toDpTextStyle
116-
val body1SemiBold: TextStyle @Composable get() = _body1.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
117-
val body1Medium: TextStyle @Composable get() = _body1.copy(fontWeight = FontWeight.Medium).toDpTextStyle
140+
val body1SemiBold: TextStyle @Composable get() = _body1SemiBold.toDpTextStyle
141+
val body1Medium: TextStyle @Composable get() = _body1Medium.toDpTextStyle
118142
val body1Regular: TextStyle @Composable get() = _body1.toDpTextStyle
119-
val body2SemiBold: TextStyle @Composable get() = _body2.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
120-
val body2Medium: TextStyle @Composable get() = _body2.copy(fontWeight = FontWeight.Medium).toDpTextStyle
143+
val body2SemiBold: TextStyle @Composable get() = _body2SemiBold.toDpTextStyle
144+
val body2Medium: TextStyle @Composable get() = _body2Medium.toDpTextStyle
121145
val body2Regular: TextStyle @Composable get() = _body2.toDpTextStyle
122-
val caption1SemiBold: TextStyle @Composable get() = _caption1.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
123-
val caption1Medium: TextStyle @Composable get() = _caption1.copy(fontWeight = FontWeight.Medium).toDpTextStyle
146+
val caption1SemiBold: TextStyle @Composable get() = _caption1SemiBold.toDpTextStyle
147+
val caption1Medium: TextStyle @Composable get() = _caption1Medium.toDpTextStyle
124148
val caption1Regular: TextStyle @Composable get() = _caption1.toDpTextStyle
125-
val caption1UnderlineSemiBold: TextStyle @Composable get() = _caption1Underline.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
126-
val caption1UnderlineMedium: TextStyle @Composable get() = _caption1Underline.copy(fontWeight = FontWeight.Medium).toDpTextStyle
149+
val caption1UnderlineSemiBold: TextStyle @Composable get() = _caption1UnderlineSemiBold.toDpTextStyle
150+
val caption1UnderlineMedium: TextStyle @Composable get() = _caption1UnderlineMedium.toDpTextStyle
127151
val caption1UnderlineRegular: TextStyle @Composable get() = _caption1Underline.toDpTextStyle
128-
val caption2SemiBold: TextStyle @Composable get() = _caption2.copy(fontWeight = FontWeight.SemiBold).toDpTextStyle
129-
val caption2Medium: TextStyle @Composable get() = _caption2.copy(fontWeight = FontWeight.Medium).toDpTextStyle
152+
val caption2SemiBold: TextStyle @Composable get() = _caption2SemiBold.toDpTextStyle
153+
val caption2Medium: TextStyle @Composable get() = _caption2Medium.toDpTextStyle
130154
val caption2Regular: TextStyle @Composable get() = _caption2.toDpTextStyle
131155
val button1: TextStyle @Composable get() = _button1.toDpTextStyle
132156
val button2: TextStyle @Composable get() = _button2.toDpTextStyle

0 commit comments

Comments
 (0)