Merge pull request #17 from YAPP-Github/feature/sksowk156/PC-207

Feature/sksowk156/pc 207(복구)
YAPP-Github · Dec 30, 2024 · eb5c904 · eb5c904
2 parents e0374c6 + 7e8a751
commit eb5c904
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="feature_matching_detail_valuepick_bottom_bar_label">매칭 수락하기</string>
+    <string name="feature_matching_detail_basicinfo_main_label">오늘의 매칭 조각</string>
+    <string name="feature_matching_detail_basicinfocard_age">나이</string>
+    <string name="feature_matching_detail_basicinfocard_age_particle">만</string>
+    <string name="feature_matching_detail_basicinfocard_age_classifier">세</string>
+    <string name="feature_matching_detail_basicinfocard_age_suffix">년생</string>
+    <string name="feature_matching_detail_basicinfocard_height">키</string>
+    <string name="feature_matching_detail_basicinfocard_religion">종교</string>
+    <string name="feature_matching_detail_basicinfocard_activityRegion">활동 지역</string>
+    <string name="feature_matching_detail_basicinfocard_occupation">직업</string>
+    <string name="feature_matching_detail_basicinfocard_smokeStatue">흡연</string>
+</resources>
diff --git a/feature/matching/src/main/java/com/puzzle/matching/detail/MatchingDetailRoute.kt b/feature/matching/src/main/java/com/puzzle/matching/detail/MatchingDetailRoute.kt
@@ -31,13 +31,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
@@ -243,7 +243,7 @@ private fun MatchingDetailBottomBar(
 
         if (currentPage == MatchingDetailPage.ValuePickState) {
             PieceRoundingButton(
-                label = "매칭 수락하기",
+                label = stringResource(R.string.feature_matching_detail_valuepick_bottom_bar_label),
                 onClick = onAcceptClick,
             )
         } else {
@@ -305,7 +305,7 @@ private fun BasicInfoName(
 ) {
     Column(modifier = modifier) {
         Text(
-            text = "오늘의 매칭 조각",
+            text = stringResource(R.string.feature_matching_detail_basicinfo_main_label),
             style = PieceTheme.typography.bodyMM,
             color = PieceTheme.colors.primaryDefault,
         )
@@ -345,11 +345,11 @@ private fun BasicInfoCard(
             horizontalArrangement = Arrangement.spacedBy(4.dp),
         ) {
             InfoItem(
-                title = "나이",
+                title = stringResource(R.string.feature_matching_detail_basicinfocard_age),
                 text = {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         Text(
-                            text = "만",
+                            text = stringResource(R.string.feature_matching_detail_basicinfocard_age_particle),
                             style = PieceTheme.typography.bodySM,
                             color = PieceTheme.colors.black,
                         )
@@ -363,15 +363,15 @@ private fun BasicInfoCard(
                         )
 
                         Text(
-                            text = "세",
+                            text = stringResource(R.string.feature_matching_detail_basicinfocard_age_classifier),
                             style = PieceTheme.typography.bodySM,
                             color = PieceTheme.colors.black,
                         )
 
                         Spacer(modifier = Modifier.width(4.dp))
 
                         Text(
-                            text = "${birthYear}년생",
+                            text = birthYear + stringResource(R.string.feature_matching_detail_basicinfocard_age_suffix),
                             style = PieceTheme.typography.bodySM,
                             color = PieceTheme.colors.dark2,
                         )
@@ -383,12 +383,12 @@ private fun BasicInfoCard(
                 ),
             )
             InfoItem(
-                title = "키",
+                title = stringResource(R.string.feature_matching_detail_basicinfocard_height),
                 content = height,
                 modifier = modifier.weight(1f),
             )
             InfoItem(
-                title = "종교",
+                title = stringResource(R.string.feature_matching_detail_basicinfocard_religion),
                 content = religion,
                 modifier = modifier.weight(1f),
             )
@@ -400,7 +400,7 @@ private fun BasicInfoCard(
             horizontalArrangement = Arrangement.spacedBy(5.5.dp),
         ) {
             InfoItem(
-                title = "활동 지역",
+                title = stringResource(R.string.feature_matching_detail_basicinfocard_activityRegion),
                 content = activityRegion,
                 modifier = modifier.size(
                     width = 144.dp,
@@ -409,13 +409,13 @@ private fun BasicInfoCard(
             )
 
             InfoItem(
-                title = "직업",
+                title = stringResource(R.string.feature_matching_detail_basicinfocard_occupation),
                 content = occupation,
                 modifier = modifier.weight(1f),
             )
 
             InfoItem(
-                title = "흡연",
+                title = stringResource(R.string.feature_matching_detail_basicinfocard_smokeStatue),
                 content = smokeStatue,
                 modifier = modifier.weight(1f),
             )