Skip to content

Commit 72c4f4d

Browse files
committed
FIX: 중복 정의된 폰트 제거, 컴포저블 내부에서 staticCompositionLocalOf 사용하던 부분 수정, 다크/라이트 테마 색상이 반대로 되어있던 부분 수정
1 parent ccc3bcc commit 72c4f4d

2 files changed

Lines changed: 8 additions & 18 deletions

File tree

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

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/Theme.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.compose.foundation.isSystemInDarkTheme
44
import androidx.compose.runtime.Composable
55
import androidx.compose.runtime.CompositionLocalProvider
66
import androidx.compose.runtime.ReadOnlyComposable
7-
import androidx.compose.runtime.staticCompositionLocalOf
87
import com.threegap.bitnagil.designsystem.color.BitnagilColors
98
import com.threegap.bitnagil.designsystem.color.LocalBitnagilColors
109
import com.threegap.bitnagil.designsystem.color.bitnagilColorsDark
@@ -30,13 +29,13 @@ fun BitnagilTheme(
3029
content: @Composable () -> Unit,
3130
) {
3231
val colors = when {
33-
darkTheme -> staticCompositionLocalOf { bitnagilColorsLight() }
34-
else -> staticCompositionLocalOf { bitnagilColorsDark() }
32+
darkTheme -> bitnagilColorsDark()
33+
else -> bitnagilColorsLight()
3534
}
3635

3736
CompositionLocalProvider(
3837
LocalBitnagilTypography provides LocalBitnagilTypography.current,
39-
LocalBitnagilColors provides colors.current,
38+
LocalBitnagilColors provides colors,
4039
content = content,
4140
)
4241
}

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/font/Font.kt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,12 @@ import com.threegap.bitnagil.designsystem.R
88

99
val pretendard = FontFamily(
1010
Font(R.font.pretendard_black, FontWeight.Black, FontStyle.Normal),
11-
Font(R.font.pretendard_bold, FontWeight.Bold, FontStyle.Normal),
1211
Font(R.font.pretendard_extra_bold, FontWeight.ExtraBold, FontStyle.Normal),
13-
Font(R.font.pretendard_extra_light, FontWeight.ExtraLight, FontStyle.Normal),
14-
Font(R.font.pretendard_light, FontWeight.Light, FontStyle.Normal),
15-
Font(R.font.pretendard_medium, FontWeight.Medium, FontStyle.Normal),
12+
Font(R.font.pretendard_bold, FontWeight.Bold, FontStyle.Normal),
1613
Font(R.font.pretendard_semi_bold, FontWeight.SemiBold, FontStyle.Normal),
14+
Font(R.font.pretendard_medium, FontWeight.Medium, FontStyle.Normal),
15+
Font(R.font.pretendard_regular, FontWeight.Normal, FontStyle.Normal),
16+
Font(R.font.pretendard_light, FontWeight.Light, FontStyle.Normal),
17+
Font(R.font.pretendard_extra_light, FontWeight.ExtraLight, FontStyle.Normal),
1718
Font(R.font.pretendard_thin, FontWeight.Thin, FontStyle.Normal),
18-
19-
Font(R.font.pretendard_black, FontWeight.W900, FontStyle.Normal),
20-
Font(R.font.pretendard_extra_bold, FontWeight.W800, FontStyle.Normal),
21-
Font(R.font.pretendard_bold, FontWeight.W700, FontStyle.Normal),
22-
Font(R.font.pretendard_semi_bold, FontWeight.W600, FontStyle.Normal),
23-
Font(R.font.pretendard_medium, FontWeight.W500, FontStyle.Normal),
24-
Font(R.font.pretendard_regular, FontWeight.W400, FontStyle.Normal),
25-
Font(R.font.pretendard_light, FontWeight.W300, FontStyle.Normal),
26-
Font(R.font.pretendard_extra_light, FontWeight.W200, FontStyle.Normal),
27-
Font(R.font.pretendard_thin, FontWeight.W100, FontStyle.Normal),
2819
)

0 commit comments

Comments
 (0)