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.

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

[FEATURE] 달력 뷰 만들기 #42

Merged
merged 13 commits into from
Feb 25, 2023
Merged

[FEATURE] 달력 뷰 만들기 #42

merged 13 commits into from
Feb 25, 2023

Conversation

eshc123
Copy link
Member

@eshc123 eshc123 commented Feb 25, 2023

이슈 번호

#7

작업 내용

  • 달력 뷰 만들기

@eshc123 eshc123 added feature New feature or request seokjoon labels Feb 25, 2023
@eshc123 eshc123 requested a review from Mnseo February 25, 2023 06:11
@eshc123 eshc123 self-assigned this Feb 25, 2023
findNavController().navigate(Uri.parse("https://www/meeting/detail"))
findNavController().navigate(Uri.parse("https://www/meeting/detail/{meetingId}"))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

얘는 viewpager에 상관 없이 플로팅으로 뜨는거니까 그대로 남아있는거죠 ?,?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

얘는 약속방 입장이라 플로팅은 아니긴하지만 HomeFragment에 남아 있긴 할거야!

Comment on lines +232 to +255
fun updatePeriod() {
_meetingInitialPeriod.value = meetingInitialPeriod.value.map {
if (it.isCurrentMonth == true) {
if (meetingPeriodState.value.meetingPeriodStart != null && meetingPeriodState.value.meetingPeriodEnd != null) {
if (meetingPeriodState.value.meetingPeriodStart?.dateTime == it.dateTime)
it.copy(dateState = DateUiState.SELECTED_START)
else if (meetingPeriodState.value.meetingPeriodEnd?.dateTime == it.dateTime)
it.copy(dateState = DateUiState.SELECTED_END)
//월요일일 때, 토요일일 떄, 1일일때, 28,30,31일때 조건 추가
else if (it.dateTime.millis in meetingPeriodState.value.meetingPeriodStart!!.dateTime.millis..meetingPeriodState.value.meetingPeriodEnd!!.dateTime.millis)
it.copy(dateState = DateUiState.PASS)
else it.copy(dateState = DateUiState.INITIAL)
} else if (meetingPeriodState.value.meetingPeriodStart != null && meetingPeriodState.value.meetingPeriodEnd == null) {
if (meetingPeriodState.value.meetingPeriodStart?.dateTime == it.dateTime) {
it.copy(dateState = DateUiState.SELECTED)
} else {
it.copy(dateState = DateUiState.INITIAL)
}
} else {
it.copy(dateState = DateUiState.INITIAL)
}
} else it.copy(dateState = DateUiState.INITIAL)
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

케이스 처리 수고하셨습니다 🙇🏻‍♀️😶‍🌫️ ... 와우여요

Copy link
Collaborator

@Mnseo Mnseo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

밖에서도 PR 올리시느라 수고 많아요 오빠 좀 이따 봐요 🙇🏻‍♀️

@eshc123 eshc123 merged commit 3c8fbc5 into dev Feb 25, 2023
@eshc123 eshc123 deleted the feature/add_calendar_view branch September 24, 2023 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature New feature or request seokjoon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants