color 이름 수정

RandomJusicool · Jun 17, 2024 · 0b1db24 · 0b1db24
1 parent 6f42202
commit 0b1db24
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 41 deletions.
diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/bottomSheet/JDSBottomSheet.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/bottomSheet/JDSBottomSheet.kt
@@ -42,7 +42,7 @@ fun JDSBottomSheet(
         ) {
             Text(
                 text = companyName,
-                style = JDSTypography.labelSmall,
+                style = JDSTypography.subTitle,
                 color = JDSColor.Black,
             )
             Text(

diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/textField/JDSTextField.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/textField/JDSTextField.kt
@@ -108,7 +108,7 @@ fun JDSTextField(
         Text(
             text = supportText,
             color = if (isError) JDSColor.ERROR else JDSColor.MAIN,
-            style = JDSTypography.labelLarge,
+            style = JDSTypography.label,
             modifier = if (!isError) Modifier
                 .align(Alignment.End)
                 .clickableSingle(

diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/topBar/JDSArrowTopBar.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/topBar/JDSArrowTopBar.kt
@@ -38,7 +38,7 @@ fun JDSArrowTopBar(
         startIcon()
         Text(
             text = betweenText,
-            style = JDSTypography.labelSmall,
+            style = JDSTypography.subTitle,
             color = JDSColor.Black
         )
         endIcon()

diff --git a/JDS-component/src/main/java/com/jusiCool/jds_component/typography/JDSTypography.kt b/JDS-component/src/main/java/com/jusiCool/jds_component/typography/JDSTypography.kt
@@ -1,75 +1,91 @@
 package com.jusiCool.jds_component.typography
 
 import androidx.compose.material3.Typography
+import androidx.compose.runtime.Stable
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.sp
-import com.jusiCool.jds_component.R
+import com.example.jds_component.R
 
-val pretendard = FontFamily(
-    Font(R.font.pretendard),
-    Font(R.font.pretendard_regular),
-    Font(R.font.pretendard_semi_bold)
-)
+object JDSTypography {
+    private val pretendard = FontFamily(
+        Font(R.font.pretendard),
+        Font(R.font.pretendard_regular),
+        Font(R.font.pretendard_semi_bold)
+    )
 
-val JDSTypography = Typography(
-    labelSmall = TextStyle( // Sub Title
-        fontSize = 18.sp,
+    @Stable
+    val titleLarge = TextStyle(
         fontFamily = pretendard,
-        lineHeight = 27.sp,
-        fontWeight = FontWeight.SemiBold,
-        textAlign = TextAlign.Center,
-    ),
-    titleLarge = TextStyle(
         fontSize = 48.sp,
-        fontFamily = pretendard,
         lineHeight = 58.sp,
         fontWeight = FontWeight.SemiBold,
-        textAlign = TextAlign.Center
-    ),
-    titleMedium = TextStyle(
-        fontSize = 36.sp,
+        textAlign = TextAlign.Center,
+    )
+
+    @Stable
+    val titleMedium = TextStyle(
         fontFamily = pretendard,
+        fontSize = 36.sp,
         lineHeight = 43.sp,
         fontWeight = FontWeight.SemiBold,
         textAlign = TextAlign.Center,
-    ),
-    titleSmall = TextStyle(
-        fontSize = 24.sp,
+    )
+
+    @Stable
+    val titleSmall = TextStyle(
         fontFamily = pretendard,
+        fontSize = 24.sp,
         lineHeight = 31.sp,
         fontWeight = FontWeight.SemiBold,
         textAlign = TextAlign.Center,
-    ),
-    bodyLarge = TextStyle(
-        fontSize = 16.sp,
+    )
+
+    @Stable
+    val subTitle = TextStyle(
         fontFamily = pretendard,
-        lineHeight = 22.sp,
+        fontSize = 18.sp,
+        lineHeight = 27.sp,
+        fontWeight = FontWeight.SemiBold,
+        textAlign = TextAlign.Center,
+    )
+
+    @Stable
+    val bodyLarge = TextStyle(
+        fontFamily = pretendard,
+        fontSize = 18.sp,
+        lineHeight = 27.sp,
         fontWeight = FontWeight.Normal,
         textAlign = TextAlign.Center,
-    ),
-    bodyMedium = TextStyle(
-        fontSize = 14.sp,
+    )
+
+    @Stable
+    val bodyMedium = TextStyle(
         fontFamily = pretendard,
-        lineHeight = 20.sp,
+        fontSize = 16.sp,
+        lineHeight = 22.sp,
         fontWeight = FontWeight.SemiBold,
         textAlign = TextAlign.Center,
-    ),
-    bodySmall = TextStyle(
-        fontSize = 14.sp,
+    )
+
+    @Stable
+    val bodySmall = TextStyle(
         fontFamily = pretendard,
-        lineHeight = 20.sp,
+        fontSize = 16.sp,
+        lineHeight = 22.sp,
         fontWeight = FontWeight.Normal,
         textAlign = TextAlign.Center,
-    ),
-    labelLarge = TextStyle( //lable
-        fontSize = 12.sp,
+    )
+
+    @Stable
+    val label = TextStyle(
         fontFamily = pretendard,
+        fontSize = 14.sp,
         lineHeight = 18.sp,
         fontWeight = FontWeight.Normal,
         textAlign = TextAlign.Center,
     )
-)
+}