Merge pull request #59 from Team-HMH/fix/design_system

[fix/design system] : 디자인 시스템 세부사항 수정

app/build.gradle.kts

@@ -70,7 +70,7 @@ dependencies {
 
     // Core
     implementation(projects.core.common)
-    implementation(projects.core.designSystem)
+    implementation(projects.core.designsystem)
     implementation(projects.core.database)
 
     // Firebase

core/design_system/build.gradle.kts → core/designsystem/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace = "com.hmh.hamyeonham.core.design_system"
+    namespace = "com.hmh.hamyeonham.core.designsystem"
 }
 
 dependencies {

core/design_system/src/main/res/values/attrs.xml → core/designsystem/src/main/res/values/attrs.xml

@@ -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>

core/design_system/src/main/res/values/typography.xml → core/designsystem/src/main/res/values/typography.xml

@@ -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 -->
@@ -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>

feature/onboarding/build.gradle.kts

@@ -9,4 +9,5 @@ android {
 
 dependencies {
     implementation(projects.core.common)
+    implementation(projects.core.designsystem)
 }

settings.gradle.kts

@@ -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")