Skip to content

Commit 879078f

Browse files
[YDS-#265] 색, 스타일 추가 (#266)
* chore: Style 추가 및 수정 * chore: Colors 추가 * chore: update version * chore: modify xml typo * chore: modify xml colors
1 parent 63bfd93 commit 879078f

File tree

6 files changed

+28
-9
lines changed

6 files changed

+28
-9
lines changed

DesignSystem/src/main/res/values/foundation_basic_colors.xml

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<drawable name="logoViolet">#8969AC</drawable>
1616
<drawable name="logoBlue">#1653DB</drawable>
1717
<drawable name="logoYellow">#FDD655</drawable>
18+
<drawable name="logoLightBlue">#5865F2</drawable>
19+
<drawable name="logoDarkBlue">#423FCC</drawable>
1820

1921
<!-- pointColor -->
2022
<drawable name="pointColor050">#EBE6FB</drawable>

DesignSystem/src/main/res/values/foundation_typo.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
<dimen name="subtitle2_line_height">20.8dp</dimen>
4646

4747
<style name="Text.SubTitle3">
48-
<item name="android:textSize">14dp</item>
48+
<item name="android:textSize">18dp</item>
4949
<item name="android:fontFamily">@font/spoqa_han_sans_neo_medium</item>
5050
</style>
51-
<dimen name="subtitle3_line_height">18.2dp</dimen>
51+
<dimen name="subtitle3_line_height">23.4dp</dimen>
5252

5353
<style name="Text.Body1">
5454
<item name="android:textSize">15dp</item>
@@ -62,6 +62,12 @@
6262
</style>
6363
<dimen name="body2_line_height">21dp</dimen>
6464

65+
<style name="Text.Body16">
66+
<item name="android:textSize">16dp</item>
67+
<item name="android:fontFamily">@font/spoqa_han_sans_neo_regular</item>
68+
</style>
69+
<dimen name="body16_line_height">20.8dp</dimen>
70+
6571
<style name="Text.Button0">
6672
<item name="android:textSize">16dp</item>
6773
<item name="android:fontFamily">@font/spoqa_han_sans_neo_medium</item>

compose/src/main/java/com/yourssu/design/system/compose/foundation/SemanticColors.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@ data class YdsColorScheme(
120120
// PinkItem
121121
val pinkItemPrimary: Color = Pink300,
122122
val pinkItemBG: Color = Pink050,
123-
val pinkItemText: Color = Pink600
123+
val pinkItemText: Color = Pink600,
124+
125+
// Logo
126+
val logoLightBlue: Color = LogoLightBlue,
127+
val logoDarkBlue: Color = LogoDarkBlue,
124128
)
125129

126130
val lightColorScheme = YdsColorScheme()
@@ -187,7 +191,7 @@ val darkColorScheme = YdsColorScheme(
187191
tooltipPoint = PointColor400_night,
188192

189193
// Pressed
190-
pressed = White000A10
194+
pressed = White000A10,
191195

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

compose/src/main/java/com/yourssu/design/system/compose/foundation/Typography.kt

+9-4
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ data class YdsTypography(
9696
),
9797
val subTitle3: YdsTextStyle = YdsTextStyle(
9898
fontWeight = FontWeight.Medium,
99-
fontSize = 14.dp,
100-
lineHeight = 18.2f.dp,
99+
fontSize = 18.dp,
100+
lineHeight = 23.4f.dp,
101101
),
102102
val body1: YdsTextStyle = YdsTextStyle(
103103
fontWeight = FontWeight.Normal,
@@ -109,6 +109,11 @@ data class YdsTypography(
109109
fontSize = 14.dp,
110110
lineHeight = 21f.dp,
111111
),
112+
val body16: YdsTextStyle = YdsTextStyle(
113+
fontWeight = FontWeight.Normal,
114+
fontSize = 16.dp,
115+
lineHeight = 20.8f.dp,
116+
),
112117
val button0: YdsTextStyle = YdsTextStyle(
113118
fontWeight = FontWeight.Medium,
114119
fontSize = 16.dp,
@@ -125,7 +130,7 @@ data class YdsTypography(
125130
lineHeight = 18.2f.dp,
126131
),
127132
val button3: YdsTextStyle = YdsTextStyle(
128-
fontWeight = FontWeight.Medium,
133+
fontWeight = FontWeight.Normal,
129134
fontSize = 14.dp,
130135
lineHeight = 18.2f.dp,
131136
),
@@ -140,7 +145,7 @@ data class YdsTypography(
140145
lineHeight = 15.6f.dp,
141146
),
142147
val caption1: YdsTextStyle = YdsTextStyle(
143-
fontWeight = FontWeight.Medium,
148+
fontWeight = FontWeight.Normal,
144149
fontSize = 12.dp,
145150
lineHeight = 15.6f.dp,
146151
),

compose/src/main/java/com/yourssu/design/system/compose/foundation/YdsBasicColors.kt

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ internal val LogoIndigo = Color(0xFF4E5986)
77
internal val LogoViolet = Color(0xFF8969AC)
88
internal val LogoBlue = Color(0xFF1653DB)
99
internal val LogoYellow = Color(0xFFFDD655)
10+
internal val LogoLightBlue = Color(0xFF5865F2)
11+
internal val LogoDarkBlue = Color(0xFF423FCC)
1012

1113
// pointColor
1214
internal val PointColor050 = Color(0xFFEBE6FB)

version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionName=2.5.8
1+
versionName=2.5.9
22
#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다

0 commit comments

Comments
 (0)