Skip to content

Commit

Permalink
#25 [MOD] c2sb -> c3sb typo 네이밍 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
Eonji-sw committed Jan 16, 2025
1 parent 4ee572f commit 8c583f5
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fun NoostakCategoryChip(

NoostakChip(
text = text,
textStyle = NoostakTheme.typography.c2SemiBold,
textStyle = NoostakTheme.typography.c3SemiBold,
textColor = NoostakTheme.colors.white,
backgroundColor = resolvedBackgroundColor,
borderColor = Color.Transparent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ fun NoostakTextField(
Text(
text = stringResource(R.string.text_noostak_text_field_sign_up_condition),
color = NoostakTheme.colors.red02,
style = NoostakTheme.typography.c2SemiBold,
style = NoostakTheme.typography.c3SemiBold,
modifier = modifier.padding(top = 6.dp),
maxLines = 1
)
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/com/sopt/core/designsystem/theme/Type.kt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class NoostakTypography internal constructor(
b4Regular: TextStyle,
b5Regular: TextStyle,
c1Bold: TextStyle,
c2SemiBold: TextStyle,
c3SemiBold: TextStyle,
c3Regular: TextStyle,
c4Regular: TextStyle
) {
Expand Down Expand Up @@ -86,7 +86,7 @@ class NoostakTypography internal constructor(
private set
var c1Bold: TextStyle by mutableStateOf(c1Bold)
private set
var c2SemiBold: TextStyle by mutableStateOf(c2SemiBold)
var c3SemiBold: TextStyle by mutableStateOf(c3SemiBold)
private set
var c3Regular: TextStyle by mutableStateOf(c3Regular)
private set
Expand All @@ -113,7 +113,7 @@ class NoostakTypography internal constructor(
b4Regular: TextStyle = this.b4Regular,
b5Regular: TextStyle = this.b5Regular,
c1Bold: TextStyle = this.c1Bold,
c2SemiBold: TextStyle = this.c2SemiBold,
c3SemiBold: TextStyle = this.c3SemiBold,
c3Regular: TextStyle = this.c3Regular,
c4Regular: TextStyle = this.c4Regular
): NoostakTypography = NoostakTypography(
Expand All @@ -136,7 +136,7 @@ class NoostakTypography internal constructor(
b4Regular = b4Regular,
b5Regular = b5Regular,
c1Bold = c1Bold,
c2SemiBold = c2SemiBold,
c3SemiBold = c3SemiBold,
c3Regular = c3Regular,
c4Regular = c4Regular
)
Expand All @@ -161,7 +161,7 @@ class NoostakTypography internal constructor(
b4Regular = other.b4Regular
b5Regular = other.b5Regular
c1Bold = other.c1Bold
c2SemiBold = other.c2SemiBold
c3SemiBold = other.c3SemiBold
c3Regular = other.c3Regular
c4Regular = other.c4Regular
}
Expand Down Expand Up @@ -304,7 +304,7 @@ fun noostakTypography(): NoostakTypography {
fontSize = 13.sp,
lineHeight = 18.sp
),
c2SemiBold = noostakTextStyle(
c3SemiBold = noostakTextStyle(
fontFamily = PretendardSemiBold,
fontWeight = FontWeight.SemiBold,
fontSize = 13.sp,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ fun RecommendationItem(
modifier = Modifier.padding(start = 2.dp),
text = likes.toString(),
color = if (isLiked) NoostakTheme.colors.black else NoostakTheme.colors.gray600,
style = NoostakTheme.typography.c2SemiBold
style = NoostakTheme.typography.c3SemiBold
)
}
}
Expand All @@ -164,7 +164,7 @@ fun RecommendationItem(
data.availableMembersCount
),
color = NoostakTheme.colors.black,
style = NoostakTheme.typography.c2SemiBold
style = NoostakTheme.typography.c3SemiBold
)
FlowRow(
modifier = Modifier.padding(top = 10.dp),
Expand All @@ -187,7 +187,7 @@ fun RecommendationItem(
data.unavailableMembersCount
),
color = NoostakTheme.colors.black,
style = NoostakTheme.typography.c2SemiBold
style = NoostakTheme.typography.c3SemiBold
)
FlowRow(
modifier = Modifier.padding(top = 10.dp),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ fun GroupMemberItem(
Text(
text = name,
color = NoostakTheme.colors.gray900,
style = NoostakTheme.typography.c2SemiBold,
style = NoostakTheme.typography.c3SemiBold,
textAlign = TextAlign.Center
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fun MyPageProfileEditButton(text: String, onClick: () -> Unit) {
) {
Text(
text = text,
style = NoostakTheme.typography.c2SemiBold,
style = NoostakTheme.typography.c3SemiBold,
color = NoostakTheme.colors.gray900
)
}
Expand Down

0 comments on commit 8c583f5

Please sign in to comment.