[feat] 대기 상세 뷰 구현 #7
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
Closed
2 tasks
jihyunniiii
reviewed
Nov 24, 2023
app/src/main/AndroidManifest.xml
Outdated
Comment on lines
18
to
20
| <activity | ||
| android:name=".presentation.waiting.WaitingDetailActivity" | ||
| android:exported="false" /> |
There was a problem hiding this comment.
Suggested change
| <activity | |
| android:name=".presentation.waiting.WaitingDetailActivity" | |
| android:exported="false" /> | |
| <activity | |
| android:name=".presentation.waiting.WaitingDetailActivity" | |
| android:exported="false" | |
| android:screenOrientation="portrait" | |
| tools:ignore="LockedOrientationActivity" /> |
추가해주셍요
There was a problem hiding this comment.
아 이거 모든 액티비티마다 적어야 되는건가요???
There was a problem hiding this comment.
네네 ㅠㅠ 다 적용해줘야함니다 ㅠ 제가 말을 안 해줬네요 제송티비
| MutableLiveData<ResponseWaitingDetailDto.WaitingDetailData>() | ||
| val waitingDetail: LiveData<ResponseWaitingDetailDto.WaitingDetailData> = _waitingDetail | ||
|
|
||
| init { |
There was a problem hiding this comment.
요거 뒤에 px 지워주고 그냥 숫자만 써주셍요 전체적으로 다 !
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:menu="@menu/item_waiting_detail_tb" |
There was a problem hiding this comment.
이거 그 새로고침 이미지 넣기 위해 한 건가요??? menu니까 네이밍은 menu_waiting_detail_tb로 하는 게 좋을 것 같구,,,, 이미지가 왤케 작아 보일까요? 기분탓인가,,, 한 번만 확인 부탁해염
There was a problem hiding this comment.
넵 이미지는 다시 새로 해봤는데도 크기가 똑같아요!
Comment on lines
31
to
40
| <TextView | ||
| android:id="@+id/tv_waiting_detail_ing" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="17dp" | ||
| android:layout_marginTop="5dp" | ||
| android:text="@string/waiting_ing" | ||
| android:textColor="@color/gray_300" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/tb_waiting_detail" /> |
|
|
||
| <Button | ||
| android:id="@+id/btn_waiting_detail_call" | ||
| style="@style/Style.Material3.Button.Outlined.Custom" |
Comment on lines
114
to
144
| <Button | ||
| android:id="@+id/btn_waiting_detail_call" | ||
| style="@style/Style.Material3.Button.Outlined.Custom" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="20dp" | ||
| android:text="@string/call" | ||
| app:icon="@drawable/ic_call_gray_500_24px" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/tv_waiting_detail_number" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/btn_waiting_detail_location" | ||
| style="@style/Style.Material3.Button.Outlined.Custom" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="20dp" | ||
| android:text="@string/location" | ||
| app:icon="@drawable/ic_location_gray_500_24px" | ||
| app:layout_constraintStart_toEndOf="@id/btn_waiting_detail_call" | ||
| app:layout_constraintTop_toBottomOf="@id/tv_waiting_detail_number" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/btn_waiting_detail_store" | ||
| style="@style/Style.Material3.Button.Outlined.Custom" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="20dp" |
There was a problem hiding this comment.
요 나란히 있는 버튼 3개를 구현할 때 저라면 기기 대응을 생각해서 체인을 걸어줄 것 같아요 !
기기에 맞춰 버튼 사이 공백 값을 동적으로 유지하기 위해서요 !
제 뷰에도 요런 버튼 3개 짜리가 있는데 제가 피알 올리면 어떤 식으로 구현했는지 한 번 참고하면 좋을 것 같네염 !!
There was a problem hiding this comment.
헉 그러네요 마진 패딩처리하느라 고생했는데 체인으로 묶어주니깐 균등하게 정렬되네요!
일단은 수정해뒀고 피알올리시면 참고하겠습니다!
Comment on lines
+155
to
+157
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="22dp" | ||
| android:layout_marginEnd="16dp" |
There was a problem hiding this comment.
Suggested change
| android:layout_marginStart="16dp" | |
| android:layout_marginTop="22dp" | |
| android:layout_marginEnd="16dp" | |
| android:layout_marginHorizontal="16dp" | |
| android:layout_marginTop="22dp" |
There was a problem hiding this comment.
오홍 저 속성 하나로 코드 한줄이 줄어드는군요
동일한 경우에는 사용하면 좋네요!
| android:layout_width="0dp" | ||
| android:layout_height="1dp" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginTop="22dp" |
There was a problem hiding this comment.
허걱 그러네요..
제가 조금 꼼꼼하지가 못하네요 ㅋㅎㅋㅎㅋㅎㅋㅋ
Comment on lines
+38
to
+55
| <style name="Style.Material3.Button.Outlined" parent="Widget.Material3.Button.OutlinedButton"> | ||
| <item name="cornerRadius">0dp</item> | ||
| <item name="android:padding">0dp</item> | ||
| <item name="android:drawablePadding">0dp</item> | ||
| </style> | ||
|
|
||
| <style name="Style.Material3.Button.Outlined.Custom" parent="Style.Material3.Button.Outlined"> | ||
| <item name="cornerRadius">8dp</item> | ||
| <item name="iconTint">@null</item> | ||
| <item name="iconSize">@null</item> | ||
| <item name="backgroundColor">@color/white</item> | ||
| <item name="strokeColor">@color/gray_100</item> | ||
| <item name="android:paddingStart">16dp</item> | ||
| <item name="android:paddingEnd">29dp</item> | ||
| <item name="android:textColor">@color/gray_600</item> | ||
| <item name="android:textAppearance">@style/TextAppearance.Caption1.SemiBold</item> | ||
| </style> | ||
|
|
Merge branch 'develop' into feat-waiting-detail-view # Conflicts: # app/src/main/AndroidManifest.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.
Work Description ✏️
Screenshot 📸