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

[init] xml Styles 세팅 #9

Merged
merged 5 commits into from
May 15, 2024
Merged

[init] xml Styles 세팅 #9

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ddbd3b
[add] #7 폰트 파일 추가
Hyobeen-Park May 14, 2024
0705d4e
[feat] #7 TextAppearance 설정
Hyobeen-Park May 14, 2024
acfc266
[add] #7 Colors 설정
Hyobeen-Park May 14, 2024
a11d7b0
Merge remote-tracking branch 'origin/develop' into init-project-setti…
Hyobeen-Park May 14, 2024
d31cd44
[chore] #7 주석 수정 및 코드 형식 맞추기
Hyobeen-Park May 15, 2024
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/notosans_bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/notosans_regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/font/notosans_semibold.ttf
View file
Open in desktop
Binary file not shown.
46 changes: 44 additions & 2 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

주석 사용! 좋네용 ~

Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<!-- Uncategorized -->
<color name="white">#FFFFFF</color>

<color name="green01">#02E16A</color>
<color name="green04">#316D4D</color>
<color name="green05">#F2F9F6</color>
<color name="green06">#3CAA6F</color>

<color name="yellow01">#F1F1EA</color>
<color name="red01">#F6EEED</color>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요 사이에도 한 줄 추가해주면 좋을 것 같습니다 ~

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

아하~!! 넵 확인했습니다!!

<color name="red03">#88423A</color>
<color name="red04">#DC5A4C</color>

<color name="orange">#E76D55</color>
<color name="blue03">#EBF0F5</color>
<color name="purple">#7C72EE</color>
<color name="pink">#E36686</color>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기도 통일성을 위해 한 줄 씩 추가해 줍시다 ~


<!-- Font Black -->
<color name="black01">#000000</color>
<color name="black02">#222222</color>
<color name="black03">#333333</color>
<color name="black04">#4C4C4C</color>
<color name="black05">#646A76</color>
<color name="black06">#909090</color>
<color name="black07">#969696</color>
<color name="black08">#A6A6A6</color>
<color name="black09">#C7C7C7</color>

<!-- Gray -->
<color name="gray02">#A3A3A3</color>
<color name="gray03">#BDBDBD</color>
<color name="gray04">#E9E9E9</color>
<color name="gray05">#F0F0F0</color>
<color name="gray06">#F4F4F4</color>
<color name="gray07">#FAFAFA</color>

<!-- Font Other -->
<color name="blue01">#297DCB</color>
<color name="blue02">#2588E4</color>
<color name="brown">#CC6E00</color>
<color name="red02">#EF6253</color>
<color name="green02">#00B856</color>
<color name="green03">#41B979</color>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기도 !

</resources>
107 changes: 107 additions & 0 deletions app/src/main/res/values/text_appearance.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="TextAppearance.Kream" parent="">
<item name="android:includeFontPadding">false</item>
</style>

<!-- HEAD -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<!-- HEAD -->
<!-- Head -->

color와의 동일성을 유지하기 위해 이런 식으로 작성하는 게 좋을 것 같아요 ~

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오호! color와의 동일성을 생각 못했네요ㅎㅎㅎㅎ 요것도 수정하겠습니다 감사합니다😊

<style name="TextAppearance.Kream.Head1.Bold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_bold</item>
<item name="android:textSize">18sp</item>
</style>

<style name="TextAppearance.Kream.Head2.Bold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_bold</item>
<item name="android:textSize">15sp</item>
</style>

<!-- BODY1 -->
<style name="TextAppearance.Kream.Body1.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">17sp</item>
</style>

<!-- BODY2 -->
<style name="TextAppearance.Kream.Body2.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">14sp</item>
</style>

<style name="TextAppearance.Kream.Body2.SemiBold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_semibold</item>
<item name="android:textSize">14sp</item>
</style>

<!-- BODY3 -->
<style name="TextAppearance.Kream.Body3.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">13sp</item>
</style>

<style name="TextAppearance.Kream.Body3.SemiBold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_semibold</item>
<item name="android:textSize">13sp</item>
</style>

<!-- BODY4 -->
<style name="TextAppearance.Kream.Body4.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">12sp</item>
</style>

<style name="TextAppearance.Kream.Body4.SemiBold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_semibold</item>
<item name="android:textSize">12sp</item>
</style>

<style name="TextAppearance.Kream.Body4.Bold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_bold</item>
<item name="android:textSize">12sp</item>
</style>

<!-- BODY5 -->
<style name="TextAppearance.Kream.Body5.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">11sp</item>
</style>

<style name="TextAppearance.Kream.Body5.SemiBold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_semibold</item>
<item name="android:textSize">11sp</item>
</style>

<!-- BODY6 -->
<style name="TextAppearance.Kream.Body6.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">10sp</item>
</style>

<style name="TextAppearance.Kream.Body6.SemiBold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_semibold</item>
<item name="android:textSize">10sp</item>
</style>

<!-- BODY7 -->
<style name="TextAppearance.Kream.Body7.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">9sp</item>
</style>

<style name="TextAppearance.Kream.Body7.Bold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_bold</item>
<item name="android:textSize">9sp</item>
</style>

<!-- BODY8 -->
<style name="TextAppearance.Kream.Body8.Regular" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_regular</item>
<item name="android:textSize">8sp</item>
</style>

<style name="TextAppearance.Kream.Body8.SemiBold" parent="TextAppearance.Kream">
<item name="fontFamily">@font/notosans_semibold</item>
<item name="android:textSize">8sp</item>
</style>

</resources>
Loading