[PC-000] 리소스 모두 core:designsystem에서 관리하도록 변경

YAPP-Github · Jan 1, 2025 · 9e9e684 · 9e9e684
1 parent 2b1e7ca
commit 9e9e684
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 36 deletions.
diff --git a/...main/res/drawable/ic_matching_loading.xml → ...main/res/drawable/ic_matching_loading.xml b/...main/res/drawable/ic_matching_loading.xml → ...main/res/drawable/ic_matching_loading.xml
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -1,14 +1,24 @@
 <?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>
+    <!--Matching-->
+    <string name="matching_title">Matching</string>
+    <string name="check_the_matching_pieces">매칭 조각을 확인해주세요!</string>
+    <string name="same_value_as_me">나와 같은 가치관</string>
+    <string name="accept_matching">매칭 수락하기</string>
+
+    <!--Matching Detail-->
+    <string name="basicinfo_title" />
+    <string name="valuetalk_title">가치관 Talk</string>
+    <string name="valuepick_title">가치관 Pick</string>
+    <string name="valuepick_bottom_bar_label">매칭 수락하기</string>
+    <string name="basicinfo_main_label">오늘의 매칭 조각</string>
+    <string name="basicinfocard_age">나이</string>
+    <string name="basicinfocard_age_particle">만</string>
+    <string name="basicinfocard_age_classifier">세</string>
+    <string name="basicinfocard_age_suffix">년생</string>
+    <string name="basicinfocard_height">키</string>
+    <string name="basicinfocard_religion">종교</string>
+    <string name="basicinfocard_activityRegion">활동 지역</string>
+    <string name="basicinfocard_occupation">직업</string>
+    <string name="basicinfocard_smokeStatue">흡연</string>
 </resources>
diff --git a/feature/matching/src/main/java/com/puzzle/matching/MatchingScreen.kt b/feature/matching/src/main/java/com/puzzle/matching/MatchingScreen.kt
@@ -41,6 +41,7 @@ import com.puzzle.designsystem.component.PieceSolidButton
 import com.puzzle.designsystem.foundation.PieceTheme
 import com.puzzle.matching.contract.MatchingIntent
 import com.puzzle.matching.contract.MatchingState
+import com.puzzle.designsystem.R
 
 @Composable
 internal fun MatchingRoute(
@@ -72,7 +73,7 @@ internal fun MatchingScreen(
             titleColor = PieceTheme.colors.white,
             rightComponent = {
                 Image(
-                    painter = painterResource(com.puzzle.designsystem.R.drawable.ic_alarm),
+                    painter = painterResource(R.drawable.ic_alarm),
                     contentDescription = "",
                 )
             },

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
@@ -243,7 +243,7 @@ private fun MatchingDetailBottomBar(
 
         if (currentPage == MatchingDetailPage.ValuePickState) {
             PieceRoundingButton(
-                label = stringResource(R.string.feature_matching_detail_valuepick_bottom_bar_label),
+                label = stringResource(R.string.valuepick_bottom_bar_label),
                 onClick = onAcceptClick,
             )
         } else {
@@ -305,7 +305,7 @@ private fun BasicInfoName(
 ) {
     Column(modifier = modifier) {
         Text(
-            text = stringResource(R.string.feature_matching_detail_basicinfo_main_label),
+            text = stringResource(R.string.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 = stringResource(R.string.feature_matching_detail_basicinfocard_age),
+                title = stringResource(R.string.basicinfocard_age),
                 text = {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         Text(
-                            text = stringResource(R.string.feature_matching_detail_basicinfocard_age_particle),
+                            text = stringResource(R.string.basicinfocard_age_particle),
                             style = PieceTheme.typography.bodySM,
                             color = PieceTheme.colors.black,
                         )
@@ -363,15 +363,15 @@ private fun BasicInfoCard(
                         )
 
                         Text(
-                            text = stringResource(R.string.feature_matching_detail_basicinfocard_age_classifier),
+                            text = stringResource(R.string.basicinfocard_age_classifier),
                             style = PieceTheme.typography.bodySM,
                             color = PieceTheme.colors.black,
                         )
 
                         Spacer(modifier = Modifier.width(4.dp))
 
                         Text(
-                            text = birthYear + stringResource(R.string.feature_matching_detail_basicinfocard_age_suffix),
+                            text = birthYear + stringResource(R.string.basicinfocard_age_suffix),
                             style = PieceTheme.typography.bodySM,
                             color = PieceTheme.colors.dark2,
                         )
@@ -383,12 +383,12 @@ private fun BasicInfoCard(
                 ),
             )
             InfoItem(
-                title = stringResource(R.string.feature_matching_detail_basicinfocard_height),
+                title = stringResource(R.string.basicinfocard_height),
                 content = height,
                 modifier = modifier.weight(1f),
             )
             InfoItem(
-                title = stringResource(R.string.feature_matching_detail_basicinfocard_religion),
+                title = stringResource(R.string.basicinfocard_religion),
                 content = religion,
                 modifier = modifier.weight(1f),
             )
@@ -400,7 +400,7 @@ private fun BasicInfoCard(
             horizontalArrangement = Arrangement.spacedBy(5.5.dp),
         ) {
             InfoItem(
-                title = stringResource(R.string.feature_matching_detail_basicinfocard_activityRegion),
+                title = stringResource(R.string.basicinfocard_activityRegion),
                 content = activityRegion,
                 modifier = modifier.size(
                     width = 144.dp,
@@ -409,13 +409,13 @@ private fun BasicInfoCard(
             )
 
             InfoItem(
-                title = stringResource(R.string.feature_matching_detail_basicinfocard_occupation),
+                title = stringResource(R.string.basicinfocard_occupation),
                 content = occupation,
                 modifier = modifier.weight(1f),
             )
 
             InfoItem(
-                title = stringResource(R.string.feature_matching_detail_basicinfocard_smokeStatue),
+                title = stringResource(R.string.basicinfocard_smokeStatue),
                 content = smokeStatue,
                 modifier = modifier.weight(1f),
             )

diff --git a/feature/matching/src/main/res/values/strings.xml b/feature/matching/src/main/res/values/strings.xml