[feat] 메인 지도 뷰 카드 구현 #40
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
# Conflicts: # app/src/main/res/values/dimens.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/themes.xml
Dan2dani
approved these changes
Jan 7, 2024
| @@ -0,0 +1,16 @@ | |||
| package org.sopt.pingle.domain.model | |||
|
|
|||
| data class PingleEntity( | |||
There was a problem hiding this comment.
네이밍이 어떤 엔티티인지 잘 알아보기 어려운거 같은데 수정하는건 어떨까염!
There was a problem hiding this comment.
저도 이 부분 알아보기 좀 힘들다구 느꼈어여ㅜ,ㅜ
| ) | ||
| ); | ||
|
|
||
| companion object { |
There was a problem hiding this comment.
우앙 이렇게두 되는군욤 이런건 보통 어떤 경우에 이렇게 상ㅇ하낭?
# Conflicts: # app/src/main/res/values/strings.xml
HAJIEUN02
reviewed
Jan 12, 2024
| @@ -0,0 +1,16 @@ | |||
| package org.sopt.pingle.domain.model | |||
|
|
|||
| data class PingleEntity( | |||
There was a problem hiding this comment.
저도 이 부분 알아보기 좀 힘들다구 느꼈어여ㅜ,ㅜ
There was a problem hiding this comment.
카테고리 타입 쓰는 거 진짜 좋은 것 같아요
| @@ -79,7 +83,20 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map), | |||
| chipMapCategoryPlay.setChipCategoryType(CategoryType.PLAY) | |||
| chipMapCategoryStudy.setChipCategoryType(CategoryType.STUDY) | |||
| chipMapCategoryMulti.setChipCategoryType(CategoryType.MULTI) | |||
| chipMapCategoryOthers.setChipCategoryType(CategoryType.OTHER) | |||
| chipMapCategoryOthers.setChipCategoryType(CategoryType.OTHERS) | |||
| textButtonText = stringOf(R.string.map_cancel_modal_text_button_text), | ||
| clickBtn = { mapViewModel.cancelPingle() }, | ||
| clickTextBtn = { }, | ||
| onDialogClosed = { binding.cardMap.initLayout(mapViewModel.dummyPingle) } |
There was a problem hiding this comment.
프래그먼트 이런 식으로 쓰는거 진짜 깔끔하구 좋당..
| @@ -38,10 +39,59 @@ class MapViewModel() : ViewModel() { | |||
| ) | |||
| ) | |||
|
|
|||
| var dummyPingle = PingleEntity( | |||
| import org.sopt.pingle.util.view.colorOf | ||
| import org.sopt.pingle.util.view.stringOf | ||
|
|
||
| @SuppressLint("CustomViewStyleable") |
There was a problem hiding this comment.
오호이 현재 프로젝트에 설정된 minSdkVersion 버젼 이후에 나온 API를 사용할때 warning을 없애고 사용할 수 있게 합니다.. 라고 하는데 그게 여기서 머길래 SuppressLint를 사용하신건가요?
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="32dp" |
There was a problem hiding this comment.
dimen을 사용하지 않은 이유가 있는지 궁금합니다
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.
Related issue 🛠
Work Description ✏️
Screenshot 📸
모집 중/참여 신청하지 않은 경우 -> 참여하기 -> 모집완료/참여 신청한 경우 -> 취소하기 -> 모집 중/참여 신청하지 않은 경우
Screen_recording_20240106_054625.mp4
모집 중/참여 신청한 경우 -> 취소하기 -> 모집 중/참여 신청하지 않은 경우
Screen_recording_20240106_055027.mp4
모집 완료/참여 신청하지 않은 경우
Uncompleted Tasks 😅
To Reviewers 📢