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

[fix/design_system] : 디자인 시스템 세부사항 수정 #59

Merged
merged 3 commits into from
Jan 8, 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: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dependencies {

// Core
implementation(projects.core.common)
implementation(projects.core.designSystem)
implementation(projects.core.designsystem)
implementation(projects.core.database)

// Firebase
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

android {
namespace = "com.hmh.hamyeonham.core.design_system"
namespace = "com.hmh.hamyeonham.core.designsystem"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@
<attr name="blue_purple_opacity_70" format="reference" />
<attr name="blue_purple_opacity_22" format="reference" />
<attr name="white_btn" format="reference" />

<attr name="textAppearanceDisplaySmall" format="reference" />
</resources>
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TextAppearance.Hmh" parent = "">

<style name="TextAppearance.Hmh" parent="">

</style>
<!-- Display Large -->
Expand All @@ -13,73 +14,89 @@
<!-- Display Medium -->
<style name="TextAppearance.Hmh.DisplayMedium">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">21sp</item>
<item name="android:textSize">23sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>

<!-- Display Small -->
<style name="TextAppearance.Hmh.DisplaySmall">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">19sp</item>
<item name="android:textSize">21sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>

<!-- Headline Large -->
<style name="TextAppearance.Hmh.HeadlineLarge">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">21sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>

<!-- Headline Medium -->
<style name="TextAppearance.Hmh.HeadlineMedium">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">19sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>

<!-- Headline Small -->
<style name="TextAppearance.Hmh.HeadlineSmall">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">17sp</item>
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">19sp</item>
<item name="android:lineSpacingMultiplier">1.4</item>
</style>

<!-- Title Large -->
<style name="TextAppearance.Hmh.TitleLarge">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">15sp</item>
<item name="android:textSize">17sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>

<!-- Title Medium -->
<style name="TextAppearance.Hmh.TitleMedium">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">15sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>
<!-- Title Medium -->
<style name="TextAppearance.Hmh.TitleSmall">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">15sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>

<!-- Body Large -->
<style name="TextAppearance.Hmh.BodyLarge">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">13sp</item>
<!-- Line spacing auto is default -->
</style>

<!-- Body Medium -->
<style name="TextAppearance.Hmh.BodyMedium">
<item name="fontFamily">@font/pretendard_regular</item>
<item name="android:textSize">13sp</item>
<item name="android:lineSpacingMultiplier">1.5</item>
</style>

<!-- Body Small -->
<style name="TextAppearance.Hmh.BodySmall">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingMultiplier">1.4</item>
</style>

<!-- Label Large -->
<style name="TextAppearance.Hmh.LabelLarge">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">11sp</item>
<item name="android:lineSpacingMultiplier">1.4</item>
</style>

<!-- Label Medium -->
<style name="TextAppearance.Hmh.LabelMedium">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">11sp</item>
<item name="android:lineSpacingMultiplier">1.4</item>
</style>
</resources>
1 change: 1 addition & 0 deletions feature/onboarding/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ android {

dependencies {
implementation(projects.core.common)
implementation(projects.core.designsystem)
}
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ include(":core:common")
include(":core:database")
include(":feature:onboarding")
include(":feature:main")
include(":core:design_system")
include(":core:designsystem")

include(":feature:statistics")
include(":feature:login")
Expand Down