Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ISSUE-155] 캘린더 바텀시트 관련 로직 변경 #166

Merged
merged 3 commits into from
Aug 1, 2022
Merged

[ISSUE-155] 캘린더 바텀시트 관련 로직 변경 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c07174
fix - 오늘 날짜를 클릭하더라도 바텀 시트가 출력되도록 수정
hoyahozz Aug 1, 2022
dc08c4f
fix - 약속이 없는 날도 클릭 시 바텀시트를 띄우도록 수정
hoyahozz Aug 1, 2022
cbe197c
fix - 스트링 리소스 추가 및 적용
hoyahozz Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions presentation/src/main/java/com/yapp/growth/presentation/ui/main/PlanzScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

}
}

Expand Down
3 changes: 1 addition & 2 deletions presentation/src/main/java/com/yapp/growth/presentation/ui/main/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
1 change: 1 addition & 0 deletions presentation/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down