From 04358c7f2d986a92d228d48415a4c3baa1738ff5 Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Mon, 8 Jul 2024 21:51:35 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=20#40=20PointInfo=20,=20MyPageButton?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/type/MyPageMenuType.kt | 23 ++++++ .../presentation/type/MyPagePointInfoType.kt | 33 +++++++++ .../component/mypage/DateRoadMyPageButton.kt | 58 +++++++++++++++ .../mypage/DateRoadMyPagePointInfo.kt | 69 ++++++++++++++++++ .../res/drawable/img_my_page_point_info.xml | 58 +++++++++++++++ .../drawable/img_my_page_point_info_image.png | Bin 0 -> 7836 bytes app/src/main/res/values/strings.xml | 17 +++++ 7 files changed, 258 insertions(+) create mode 100644 app/src/main/java/org/sopt/dateroad/presentation/type/MyPageMenuType.kt create mode 100644 app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt create mode 100644 app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt create mode 100644 app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt create mode 100644 app/src/main/res/drawable/img_my_page_point_info.xml create mode 100644 app/src/main/res/drawable/img_my_page_point_info_image.png diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPageMenuType.kt b/app/src/main/java/org/sopt/dateroad/presentation/type/MyPageMenuType.kt new file mode 100644 index 00000000..b09715c9 --- /dev/null +++ b/app/src/main/java/org/sopt/dateroad/presentation/type/MyPageMenuType.kt @@ -0,0 +1,23 @@ +package org.sopt.dateroad.presentation.type + +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import org.sopt.dateroad.R + +enum class MyPageMenuType( + @StringRes val titleRes: Int, + @DrawableRes val iconRes: Int = R.drawable.ic_my_page_arrow +) { + FIRST( + titleRes = R.string.my_page_menu_my_enroll_course + ), + SECOND( + titleRes = R.string.my_page_menu_point_guide + ), + THIRD( + titleRes = R.string.my_page_menu_question + ), + FOURTH( + titleRes = R.string.my_page_menu_logout + ) +} diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt b/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt new file mode 100644 index 00000000..94ecb8bf --- /dev/null +++ b/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt @@ -0,0 +1,33 @@ +package org.sopt.dateroad.presentation.type + +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import org.sopt.dateroad.R + +enum class MyPagePointInfoType( + @StringRes val titleRes: Int, + @StringRes val descriptionRes: Int, + @DrawableRes val imageRes: Int = R.drawable.img_my_page_point_info, + val cornerRadius: Dp = 14.dp, + val padding: Dp = 16.dp + +) { + FIRST( + titleRes = R.string.point_system_first_title, + descriptionRes = R.string.point_system_first_description + ), + SECOND( + titleRes = R.string.point_system_second_title, + descriptionRes = R.string.point_system_second_description + ), + THIRD( + titleRes = R.string.point_system_third_title, + descriptionRes = R.string.point_system_third_description + ), + FOURTH( + titleRes = R.string.point_system_fourth_title, + descriptionRes = R.string.point_system_fourth_description + ) +} diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt new file mode 100644 index 00000000..70769ae2 --- /dev/null +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt @@ -0,0 +1,58 @@ +package org.sopt.dateroad.presentation.ui.component.mypage + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import org.sopt.dateroad.presentation.type.MyPageMenuType +import org.sopt.dateroad.ui.theme.DateRoadTheme + +@Composable +fun DateRoadMyPageButton(myPageMenuType: MyPageMenuType, onClick: () -> Unit = {}) { + Row( + modifier = Modifier + .padding(start = 16.dp, top = 19.dp, end = 16.dp, bottom = 20.dp) + .fillMaxWidth() + .clickable(onClick = onClick), + verticalAlignment = Alignment.CenterVertically + ) { + Text(text = stringResource(id = myPageMenuType.titleRes), modifier = Modifier.weight(1f)) + Spacer(modifier = Modifier.width(20.dp)) + Icon(painter = painterResource(id = myPageMenuType.iconRes), contentDescription = null) + } +} + +@Preview +@Composable +fun DateRoadMyPageButtonPreview() { + val context = LocalContext.current + Column( + modifier = Modifier + .fillMaxSize() + .background(DateRoadTheme.colors.white) + ) { + DateRoadMyPageButton(MyPageMenuType.FIRST, onClick = { + }) + DateRoadMyPageButton(MyPageMenuType.SECOND, onClick = { + }) + DateRoadMyPageButton(MyPageMenuType.THIRD, onClick = { + }) + DateRoadMyPageButton(MyPageMenuType.FOURTH, onClick = { + }) + } +} diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt new file mode 100644 index 00000000..210cfe7c --- /dev/null +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt @@ -0,0 +1,69 @@ +package org.sopt.dateroad.presentation.ui.component.mypage + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import org.sopt.dateroad.presentation.type.MyPagePointInfoType +import org.sopt.dateroad.ui.theme.DateRoadTheme + +@Composable +fun DateRoadMyPagePointInfo(myPagePointInfoType: MyPagePointInfoType) { + Row( + modifier = Modifier + .clip(RoundedCornerShape(myPagePointInfoType.cornerRadius)) + .background(DateRoadTheme.colors.gray100) + .padding(myPagePointInfoType.padding) + ) { + Image(painter = painterResource(id = myPagePointInfoType.imageRes), contentDescription = null) + Spacer(modifier = Modifier.width(10.dp)) + Column { + Text( + text = stringResource(id = myPagePointInfoType.titleRes), + style = DateRoadTheme.typography.bodyBold15, + modifier = Modifier.fillMaxWidth() + ) + Spacer(modifier = Modifier.height(10.dp)) + Text( + text = stringResource(id = myPagePointInfoType.descriptionRes), + color = DateRoadTheme.colors.gray500, + style = DateRoadTheme.typography.bodyMed13, + modifier = Modifier.fillMaxWidth() + ) + } + } +} + +@Preview +@Composable +fun DateRoadMyPagePointInfoPreview() { + Column( + modifier = Modifier + .fillMaxSize() + .background(DateRoadTheme.colors.white) + .padding(horizontal = 16.dp) + ) { + DateRoadMyPagePointInfo(myPagePointInfoType = MyPagePointInfoType.FIRST) + Spacer(modifier = Modifier.height(16.dp)) + DateRoadMyPagePointInfo(myPagePointInfoType = MyPagePointInfoType.SECOND) + Spacer(modifier = Modifier.height(16.dp)) + DateRoadMyPagePointInfo(myPagePointInfoType = MyPagePointInfoType.THIRD) + Spacer(modifier = Modifier.height(16.dp)) + DateRoadMyPagePointInfo(myPagePointInfoType = MyPagePointInfoType.FOURTH) + } +} diff --git a/app/src/main/res/drawable/img_my_page_point_info.xml b/app/src/main/res/drawable/img_my_page_point_info.xml new file mode 100644 index 00000000..cfa1faf0 --- /dev/null +++ b/app/src/main/res/drawable/img_my_page_point_info.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/img_my_page_point_info_image.png b/app/src/main/res/drawable/img_my_page_point_info_image.png new file mode 100644 index 0000000000000000000000000000000000000000..cd47eb3d98bf3e8489ed3cda5ba6969286e27824 GIT binary patch literal 7836 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만원 이하 3만원 이하 + + 데이트 코스를 등록하면\n 포인트를 얻을 수 있어요 + 내 데이트를 자랑하고 포인트를 받아보세요 + 처음 3번 무료로\n데이트 코스를 열람할 수 있어요 + 무료 찬스로 데이트를 열람하세요 + 쌓인 포인트로\n다양한 데이트 코스를 둘러보세요 + 다른 커플의 데이트, 궁금하지 않으세요? + 모인 포인트는 데이트 장소를\n예약할 때 현금처럼 사용 가능해요 + 추후 만들어질 기능을 기대해주세요 + 데이트로드는 포인트로\n데이트 코스를 열람할 수 있어요. 최초 3회 찬스로 다른 사람의 데이트 코스를 구경해 보세요 @@ -157,5 +167,12 @@ 지역을 선택해주세요 적용하기 + + + 내가 등록한 코스 + 포인트 제도 소개 + 문의하기 + 로그아웃 + \ No newline at end of file From 81fdfe5398916a87c66ab2d801ee91ac38f703fc Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Mon, 8 Jul 2024 23:42:30 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[chore]=20#43=20=ED=8F=B0=ED=8A=B8,=20?= =?UTF-8?q?=EC=83=89=EC=83=81,=20=EA=B8=B0=EA=B8=B0=EB=8C=80=EC=9D=91=20?= =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/type/MyPagePointInfoType.kt | 6 +----- .../ui/component/mypage/DateRoadMyPageButton.kt | 4 ++-- .../component/mypage/DateRoadMyPagePointInfo.kt | 6 +++--- .../drawable/img_my_page_point_info_image.png | Bin 7836 -> 0 bytes app/src/main/res/values/strings.xml | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 app/src/main/res/drawable/img_my_page_point_info_image.png diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt b/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt index 94ecb8bf..9df191a0 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt @@ -2,16 +2,12 @@ package org.sopt.dateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp import org.sopt.dateroad.R enum class MyPagePointInfoType( @StringRes val titleRes: Int, @StringRes val descriptionRes: Int, - @DrawableRes val imageRes: Int = R.drawable.img_my_page_point_info, - val cornerRadius: Dp = 14.dp, - val padding: Dp = 16.dp + @DrawableRes val imageRes: Int = R.drawable.img_my_page_point_info ) { FIRST( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt index 70769ae2..293e3124 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPageButton.kt @@ -26,12 +26,12 @@ import org.sopt.dateroad.ui.theme.DateRoadTheme fun DateRoadMyPageButton(myPageMenuType: MyPageMenuType, onClick: () -> Unit = {}) { Row( modifier = Modifier - .padding(start = 16.dp, top = 19.dp, end = 16.dp, bottom = 20.dp) + .padding(top = 19.dp, bottom = 20.dp) .fillMaxWidth() .clickable(onClick = onClick), verticalAlignment = Alignment.CenterVertically ) { - Text(text = stringResource(id = myPageMenuType.titleRes), modifier = Modifier.weight(1f)) + Text(text = stringResource(id = myPageMenuType.titleRes), style = DateRoadTheme.typography.bodySemi15, color = DateRoadTheme.colors.black, modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.width(20.dp)) Icon(painter = painterResource(id = myPageMenuType.iconRes), contentDescription = null) } diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt index 210cfe7c..e0f0cd39 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt @@ -25,10 +25,10 @@ import org.sopt.dateroad.ui.theme.DateRoadTheme @Composable fun DateRoadMyPagePointInfo(myPagePointInfoType: MyPagePointInfoType) { Row( - modifier = Modifier - .clip(RoundedCornerShape(myPagePointInfoType.cornerRadius)) + modifier = Modifier.fillMaxWidth() + .clip(RoundedCornerShape(14.dp)) .background(DateRoadTheme.colors.gray100) - .padding(myPagePointInfoType.padding) + .padding(14.dp) ) { Image(painter = painterResource(id = myPagePointInfoType.imageRes), contentDescription = null) Spacer(modifier = Modifier.width(10.dp)) diff --git a/app/src/main/res/drawable/img_my_page_point_info_image.png b/app/src/main/res/drawable/img_my_page_point_info_image.png deleted file mode 100644 index cd47eb3d98bf3e8489ed3cda5ba6969286e27824..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7836 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만원 이하 3만원 이하 - + 데이트 코스를 등록하면\n 포인트를 얻을 수 있어요 내 데이트를 자랑하고 포인트를 받아보세요 처음 3번 무료로\n데이트 코스를 열람할 수 있어요 From 124011f1200c96da396285a1fafc77c4e72a4c56 Mon Sep 17 00:00:00 2001 From: t1nm1ksun Date: Tue, 9 Jul 2024 00:31:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[chore]=20#43=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=EC=88=98=EC=A7=81=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EA=B8=B0?= =?UTF-8?q?=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/component/mypage/DateRoadMyPagePointInfo.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt index e0f0cd39..3f854d4e 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt +++ b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/mypage/DateRoadMyPagePointInfo.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource @@ -25,10 +26,12 @@ import org.sopt.dateroad.ui.theme.DateRoadTheme @Composable fun DateRoadMyPagePointInfo(myPagePointInfoType: MyPagePointInfoType) { Row( - modifier = Modifier.fillMaxWidth() + modifier = Modifier + .fillMaxWidth() .clip(RoundedCornerShape(14.dp)) .background(DateRoadTheme.colors.gray100) - .padding(14.dp) + .padding(14.dp), + verticalAlignment = Alignment.CenterVertically // Aligns items vertically centered ) { Image(painter = painterResource(id = myPagePointInfoType.imageRes), contentDescription = null) Spacer(modifier = Modifier.width(10.dp))