Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[YDS-#265] 색, 스타일 추가 #266

Merged
merged 5 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions DesignSystem/src/main/res/values/foundation_basic_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
<drawable name="logoViolet">#8969AC</drawable>
<drawable name="logoBlue">#1653DB</drawable>
<drawable name="logoYellow">#FDD655</drawable>
<drawable name="logoLightBlue">#5865F2</drawable>
<drawable name="logoDarkBlue">#423FCC</drawable>

<!-- pointColor -->
<drawable name="pointColor050">#EBE6FB</drawable>
Expand Down
10 changes: 8 additions & 2 deletions DesignSystem/src/main/res/values/foundation_typo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
<dimen name="subtitle2_line_height">20.8dp</dimen>

<style name="Text.SubTitle3">
<item name="android:textSize">14dp</item>
<item name="android:textSize">18dp</item>
<item name="android:fontFamily">@font/spoqa_han_sans_neo_medium</item>
</style>
<dimen name="subtitle3_line_height">18.2dp</dimen>
<dimen name="subtitle3_line_height">23.4dp</dimen>

<style name="Text.Body1">
<item name="android:textSize">15dp</item>
Expand All @@ -62,6 +62,12 @@
</style>
<dimen name="body2_line_height">21dp</dimen>

<style name="Text.Body16">
<item name="android:textSize">16dp</item>
<item name="android:fontFamily">@font/spoqa_han_sans_neo_regular</item>
</style>
<dimen name="body16_line_height">20.8dp</dimen>

<style name="Text.Button0">
<item name="android:textSize">16dp</item>
<item name="android:fontFamily">@font/spoqa_han_sans_neo_medium</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@ data class YdsColorScheme(
// PinkItem
val pinkItemPrimary: Color = Pink300,
val pinkItemBG: Color = Pink050,
val pinkItemText: Color = Pink600
val pinkItemText: Color = Pink600,

// Logo
val logoLightBlue: Color = LogoLightBlue,
val logoDarkBlue: Color = LogoDarkBlue,
)

val lightColorScheme = YdsColorScheme()
Expand Down Expand Up @@ -187,7 +191,7 @@ val darkColorScheme = YdsColorScheme(
tooltipPoint = PointColor400_night,

// Pressed
pressed = White000A10
pressed = White000A10,

// Shadow * 다크모드에서는 Shadow를 사용하지 않습니다 *

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ data class YdsTypography(
),
val subTitle3: YdsTextStyle = YdsTextStyle(
fontWeight = FontWeight.Medium,
fontSize = 14.dp,
lineHeight = 18.2f.dp,
fontSize = 18.dp,
lineHeight = 23.4f.dp,
),
val body1: YdsTextStyle = YdsTextStyle(
fontWeight = FontWeight.Normal,
Expand All @@ -109,6 +109,11 @@ data class YdsTypography(
fontSize = 14.dp,
lineHeight = 21f.dp,
),
val body16: YdsTextStyle = YdsTextStyle(
fontWeight = FontWeight.Normal,
fontSize = 16.dp,
lineHeight = 20.8f.dp,
),
val button0: YdsTextStyle = YdsTextStyle(
fontWeight = FontWeight.Medium,
fontSize = 16.dp,
Expand All @@ -125,7 +130,7 @@ data class YdsTypography(
lineHeight = 18.2f.dp,
),
val button3: YdsTextStyle = YdsTextStyle(
fontWeight = FontWeight.Medium,
fontWeight = FontWeight.Normal,
fontSize = 14.dp,
lineHeight = 18.2f.dp,
),
Expand All @@ -140,7 +145,7 @@ data class YdsTypography(
lineHeight = 15.6f.dp,
),
val caption1: YdsTextStyle = YdsTextStyle(
fontWeight = FontWeight.Medium,
fontWeight = FontWeight.Normal,
fontSize = 12.dp,
lineHeight = 15.6f.dp,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ internal val LogoIndigo = Color(0xFF4E5986)
internal val LogoViolet = Color(0xFF8969AC)
internal val LogoBlue = Color(0xFF1653DB)
internal val LogoYellow = Color(0xFFFDD655)
internal val LogoLightBlue = Color(0xFF5865F2)
internal val LogoDarkBlue = Color(0xFF423FCC)

// pointColor
internal val PointColor050 = Color(0xFFEBE6FB)
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionName=2.5.8
versionName=2.5.9
#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다
Loading