Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PC-433] 프로필 메인 ui 구현 #41

Merged
merged 5 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_alarm_black.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M5.333,24.2H26.667"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"
android:strokeLineCap="round" />
<path
android:pathData="M8.533,14.601C8.533,10.477 11.876,7.134 16,7.134V7.134C20.124,7.134 23.467,10.477 23.467,14.601V24.201H8.533V14.601Z"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"
android:strokeLineCap="round" />
<path
android:pathData="M16,7.133V5"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"
android:strokeLineCap="round" />
<path
android:pathData="M19.733,23.667C19.733,24.799 19.34,25.884 18.64,26.684C17.94,27.484 16.99,27.934 16,27.934C15.01,27.934 14.06,27.484 13.36,26.684C12.66,25.884 12.267,24.799 12.267,23.667"
android:strokeWidth="1.6"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A" />
</vector>
13 changes: 13 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_arrow_right_black.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="30dp"
android:height="30dp"
android:viewportWidth="30"
android:viewportHeight="30">
<path
android:pathData="M11.25,8.75L18.125,14.688L11.25,20.625"
android:strokeLineJoin="round"
android:strokeWidth="1.5"
android:fillColor="#00000000"
android:strokeColor="#1B1A2A"
android:strokeLineCap="round" />
</vector>
6 changes: 3 additions & 3 deletions core/designsystem/src/main/res/drawable/ic_question.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:pathData="M9.732,9.732m-6.545,0a6.545,6.545 0,1 1,13.089 0a6.545,6.545 0,1 1,-13.089 0"
android:pathData="M9.7,9.7m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"
android:strokeWidth="2.37572"
android:fillColor="#00000000"
android:strokeColor="#6F00FB" />
android:strokeColor="#1B1A2A" />
<path
android:pathData="M15.63,14.112L17.16,15.642A1.188,1.188 90,0 1,17.16 17.322L17.16,17.322A1.188,1.188 90,0 1,15.48 17.322L13.951,15.792A1.188,1.188 0,0 1,13.951 14.112L13.951,14.112A1.188,1.188 90,0 1,15.63 14.112z"
android:fillColor="#6F00FB" />
android:fillColor="#1B1A2A" />
</vector>
12 changes: 12 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_talk.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<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="M10.761,16.572L11.14,15.93C11.434,15.433 11.581,15.184 11.818,15.047C12.054,14.909 12.352,14.904 12.947,14.894C13.826,14.879 14.377,14.825 14.839,14.633C15.264,14.457 15.65,14.2 15.975,13.875C16.3,13.55 16.557,13.164 16.733,12.739C17,12.097 17,11.281 17,9.65V8.95C17,6.659 17,5.513 16.484,4.672C16.196,4.201 15.8,3.805 15.329,3.516C14.487,3 13.341,3 11.05,3H8.95C6.659,3 5.513,3 4.672,3.516C4.201,3.804 3.805,4.2 3.516,4.671C3,5.513 3,6.66 3,8.95V9.65C3,11.281 3,12.097 3.266,12.739C3.442,13.164 3.7,13.55 4.025,13.875C4.35,14.2 4.736,14.458 5.161,14.633C5.623,14.825 6.174,14.878 7.053,14.894C7.648,14.904 7.945,14.909 8.182,15.047C8.418,15.184 8.566,15.433 8.86,15.93L9.239,16.572C9.577,17.143 10.422,17.143 10.761,16.572Z"
android:strokeWidth="2.38"
android:fillColor="#00000000"
android:fillType="evenOdd"
android:strokeColor="#1B1A2A" />
</vector>
11 changes: 11 additions & 0 deletions core/designsystem/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,13 @@
<string name="basicinfocard_age_classifier">세</string>
<string name="basicinfocard_age_suffix">년생</string>
<string name="basicinfocard_height">키</string>
<string name="basicinfocard_height_unit">cm</string>
<string name="basicinfocard_religion">종교</string>
<string name="basicinfocard_activityRegion">활동 지역</string>
<string name="basicinfocard_occupation">직업</string>
<string name="basicinfocard_smokeStatue">흡연</string>
<string name="basicinfocard_weight">몸무게</string>
<string name="basicinfocard_weight_unit">kg</string>
<string name="valuepick_all">전체</string>
<string name="valuepick_same">나와 같은</string>
<string name="valuepick_different">나와 다른</string>
Expand Down Expand Up @@ -91,4 +94,12 @@
<string name="setting_match_notification">매칭 알림</string>
<string name="setting_push_notification">푸쉬 알림</string>
<string name="setting_logged_in_account">로그인 계정</string>

<!--Main Profile-->
<string name="main_profile_topbar_title">Profile</string>
<string name="main_profile_my_matching_piece_title">나의 매칭 조각</string>
<string name="main_profile_value_talk_title">가치관 Talk</string>
<string name="main_profile_value_talk_content">꿈과 목표, 관심사와 취향, 연애에 관련된\n내 생각을 확인하고 수정할 수 있습니다.</string>
<string name="main_profile_value_pick_title">가치관 Pick</string>
<string name="main_profile_value_pick_content">퀴즈를 통해 나의 연애 스타일을 파악해보고\n선택한 답변을 수정할 수 있습니다.</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ package com.puzzle.matching.graph.detail.common.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
Expand All @@ -25,15 +22,13 @@ internal fun BasicInfoHeader(
onMoreClick: () -> Unit,
modifier: Modifier = Modifier
) {
Column(modifier = modifier) {
Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = modifier) {
Text(
text = selfDescription,
style = PieceTheme.typography.bodyMR,
color = PieceTheme.colors.black,
)

Spacer(modifier = Modifier.height(8.dp))

Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = nickName,
Expand All @@ -42,8 +37,6 @@ internal fun BasicInfoHeader(
modifier = Modifier.weight(1f)
)

Spacer(modifier = Modifier.width(28.dp))

Image(
painter = painterResource(id = R.drawable.ic_more),
contentDescription = "basic info 배경화면",
Expand Down
Loading
Loading