[Merge] #21 -> develop

Team-Hankki · Jul 4, 2024 · 3aea6fd · 3aea6fd
2 parents 589344d + a85674a
commit 3aea6fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/core/designsystem/src/main/java/com/hankki/core/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/hankki/core/designsystem/theme/Color.kt
@@ -11,9 +11,10 @@ val PurpleGrey40 = Color(0xFF625b71)
 val Pink40 = Color(0xFF7D5260)
 
 //main color
-val PrimaryColor = Color(0xFFFF4C24)
-val SubColor01 = Color(0xFFFFFFEB)
-val SubColor02 = Color(0xFFF8F891)
+val Red = Color(0xFFFF4C24)
+val RedLight = Color(0xFFFFF5F3)
+val Yellow = Color(0xFFF8F891)
+val YellowLight = Color(0xFFFFFFEB)
 
 //gray scale
 val White = Color(0xFFFFFFFF)

diff --git a/core/designsystem/src/main/java/com/hankki/core/designsystem/theme/Type.kt b/core/designsystem/src/main/java/com/hankki/core/designsystem/theme/Type.kt
@@ -34,6 +34,7 @@ class HankkiTypography internal constructor(
     body2: TextStyle,
     body3: TextStyle,
     body4: TextStyle,
+    body5: TextStyle,
     suitBody1: TextStyle,
     suitBody2: TextStyle,
     button1: TextStyle,
@@ -62,6 +63,8 @@ class HankkiTypography internal constructor(
         private set
     var body4: TextStyle by mutableStateOf(body4)
         private set
+    var body5: TextStyle by mutableStateOf(body5)
+        private set
     var suitBody1: TextStyle by mutableStateOf(suitBody1)
         private set
     var suitBody2: TextStyle by mutableStateOf(suitBody2)
@@ -85,6 +88,7 @@ class HankkiTypography internal constructor(
         body2: TextStyle = this.body2,
         body3: TextStyle = this.body3,
         body4: TextStyle = this.body4,
+        body5: TextStyle = this.body5,
         suitBody1: TextStyle = this.suitBody1,
         suitBody2: TextStyle = this.suitBody2,
         button1: TextStyle = this.button1,
@@ -102,6 +106,7 @@ class HankkiTypography internal constructor(
         body2,
         body3,
         body4,
+        body5,
         suitBody1,
         suitBody2,
         button1,
@@ -121,6 +126,7 @@ class HankkiTypography internal constructor(
         body2 = other.body2
         body3 = other.body3
         body4 = other.body4
+        body5 = other.body5
         suitBody1 = other.suitBody1
         suitBody2 = other.suitBody2
         button1 = other.button1
@@ -198,6 +204,12 @@ fun hankkiTypography(): HankkiTypography {
             fontSize = 14.sp,
             lineHeight = 21.sp
         ),
+        body5 = TextStyle(
+            fontFamily = PretendardMedium,
+            fontWeight = FontWeight.Medium,
+            fontSize = 13.sp,
+            lineHeight = 19.5.sp
+        ),
         suitBody1 = TextStyle(
             fontFamily = SuiteMedium,
             fontWeight = FontWeight.Medium,