-
Notifications
You must be signed in to change notification settings - Fork 2
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/#557 스크랩 변경 화면 적용 #603
Merged
The head ref may contain hidden characters: "Feature/#557-\uC2A4\uD06C\uB7A9_\uBCC0\uACBD_\uD654\uBA74_\uC801\uC6A9"
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
- EventChip 공용 BindingAdpater 생성
- 만약 정보 탭이면 스크랩버튼과 웹사이트 이동 버튼이 하단에 나타남 - 아니라면, 글쓰기 버튼이 나타남
- relativeDate 바인딩 어탭터 추가
- ChipGroup 바인딩 어댑터 Nullable 타입 제거 - 불필요한 헤더값 삭제 및 함수 표현 변경 - Post Model nullable 제거 - 불필요한 주석 제거 - Tag로만 되있는 네이밍에 Chip추가하여 네이밍 변경 - ChipBindingAdapter 함수 네이밍 속성과 변수명 맞히기
…성_화면_구현 # Conflicts: # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventDetail/EventDetailActivity.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventDetail/EventDetailViewModel.kt # android/2023-emmsale/app/src/main/res/layout/activity_event_detail.xml # android/2023-emmsale/app/src/main/res/values/date_time_patterns.xml # android/2023-emmsale/app/src/main/res/values/strings.xml
# Conflicts: # android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/interfaces/PostRepository.kt # android/2023-emmsale/app/src/main/java/com/emmsale/data/service/PostService.kt
# Conflicts: # android/2023-emmsale/app/src/main/AndroidManifest.xml # android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/concretes/DefaultRecruitmentRepository.kt # android/2023-emmsale/app/src/main/java/com/emmsale/di/RepositoryContainer.kt # android/2023-emmsale/app/src/main/java/com/emmsale/di/ServiceContainer.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/bindingadapter/LocalDateTimeBindingAdapter.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/extension/LocalDateTimeExt.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/competitionList/recyclerView/CompetitionViewHolder.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventDetail/EventDetailActivity.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventDetail/EventDetailFragmentStateAdapter.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventDetail/EventDetailViewModel.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/recruitmentList/EventRecruitmentFragment.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/recruitmentList/EventRecruitmentViewModel.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/scrappedEventList/recyclerView/ScrappedEventViewHolder.kt # android/2023-emmsale/app/src/main/res/drawable/bg_shadow.xml # android/2023-emmsale/app/src/main/res/layout/activity_event_detail.xml # android/2023-emmsale/app/src/main/res/layout/fragment_event_information.xml # android/2023-emmsale/app/src/main/res/layout/item_comment_notification_body.xml # android/2023-emmsale/app/src/main/res/layout/item_primary_notification.xml # android/2023-emmsale/app/src/main/res/values/colors.xml # android/2023-emmsale/app/src/main/res/values/date_time_patterns.xml # android/2023-emmsale/app/src/main/res/values/strings.xml # android/2023-emmsale/app/src/test/java/com/emmsale/presentation/ui/eventdetail/EventDetailViewModelTest.kt # android/2023-emmsale/app/src/test/java/com/emmsale/presentation/ui/eventdetail/information/EventInfoViewModelTest.kt
…스크랩_변경_화면_적용 # Conflicts: # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/service/KerdyFirebaseMessagingService.kt
…스크랩_변경_화면_적용 # Conflicts: # android/2023-emmsale/app/src/main/java/com/emmsale/data/apiModel/response/EventResponse.kt # android/2023-emmsale/app/src/main/java/com/emmsale/data/apiModel/response/PostResponse.kt # android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/PostMapper.kt # android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/ScrappedEventMapper.kt # android/2023-emmsale/app/src/main/java/com/emmsale/data/model/Post.kt # android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/concretes/DefaultPostRepository.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/eventDetail/EventDetailViewModel.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/scrappedEventList/recyclerView/ScrappedEventViewHolder.kt # android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/scrappedEventList/uiState/ScrappedEventUiState.kt # android/2023-emmsale/app/src/main/res/layout/fragment_post_list.xml # android/2023-emmsale/app/src/main/res/layout/item_post.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.
#️⃣연관된 이슈
📝작업 내용
예상 소요 시간 및 실제 소요 시간
1시간/ 1시간