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}명", 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, 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)}" } 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( 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( 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))