[TNT-180] 트레이니 주간 캘린더 연동 #67
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hoyahozz
requested changes
Feb 7, 2025
| val now = LocalDate.now() | ||
| val coroutineScope = rememberCoroutineScope() | ||
|
|
||
| val weekCalendarState = rememberWeekCalendarState( |
There was a problem hiding this comment.
우리 앱의 첫번째 요일은 '일요일'이므로 별도로 FirstDayOfWeek 선언해주는게 좋을 것 같습니다 ~
| .padding(horizontal = 20.dp, vertical = 8.dp), | ||
| ) { | ||
| Spacer(Modifier.height(8.dp)) | ||
| TnTCalendarSelector( |
There was a problem hiding this comment.
요거 제 브랜치에서 TnTHomeTopBar 만들어뒀어요! 체리픽해서 사용하면 조을 것 같습니당
| } | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| TnTIndicatorWeekCalendar( |
| } | ||
| } | ||
|
|
||
| private fun moveToNextWeek() { |
There was a problem hiding this comment.
7일 중 과반 이상(4개 이상)이 해당하는 년도-월로 표시
현재 보이는 '연월'은 위 기획과 동일하게 설정되도록 수정이 필요할 것 같아요!
hoyahozz
approved these changes
Feb 8, 2025
Comment on lines
68
to
75
| private fun getDominantYearMonth(visibleDays: List<LocalDate>): YearMonth { | ||
| val yearMonthCount = visibleDays.groupingBy { YearMonth.from(it) }.eachCount() | ||
|
|
||
| return yearMonthCount.entries | ||
| .sortedByDescending { it.value } | ||
| .firstOrNull { it.value >= 4 }?.key | ||
| ?: YearMonth.from(visibleDays.first()) | ||
| } |
There was a problem hiding this comment.
Suggested change
| private fun getDominantYearMonth(visibleDays: List<LocalDate>): YearMonth { | |
| val yearMonthCount = visibleDays.groupingBy { YearMonth.from(it) }.eachCount() | |
| return yearMonthCount.entries | |
| .sortedByDescending { it.value } | |
| .firstOrNull { it.value >= 4 }?.key | |
| ?: YearMonth.from(visibleDays.first()) | |
| } | |
| private fun getMostFrequentYearMonth(visibleDays: List<LocalDate>): YearMonth { | |
| return visibleDays | |
| .groupingBy { YearMonth.from(it) } | |
| .eachCount() | |
| .maxBy { it.value } | |
| .key | |
| } |
요거 단순하게 Grouping 한 후에 값이 가장 많은 YearMonth 로 넘겨주는건 어떨까요?
캘린더 상에서 과반이 항상 4일 이상을 의미하는건 아닐 것 같아요!
There was a problem hiding this comment.
옹 넵 수정하고 머지하겠습니다!! 🙇
- jpg, jpeg, png, svg만 가능하다 - 만약 지원하지 않는 형식의 파일이 들어오면 png로 바꿔준다
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝 작업 내용
[TNT-180] 트레이니의 주간 기록 출력 #43
트레이니 홈 화면 주간 캘린더 연동했습니다.
알림 아이콘 클릭 시 알림 화면으로 이동하도록 수정했습니다.
📸 실행 화면
TraineeHomeWeekCalendar.mp4
🙆🏻 리뷰 요청 사항
없습니다!
👀 레퍼런스