From 005e86ee588195a38023c8c5b51a0113558f931d Mon Sep 17 00:00:00 2001
From: memoryBangwool <jihyuneee01@gmail.com>
Date: Mon, 8 Jan 2024 21:17:17 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[fix]=20:=20=ED=8F=B0=ED=8A=B8=20=EC=84=B8?=
 =?UTF-8?q?=EB=B6=80=20=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.gitignore                                |   0
 .../build.gradle.kts                          |   0
 .../consumer-rules.pro                        |   0
 .../proguard-rules.pro                        |   0
 .../src/main/AndroidManifest.xml              |   0
 .../res/drawable/ic_launcher_background.xml   |   0
 .../res/drawable/ic_launcher_foreground.xml   |   0
 .../src/main/res/font/hmh_font.xml            |   0
 .../src/main/res/font/pretendard_medium.otf   | Bin
 .../src/main/res/font/pretendard_regular.otf  | Bin
 .../src/main/res/font/pretendard_semibold.otf | Bin
 .../src/main/res/values/attrs.xml             |   0
 .../src/main/res/values/colors.xml            |   0
 .../src/main/res/values/themes.xml            |   0
 .../src/main/res/values/typography.xml        |  33 +++++++++++++-----
 feature/statistics/build.gradle.kts           |   1 +
 .../res/layout/item_usagestatic_total.xml     |   3 +-
 settings.gradle.kts                           |   2 +-
 18 files changed, 29 insertions(+), 10 deletions(-)
 rename core/{design_system => designsystem}/.gitignore (100%)
 rename core/{design_system => designsystem}/build.gradle.kts (100%)
 rename core/{design_system => designsystem}/consumer-rules.pro (100%)
 rename core/{design_system => designsystem}/proguard-rules.pro (100%)
 rename core/{design_system => designsystem}/src/main/AndroidManifest.xml (100%)
 rename core/{design_system => designsystem}/src/main/res/drawable/ic_launcher_background.xml (100%)
 rename core/{design_system => designsystem}/src/main/res/drawable/ic_launcher_foreground.xml (100%)
 rename core/{design_system => designsystem}/src/main/res/font/hmh_font.xml (100%)
 rename core/{design_system => designsystem}/src/main/res/font/pretendard_medium.otf (100%)
 rename core/{design_system => designsystem}/src/main/res/font/pretendard_regular.otf (100%)
 rename core/{design_system => designsystem}/src/main/res/font/pretendard_semibold.otf (100%)
 rename core/{design_system => designsystem}/src/main/res/values/attrs.xml (100%)
 rename core/{design_system => designsystem}/src/main/res/values/colors.xml (100%)
 rename core/{design_system => designsystem}/src/main/res/values/themes.xml (100%)
 rename core/{design_system => designsystem}/src/main/res/values/typography.xml (71%)

diff --git a/core/design_system/.gitignore b/core/designsystem/.gitignore
similarity index 100%
rename from core/design_system/.gitignore
rename to core/designsystem/.gitignore
diff --git a/core/design_system/build.gradle.kts b/core/designsystem/build.gradle.kts
similarity index 100%
rename from core/design_system/build.gradle.kts
rename to core/designsystem/build.gradle.kts
diff --git a/core/design_system/consumer-rules.pro b/core/designsystem/consumer-rules.pro
similarity index 100%
rename from core/design_system/consumer-rules.pro
rename to core/designsystem/consumer-rules.pro
diff --git a/core/design_system/proguard-rules.pro b/core/designsystem/proguard-rules.pro
similarity index 100%
rename from core/design_system/proguard-rules.pro
rename to core/designsystem/proguard-rules.pro
diff --git a/core/design_system/src/main/AndroidManifest.xml b/core/designsystem/src/main/AndroidManifest.xml
similarity index 100%
rename from core/design_system/src/main/AndroidManifest.xml
rename to core/designsystem/src/main/AndroidManifest.xml
diff --git a/core/design_system/src/main/res/drawable/ic_launcher_background.xml b/core/designsystem/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from core/design_system/src/main/res/drawable/ic_launcher_background.xml
rename to core/designsystem/src/main/res/drawable/ic_launcher_background.xml
diff --git a/core/design_system/src/main/res/drawable/ic_launcher_foreground.xml b/core/designsystem/src/main/res/drawable/ic_launcher_foreground.xml
similarity index 100%
rename from core/design_system/src/main/res/drawable/ic_launcher_foreground.xml
rename to core/designsystem/src/main/res/drawable/ic_launcher_foreground.xml
diff --git a/core/design_system/src/main/res/font/hmh_font.xml b/core/designsystem/src/main/res/font/hmh_font.xml
similarity index 100%
rename from core/design_system/src/main/res/font/hmh_font.xml
rename to core/designsystem/src/main/res/font/hmh_font.xml
diff --git a/core/design_system/src/main/res/font/pretendard_medium.otf b/core/designsystem/src/main/res/font/pretendard_medium.otf
similarity index 100%
rename from core/design_system/src/main/res/font/pretendard_medium.otf
rename to core/designsystem/src/main/res/font/pretendard_medium.otf
diff --git a/core/design_system/src/main/res/font/pretendard_regular.otf b/core/designsystem/src/main/res/font/pretendard_regular.otf
similarity index 100%
rename from core/design_system/src/main/res/font/pretendard_regular.otf
rename to core/designsystem/src/main/res/font/pretendard_regular.otf
diff --git a/core/design_system/src/main/res/font/pretendard_semibold.otf b/core/designsystem/src/main/res/font/pretendard_semibold.otf
similarity index 100%
rename from core/design_system/src/main/res/font/pretendard_semibold.otf
rename to core/designsystem/src/main/res/font/pretendard_semibold.otf
diff --git a/core/design_system/src/main/res/values/attrs.xml b/core/designsystem/src/main/res/values/attrs.xml
similarity index 100%
rename from core/design_system/src/main/res/values/attrs.xml
rename to core/designsystem/src/main/res/values/attrs.xml
diff --git a/core/design_system/src/main/res/values/colors.xml b/core/designsystem/src/main/res/values/colors.xml
similarity index 100%
rename from core/design_system/src/main/res/values/colors.xml
rename to core/designsystem/src/main/res/values/colors.xml
diff --git a/core/design_system/src/main/res/values/themes.xml b/core/designsystem/src/main/res/values/themes.xml
similarity index 100%
rename from core/design_system/src/main/res/values/themes.xml
rename to core/designsystem/src/main/res/values/themes.xml
diff --git a/core/design_system/src/main/res/values/typography.xml b/core/designsystem/src/main/res/values/typography.xml
similarity index 71%
rename from core/design_system/src/main/res/values/typography.xml
rename to core/designsystem/src/main/res/values/typography.xml
index c5330cab..b449775a 100644
--- a/core/design_system/src/main/res/values/typography.xml
+++ b/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>
diff --git a/feature/statistics/build.gradle.kts b/feature/statistics/build.gradle.kts
index d650d9fc..20356ff3 100644
--- a/feature/statistics/build.gradle.kts
+++ b/feature/statistics/build.gradle.kts
@@ -15,6 +15,7 @@ dependencies {
 
     // Core
     implementation(projects.core.common)
+    implementation(projects.core.designSystem)
 
     implementation(libs.appcompat)
     implementation(libs.material)
diff --git a/feature/statistics/src/main/res/layout/item_usagestatic_total.xml b/feature/statistics/src/main/res/layout/item_usagestatic_total.xml
index fdee9b1c..a9c1f94b 100644
--- a/feature/statistics/src/main/res/layout/item_usagestatic_total.xml
+++ b/feature/statistics/src/main/res/layout/item_usagestatic_total.xml
@@ -6,9 +6,10 @@
 
     <TextView
         android:id="@+id/tv_statics_goal_title"
+        style="?textAppearanceDisplaySmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/all_goal_time"
+        android:text="목표이용시간\n어아어아"
         android:textColor="#ffffff"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/settings.gradle.kts b/settings.gradle.kts
index edfc2f33..6bfa02fb 100644
--- a/settings.gradle.kts
+++ b/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")

From 1d8c656a0f3442ae16182377f934cffbe7aef4b5 Mon Sep 17 00:00:00 2001
From: memoryBangwool <jihyuneee01@gmail.com>
Date: Mon, 8 Jan 2024 21:22:24 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[fix]=20:=20desginsystem=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                | 2 +-
 feature/statistics/build.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 91b5d7c1..85039e33 100644
--- a/app/build.gradle.kts
+++ b/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
diff --git a/feature/statistics/build.gradle.kts b/feature/statistics/build.gradle.kts
index 20356ff3..8d09b321 100644
--- a/feature/statistics/build.gradle.kts
+++ b/feature/statistics/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
 
     // Core
     implementation(projects.core.common)
-    implementation(projects.core.designSystem)
+    implementation(projects.core.designsystem)
 
     implementation(libs.appcompat)
     implementation(libs.material)

From 696e2021e26825995b42ac41763a574ed951de6d Mon Sep 17 00:00:00 2001
From: memoryBangwool <jihyuneee01@gmail.com>
Date: Mon, 8 Jan 2024 21:45:10 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[fix]=20:=20designsystem=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/designsystem/build.gradle.kts                             | 2 +-
 core/designsystem/src/main/res/values/attrs.xml                | 2 ++
 feature/onboarding/build.gradle.kts                            | 1 +
 feature/statistics/build.gradle.kts                            | 1 -
 .../statistics/src/main/res/layout/item_usagestatic_total.xml  | 3 +--
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
index ebbf1d01..7f3b31ff 100644
--- a/core/designsystem/build.gradle.kts
+++ b/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 {
diff --git a/core/designsystem/src/main/res/values/attrs.xml b/core/designsystem/src/main/res/values/attrs.xml
index 59d059c3..cd7fb236 100644
--- a/core/designsystem/src/main/res/values/attrs.xml
+++ b/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>
\ No newline at end of file
diff --git a/feature/onboarding/build.gradle.kts b/feature/onboarding/build.gradle.kts
index 13498eeb..81e4178b 100644
--- a/feature/onboarding/build.gradle.kts
+++ b/feature/onboarding/build.gradle.kts
@@ -9,4 +9,5 @@ android {
 
 dependencies {
     implementation(projects.core.common)
+    implementation(projects.core.designsystem)
 }
diff --git a/feature/statistics/build.gradle.kts b/feature/statistics/build.gradle.kts
index 8d09b321..d650d9fc 100644
--- a/feature/statistics/build.gradle.kts
+++ b/feature/statistics/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
 
     // Core
     implementation(projects.core.common)
-    implementation(projects.core.designsystem)
 
     implementation(libs.appcompat)
     implementation(libs.material)
diff --git a/feature/statistics/src/main/res/layout/item_usagestatic_total.xml b/feature/statistics/src/main/res/layout/item_usagestatic_total.xml
index a9c1f94b..fdee9b1c 100644
--- a/feature/statistics/src/main/res/layout/item_usagestatic_total.xml
+++ b/feature/statistics/src/main/res/layout/item_usagestatic_total.xml
@@ -6,10 +6,9 @@
 
     <TextView
         android:id="@+id/tv_statics_goal_title"
-        style="?textAppearanceDisplaySmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="목표이용시간\n어아어아"
+        android:text="@string/all_goal_time"
         android:textColor="#ffffff"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />