Feature/main calender #113
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
…into feature/main_calender � Conflicts: � app/src/main/res/layout/fragment_main.xml
…into feature/main_calender � Conflicts: � app/src/main/java/com/depromeet/housekeeper/adapter/HouseWorkAdapter.kt � app/src/main/java/com/depromeet/housekeeper/ui/MainFragment.kt � app/src/main/java/com/depromeet/housekeeper/ui/MainViewModel.kt � app/src/main/res/layout/fragment_main.xml � app/src/main/res/layout/item_housework.xml � app/src/main/res/layout/layout_home_add_chore.xml � app/src/main/res/values/strings.xml
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.
메인화면 작업 마무리 했고 캘린더 작업은 민주님이 머지해주시면 메인화면 어느정도 마무리 될 것 같습니다. ㅠㅠㅠ 결국 섹션리사이클러뷰는 사용 못하고 뷰 재활용해서 사용했습니다. 뭔가 마음에 안들지만 하긴했네요 ㅠㅠ