From c03a10d4d04d5d30986784ccdd0651374a5c5c7f Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 13:47:30 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[fix/#224]=20=EC=86=8C=EB=B9=84=EC=9E=90-?= =?UTF-8?q?=EB=A7=A4=EC=B9=AD=20=EA=B2=B0=EA=B3=BC=20SSING=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=20=ED=82=A4=EC=9B=8C=EB=93=9C=20=EB=8D=94=EB=AF=B8?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/consumermatching/ConsumerMatchingViewModel.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/ConsumerMatchingViewModel.kt b/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/ConsumerMatchingViewModel.kt index 22d5f76a..50321ed9 100644 --- a/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/ConsumerMatchingViewModel.kt +++ b/presentation/consumer-matching/src/main/java/com/ssing/presentation/consumermatching/ConsumerMatchingViewModel.kt @@ -76,6 +76,7 @@ internal class ConsumerMatchingViewModel @Inject constructor( private fun loadReview() { updateState { copy( + keywords = persistentListOf("#키즈전문", "#수락률 100%"), rating = "4.8", reviews = persistentListOf( InstructorReview( From 0edb8a326f13605118a72a71cbead93dcfe1c696 Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 14:43:42 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[fix/#224]=20=EC=86=8C=EB=B9=84=EC=9E=90=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EC=B9=B4=EB=93=9C=20=EB=82=B4=EB=B6=80=20?= =?UTF-8?q?=EC=97=AC=EB=B0=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ssing/core/ui/common/component/ConsumerInfoCard.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ui/src/main/java/com/ssing/core/ui/common/component/ConsumerInfoCard.kt b/core/ui/src/main/java/com/ssing/core/ui/common/component/ConsumerInfoCard.kt index a5209aba..7797e88a 100644 --- a/core/ui/src/main/java/com/ssing/core/ui/common/component/ConsumerInfoCard.kt +++ b/core/ui/src/main/java/com/ssing/core/ui/common/component/ConsumerInfoCard.kt @@ -75,7 +75,7 @@ fun ConsumerInfoCard( } Column( - verticalArrangement = Arrangement.spacedBy(4.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), ) { Text( text = "${nickname}님 팀 ${participants.size}명", From 8a97de5ad4e36aa1c8819e2789cd0c55edb59fd9 Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 14:53:13 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[fix/#224]=20=EC=86=8C=EB=B9=84=EC=9E=90-?= =?UTF-8?q?=EB=A0=88=EC=8A=A8=20=EA=B0=95=EC=8A=B5=EC=83=9D=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B9=B4=EB=93=9C=20Before=20=EC=9D=B4=ED=9B=84=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=8A=94=20isReady=3Dfalse=EB=A1=9C=20?= =?UTF-8?q?=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumerlesson/mapper/LessonMatchingRequestToUiModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/consumer-lesson/src/main/java/com/ssing/presentation/consumerlesson/mapper/LessonMatchingRequestToUiModel.kt b/presentation/consumer-lesson/src/main/java/com/ssing/presentation/consumerlesson/mapper/LessonMatchingRequestToUiModel.kt index 7d33932f..fd379c10 100644 --- a/presentation/consumer-lesson/src/main/java/com/ssing/presentation/consumerlesson/mapper/LessonMatchingRequestToUiModel.kt +++ b/presentation/consumer-lesson/src/main/java/com/ssing/presentation/consumerlesson/mapper/LessonMatchingRequestToUiModel.kt @@ -15,7 +15,7 @@ internal fun ConsumerConfirmedMatchingRequest.toUiModel(): ParticipantTeamUiMode ) internal fun ConsumerMatchingRequest.toUiModel(): ParticipantTeamUiModel = ParticipantTeamUiModel( - isReady = true, + isReady = false, nickname = representativeMemberName, participants = participants .map { "${it.age}세 ${displayGender(it.gender)}" } From 697502d5d7c1648b0cb4df0946b5748ec0849aae Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 14:58:57 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[fix/#224]=20=ED=99=88=20=EC=B9=B4=EB=93=9C?= =?UTF-8?q?=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ui/common/component/HomeLessonCardList.kt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/ui/src/main/java/com/ssing/core/ui/common/component/HomeLessonCardList.kt b/core/ui/src/main/java/com/ssing/core/ui/common/component/HomeLessonCardList.kt index b661313e..1e9ec006 100644 --- a/core/ui/src/main/java/com/ssing/core/ui/common/component/HomeLessonCardList.kt +++ b/core/ui/src/main/java/com/ssing/core/ui/common/component/HomeLessonCardList.kt @@ -210,21 +210,12 @@ private fun LessonInfoSection( color = SSINGTheme.colors.textNormal, ) - Row( - horizontalArrangement = Arrangement.spacedBy(4.dp), - verticalAlignment = Alignment.CenterVertically, - ) { + Column { InfoRow( iconRes = R.drawable.ic_reservation_16, text = state.date?.ssingDateFormatter() ?: "", ) - Icon( - imageVector = ImageVector.vectorResource(R.drawable.ic_divide_line), - contentDescription = null, - tint = SSINGTheme.colors.borderAlternative, - ) - InfoRow( iconRes = R.drawable.ic_location_16, text = state.location, From 6feae0af97347aa8eb16163dea11ad2980a7924c Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 15:28:00 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[fix/#224]=20=EA=B0=95=EC=82=AC=20MatchingW?= =?UTF-8?q?aiting=20=ED=99=94=EB=A9=B4=20SsingMatchingDetailCard=20borderC?= =?UTF-8?q?olor=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instructormatching/screen/MatchingWaitingScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingWaitingScreen.kt b/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingWaitingScreen.kt index 58026ddb..7a17fed9 100644 --- a/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingWaitingScreen.kt +++ b/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingWaitingScreen.kt @@ -89,6 +89,7 @@ internal fun MatchingWaitingScreen( price = waiting.price, equipmentStatus = waiting.equipmentStatus, modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp), + borderColor = SSINGTheme.colors.borderAlternative, ) Spacer(modifier = Modifier.weight(1f)) From 06b39f3d4640e4d86c2c38ba51809750c6f09639 Mon Sep 17 00:00:00 2001 From: dodo Date: Fri, 17 Jul 2026 15:39:25 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[fix/#224]=20=EA=B0=95=EC=82=AC=20MatchingW?= =?UTF-8?q?aiting=20=ED=99=94=EB=A9=B4=20SsingMatchingDetailCard=20borderC?= =?UTF-8?q?olor=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instructormatching/screen/MatchingOfferScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingOfferScreen.kt b/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingOfferScreen.kt index cb1e1a9d..44ae2e6d 100644 --- a/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingOfferScreen.kt +++ b/presentation/instructor-matching/src/main/java/com/ssing/presentation/instructormatching/screen/MatchingOfferScreen.kt @@ -57,6 +57,7 @@ internal fun MatchingOfferScreen( MatchingOfferSummaryDetailCard( offer = offer, stepLabel = "빠른 요청", + ) Text(