Merge pull request #171 from depromeet/fix/#169-minju-final-qa

[FIX] 시야 등록 좌석 에러 처리 보완
depromeet · Aug 30, 2024 · 70c48d1 · 70c48d1
2 parents 5d4fd36 + 9e7a255
commit 70c48d1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin b/buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
diff --git a/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin b/buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar
diff --git a/presentation/src/main/java/com/dpm/presentation/seatreview/dialog/main/SelectSeatDialog.kt b/presentation/src/main/java/com/dpm/presentation/seatreview/dialog/main/SelectSeatDialog.kt
@@ -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) {

diff --git a/presentation/src/main/res/layout/fragment_select_review_type_dialog.xml b/presentation/src/main/res/layout/fragment_select_review_type_dialog.xml
@@ -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"