Merge pull request #166 from YAPP-Github/refactor/issue-155-home-bott…

…om-sheet [ISSUE-155] �캘린더 바텀시트 관련 로직 변경
YAPP-Github · Aug 1, 2022 · 2c95918 · 2c95918
2 parents 2fa6f80 + cbe197c
commit 2c95918
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
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
@@ -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
@@ -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
@@ -9,6 +9,7 @@
 
  <string name="planz_error_text_01">문제가 발생했습니다.</string>
  <string name="planz_error_text_02">다시 시도해주세요.</string>
+ <string name="planz_has_not_plan">오늘의 약속이 없습니다.</string>
 
  <string name="navigation_home_text">메인 홈</string>
  <string name="navigation_create_plan_text">약속잡기</string>