[feat] 핑글 개최 프로세스 - 장소 선택 뷰 구현 #37
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/strings.xml # app/src/main/res/values/themes.xml
# Conflicts: # app/src/main/java/org/sopt/pingle/util/component/PingleChip.kt # app/src/main/res/values/strings.xml
|
PR 내용 업데이트 해주세용 ~ |
jihyunniiii
reviewed
Jan 6, 2024
There was a problem hiding this comment.
수고하셨습니당 !! 아래 내용들과 코드리뷰 확인해서 수정사항 반영해주세용
- plan 패키지 내부에 planlocation 패키지 만들어서 관련 내용들을 다시 폴더링 해주세요
- diffcallback 만들어져 있는 걸로 사용해주세요.
- 디바이더 공통적으로 사용되므로 폴더링, 네이밍 다시 부탁합니당 (그리고 현재 디바이더 안 보이는데 수정 부탁드려요)
- plan 내부 fragment 들이 planViewModel을 공유하는 로직이므로 planLocationViewModel의 내용을 planView 모델로 옮겨주시고 planLocationViewModel 삭제해주세요.
- 전체 액티비티에 기본적으로 좌우마진이 들어간다는 것을 생각해서 좌우 마진 다시 설정해주세요!
- 검색창 수정해주세요 ~
추가적으로,, 엠티뷰 나오는 거 확인 했나용?? 확인한 내용 pr에 업데이트 해주세요.
| import org.sopt.pingle.R | ||
| import org.sopt.pingle.databinding.ActivityPlanLocationBinding | ||
|
|
||
| class PlanLocationActivity : AppCompatActivity() { |
There was a problem hiding this comment.
바인딩 액티비티 사용해주세요. 그리고 나중에 다은이 피알 머지되면 다은이가 만든 액티비티 사용해주세용
|
|
||
| class PlanLocationAdapter : | ||
| ListAdapter<PlanLocationModel, PlanLocationAdapter.PlanLocationViewHolder>( | ||
| PlanLocationDiffCallback(), |
There was a problem hiding this comment.
확장함수로 DiffCallback 만들어 두었으니 그거 사용하시면 됩니다. 따로 만들 필요 없어요.
| ListAdapter<PlanLocationModel, PlanLocationAdapter.PlanLocationViewHolder>( | ||
| PlanLocationDiffCallback(), | ||
| ) { | ||
| private var planLocationList: List<PlanLocationModel> = emptyList() |
There was a problem hiding this comment.
listAdapter로 만들면 따로 만들어줄 필요 없어요
app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanLocationAdapter.kt
Outdated
Show resolved
Hide resolved
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/tv_plan_location_empty_info" |
There was a problem hiding this comment.
Suggested change
| android:id="@+id/tv_plan_location_empty_info" | |
| android:id="@+id/tv_plan_location_empty_detail" |
| android:id="@+id/tv_plan_location_name" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="@dimen/spacing16" |
There was a problem hiding this comment.
좌우 기본 마진이 16dp 라는 것 고려해서 좌우 마진 다시 잡아주세요 (전체적으로)
There was a problem hiding this comment.
전체적으루 16dp 깔려있는거 고려해서 다 수정했어염!
| tools:text="상세 주소" /> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/imv_plan_location_check" |
There was a problem hiding this comment.
Suggested change
| android:id="@+id/imv_plan_location_check" | |
| android:id="@+id/iv_plan_location_check" |
app/src/main/res/values/strings.xml
Outdated
| @@ -48,4 +48,13 @@ | |||
|
|
|||
| <!-- map modal --> | |||
| <string name="map_modal_description">이 핑글에 참여할까요?</string> | |||
|
|
|||
| <!-- Plan Location --> | |||
There was a problem hiding this comment.
Suggested change
| <!-- Plan Location --> | |
| <!-- plan location --> |
app/src/main/res/values/themes.xml
Outdated
# Conflicts: # app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanViewModel.kt # app/src/main/res/values/strings.xml
# Conflicts: # app/src/main/res/values/strings.xml
HAJIEUN02
requested review from
Dan2dani,
Doreminwoo,
jihyunniiii and
a team
and removed request for
Dan2dani,
Doreminwoo and
jihyunniiii
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 📸
Uncompleted Tasks 😅
To Reviewers 📢
드.디.어 끝
코리 반영해서 로직 더 깔끔하게 수정하고 UiState 이용하는 건 일단 1차 스프린트 뷰 구현 다 끝나구..
리팩하는 걸루 하겠습니다ㅜ,ㅜ
바쁜 와중에 열심히 코리 달아준 지현 언니에게 사랑을 찬사를 칭찬을