[CHORE/#10] 명칭 정정된 textAppearances 추가

team-yello · Jul 4, 2023 · 9f9f6a9 · 9f9f6a9
1 parent b3f598b
commit 9f9f6a9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/app/src/main/res/values/appearances.xml b/app/src/main/res/values/appearances.xml
@@ -37,55 +37,55 @@
         <item name="lineHeight">22sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Body01">
+    <style name="TextAppearance.Yello.BodyLarge">
         <item name="fontFamily">@font/font_pretendard_medium</item>
         <item name="android:textSize">16sp</item>
-        <item name="lineHeight">24sp</item>
+        <item name="lineHeight">26sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Body02">
+    <style name="TextAppearance.Yello.BodyMedium">
         <item name="fontFamily">@font/font_pretendard_medium</item>
         <item name="android:textSize">15sp</item>
-        <item name="lineHeight">22sp</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Body03">
+    <style name="TextAppearance.Yello.BodySmall">
         <item name="fontFamily">@font/font_pretendard_medium</item>
         <item name="android:textSize">14sp</item>
-        <item name="lineHeight">20sp</item>
+        <item name="lineHeight">22sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Body04">
+    <style name="TextAppearance.Yello.Body02">
         <item name="fontFamily">@font/font_pretendard_regular</item>
         <item name="android:textSize">13sp</item>
-        <item name="lineHeight">20sp</item>
+        <item name="lineHeight">22sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Caption01">
+    <style name="TextAppearance.Yello.LabelLarge">
         <item name="fontFamily">@font/font_pretendard_medium</item>
         <item name="android:textSize">12sp</item>
         <item name="lineHeight">16sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Caption02">
+    <style name="TextAppearance.Yello.LabelMedium">
         <item name="fontFamily">@font/font_pretendard_medium</item>
         <item name="android:textSize">11sp</item>
         <item name="lineHeight">15sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Caption03">
+    <style name="TextAppearance.Yello.LabelSmall">
         <item name="fontFamily">@font/font_pretendard_medium</item>
         <item name="android:textSize">10sp</item>
         <item name="lineHeight">14sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Btn01">
+    <style name="TextAppearance.Yello.Body01">
         <item name="fontFamily">@font/font_pretendard_medium</item>
         <item name="android:textSize">15sp</item>
         <item name="lineHeight">24sp</item>
     </style>
 
-    <style name="TextAppearance.Yello.Btn02">
+    <style name="TextAppearance.Yello.Button">
         <item name="fontFamily">@font/font_pretendard_semibold</item>
         <item name="android:textSize">13sp</item>
         <item name="lineHeight">18sp</item>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -11,17 +11,15 @@
         <item name="textAppearanceHeadline3">@style/TextAppearance.Yello.Headline03</item>
         <item name="textAppearanceSubtitle1">@style/TextAppearance.Yello.Subtitle01</item>
         <item name="textAppearanceSubtitle2">@style/TextAppearance.Yello.Subtitle02</item>
-        <!-- TODO: 명칭 수정 후 TextAppearance 등록
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        <item name="textAppearance">@style/TextAppearance.Yello.</item>
-        -->
+        <item name="textAppearanceBodyLarge">@style/TextAppearance.Yello.BodyLarge</item>
+        <item name="textAppearanceBodyMedium">@style/TextAppearance.Yello.BodyMedium</item>
+        <item name="textAppearanceBodySmall">@style/TextAppearance.Yello.BodySmall</item>
+        <item name="textAppearanceBody1">@style/TextAppearance.Yello.Body01</item>
+        <item name="textAppearanceBody2">@style/TextAppearance.Yello.Body02</item>
+        <item name="textAppearanceLabelLarge">@style/TextAppearance.Yello.LabelLarge</item>
+        <item name="textAppearanceLabelMedium">@style/TextAppearance.Yello.LabelMedium</item>
+        <item name="textAppearanceLabelSmall">@style/TextAppearance.Yello.LabelSmall</item>
+        <item name="textAppearanceButton">@style/TextAppearance.Yello.Button</item>
     </style>
 
     <style name="Theme.YELLO" parent="Base.Theme.YELLO" />