diff --git a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt index 4e516b0d..2b113fad 100644 --- a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt +++ b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt @@ -502,11 +502,23 @@ fun PlanzBottomSheetContent( .clickable { onExitClick() }, ) } - Spacer(modifier = Modifier.height(24.dp)) - PlanzPlanList( - dayPlans = selectDayPlans, - onPlanItemClick = onPlanItemClick - ) + if(selectDayPlans.isNotEmpty()) { + Spacer(modifier = Modifier.height(24.dp)) + PlanzPlanList( + dayPlans = selectDayPlans, + onPlanItemClick = onPlanItemClick + ) + } else { + Spacer(modifier = Modifier.height(70.dp)) + Text( + text = stringResource(id = R.string.planz_has_not_plan), + style = PlanzTypography.body1, + color = Gray500, + modifier = Modifier.align(Alignment.CenterHorizontally) + ) + Spacer(modifier = Modifier.height(70.dp)) + } + } } diff --git a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt index 0c146425..ca3c7ea0 100644 --- a/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt +++ b/presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt @@ -477,8 +477,7 @@ fun HomeCalendar( currentDate = currentDate, selectMode = PlanzCalendarSelectMode.SINGLE, onDateSelectedListener = { widget, date, selected -> - if (date != CalendarDay.today() && monthlyPlanDates.containsKey(date)) - onDateClick(date) + onDateClick(date) }, monthlyDates = monthlyPlanDates ) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index a0fbda92..fcaee735 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -9,6 +9,7 @@ 문제가 발생했습니다. 다시 시도해주세요. + 오늘의 약속이 없습니다. 메인 홈 약속잡기