Skip to content

Commit

Permalink
Merge pull request #49 from Team-HMH/feat/desing_system
Browse files Browse the repository at this point in the history
[Feat/desing_system] : ๋””์ž์ธ ์‹œ์Šคํ…œ ๋ชจ๋“ˆ ์ถ”๊ฐ€
  • Loading branch information
jihyun0v0 authored Jan 7, 2024
2 parents 57910f9 + c22a211 commit 806c32b
Show file tree
Hide file tree
Showing 14 changed files with 160 additions and 1 deletion.
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ dependencies {

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

// Firebase
implementation(platform(libs.firebase))
Expand Down
1 change: 1 addition & 0 deletions core/design_system/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
11 changes: 11 additions & 0 deletions core/design_system/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
hmh("feature")
}

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

dependencies {
}
Empty file.
21 changes: 21 additions & 0 deletions core/design_system/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
4 changes: 4 additions & 0 deletions core/design_system/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
9 changes: 9 additions & 0 deletions core/design_system/src/main/res/font/hmh_font.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/pretendard_semibold" />
<font
android:font="@font/pretendard_medium" />
<font
android:font="@font/pretendard_regular"/>
</font-family>
Binary file not shown.
Binary file not shown.
Binary file not shown.
27 changes: 27 additions & 0 deletions core/design_system/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Basic Colors -->
<color name="blackground">#17171B</color>
<color name="gray8">#1B1B23</color>
<color name="gray7">#202028</color>
<color name="gray6">#272934</color>
<color name="gray5">#363948</color>
<color name="gray4">#3D3F4D</color>
<color name="gray3">#50505E</color>
<color name="gray2">#8D8D9F</color>
<color name="gray1">#A5A5BB</color>
<color name="white_text">#DBDAE7</color>

<!-- Blue Purple Colors -->
<color name="blue_purple_button">#3D17D3</color>
<color name="blue_purple_line">#461EE7</color>
<color name="blue_purple_progress">#4428EC</color>
<color name="blue_purple_text">#3726F8</color>

<!-- Blue Purple Opacities -->
<color name="blue_purple_opacity_70">#B33D17D3</color> <!-- 70% opacity -->
<color name="blue_purple_opacity_22">#382B1DD6</color> <!-- 22% opacity -->

<!-- Other Colors -->
<color name="white_btn">#EBECF4</color>
</resources>
2 changes: 2 additions & 0 deletions core/design_system/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
82 changes: 82 additions & 0 deletions core/design_system/src/main/res/values/typography.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Display Large -->
<style name="TextAppearance.App.DisplayLarge" parent="TextAppearance.Material3.DisplayLarge">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">31sp</item>
<!-- Line spacing auto is default -->
</style>

<!-- Display Medium -->
<style name="TextAppearance.App.DisplayMedium" parent="TextAppearance.Material3.DisplayMedium">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">21sp</item>
</style>

<!-- Display Small -->
<style name="TextAppearance.App.DisplaySmall" parent="TextAppearance.Material3.DisplaySmall">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">19sp</item>
</style>

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

<!-- Headline Medium -->
<style name="TextAppearance.App.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">19sp</item>
</style>

<!-- Headline Small -->
<style name="TextAppearance.App.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">17sp</item>
</style>

<!-- Title Large -->
<style name="TextAppearance.App.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
<item name="fontFamily">@font/pretendard_semibold</item>
<item name="android:textSize">15sp</item>
</style>

<!-- Title Medium -->
<style name="TextAppearance.App.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">15sp</item>
</style>

<!-- Body Large -->
<style name="TextAppearance.App.BodyLarge" parent="TextAppearance.Material3.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.App.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
<item name="fontFamily">@font/pretendard_regular</item>
<item name="android:textSize">13sp</item>
</style>

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

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

<!-- Label Medium -->
<style name="TextAppearance.App.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
<item name="fontFamily">@font/pretendard_medium</item>
<item name="android:textSize">11sp</item>
</style>
</resources>
3 changes: 2 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ rootProject.name = "HMH-Android"
include(":app")
include(":core:common")
include(":core:database")

include(":feature:onboarding")
include(":feature:main")
include(":core:design_system")

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

Expand Down

0 comments on commit 806c32b

Please sign in to comment.