Skip to content

Commit

Permalink
Merge pull request #60 from YAPP-Github/feature/sksowk156/PC-549
Browse files Browse the repository at this point in the history 
[PC-549] 매칭 성공 UI 구현
  • Loading branch information
@sksowk156
sksowk156 authored Feb 11, 2025
2 parents 75c8fa6 + fe31db2 commit 349cb4b
Show file tree
Hide file tree
Showing 21 changed files with 598 additions and 2 deletions.
24 changes: 24 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_copy.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M15.667,12.334H9C8.264,12.334 7.667,11.737 7.667,11.001V4.334C7.667,3.598 8.264,3.001 9,3.001H15.667C16.403,3.001 17,3.598 17,4.334V11.001C17,11.737 16.403,12.334 15.667,12.334Z"
android:strokeAlpha="0.8"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#484B4D"
android:fillAlpha="0.8"
android:strokeLineCap="round" />
<path
android:pathData="M4.333,7.667C3.6,7.667 3,8.267 3,9V15.667C3,16.4 3.6,17 4.333,17H11C11.733,17 12.333,16.4 12.333,15.667"
android:strokeAlpha="0.8"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#484B4D"
android:fillAlpha="0.8"
android:strokeLineCap="round" />
</vector>
16 changes: 16 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_insta_off.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#ffffff" />
<path
android:pathData="M20.918,17.076C19.899,17.076 18.922,17.48 18.202,18.201C17.481,18.921 17.076,19.898 17.076,20.916V31.162C17.076,32.181 17.481,33.158 18.201,33.879C18.922,34.599 19.899,35.004 20.918,35.004H31.164C32.182,35.004 33.159,34.599 33.879,33.878C34.6,33.158 35.004,32.181 35.004,31.162V20.916C35.004,19.898 34.599,18.921 33.879,18.201C33.159,17.481 32.182,17.076 31.164,17.076H20.918ZM32.269,20.922C32.269,21.216 32.152,21.497 31.945,21.705C31.737,21.912 31.456,22.029 31.162,22.029C30.869,22.029 30.587,21.912 30.38,21.705C30.172,21.497 30.056,21.216 30.056,20.922C30.056,20.629 30.172,20.347 30.38,20.14C30.587,19.932 30.869,19.816 31.162,19.816C31.456,19.816 31.737,19.932 31.945,20.14C32.152,20.347 32.269,20.629 32.269,20.922ZM26.042,22.97C25.228,22.97 24.448,23.294 23.872,23.869C23.297,24.444 22.973,25.225 22.973,26.039C22.973,26.853 23.297,27.634 23.872,28.209C24.448,28.785 25.228,29.108 26.042,29.108C26.856,29.108 27.637,28.785 28.212,28.209C28.788,27.634 29.111,26.853 29.111,26.039C29.111,25.225 28.788,24.444 28.212,23.869C27.637,23.294 26.856,22.97 26.042,22.97ZM21.496,26.039C21.496,24.834 21.975,23.678 22.827,22.826C23.68,21.973 24.836,21.495 26.041,21.495C27.246,21.495 28.402,21.973 29.254,22.826C30.106,23.678 30.585,24.834 30.585,26.039C30.585,27.244 30.106,28.4 29.254,29.252C28.402,30.105 27.246,30.583 26.041,30.583C24.836,30.583 23.68,30.105 22.827,29.252C21.975,28.4 21.496,27.244 21.496,26.039Z"
android:fillColor="#6F00FB"
android:fillType="evenOdd" />
</group>
</vector>
16 changes: 16 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_insta_on.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#6F00FB" />
<path
android:pathData="M20.918,17.076C19.899,17.076 18.922,17.48 18.202,18.201C17.481,18.921 17.076,19.898 17.076,20.916V31.162C17.076,32.181 17.481,33.158 18.201,33.879C18.922,34.599 19.899,35.004 20.918,35.004H31.164C32.182,35.004 33.159,34.599 33.879,33.878C34.6,33.158 35.004,32.181 35.004,31.162V20.916C35.004,19.898 34.599,18.921 33.879,18.201C33.159,17.481 32.182,17.076 31.164,17.076H20.918ZM32.269,20.922C32.269,21.216 32.152,21.497 31.945,21.705C31.737,21.912 31.456,22.029 31.162,22.029C30.869,22.029 30.587,21.912 30.38,21.705C30.172,21.497 30.056,21.216 30.056,20.922C30.056,20.629 30.172,20.347 30.38,20.14C30.587,19.932 30.869,19.816 31.162,19.816C31.456,19.816 31.737,19.932 31.945,20.14C32.152,20.347 32.269,20.629 32.269,20.922ZM26.042,22.97C25.228,22.97 24.448,23.294 23.872,23.869C23.297,24.444 22.973,25.225 22.973,26.039C22.973,26.853 23.297,27.634 23.872,28.209C24.448,28.785 25.228,29.108 26.042,29.108C26.856,29.108 27.637,28.785 28.212,28.209C28.788,27.634 29.111,26.853 29.111,26.039C29.111,25.225 28.788,24.444 28.212,23.869C27.637,23.294 26.856,22.97 26.042,22.97ZM21.496,26.039C21.496,24.834 21.975,23.678 22.827,22.826C23.68,21.973 24.836,21.495 26.041,21.495C27.246,21.495 28.402,21.973 29.254,22.826C30.106,23.678 30.585,24.834 30.585,26.039C30.585,27.244 30.106,28.4 29.254,29.252C28.402,30.105 27.246,30.583 26.041,30.583C24.836,30.583 23.68,30.105 22.827,29.252C21.975,28.4 21.496,27.244 21.496,26.039Z"
android:fillColor="#ffffff"
android:fillType="evenOdd" />
</group>
</vector>
16 changes: 16 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_kakao_off.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#ffffff" />
<path
android:pathData="M26,31.859C30.9,31.859 34.873,28.737 34.873,24.887C34.873,21.037 30.9,17.916 26,17.916C21.1,17.916 17.127,21.037 17.127,24.887C17.127,27.254 18.629,29.346 20.924,30.606L19.662,34.394L24.003,31.681C24.645,31.797 25.313,31.859 26,31.859Z"
android:fillColor="#6F00FB"
android:fillType="evenOdd" />
</group>
</vector>
16 changes: 16 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_kakao_on.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#6F00FB" />
<path
android:pathData="M26,31.859C30.9,31.859 34.873,28.737 34.873,24.887C34.873,21.037 30.9,17.916 26,17.916C21.1,17.916 17.127,21.037 17.127,24.887C17.127,27.254 18.629,29.346 20.924,30.606L19.662,34.394L24.003,31.681C24.645,31.797 25.313,31.859 26,31.859Z"
android:fillColor="#ffffff"
android:fillType="evenOdd" />
</group>
</vector>
20 changes: 20 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_open_chat_off.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#ffffff" />
<path
android:pathData="M21.833,30.892C24.998,30.892 27.563,28.876 27.563,26.389C27.563,23.903 24.998,21.887 21.833,21.887C18.668,21.887 16.103,23.903 16.103,26.389C16.103,27.918 17.073,29.268 18.555,30.082L17.739,32.529L20.543,30.777C20.957,30.852 21.389,30.892 21.833,30.892Z"
android:fillColor="#6F00FB"
android:fillType="evenOdd" />
<path
android:pathData="M25.134,31.23C25.903,31.414 26.72,31.513 27.566,31.513C28.211,31.513 28.839,31.455 29.442,31.346L33.52,33.895L32.334,30.336C34.49,29.152 35.9,27.188 35.9,24.964C35.9,21.347 32.169,18.416 27.566,18.416C24.926,18.416 22.573,19.379 21.046,20.884C21.307,20.858 21.571,20.845 21.835,20.845C25.327,20.845 28.607,23.107 28.607,26.389C28.607,28.581 27.145,30.317 25.134,31.23ZM23.524,30.693C25.865,30.126 27.565,28.414 27.565,26.389C27.565,23.903 25,21.887 21.835,21.887C21.217,21.887 20.622,21.964 20.064,22.106C19.53,22.97 19.231,23.94 19.231,24.964C19.231,27.429 20.964,29.575 23.524,30.693Z"
android:fillColor="#6F00FB"
android:fillType="evenOdd" />
</group>
</vector>
20 changes: 20 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_open_chat_on.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#6F00FB" />
<path
android:pathData="M21.833,30.892C24.998,30.892 27.563,28.876 27.563,26.389C27.563,23.903 24.998,21.887 21.833,21.887C18.668,21.887 16.103,23.903 16.103,26.389C16.103,27.918 17.073,29.268 18.555,30.082L17.739,32.529L20.543,30.777C20.957,30.852 21.389,30.892 21.833,30.892Z"
android:fillColor="#ffffff"
android:fillType="evenOdd" />
<path
android:pathData="M25.134,31.23C25.903,31.414 26.72,31.513 27.566,31.513C28.211,31.513 28.839,31.455 29.442,31.346L33.52,33.895L32.334,30.336C34.49,29.152 35.9,27.188 35.9,24.964C35.9,21.347 32.169,18.416 27.566,18.416C24.926,18.416 22.573,19.379 21.046,20.884C21.307,20.858 21.571,20.845 21.835,20.845C25.327,20.845 28.607,23.107 28.607,26.389C28.607,28.581 27.145,30.317 25.134,31.23ZM23.524,30.693C25.865,30.126 27.565,28.414 27.565,26.389C27.565,23.903 25,21.887 21.835,21.887C21.217,21.887 20.622,21.964 20.064,22.106C19.53,22.97 19.231,23.94 19.231,24.964C19.231,27.429 20.964,29.575 23.524,30.693Z"
android:fillColor="#ffffff"
android:fillType="evenOdd" />
</group>
</vector>
15 changes: 15 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_phone_off.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#ffffff" />
<path
android:pathData="M35.779,31.117C35.493,33.665 34.158,34.612 33.09,34.957C32.564,35.127 31.968,35.195 31.32,35.165C30.197,35.112 28.917,34.763 27.57,34.13C25.629,33.218 23.682,31.78 22.227,30.181C20.773,28.582 19.522,26.509 18.796,24.491C18.003,22.283 17.894,20.303 18.491,18.918C18.936,17.886 20.004,16.648 22.567,16.601C22.696,16.597 22.815,16.669 22.876,16.783L25.207,21.219C25.279,21.356 25.249,21.525 25.135,21.63L22.895,23.668C23.339,24.961 24.172,26.334 25.205,27.469C26.237,28.603 27.527,29.563 28.772,30.127L31.013,28.088C31.128,27.983 31.299,27.97 31.429,28.055L35.626,30.792C35.734,30.863 35.793,30.989 35.779,31.117L35.779,31.117Z"
android:fillColor="#6F00FB" />
</group>
</vector>
15 changes: 15 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_phone_on.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="52dp"
android:viewportWidth="52"
android:viewportHeight="52">
<group>
<clip-path android:pathData="M0,0h52v52h-52z" />
<path
android:pathData="M26,26m-26,0a26,26 0,1 1,52 0a26,26 0,1 1,-52 0"
android:fillColor="#6F00FB" />
<path
android:pathData="M35.779,31.117C35.493,33.665 34.158,34.612 33.09,34.957C32.564,35.127 31.968,35.195 31.32,35.165C30.197,35.112 28.917,34.763 27.57,34.13C25.629,33.218 23.682,31.78 22.227,30.181C20.773,28.582 19.522,26.509 18.796,24.491C18.003,22.283 17.894,20.303 18.491,18.918C18.936,17.886 20.004,16.648 22.567,16.601C22.696,16.597 22.815,16.669 22.876,16.783L25.207,21.219C25.279,21.356 25.249,21.525 25.135,21.63L22.895,23.668C23.339,24.961 24.172,26.334 25.205,27.469C26.237,28.603 27.527,29.563 28.772,30.127L31.013,28.088C31.128,27.983 31.299,27.97 31.429,28.055L35.626,30.792C35.734,30.863 35.793,30.989 35.779,31.117L35.779,31.117Z"
android:fillColor="#ffffff" />
</group>
</vector>
Binary file added core/designsystem/src/main/res/drawable/matching_contact_bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion core/designsystem/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@
<string name="valuepick_refuse">매칭 거절하기</string>
<string name="valuepick_similar">나와 같은</string>

<!-- Matching Contact -->
<string name="maching_contact_header">님과 퍼즐 완성!</string>
<string name="maching_contact_sub_header">망설이지 말고 연락해 보세요\n두 분의 평화로운 사랑을 피스가 응원헤요</string>
<string name="maching_contact_kakao_id">카카오톡 아이디</string>
<string name="maching_contact_open_chat_id">카카오톡 오픈채팅방</string>
<string name="maching_contact_insta_id">인스타 아이디</string>
<string name="maching_contact_phone_number">전화번호</string>
<string name="maching_contact_null"> </string>


<!-- Report -->
<string name="report">신고하기</string>
<string name="report_subtitle">신고하면 되돌릴 수 없으니,\n신중한 신고 부탁드립니다.</string>
Expand Down Expand Up @@ -203,7 +213,6 @@
<string name="value_pick_profile_page_header">가치관 Pick,\n당신의 연애 취향을 알려주세요</string>
<string name="value_pick_profile_page_sub_header">선택한 답변으로 연애 스타일을 쉽게 확인할 수 있어요.\n서로의 우선순위와 취향을 이해하는 데 큰 도움이 될 거예요.</string>


<!--Finish -->
<string name="finish_register_profile_header">프로필 작성을 마쳤습니다!</string>
<string name="finish_register_profile_sub_header">작성 후 24시간 이내에 심사가 진행됩니다.\n생성한 프로필을 검토하며 기다려 주세요.</string>
Expand Down
3 changes: 3 additions & 0 deletions core/navigation/src/main/java/com/puzzle/navigation/Route.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ sealed class MatchingGraphDest : Route {

@Serializable
data class BlockRoute(val userId: Int, val userName: String) : MatchingGraphDest()

@Serializable
data object ContactRoute: MatchingGraphDest()
}

@Serializable
Expand Down
Loading

0 comments on commit 349cb4b

Please sign in to comment.