[FEAT] 텍스트 폰트 및 색상 적용

변경된 string resource 반영
Nexters · Jan 30, 2024 · af4bc76 · af4bc76
1 parent ed60494
commit af4bc76
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 18 deletions.
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -15,17 +15,15 @@
     <string name="check">확인</string>
     <string name="good">GOOD</string>
     <string name="good_example">&#160;좋은 예시</string>
-    <string name="good_example_first">- 밝고 선명한 얼굴, 카메라를 보고 있는 사진</string>
-    <string name="good_example_second">- 내가 제일 잘나왔다고 생각하는 사진</string>
+    <string name="good_example_description">- 밝고 선명한 얼굴, 카메라를 보고 있는 사진\n- 내가 제일 잘나왔다고 생각하는 사진</string>
     <string name="normal">NORMAL</string>
     <string name="bad">BAD</string>
     <string name="bad_example">&#160;좋지 않은 예시</string>
-    <string name="bad_example_first">- 어둡거나 흐린 얼굴</string>
-    <string name="bad_example_second">- 얼굴을 가린 사진(안경, 마스크, 모자 등)</string>
+    <string name="bad_example_description">- 어둡거나 흐린 얼굴\n- 얼굴을 가린 사진(안경, 마스크, 모자 등)</string>
     <string name="check_guide_twice">다시 한번\n확인해주세요!</string>
     <string name="check_needed_for_accurate_result">정확한 결과를 위해 확인이 필요합니다.</string>
     <string name="choice_good_example_first">밝고 선명한 얼굴, 카메라 보고 있는 사진을 선택해주세요.</string>
     <string name="choice_good_example_second">내가 제일 잘나왔다고 생각하는 사진을 선택해주세요.</string>
     <string name="avoid_bad_example_first">어둡거나 흐린 사진은 피해주세요.</string>
-    <string name="avoid_bad_example_second">복잡하거나 동일한 배경은 피해주세요.</string>
+    <string name="avoid_bad_example_second">안경이나 마스크, 모자 등 얼굴을 가린 사진은 피해주세요.</string>
 </resources>
diff --git a/core/ui/src/main/kotlin/com/nexters/ilab/core/ui/component/TopAppBar.kt b/core/ui/src/main/kotlin/com/nexters/ilab/core/ui/component/TopAppBar.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import com.nexters.ilab.android.core.designsystem.R
+import com.nexters.ilab.android.core.designsystem.theme.Subtitle1
 import com.nexters.ilab.core.ui.ComponentPreview
 
 @Composable
@@ -68,6 +69,8 @@ fun ILabTopAppBar(
             Text(
                 text = stringResource(id = titleRes),
                 modifier = Modifier.align(Alignment.Center),
+                style = Subtitle1,
+                color = Color.Black,
             )
         }
     }

diff --git a/feature/camera/src/main/kotlin/com/nexters/ilab/android/feature/camera/UploadCheckScreen.kt b/feature/camera/src/main/kotlin/com/nexters/ilab/android/feature/camera/UploadCheckScreen.kt
@@ -25,8 +25,13 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.nexters.ilab.android.core.designsystem.R
+import com.nexters.ilab.android.core.designsystem.theme.Contents1
+import com.nexters.ilab.android.core.designsystem.theme.Contents2
+import com.nexters.ilab.android.core.designsystem.theme.Gray500
 import com.nexters.ilab.android.core.designsystem.theme.PurpleBlue200
 import com.nexters.ilab.android.core.designsystem.theme.PurpleBlue900
+import com.nexters.ilab.android.core.designsystem.theme.Subtitle1
+import com.nexters.ilab.android.core.designsystem.theme.Title1
 import com.nexters.ilab.core.ui.DevicePreview
 import com.nexters.ilab.core.ui.component.ILabButton
 import com.nexters.ilab.core.ui.component.ILabTopAppBar
@@ -77,10 +82,14 @@ private fun UploadCheckContent() {
         Spacer(modifier = Modifier.height(32.dp))
         Text(
             text = stringResource(id = R.string.check_guide_twice),
+            style = Title1,
+            color = Color.Black,
         )
         Spacer(modifier = Modifier.height(20.dp))
         Text(
             text = stringResource(id = R.string.check_needed_for_accurate_result),
+            style = Contents1,
+            color = Gray500,
         )
         Spacer(modifier = Modifier.height(36.dp))
         NetworkImage(
@@ -132,7 +141,10 @@ private fun UploadCheckContent() {
                 containerColor = PurpleBlue200,
                 contentColor = PurpleBlue900,
                 text = {
-                    Text(text = stringResource(id = R.string.change_photo))
+                    Text(
+                        text = stringResource(id = R.string.change_photo),
+                        style = Subtitle1,
+                    )
                 },
             )
             ILabButton(
@@ -142,7 +154,10 @@ private fun UploadCheckContent() {
                     .height(60.dp)
                     .padding(start = 4.dp),
                 text = {
-                    Text(text = stringResource(id = R.string.check))
+                    Text(
+                        text = stringResource(id = R.string.check),
+                        style = Subtitle1,
+                    )
                 },
             )
         }
@@ -165,7 +180,11 @@ fun GuideRow(
             tint = Color.Unspecified,
         )
         Spacer(Modifier.width(12.dp))
-        Text(text = text)
+        Text(
+            text = text,
+            style = Contents2,
+            color = Color.Black,
+        )
     }
 }
 

diff --git a/feature/camera/src/main/kotlin/com/nexters/ilab/android/feature/camera/UploadScreen.kt b/feature/camera/src/main/kotlin/com/nexters/ilab/android/feature/camera/UploadScreen.kt
@@ -17,17 +17,21 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.nexters.ilab.android.core.designsystem.R
+import com.nexters.ilab.android.core.designsystem.theme.Contents2
 import com.nexters.ilab.android.core.designsystem.theme.PurpleBlue200
 import com.nexters.ilab.android.core.designsystem.theme.PurpleBlue900
+import com.nexters.ilab.android.core.designsystem.theme.Subtitle1
 import com.nexters.ilab.android.core.designsystem.theme.SystemGreen
 import com.nexters.ilab.android.core.designsystem.theme.SystemRed
+import com.nexters.ilab.android.core.designsystem.theme.Title2
 import com.nexters.ilab.core.ui.DevicePreview
 import com.nexters.ilab.core.ui.component.ExampleImage
 import com.nexters.ilab.core.ui.component.ILabButton
@@ -94,14 +98,17 @@ private fun UploadContent(
                 withStyle(style = SpanStyle(color = SystemGreen)) {
                     append(stringResource(id = R.string.good))
                 }
-                append(stringResource(id = R.string.good_example))
+                withStyle(style = SpanStyle(color = Color.Black)) {
+                    append(stringResource(id = R.string.good_example))
+                }
             },
+            style = Title2,
         )
+        Spacer(modifier = Modifier.height(16.dp))
         Text(
-            text = stringResource(id = R.string.good_example_first),
-        )
-        Text(
-            text = stringResource(id = R.string.good_example_second),
+            text = stringResource(id = R.string.good_example_description),
+            style = Contents2,
+            color = Color.Black,
         )
         Spacer(modifier = Modifier.height(20.dp))
         ImageRow(images = goodExamples)
@@ -111,14 +118,18 @@ private fun UploadContent(
                 withStyle(style = SpanStyle(color = SystemRed)) {
                     append(stringResource(id = R.string.bad))
                 }
-                append(stringResource(id = R.string.bad_example))
+                withStyle(style = SpanStyle(color = Color.Black)) {
+                    append(stringResource(id = R.string.bad_example))
+                }
             },
+            style = Title2,
+            color = Color.Black,
         )
+        Spacer(modifier = Modifier.height(16.dp))
         Text(
-            text = stringResource(id = R.string.bad_example_first),
-        )
-        Text(
-            text = stringResource(id = R.string.bad_example_second),
+            text = stringResource(id = R.string.bad_example_description),
+            style = Contents2,
+            color = Color.Black,
         )
         Spacer(modifier = Modifier.height(20.dp))
         ImageRow(images = badExamples)
@@ -140,6 +151,7 @@ private fun UploadContent(
                 text = {
                     Text(
                         text = stringResource(id = R.string.photo_library),
+                        style = Subtitle1,
                     )
                 },
             )
@@ -152,6 +164,7 @@ private fun UploadContent(
                 text = {
                     Text(
                         text = stringResource(id = R.string.take_photo),
+                        style = Subtitle1,
                     )
                 },
             )