Conversation
Closed
2 tasks
boiledeggg
requested changes
Sep 16, 2024
Member
boiledeggg
left a comment
boiledeggg
left a comment
There was a problem hiding this comment.
고생하셨습니다!! 캘린더는 develop 풀 받고 수정해주세요~
Member
There was a problem hiding this comment.
스크랩 다이얼로그의 로직은 문제가 없는데, 달력 화면의 구조가 많이 바뀌어서 충돌이 발생했네요,,
develop을 풀 받고 다시 수정해주셔야 할 것 같아요!!
현재 달력 화면들에선 ~Screen 컴포저블 안에서 다이얼로그를 호출하지 않고, 상위 컴포저블인 ~Route에서 Screen과 dialog를 각각 관리하고 있습니다! 따라서 바뀐 위치에 Boolean만 지정해주시면 될 것 같아요!
| delay(2000) | ||
| if (!pagerState.isScrollInProgress) { | ||
| val nextPage = (pagerState.currentPage + 1) % pagerState.pageCount | ||
| pagerState.animateScrollToPage(nextPage) |
| currentSortBy: Int, | ||
| modifier: Modifier = Modifier, | ||
| newSortBy: MutableState<Int> = mutableStateOf(currentSortBy), | ||
| onSortChange: (Int) -> Unit = {}, |
Member
There was a problem hiding this comment.
오호!! 안그래도 이 바텀시트 수정 필요했었는데..!! 이거 활용해서 한번 홈 부분도 고쳐봐야겠네욤 수정 감사합니다!!ㅎㅎㅎㅎ
# Conflicts: # feature/src/main/java/com/terning/feature/calendar/list/CalendarListScreen.kt # feature/src/main/java/com/terning/feature/calendar/week/CalendarWeekScreen.kt
boiledeggg
approved these changes
Sep 18, 2024
Member
boiledeggg
left a comment
boiledeggg
left a comment
There was a problem hiding this comment.
개떡같이 설명해도 찰떡같이 알아듣고 수정하셨네요ㅎㅎ 너무 고생하셨습니당~
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
⛳️ Work Description
📸 Screenshot
250.mp4
📢 To Reviewers
따라서, ScrapDialog의 dismiss 함수에 Boolean 값을 전달받도록 수정하여 "스크랩" 했을 경우를 따지고 해당 인덱스만 UPDATE 되도록 수정하였습니다.
제가 짠 로직이 적절할 지,.,. 로직 한 번만 확인해주세요!
만약 해당 로직이 채택된다면 효빈이도 스크랩 다이얼로그가 없어졌을 때 모든 데이터를 다시 받아오는 로직을 수정해야 할 것 같아용~!
또한 이에 따라 캘린더 로직도 조금 수정하게 되었는데,
석준오빠가 캘린더 수정한 피알 머지하고 컨플릭 해결한 뒤에 머지할게요 🙌🙌