Skip to content

Commit e544bac

Browse files
authored
feat - 매칭 대기화면 UI 업데이트 (#86)
* refactor: 홈화면 리팩토링 * feat: 유저이름 파라미터 추가 및 멘트 수정 * feat: 텍스트 UI 개선 * feat: ai 요약 카드 UI 업데이트 * feat: 요약 카드 UI 최종 업데이트 * feat: 전체보기버튼 추가 * fix: api 엔드포인트 수정 및 Mapper 수정 * feat: 실물이미지 추가 * feat: 매칭 캐러셀 UI 업데이트 * feat: detail 페이지 UI 업데이트
1 parent d7f079e commit e544bac

File tree

10 files changed

+877
-491
lines changed

10 files changed

+877
-491
lines changed

app/src/main/java/com/apptive/japkor/data/api/MatchingService.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ interface MatchingService {
1313
@GET("members/matchings/female")
1414
fun getFemaleMatchings(): Call<List<MatchingResponse>>
1515

16-
@POST("members/matchings/{matchingId}/select")
16+
@POST("members/matchings/female/{matchingId}/select")
1717
fun femaleSelectMatching(@Path("matchingId") matchingId: Long): Call<Void>
1818

1919
// 남자 전용
2020
@GET("members/matchings/male/pendingMatching")
2121
fun getMalePendingMatchings(): Call<List<MalePendingMatchingResponse>>
2222

23-
@POST("members/matchings/{matchingId}/accept")
23+
@POST("members/matchings/male/{matchingId}/accept")
2424
fun maleAcceptMatching(@Path("matchingId") matchingId: Long): Call<Void>
2525

26-
@POST("members/matchings/{matchingId}/reject")
26+
@POST("members/matchings/male/{matchingId}/reject")
2727
fun maleRejectMatching(@Path("matchingId") matchingId: Long): Call<Void>
2828
}

app/src/main/java/com/apptive/japkor/data/api/UserService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ interface UserService {
99
@GET("members/ai-summary")
1010
fun getMyAiSummary(): Call<AiSummaryResponse>
1111

12-
@GET("members/info")
12+
@GET("user/info")
1313
fun getUserInfo(): Call<UserInfoResponse>
1414
}

app/src/main/java/com/apptive/japkor/data/model/Matching.kt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ data class MatchingResponse(
1010
val height: Int?,
1111
val weight: Int?,
1212
val residenceArea: String?,
13+
val thumbnailImageUrl: String?,
1314
val matchingOrder: Int,
1415
val status: String
1516
)
@@ -29,3 +30,17 @@ data class MalePendingMatchingResponse(
2930
@SerializedName(value = "profileImageUrls", alternate = ["profileImageUrl"])
3031
val profileImageUrls: List<String>?
3132
)
33+
34+
data class HomeMatching(
35+
val matchingId: Long,
36+
val memberId: Long,
37+
val name: String,
38+
val email: String,
39+
val thumbnailImageUrl: String?,
40+
val profileImageUrl: String?,
41+
val height: Int?,
42+
val weight: Int?,
43+
val residenceArea: String?,
44+
val matchingOrder: Int?,
45+
val status: String
46+
)

app/src/main/java/com/apptive/japkor/ui/main/home/HomeMatching.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)