From 270c6840636f5ac77460f11f47d24e7e06451806 Mon Sep 17 00:00:00 2001 From: eshc123 Date: Wed, 20 Aug 2025 19:54:35 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=ED=99=88=20=EB=AA=A8=EC=9E=84=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=9C=84=EC=B9=98=20=EB=B0=8F=20=EB=A7=88=EC=A7=84?= =?UTF-8?q?=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/plottwist/feature/home/HomeScreen.kt | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt b/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt index 08fe2ce..7482c03 100644 --- a/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt +++ b/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt @@ -317,27 +317,41 @@ private fun HomeScreen( HomeAppBar(onMyPageClick) Column( - modifier = Modifier.fillMaxSize().padding( - bottom = BOTTOM_SHEET_PEEK_HEIGHT.dp - ).verticalScroll(verticalScrollState) + modifier = Modifier + .fillMaxSize() + .padding( + bottom = BOTTOM_SHEET_PEEK_HEIGHT.dp + ) + .verticalScroll(verticalScrollState) ) { HomeTitle( modifier = Modifier.height(HOME_TITLE_HEIGHT.dp), name = if(userName is UiState.Success) userName.value else "" ) - - HomeContent( - modifier = Modifier - .padding( - top = homeContentTopPadding - HOME_TITLE_HEIGHT.dp - 40.dp, - bottom = 40.dp - ), - gatherings = if(gatherings is UiState.Success) gatherings.value else Gatherings(), + if(gatherings is UiState.Success && gatherings.value.gatheringOverviews.size >= 2) { + HomeContent( + modifier = Modifier + .padding(top = 80.dp), + gatherings = gatherings.value, onAddGatheringClick = onAddGatheringClick, onGatheringClick = onGatheringClick - ) + ) + } } } + if(gatherings !is UiState.Success || gatherings.value.gatheringOverviews.size < 2){ + HomeContent( + modifier = Modifier.align(Alignment.Center), + gatherings = if(gatherings is UiState.Success && gatherings.value.gatheringOverviews.size <= 1) { + gatherings.value + } else { + Gatherings() + }, + onAddGatheringClick = onAddGatheringClick, + onGatheringClick = onGatheringClick + ) + } + if(proposalTags is UiState.Success) { HomeBottomSheet( modifier = Modifier From 122cb2a137ef48676b2691eb190f08d11c65364e Mon Sep 17 00:00:00 2001 From: eshc123 Date: Wed, 20 Aug 2025 19:59:11 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=ED=99=88=20=EB=AA=A8=EC=9E=84=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=20=EC=95=8C=ED=8C=8C=EA=B0=92=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/plottwist/feature/home/component/GatheringsCard.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt index cdc5eb1..aae9b0b 100644 --- a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt +++ b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt @@ -46,7 +46,7 @@ fun GatheringsCard( blur = 6.dp ) .background( - color = Color(0x35FFFFFF), + color = Color(0x49FFFFFF), shape = RoundedCornerShape(20.dp) ) .border( @@ -63,7 +63,7 @@ fun GatheringsCard( ) if(gatherings.gatheringOverviews.isNotEmpty()) { HorizontalDivider( - color = Color(0xFFEFEFEF) + color = Color(0xFFEAEAEA) ) gatherings.gatheringOverviews.forEach { gathering -> From 17eda2744bb1b3a8dddef134e3072cbc6e0e29f2 Mon Sep 17 00:00:00 2001 From: eshc123 Date: Wed, 20 Aug 2025 23:39:58 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=ED=99=88=20=EB=AA=A8=EC=9E=84=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=ED=95=98=EB=8B=A8=20=ED=8C=A8=EB=94=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/src/main/java/com/plottwist/feature/home/HomeScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt b/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt index 7482c03..82c324c 100644 --- a/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt +++ b/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt @@ -331,7 +331,7 @@ private fun HomeScreen( if(gatherings is UiState.Success && gatherings.value.gatheringOverviews.size >= 2) { HomeContent( modifier = Modifier - .padding(top = 80.dp), + .padding(top = 80.dp, bottom = 80.dp), gatherings = gatherings.value, onAddGatheringClick = onAddGatheringClick, onGatheringClick = onGatheringClick From 4287f365bc85d4202a1df1a7b9d3f7ed07df8308 Mon Sep 17 00:00:00 2001 From: eshc123 Date: Wed, 20 Aug 2025 23:56:38 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=ED=99=88=20=ED=99=94=EB=A9=B4=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/designsystem/src/main/res/values/strings.xml | 2 +- .../plottwist/feature/home/component/GatheringsCard.kt | 10 ++++++---- .../feature/home/component/HomeBottomSheet.kt | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml index 996cbb7..3c48d23 100644 --- a/core/designsystem/src/main/res/values/strings.xml +++ b/core/designsystem/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ 멈추기 모임을 생성하고\n넌지시 만남을 제안해 보세요 모임 생성하기 - 마지막 알람 + 마지막 연락 말이 안되는거 알지만\n\n\n우리, 어때 받은 초대장 diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt index aae9b0b..1b72034 100644 --- a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt +++ b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt @@ -27,6 +27,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.plottwist.core.designsystem.R import com.plottwist.core.designsystem.foundation.TukColorTokens.Gray000 +import com.plottwist.core.designsystem.foundation.TukColorTokens.Gray800 +import com.plottwist.core.designsystem.foundation.TukColorTokens.Gray900 import com.plottwist.core.designsystem.foundation.type.TukPretendardTypography import com.plottwist.core.domain.model.Gatherings @@ -107,7 +109,7 @@ fun CreateGatheringText( Text( text = "모임 생성", style = TukPretendardTypography.body14R, - color = Color(0xFF1F1F1F) + color = Gray900 ) } } @@ -142,7 +144,7 @@ fun GatheringItem( style = TukPretendardTypography.body14M, maxLines = 1, overflow = TextOverflow.Ellipsis, - color = Color(0xFF1f1f1f) + color = Gray900 ) Row ( @@ -151,13 +153,13 @@ fun GatheringItem( Text( text = stringResource(R.string.home_last_alarm), style = TukPretendardTypography.body14R, - color = Color(0xFF888888) + color = Gray800 ) Text( text = lastAlarm, style = TukPretendardTypography.body14R, - color = Color(0xFF888888) + color = Gray800 ) } } diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/HomeBottomSheet.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/HomeBottomSheet.kt index f537738..f36740c 100644 --- a/feature/home/src/main/java/com/plottwist/feature/home/component/HomeBottomSheet.kt +++ b/feature/home/src/main/java/com/plottwist/feature/home/component/HomeBottomSheet.kt @@ -40,6 +40,7 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import com.plottwist.core.designsystem.R import com.plottwist.core.designsystem.foundation.TukColorTokens.Gray800 +import com.plottwist.core.designsystem.foundation.TukColorTokens.Gray900 import com.plottwist.core.designsystem.foundation.type.TukSerifTypography import com.plottwist.core.ui.extension.borderExceptBottom import com.plottwist.core.ui.extension.dropShadow @@ -264,7 +265,8 @@ fun DraggableBottomSheet( ) { Text( text = stringResource(R.string.home_bottom_sheet_nudging_text), - style = TukSerifTypography.body14R + style = TukSerifTypography.body14R, + color = Gray900 ) } } From 340cb25f54e96bc2817a0af3e125922ce5c5c11f Mon Sep 17 00:00:00 2001 From: eshc123 Date: Thu, 21 Aug 2025 00:02:21 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=ED=99=88=20=ED=99=94=EB=A9=B4=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/plottwist/feature/home/component/GatheringsCard.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt index 1b72034..a9a548e 100644 --- a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt +++ b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt @@ -152,13 +152,13 @@ fun GatheringItem( ) { Text( text = stringResource(R.string.home_last_alarm), - style = TukPretendardTypography.body14R, + style = TukPretendardTypography.body12R, color = Gray800 ) Text( text = lastAlarm, - style = TukPretendardTypography.body14R, + style = TukPretendardTypography.body12R, color = Gray800 ) } From ce969c94ef6f8fac451b90f42ae3bf31e58d7043 Mon Sep 17 00:00:00 2001 From: eshc123 Date: Thu, 21 Aug 2025 00:44:03 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=ED=99=88=20=ED=99=94=EB=A9=B4=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=20=EC=95=8C=ED=8C=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/plottwist/feature/home/component/GatheringsCard.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt index a9a548e..73e3628 100644 --- a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt +++ b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt @@ -48,7 +48,7 @@ fun GatheringsCard( blur = 6.dp ) .background( - color = Color(0x49FFFFFF), + color = Color(0x88FFFFFF), shape = RoundedCornerShape(20.dp) ) .border( @@ -125,7 +125,7 @@ fun GatheringItem( modifier .fillMaxWidth() .clip(RoundedCornerShape(20.dp)) - .padding(vertical = 12.dp) + .padding(vertical = 6.dp) .clickable( interactionSource = null, indication = null