[PC-000] Resolve Conflict

YAPP-Github · Jan 1, 2025 · d563019 · d563019
2 parents 3700380 + 9e9e684
commit d563019
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 33 deletions.
diff --git a/core/designsystem/src/main/java/com/puzzle/designsystem/foundation/Color.kt b/core/designsystem/src/main/java/com/puzzle/designsystem/foundation/Color.kt
@@ -20,6 +20,8 @@ private val Light2 = Color(0xFFE8EBF0)
 private val Light3 = Color(0xFFF4F6FA)
 private val White = Color(0xFFFFFFFF)
 
+private val Error = Color(0xFFFF3059)
+
 @Immutable
 data class PieceColors(
     val primaryDefault: Color = PrimaryDefault,
@@ -36,4 +38,5 @@ data class PieceColors(
     val light2: Color = Light2,
     val light3: Color = Light3,
     val white: Color = White,
+    val error: Color = Error,
 )
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
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -25,6 +26,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
@@ -39,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(
@@ -66,11 +69,11 @@ internal fun MatchingScreen(
             .padding(horizontal = 20.dp),
     ) {
         PieceMainTopBar(
-            title = "Matching",
+            title = stringResource(R.string.matching_title),
             titleColor = PieceTheme.colors.white,
             rightComponent = {
                 Image(
-                    painter = painterResource(com.puzzle.designsystem.R.drawable.ic_alarm),
+                    painter = painterResource(R.drawable.ic_alarm),
                     contentDescription = "",
                 )
             },
@@ -87,9 +90,11 @@ internal fun MatchingScreen(
             Text(
                 text = buildAnnotatedString {
                     append("소중한 인연이 시작되기까지 ")
+
                     withStyle(style = SpanStyle(color = PieceTheme.colors.subDefault)) {
                         append("02:32:75")
                     }
+
                     append(" 남았어요")
                 },
                 style = PieceTheme.typography.bodySM,
@@ -124,7 +129,7 @@ internal fun MatchingScreen(
                 )
 
                 Text(
-                    text = "매칭 조각을 확인해주세요!",
+                    text = stringResource(R.string.check_the_matching_pieces),
                     style = PieceTheme.typography.bodySM,
                     color = PieceTheme.colors.dark3
                 )
@@ -196,7 +201,7 @@ internal fun MatchingScreen(
             ) {
                 Row(horizontalArrangement = Arrangement.spacedBy(6.dp)) {
                     Text(
-                        text = "나와 같은 가치관",
+                        text = stringResource(R.string.same_value_as_me),
                         style = PieceTheme.typography.bodyMM,
                         color = PieceTheme.colors.black,
                     )
@@ -235,10 +240,18 @@ internal fun MatchingScreen(
                         ),
                         key = { it },
                     ) { value -> ValueTag(value) }
+
+                    item {
+                        Spacer(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .height(20.dp),
+                        )
+                    }
                 }
 
                 PieceSolidButton(
-                    label = "매칭 수락하기",
+                    label = stringResource(R.string.accept_matching),
                     onClick = { navigateToMatchingDetail() },
                     modifier = Modifier
                         .padding(top = 16.dp)

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
@@ -319,7 +319,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 {

diff --git a/feature/matching/src/main/java/com/puzzle/matching/detail/content/BasicInfoBody.kt b/feature/matching/src/main/java/com/puzzle/matching/detail/content/BasicInfoBody.kt
@@ -68,7 +68,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,
         )
@@ -108,11 +108,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,
                         )
@@ -126,15 +126,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,
                         )
@@ -146,12 +146,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),
             )
@@ -163,7 +163,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,
@@ -172,13 +172,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