-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'chore/#10-color-typography' of https://github.com/team-…
…yello/YELLO-Android into ui/#15-bottom-navigation-bar
- Loading branch information
Showing
19 changed files
with
203 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <font-family xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <font | ||
| android:font="@font/pretendard_bold" | ||
| android:fontStyle="normal" | ||
| android:fontWeight="700" /> | ||
| <font | ||
| android:font="@font/pretendard_bold" | ||
| android:fontStyle="italic" | ||
| android:fontWeight="700" /> | ||
| </font-family> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <font-family xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <font | ||
| android:font="@font/pretendard_medium" | ||
| android:fontStyle="normal" | ||
| android:fontWeight="500" /> | ||
| <font | ||
| android:font="@font/pretendard_medium" | ||
| android:fontStyle="italic" | ||
| android:fontWeight="500" /> | ||
| </font-family> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <font-family xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <font | ||
| android:font="@font/pretendard_regular" | ||
| android:fontStyle="normal" | ||
| android:fontWeight="400" /> | ||
| <font | ||
| android:font="@font/pretendard_regular" | ||
| android:fontStyle="italic" | ||
| android:fontWeight="400" /> | ||
| </font-family> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <font-family xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <font | ||
| android:font="@font/pretendard_semibold" | ||
| android:fontStyle="normal" | ||
| android:fontWeight="600" /> | ||
| <font | ||
| android:font="@font/pretendard_semibold" | ||
| android:fontStyle="italic" | ||
| android:fontWeight="600" /> | ||
| </font-family> |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <resources> | ||
| <style name="TextAppearance.Yello" parent=""> | ||
| <item name="android:textStyle">normal</item> | ||
| <item name="android:textColor">?colorOnBackground</item> | ||
| <item name="android:textAllCaps">false</item> | ||
| <item name="android:includeFontPadding">false</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Headline01"> | ||
| <item name="fontFamily">@font/font_pretendard_bold</item> | ||
| <item name="android:textSize">22sp</item> | ||
| <item name="lineHeight">32sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Headline02"> | ||
| <item name="fontFamily">@font/font_pretendard_bold</item> | ||
| <item name="android:textSize">22sp</item> | ||
| <item name="lineHeight">32sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Headline03"> | ||
| <item name="fontFamily">@font/font_pretendard_bold</item> | ||
| <item name="android:textSize">21sp</item> | ||
| <item name="lineHeight">30sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Subtitle01"> | ||
| <item name="fontFamily">@font/font_pretendard_semibold</item> | ||
| <item name="android:textSize">18sp</item> | ||
| <item name="lineHeight">24sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Subtitle02"> | ||
| <item name="fontFamily">@font/font_pretendard_bold</item> | ||
| <item name="android:textSize">16sp</item> | ||
| <item name="lineHeight">22sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.BodyLarge"> | ||
| <item name="fontFamily">@font/font_pretendard_medium</item> | ||
| <item name="android:textSize">16sp</item> | ||
| <item name="lineHeight">26sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.BodyMedium"> | ||
| <item name="fontFamily">@font/font_pretendard_medium</item> | ||
| <item name="android:textSize">15sp</item> | ||
| <item name="lineHeight">24sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.BodySmall"> | ||
| <item name="fontFamily">@font/font_pretendard_medium</item> | ||
| <item name="android:textSize">14sp</item> | ||
| <item name="lineHeight">22sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Body02"> | ||
| <item name="fontFamily">@font/font_pretendard_regular</item> | ||
| <item name="android:textSize">13sp</item> | ||
| <item name="lineHeight">22sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.LabelLarge"> | ||
| <item name="fontFamily">@font/font_pretendard_medium</item> | ||
| <item name="android:textSize">12sp</item> | ||
| <item name="lineHeight">16sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.LabelMedium"> | ||
| <item name="fontFamily">@font/font_pretendard_medium</item> | ||
| <item name="android:textSize">11sp</item> | ||
| <item name="lineHeight">15sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.LabelSmall"> | ||
| <item name="fontFamily">@font/font_pretendard_medium</item> | ||
| <item name="android:textSize">10sp</item> | ||
| <item name="lineHeight">14sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Body01"> | ||
| <item name="fontFamily">@font/font_pretendard_medium</item> | ||
| <item name="android:textSize">15sp</item> | ||
| <item name="lineHeight">24sp</item> | ||
| </style> | ||
|
|
||
| <style name="TextAppearance.Yello.Button"> | ||
| <item name="fontFamily">@font/font_pretendard_semibold</item> | ||
| <item name="android:textSize">13sp</item> | ||
| <item name="lineHeight">18sp</item> | ||
| </style> | ||
| </resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,55 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <resources> | ||
| <color name="black">#FF000000</color> | ||
| <!-- Basic --> | ||
| <color name="white">#FFFFFFFF</color> | ||
| <color name="black">#FF000000</color> | ||
|
|
||
| <!-- Grayscales --> | ||
| <color name="grayscales_50">#FFFBFBFB</color> | ||
| <color name="grayscales_100">#FFF1F3F5</color> | ||
| <color name="grayscales_200">#FFE9ECEF</color> | ||
| <color name="grayscales_300">#FFDEE2E6</color> | ||
| <color name="grayscales_400">#FFCED4DA</color> | ||
| <color name="grayscales_500">#FFADB5BD</color> | ||
| <color name="grayscales_600">#FF868E96</color> | ||
| <color name="grayscales_700">#FF495057</color> | ||
| <color name="grayscales_800">#FF343A40</color> | ||
| <color name="grayscales_900">#FF212529</color> | ||
|
|
||
| <!-- Yello Main --> | ||
| <color name="yello_main_100">#FFFFFFF4</color> | ||
| <color name="yello_main_200">#FFFEFFDE</color> | ||
| <color name="yello_main_300">#FFFDFFA8</color> | ||
| <color name="yello_main_400">#FFFCFF7E</color> | ||
| <color name="yello_main_500">#FFFBFF3E</color> | ||
| <color name="yello_main_600">#FFFBFF3E</color> | ||
| <color name="yello_main_700">#FFE7EB1A</color> | ||
| <color name="yello_main_800">#FFD1D412</color> | ||
| <color name="yello_main_900">#FFB8BC17</color> | ||
|
|
||
| <!-- Purple Sub --> | ||
| <color name="purple_sub_50">#FFF5F3FF</color> | ||
| <color name="purple_sub_100">#FFE6E2FF</color> | ||
| <color name="purple_sub_200">#FFC7C2FF</color> | ||
| <color name="purple_sub_300">#FFA799FF</color> | ||
| <color name="purple_sub_400">#FF8364FF</color> | ||
| <color name="purple_sub_500">#FF673CFF</color> | ||
| <color name="purple_sub_600">#FF5837DC</color> | ||
| <color name="purple_sub_700">#FF4B25B8</color> | ||
| <color name="purple_sub_800">#FF40139F</color> | ||
| <color name="purple_sub_900">#FF33117C</color> | ||
|
|
||
| <!-- Semantic Status --> | ||
| <color name="semantic_red_100">#FFFFF1F1</color> | ||
| <color name="semantic_red_500">#FFF04646</color> | ||
| <color name="semantic_yellow_100">#FFFEF7E7</color> | ||
| <color name="semantic_yellow_500">#FFFFD84D</color> | ||
| <color name="semantic_green_100">#FFF6FFF3</color> | ||
| <color name="semantic_green_500">#FF68D44C</color> | ||
|
|
||
| <!-- Semantic Gender --> | ||
| <color name="semantic_gender_f_100">#FFFFF2FB</color> | ||
| <color name="semantic_gender_f_500">#FFFF49C1</color> | ||
| <color name="semantic_gender_m_100">#FFF0F6FF</color> | ||
| <color name="semantic_gender_m_500">#FF367FEE</color> | ||
| </resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters