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.

Sign up for GitHub

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

[FIX] 시야 등록 좌석 에러 처리 보완 #171

Merged
merged 2 commits into from
Aug 30, 2024
+10 −8
Merged

[FIX] 시야 등록 좌석 에러 처리 보완 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07bc1f1
[fix/#169] 열만 입력 예외 처리 조건문 추가
minju1459 Aug 30, 2024
9e7a255
[fix/#169] 직관 후기 등록 텍스트 문구 수정
minju1459 Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
View file
Open in desktop
Binary file not shown.
Binary file modified buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
View file
Open in desktop
Binary file not shown.
Binary file modified buildSrc/build/libs/buildSrc.jar
View file
Open in desktop
Binary file not shown.
14 changes: 8 additions & 6 deletions presentation/src/main/java/com/dpm/presentation/seatreview/dialog/main/SelectSeatDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,13 +515,15 @@ class SelectSeatDialog : BindingBottomSheetDialog<FragmentSelectSeatBottomSheetB
}
}
if (binding.clOnlyColumn.isVisible) {
viewModel.userSeatState.value = ValidSeat.NONE
if (matchingRowInfo == null && viewModel.selectedColumn.value.isNotEmpty()) {
viewModel.userSeatState.value = ValidSeat.INVALID_COLUMN
} else if (matchingRowInfo != null) {
viewModel.userSeatState.value = ValidSeat.VALID
} else {
if (range.code == viewModel.selectedBlock.value) {
viewModel.userSeatState.value = ValidSeat.NONE
if (matchingRowInfo == null && viewModel.selectedColumn.value.isNotEmpty()) {
viewModel.userSeatState.value = ValidSeat.INVALID_COLUMN
} else if (matchingRowInfo != null) {
viewModel.userSeatState.value = ValidSeat.VALID
} else {
viewModel.userSeatState.value = ValidSeat.NONE
}
}
}
if (binding.clOnlyNumber.isVisible) {
Expand Down
4 changes: 2 additions & 2 deletions presentation/src/main/res/layout/fragment_select_review_type_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="center"
android:paddingHorizontal="51dp"
android:text="전반적인 경기의 순간을 간직해요"
android:paddingHorizontal="24dp"
android:text="날씨, 경기 기록 등 나만의 순간을 간직해요"
android:textAppearance="@style/TextAppearance.Spot.Body03"
android:textColor="@color/color_foreground_caption"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
Loading