From 606963c102bc3c7765ff2eac163db2a485673dc4 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:40:04 +0900 Subject: [PATCH 01/15] =?UTF-8?q?style:=20=EC=95=84=EC=9D=B4=EC=BD=98?= =?UTF-8?q?=EA=B3=BC=20=ED=85=8D=EC=8A=A4=ED=8A=B8=EA=B0=80=20=EB=B6=99?= =?UTF-8?q?=EC=96=B4=EC=9E=88=EB=8A=94=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/designsystem/component/Text.kt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Text.kt b/core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Text.kt index 341c4216a..094f3e019 100644 --- a/core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Text.kt +++ b/core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Text.kt @@ -1,14 +1,19 @@ package com.kusitms.connectdog.core.designsystem.component import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer 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.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.kusitms.connectdog.core.designsystem.theme.Gray1 +import com.kusitms.connectdog.core.designsystem.theme.Gray2 import com.kusitms.connectdog.core.designsystem.theme.Gray3 @Composable @@ -31,3 +36,27 @@ fun DetailInfo( ) } } + +@Composable +fun TextWithIcon( + text: String, + iconId: Int, + size: Int = 12 +) { + Row( + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + painter = painterResource(id = iconId), + contentDescription = null, + tint = Gray2 + ) + Spacer(modifier = Modifier.width(6.dp)) + Text( + text = text, + fontSize = size.sp, + fontWeight = FontWeight.Medium, + color = Gray2 + ) + } +} From f4885b24084f27099d9a2a1ec1c536a01638403b Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:40:25 +0900 Subject: [PATCH 02/15] =?UTF-8?q?style:=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=81=EC=88=98=20=EC=9B=8C=EB=94=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/home/src/main/res/values/string.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/home/src/main/res/values/string.xml b/feature/home/src/main/res/values/string.xml index 8a84f80bc..7a9411893 100644 --- a/feature/home/src/main/res/values/string.xml +++ b/feature/home/src/main/res/values/string.xml @@ -41,8 +41,8 @@ 마리 이동이 필요해요 이동했어요! - 이번주 이동봉사 공고 - 생생 이동봉사 후기 + 지금 필요한 이동봉사 공고 + 생생한 이동봉사 후기 딱 맞는 이동봉사를 찾아보세요!\n 출발지·도착지·일정 From acae6cd75f42dcefc8eeaf4dc7e6b7eb5777dc1c Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:42:13 +0900 Subject: [PATCH 03/15] =?UTF-8?q?update:=20=EA=B3=B5=EA=B3=A0=EB=A5=BC=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=9C=20mod?= =?UTF-8?q?el=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kusitms/connectdog/core/model/Announcement.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/model/src/main/java/com/kusitms/connectdog/core/model/Announcement.kt b/core/model/src/main/java/com/kusitms/connectdog/core/model/Announcement.kt index e274bf84b..b145eb1fd 100644 --- a/core/model/src/main/java/com/kusitms/connectdog/core/model/Announcement.kt +++ b/core/model/src/main/java/com/kusitms/connectdog/core/model/Announcement.kt @@ -4,7 +4,7 @@ data class Announcement( val imageUrl: String, val location: String, val date: String, - val organization: String, - val hasKennel: Boolean, - val postId: Int + val postId: Int, + val dogName: String, + val pickUpTime: String ) From 23b04d8f0c992b889005e646f070e09e24151591 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:42:27 +0900 Subject: [PATCH 04/15] =?UTF-8?q?update:=20=ED=99=88=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B3=B5=EA=B3=A0=EB=A5=BC=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=9C=20model=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/model/volunteer/AnnouncementHomeResponseItem.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementHomeResponseItem.kt b/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementHomeResponseItem.kt index 3a2672b09..02dc95b47 100644 --- a/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementHomeResponseItem.kt +++ b/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementHomeResponseItem.kt @@ -7,9 +7,9 @@ data class AnnouncementHomeResponseItem( val arrivalLoc: String, val departureLoc: String, val endDate: String, - val intermediaryName: String, - val isKennel: Boolean, val mainImage: String, val postId: Int, - val startDate: String + val startDate: String, + val dogName: String, + val pickUpTime: String ) From 64fd6d6d7e81ab6e806b19814a274722a1e380f6 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:42:43 +0900 Subject: [PATCH 05/15] =?UTF-8?q?update:=20=EA=B2=80=EC=83=89=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=EC=84=9C=20=EA=B3=B5=EA=B3=A0=EB=A5=BC=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20model=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/volunteer/AnnouncementMapper.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/volunteer/AnnouncementMapper.kt b/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/volunteer/AnnouncementMapper.kt index c57f07230..58f6666a5 100644 --- a/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/volunteer/AnnouncementMapper.kt +++ b/core/data/src/main/java/com/kusitms/connectdog/core/data/mapper/volunteer/AnnouncementMapper.kt @@ -3,6 +3,7 @@ package com.kusitms.connectdog.core.data.mapper.volunteer import com.kusitms.connectdog.core.data.api.model.volunteer.AnnouncementHomeResponseItem import com.kusitms.connectdog.core.data.api.model.volunteer.AnnouncementSearchResponseItem import com.kusitms.connectdog.core.model.Announcement +import com.kusitms.connectdog.core.model.AnnouncementSearch import com.kusitms.connectdog.core.util.dateRangeFormat internal fun AnnouncementHomeResponseItem.toData(): Announcement { @@ -10,19 +11,21 @@ internal fun AnnouncementHomeResponseItem.toData(): Announcement { imageUrl = this.mainImage, location = "${this.departureLoc} → ${this.arrivalLoc}", date = dateRangeFormat(startDate, endDate), - organization = this.intermediaryName, - hasKennel = this.isKennel, - postId = this.postId + postId = this.postId, + dogName = this.dogName, + pickUpTime = this.pickUpTime ) } -internal fun AnnouncementSearchResponseItem.toData(): Announcement { - return Announcement( +internal fun AnnouncementSearchResponseItem.toData(): AnnouncementSearch { + return AnnouncementSearch( imageUrl = this.mainImage, location = "${this.departureLoc} → ${this.arrivalLoc}", date = dateRangeFormat(startDate, endDate), - organization = this.intermediaryName, - hasKennel = this.isKennel, - postId = this.postId + dogName = this.dogName, + pickUpTime = this.pickUpTime, + postId = this.postId, + isKennel = this.isKennel, + dogSize = this.dogSize ) } From 3323d7f56347557b4f1799307e8f2a00fc2d57a7 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:42:48 +0900 Subject: [PATCH 06/15] =?UTF-8?q?update:=20=EA=B2=80=EC=83=89=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=EC=84=9C=20=EA=B3=B5=EA=B3=A0=EB=A5=BC=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20model=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/model/volunteer/AnnouncementSearchResponseItem.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementSearchResponseItem.kt b/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementSearchResponseItem.kt index 848f0ee43..6a6a1711a 100644 --- a/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementSearchResponseItem.kt +++ b/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/AnnouncementSearchResponseItem.kt @@ -9,7 +9,9 @@ data class AnnouncementSearchResponseItem( val arrivalLoc: String, val startDate: String, val endDate: String, - val intermediaryName: String, val isKennel: Boolean, - val mainImage: String + val mainImage: String, + val dogSize: String, + val pickUpTime: String, + val dogName: String ) From 2123a3403ffa3faee876d606abd5e11353ec4213 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:43:54 +0900 Subject: [PATCH 07/15] =?UTF-8?q?update:=20=EA=B3=B5=EA=B3=A0=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20api=20response=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kusitms/connectdog/core/data/repository/HomeRepository.kt | 3 ++- .../connectdog/core/data/repository/HomeRepositoryImpl.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepository.kt b/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepository.kt index 3b6524dee..5dc1647ef 100644 --- a/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepository.kt +++ b/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepository.kt @@ -1,6 +1,7 @@ package com.kusitms.connectdog.core.data.repository import com.kusitms.connectdog.core.model.Announcement +import com.kusitms.connectdog.core.model.AnnouncementSearch import com.kusitms.connectdog.core.model.Review interface HomeRepository { @@ -18,7 +19,7 @@ interface HomeRepository { orderCondition: String? = null, page: Int? = 0, size: Int? = 50 - ): List + ): List suspend fun getReviewList(page: Int? = 0, size: Int? = 5): List } diff --git a/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepositoryImpl.kt b/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepositoryImpl.kt index d30c3f5f1..40dfd2df5 100644 --- a/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepositoryImpl.kt +++ b/core/data/src/main/java/com/kusitms/connectdog/core/data/repository/HomeRepositoryImpl.kt @@ -4,6 +4,7 @@ import com.kusitms.connectdog.core.data.api.ApiService import com.kusitms.connectdog.core.data.mapper.toData import com.kusitms.connectdog.core.data.mapper.volunteer.toData import com.kusitms.connectdog.core.model.Announcement +import com.kusitms.connectdog.core.model.AnnouncementSearch import com.kusitms.connectdog.core.model.Review import javax.inject.Inject @@ -26,7 +27,7 @@ internal class HomeRepositoryImpl @Inject constructor( orderCondition: String?, page: Int?, size: Int? - ): List { + ): List { var depart = departureLoc if (depart != null) { if ("전체" in depart) depart = depart.take(2) From 1d34035f54e3c7fb740edea2ea7e9b37a754dd83 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:44:46 +0900 Subject: [PATCH 08/15] =?UTF-8?q?style:=20=ED=99=88=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/home/screen/HomeScreen.kt | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/HomeScreen.kt b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/HomeScreen.kt index b530b1606..2f61a30e3 100644 --- a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/HomeScreen.kt +++ b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/HomeScreen.kt @@ -55,6 +55,7 @@ import com.kusitms.connectdog.core.designsystem.component.BannerGuideline import com.kusitms.connectdog.core.designsystem.component.ConnectDogReview import com.kusitms.connectdog.core.designsystem.component.NetworkImage import com.kusitms.connectdog.core.designsystem.component.ReviewType +import com.kusitms.connectdog.core.designsystem.component.TextWithIcon import com.kusitms.connectdog.core.designsystem.theme.ConnectDogTheme import com.kusitms.connectdog.core.designsystem.theme.Gray1 import com.kusitms.connectdog.core.designsystem.theme.Gray2 @@ -377,7 +378,7 @@ fun AnnouncementLoading( arrangement: Arrangement.Horizontal ) { val list = List(4) { - Announcement("", "이동봉사 위치", "YY.mm.dd(요일)", "단체이름", false, -1) + Announcement("", "이동봉사 위치", "YY.mm.dd(요일)", -1, "", "") } LazyRow(horizontalArrangement = arrangement, modifier = modifier) { items(list) { @@ -406,12 +407,12 @@ private fun ReviewLoading(modifier: Modifier, arrangement: Arrangement.Horizonta profileNum = 0, dogName = "멍멍이", userName = "츄", - mainImage = "", date = "23.10.19(목)", location = "서울 강남구 -> 서울 도봉구", organization = "단체이름", content = "진짜 천사같은 아기와 하루를 함께해서 행복했습니다 너무 감사드려요 봉사 또 해야징 ><", - contentImages = null + contentImages = null, + mainImage = "" ) } LazyRow(horizontalArrangement = arrangement, modifier = modifier) { @@ -440,18 +441,22 @@ private fun AnnouncementCardContent( .shadow(shape = RoundedCornerShape(12.dp), elevation = 1.dp) ) Text( - text = announcement.location, + text = announcement.dogName, maxLines = 2, style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.SemiBold, modifier = Modifier.padding(start = 1.dp, top = 10.dp, bottom = 8.dp) ) - AnnouncementContent( - date = announcement.date, - organization = announcement.organization, - hasKennel = announcement.hasKennel, - style = MaterialTheme.typography.labelMedium + Text( + text = announcement.location, + color = Gray3, + fontSize = 12.sp, + fontWeight = FontWeight.Normal ) + Spacer(modifier = Modifier.height(8.dp)) + TextWithIcon(text = announcement.date.substringBefore(" "), iconId = R.drawable.ic_clock) + Spacer(modifier = Modifier.height(5.dp)) + TextWithIcon(text = announcement.pickUpTime, iconId = R.drawable.ic_clock) } } @@ -485,19 +490,19 @@ private fun HomeScreenPreview() { } } -@Preview -@Composable -private fun AnnouncementPreview() { - ConnectDogTheme { - AnnouncementCardContent( - announcement = Announcement( - "", - "서울시 강남구 -> 서울시 도봉구", - "23.10.19(수)", - "단체이름이름", - true, - -1 - ) - ) - } -} +// @Preview +// @Composable +// private fun AnnouncementPreview() { +// ConnectDogTheme { +// AnnouncementCardContent( +// announcement = Announcement( +// "", +// "서울시 강남구 -> 서울시 도봉구", +// "23.10.19(수)", +// "단체이름이름", +// true, +// -1 +// ) +// ) +// } +// } From 39800c627bb8dc13f2281892a947cdd8deb049a2 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:55:48 +0900 Subject: [PATCH 09/15] =?UTF-8?q?fix:=20=EC=9D=B4=EB=8F=99=EB=B4=89?= =?UTF-8?q?=EC=82=AC=20=ED=9B=84=EA=B8=B0=20=EA=B4=80=EB=A0=A8=20=EB=B1=83?= =?UTF-8?q?=EC=A7=80=EB=A5=BC=20=ED=91=9C=EC=8B=9C=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=EC=9D=98=20=ED=95=98=EB=8B=A8=EC=9D=B4=20?= =?UTF-8?q?=EC=9E=98=EB=A0=A4=EC=84=9C=20=EC=8A=A4=ED=81=AC=EB=A1=A4?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kusitms/connectdog/feature/mypage/screen/BadgeScreen.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BadgeScreen.kt b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BadgeScreen.kt index 61f2bdc71..9bf38b370 100644 --- a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BadgeScreen.kt +++ b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BadgeScreen.kt @@ -171,7 +171,9 @@ private fun Content( .fillMaxSize() .padding(top = 48.dp) ) { + Spacer(modifier = Modifier.height(30.dp)) BadgeGrid(titleRes = R.string.volunteer_title, volunteerItems) + Spacer(modifier = Modifier.height(30.dp)) BadgeGrid(titleRes = R.string.review_title, reviewItems) } } @@ -185,7 +187,7 @@ private fun BadgeGrid( Column( modifier = Modifier .fillMaxWidth() - .padding(horizontal = 20.dp, vertical = 30.dp) + .padding(horizontal = 20.dp) ) { Text( text = stringResource(id = titleRes), From e545a6820bb0e68514bac388ae5cc039215119be Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:56:16 +0900 Subject: [PATCH 10/15] =?UTF-8?q?update:=20=EC=A0=80=EC=9E=A5=EB=90=9C=20?= =?UTF-8?q?=EA=B3=B5=EA=B3=A0=20=EB=AA=A9=EB=A1=9D=EC=9D=84=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=9C=20dto=EC=9D=98?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/volunteer/BookmarkResponseItem.kt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/BookmarkResponseItem.kt b/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/BookmarkResponseItem.kt index 7914c1ab9..22afba988 100644 --- a/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/BookmarkResponseItem.kt +++ b/core/data/src/main/java/com/kusitms/connectdog/core/data/api/model/volunteer/BookmarkResponseItem.kt @@ -1,12 +1,27 @@ package com.kusitms.connectdog.core.data.api.model.volunteer +import com.kusitms.connectdog.core.model.AnnouncementSearch + data class BookmarkResponseItem( + val dogName: String, + val pickUpTime: String, + val dogSize: String, val arrivalLoc: String, val departureLoc: String, val endDate: String, - val intermediaryName: String, val mainImage: String, val postId: Long, val startDate: String, val isKennel: Boolean -) +) { + fun toData() = AnnouncementSearch( + imageUrl = mainImage, + location = "$departureLoc → $arrivalLoc", + date = startDate, + postId = postId.toInt(), + dogName = dogName, + dogSize = dogSize, + isKennel = isKennel, + pickUpTime = pickUpTime + ) +} From ee4af2162ee48b1b85ead913ebd123d707a6c529 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:57:32 +0900 Subject: [PATCH 11/15] =?UTF-8?q?update:=20=EC=88=98=EC=A0=95=EB=90=9C=20?= =?UTF-8?q?=EA=B3=B5=EA=B3=A0=20=EB=AA=A9=EB=A1=9D=20ui=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/mypage/screen/BookmarkScreen.kt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt index 0a23800db..8211af9b8 100644 --- a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt +++ b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt @@ -22,6 +22,7 @@ import com.kusitms.connectdog.core.designsystem.component.ListForUserItem import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType import com.kusitms.connectdog.core.designsystem.theme.ConnectDogTheme import com.kusitms.connectdog.core.designsystem.theme.Gray7 +import com.kusitms.connectdog.feature.home.screen.AnnouncementContent import com.kusitms.connectdog.feature.mypage.R import com.kusitms.connectdog.feature.mypage.viewmodel.MyPageViewModel @@ -56,12 +57,16 @@ private fun Content( item: List, onDetailClick: (Long) -> Unit ) { - LazyColumn( - modifier = Modifier.padding(top = 48.dp), - verticalArrangement = Arrangement.Top - ) { - items(item) { - BookmarkContent(item = it, onDetailClick = onDetailClick) + if (item.isEmpty()) { + //TODO 저장된 공고가 비어있는 경우 표시될 UI 추가 + } else { + LazyColumn( + modifier = Modifier.padding(top = 48.dp), + verticalArrangement = Arrangement.Top + ) { + items(item) { + AnnouncementContent(announcement = it.toData(), onClick = onDetailClick) + } } } } @@ -78,7 +83,7 @@ private fun BookmarkContent( imageUrl = item.mainImage, location = "${item.departureLoc} → ${item.arrivalLoc}", date = "${item.startDate} - ${item.endDate}", - organization = item.intermediaryName, + organization = item.dogName, hasKennel = item.isKennel ) Divider(thickness = 8.dp, color = Gray7) From 5e1aa898f34e5720ed364bd42171e310a8465c60 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:58:22 +0900 Subject: [PATCH 12/15] =?UTF-8?q?style:=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EC=A0=80=EC=9E=A5?= =?UTF-8?q?=EB=90=9C=20=EA=B3=B5=EA=B3=A0,=20=EB=B1=83=EC=A7=80=EC=9D=98?= =?UTF-8?q?=20=EC=88=98=EB=A5=BC=20=ED=91=9C=EC=8B=9C=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/mypage/screen/MypageScreen.kt | 55 ++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/MypageScreen.kt b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/MypageScreen.kt index 3ab5a2357..2ebc907db 100644 --- a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/MypageScreen.kt +++ b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/MypageScreen.kt @@ -42,6 +42,7 @@ import com.kusitms.connectdog.core.designsystem.component.ConnectDogOutlinedButt import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType import com.kusitms.connectdog.core.designsystem.theme.ConnectDogTheme +import com.kusitms.connectdog.core.designsystem.theme.PetOrange import com.kusitms.connectdog.core.util.getProfileImageId import com.kusitms.connectdog.feature.mypage.R import com.kusitms.connectdog.feature.mypage.viewmodel.MyPageViewModel @@ -103,6 +104,8 @@ private fun MypageScreen( ) { LaunchedEffect(Unit) { viewModel.fetchUserInfo() + viewModel.fetchBadge() + viewModel.fetchBookmark() } Column { @@ -114,11 +117,25 @@ private fun MypageScreen( Spacer(modifier = Modifier.height(40.dp)) BannerGuideline({}) Spacer(modifier = Modifier.height(20.dp)) - Text(text = "나의 이동봉사", style = MaterialTheme.typography.titleMedium, modifier = Modifier.padding(horizontal = 20.dp)) + Text( + text = "나의 이동봉사", + style = MaterialTheme.typography.titleMedium, + modifier = Modifier.padding(horizontal = 20.dp) + ) Spacer(modifier = Modifier.height(20.dp)) - MypageTab(painter = R.drawable.ic_bookmark, title = "저장한 이동봉사 공고", onClick = onBookmarkClick) + MypageTab( + painter = R.drawable.ic_bookmark, + title = "저장한 이동봉사 공고", + onClick = onBookmarkClick, + count = viewModel.bookmark.value?.size + ) Spacer(modifier = Modifier.height(20.dp)) - MypageTab(painter = R.drawable.ic_badge, title = "내 활동 배지", onClick = onBadgeClick) + MypageTab( + painter = R.drawable.ic_badge, + title = "내 활동 배지", + onClick = onBadgeClick, + count = viewModel.badge.value?.size + ) } } @@ -165,7 +182,8 @@ private fun MyInformation( private fun MypageTab( @DrawableRes painter: Int, title: String, - onClick: () -> Unit + onClick: () -> Unit, + count: Int? ) { Row( modifier = Modifier @@ -184,8 +202,19 @@ private fun MypageTab( text = title, style = MaterialTheme.typography.bodyLarge ) + Spacer(modifier = Modifier.width(4.dp)) + Text( + text = count?.toString() ?: "", + style = MaterialTheme.typography.bodyLarge, + color = PetOrange, + fontWeight = FontWeight.Medium + ) Spacer(modifier = Modifier.weight(1f)) - Icon(painter = painterResource(id = R.drawable.ic_right_arrow), contentDescription = null, modifier = Modifier.size(24.dp)) + Icon( + painter = painterResource(id = R.drawable.ic_right_arrow), + contentDescription = null, + modifier = Modifier.size(24.dp) + ) } } @@ -225,8 +254,20 @@ private fun Information( modifier = modifier.fillMaxHeight(), verticalArrangement = Arrangement.Center ) { - Text(text = "${count}회", color = Color.White, fontSize = 20.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.align(Alignment.CenterHorizontally)) - Text(text = title, color = Color.White, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, modifier = Modifier.align(Alignment.CenterHorizontally)) + Text( + text = "${count}회", + color = Color.White, + fontSize = 20.sp, + fontWeight = FontWeight.SemiBold, + modifier = Modifier.align(Alignment.CenterHorizontally) + ) + Text( + text = title, + color = Color.White, + fontSize = 12.sp, + fontWeight = FontWeight.SemiBold, + modifier = Modifier.align(Alignment.CenterHorizontally) + ) } } From 0bed75eeb45af4e81bc94e9fb5ff363fead46947 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:58:44 +0900 Subject: [PATCH 13/15] =?UTF-8?q?fix:=20=EC=A0=80=EC=9E=A5=EB=90=9C=20?= =?UTF-8?q?=EA=B3=B5=EA=B3=A0=EC=99=80=20=EB=B1=83=EC=A7=80=20=EB=82=B4?= =?UTF-8?q?=EC=97=AD=EC=9D=84=20=ED=98=B8=EC=B6=9C=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectdog/feature/mypage/viewmodel/MyPageViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/viewmodel/MyPageViewModel.kt b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/viewmodel/MyPageViewModel.kt index 545c65592..ccfe5f49b 100644 --- a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/viewmodel/MyPageViewModel.kt +++ b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/viewmodel/MyPageViewModel.kt @@ -46,7 +46,7 @@ class MyPageViewModel @Inject constructor( } } - fun fetchBookmark() { + fun fetchBadge() { viewModelScope.launch { try { val response = myPageRepository.getBadge() @@ -57,7 +57,7 @@ class MyPageViewModel @Inject constructor( } } - fun fetchBadge() { + fun fetchBookmark() { viewModelScope.launch { try { val response = myPageRepository.getBookmarkData() From 8ba7b100c5015fcedb1277a1255b67a41bc122e0 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Tue, 7 May 2024 23:59:24 +0900 Subject: [PATCH 14/15] =?UTF-8?q?fix:=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EB=AA=A8=EB=93=88=EC=97=90=20?= =?UTF-8?q?=EC=A0=95=EC=9D=98=EB=90=9C=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/home/screen/DetailScreen.kt | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/DetailScreen.kt b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/DetailScreen.kt index d16bbe9c1..bf3803125 100644 --- a/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/DetailScreen.kt +++ b/feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/DetailScreen.kt @@ -58,6 +58,7 @@ import com.kusitms.connectdog.core.designsystem.component.ConnectDogTagWithIcon import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar import com.kusitms.connectdog.core.designsystem.component.DetailInfo import com.kusitms.connectdog.core.designsystem.component.NetworkImage +import com.kusitms.connectdog.core.designsystem.component.TextWithIcon import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType import com.kusitms.connectdog.core.designsystem.theme.Gray2 import com.kusitms.connectdog.core.designsystem.theme.Gray3 @@ -282,10 +283,9 @@ private fun BasicInfo( color = Gray3 ) Spacer(modifier = Modifier.height(6.dp)) - - test(iconId = R.drawable.ic_clock, text = detail.startDate) + TextWithIcon(iconId = R.drawable.ic_clock, text = detail.startDate, size = 14) Spacer(modifier = Modifier.height(8.dp)) - test(iconId = R.drawable.ic_clock, text = detail.pickUpTime) + TextWithIcon(iconId = R.drawable.ic_clock, text = detail.pickUpTime, size = 14) Spacer(modifier = Modifier.height(17.dp)) Row { ConnectDogTagWithIcon( @@ -309,20 +309,6 @@ private fun BasicInfo( } } -@Composable -private fun test( - iconId: Int, - text: String -) { - Row( - verticalAlignment = Alignment.CenterVertically - ) { - Icon(painter = painterResource(id = iconId), contentDescription = null, tint = Gray2) - Spacer(modifier = Modifier.width(6.dp)) - Text(text = text, fontSize = 14.sp, fontWeight = FontWeight.Medium, color = Gray2) - } -} - @Composable fun VolunteerInfo(detail: NoticeDetailResponseItem) { Column( From 7dab5de91259d5e0f055060961b73fb57de77433 Mon Sep 17 00:00:00 2001 From: Seunggu Kang Date: Wed, 8 May 2024 00:02:26 +0900 Subject: [PATCH 15/15] chore: apply ktlintFormat --- .../kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt index 8211af9b8..99531d31f 100644 --- a/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt +++ b/feature/mypage/src/main/java/com/kusitms/connectdog/feature/mypage/screen/BookmarkScreen.kt @@ -58,7 +58,7 @@ private fun Content( onDetailClick: (Long) -> Unit ) { if (item.isEmpty()) { - //TODO 저장된 공고가 비어있는 경우 표시될 UI 추가 + // TODO 저장된 공고가 비어있는 경우 표시될 UI 추가 } else { LazyColumn( modifier = Modifier.padding(top = 48.dp),