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/#557 스크랩 변경 화면 적용 #603

Merged
merged 32 commits into from
Sep 21, 2023

Conversation

chws0508
Copy link
Collaborator

#️⃣연관된 이슈

#601

📝작업 내용

스크랩 변경 화면 적용

예상 소요 시간 및 실제 소요 시간

1시간/ 1시간

chws0508 and others added 30 commits September 14, 2023 21:51
- 만약 정보 탭이면 스크랩버튼과 웹사이트 이동 버튼이 하단에 나타남
- 아니라면, 글쓰기 버튼이 나타남
- 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
@chws0508 chws0508 merged commit 56f0993 into android-main Sep 21, 2023
1 check passed
@amaran-th amaran-th deleted the Feature/#557-스크랩_변경_화면_적용 branch September 21, 2023 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants