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.

Sign up for GitHub

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

Jump to bottom

[FEAT] 디자인 시스템 color, typo 추가 https://github.com/POLZZAK/POLZZAK-Android/issues/11 #12

Merged
merged 4 commits into from
May 16, 2023
Merged

[FEAT] 디자인 시스템 color, typo 추가 https://github.com/POLZZAK/POLZZAK-Android/issues/11 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b96dfb9
[FEAT] 디자인 시스템 color, typo 추가
HS0204 May 16, 2023
42d1d13
[CHORE] color 수정
HS0204 May 16, 2023
a7c77c1
[CHORE] color 순서 변경
HS0204 May 16, 2023
64440b2
Merge branch 'develop' into feat/main
HS0204 May 16, 2023
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
Binary file added app/src/main/res/font/pretendard_bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/pretendard_medium.otf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/pretendard_regular.otf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/pretendard_semi_bold.otf
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,27 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>

<color name="primary_700">#0D7AD3</color>
<color name="primary_600">#259BEF</color> <!-- Highlight-->
<color name="primary">#59B9FF</color> <!-- primary_500, Default -->
<color name="primary_400">#84CCFF</color>
<color name="primary_200">#C7E5FF</color>
<color name="primary_150">#E3F2FF</color>
<color name="primary_100">#F0F7FF</color>

<color name="gray_800">#2E3038</color>
<color name="gray_700">#45464F</color>
<color name="gray_600">#6B6C76</color>
<color name="gray_500">#9C9CA8</color>
<color name="gray_400">#C5C6D0</color>
<color name="gray_300">#DADAE7</color>
<color name="gray_200">#EEEEF4</color>
<color name="gray_100">#F8F8FC</color>

<color name="error_500">#FF6F50</color>
<color name="error_200">#FFDAD1</color>
<color name="error_100">#FFEEEA</color>

<color name="blue_500">#59B9FF</color>
</resources>
81 changes: 81 additions & 0 deletions app/src/main/res/values/style.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- etc -->
<style name="regular" parent="Widget.AppCompat.TextView">
<item name="fontFamily">@font/pretendard_regular</item>
</style>

<!-- title -->
<style name="title.24.600" parent="Widget.AppCompat.TextView">
<item name="android:textSize">24sp</item>
<item name="fontFamily">@font/pretendard_semi_bold</item>
</style>
<style name="title.22.700" parent="Widget.AppCompat.TextView">
<item name="android:textSize">22sp</item>
<item name="fontFamily">@font/pretendard_bold</item>
</style>
<style name="title.22.600" parent="Widget.AppCompat.TextView">
<item name="android:textSize">22sp</item>
<item name="fontFamily">@font/pretendard_semi_bold</item>
</style>
<style name="title.20.700" parent="Widget.AppCompat.TextView">
<item name="android:textSize">20sp</item>
<item name="fontFamily">@font/pretendard_bold</item>
</style>

<!-- subtitle -->
<style name="subtitle.18.600" parent="Widget.AppCompat.TextView">
<item name="android:textSize">18sp</item>
<item name="fontFamily">@font/pretendard_semi_bold</item>
</style>
<style name="subtitle.16.700" parent="Widget.AppCompat.TextView">
<item name="android:textSize">16sp</item>
<item name="fontFamily">@font/pretendard_bold</item>
</style>
<style name="subtitle.16.600" parent="Widget.AppCompat.TextView">
<item name="android:textSize">16sp</item>
<item name="fontFamily">@font/pretendard_semi_bold</item>
</style>
<style name="subtitle.20.600" parent="Widget.AppCompat.TextView">
<item name="android:textSize">20sp</item>
<item name="fontFamily">@font/pretendard_semi_bold</item>
</style>
<style name="subtitle.20.400" parent="Widget.AppCompat.TextView">
<item name="android:textSize">20sp</item>
<item name="fontFamily">@font/pretendard_regular</item>
</style>



<!-- body -->
<style name="body.15.500" parent="Widget.AppCompat.TextView">
<item name="android:textSize">15sp</item>
<item name="fontFamily">@font/pretendard_medium</item>
</style>
<style name="body.14.600" parent="Widget.AppCompat.TextView">
<item name="android:textSize">14sp</item>
<item name="fontFamily">@font/pretendard_semi_bold</item>
</style>
<style name="body.14.500" parent="Widget.AppCompat.TextView">
<item name="android:textSize">14sp</item>
<item name="fontFamily">@font/pretendard_medium</item>
</style>
<style name="body.13.500" parent="Widget.AppCompat.TextView">
<item name="android:textSize">13sp</item>
<item name="fontFamily">@font/pretendard_medium</item>
</style>

<!-- caption -->
<style name="caption.12.600" parent="Widget.AppCompat.TextView">
<item name="android:textSize">12sp</item>
<item name="fontFamily">@font/pretendard_semi_bold</item>
</style>
<style name="caption.12.500" parent="Widget.AppCompat.TextView">
<item name="android:textSize">12sp</item>
<item name="fontFamily">@font/pretendard_medium</item>
</style>
<style name="caption.12.700" parent="Widget.AppCompat.TextView">
<item name="android:textSize">12sp</item>
<item name="fontFamily">@font/pretendard_bold</item>
</style>
</resources>