[AN/USER] feat: 티켓 예매 디자인 수정 (#567) (#570)

* feat: 티켓 예매 바텀 시트 화면 디자인 수정 * feat: 포스터 크기 수정 * refactor: 티켓을 선택하면 INVISIBLE로 변환 * refactor: 화면 겹치는 현상 제거 * refactor: 불필요한 공백 제거 --------- Co-authored-by: re4rk <[email protected]>
woowacourse-teams · Oct 17, 2023 · da935fb · da935fb
1 parent 8d01458
commit da935fb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/...ago/festago/presentation/ui/ticketreserve/bottomsheet/TicketReserveBottomSheetFragment.kt b/...ago/festago/presentation/ui/ticketreserve/bottomsheet/TicketReserveBottomSheetFragment.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.DividerItemDecoration
 import com.festago.festago.databinding.FragmentTicketReserveBottomSheetBinding
 import com.festago.festago.presentation.ui.ticketreserve.TicketReserveViewModel
 import com.festago.festago.presentation.util.getParcelableArrayListCompat
@@ -22,6 +23,7 @@ class TicketReserveBottomSheetFragment : BottomSheetDialogFragment() {
     private val ticketTypeAdapter = TicketReserveBottomSheetAdapter { ticketId ->
         binding.selectedTicketTypeId = ticketId
         binding.btnReserveTicket.isEnabled = true
+        binding.tvTicketTypePrompt.visibility = View.INVISIBLE
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -56,6 +58,7 @@ class TicketReserveBottomSheetFragment : BottomSheetDialogFragment() {
 
     private fun initView() {
         binding.rvTicketTypes.adapter = ticketTypeAdapter
+        binding.rvTicketTypes.addItemDecoration(DividerItemDecoration(requireContext(), 1))
         val onReserve: (Int) -> Unit = { id -> vm.reserveTicket(id) }
         binding.onReserve = onReserve
         binding.btnReserveTicket.isEnabled = false

diff --git a/android/festago/app/src/main/res/layout/fragment_ticket_reserve_bottom_sheet.xml b/android/festago/app/src/main/res/layout/fragment_ticket_reserve_bottom_sheet.xml
@@ -47,22 +47,42 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="44dp"
+            android:text="@{stageStartTime}"
             android:textSize="18sp"
             android:textStyle="bold"
-            android:text="@{stageStartTime}"
             app:layout_constraintEnd_toEndOf="@id/endGuideLine"
             app:layout_constraintStart_toStartOf="@id/startGuideline"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="07.03 (목) 17:00" />
 
+
+        <TextView
+            android:id="@+id/tvTicketTypePrompt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/ticket_reserve_tv_ticket_type_prompt"
+            android:textColor="@color/md_theme_light_primary"
+            app:layout_constraintStart_toStartOf="@id/startGuideline"
+            app:layout_constraintTop_toBottomOf="@id/tvDate" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:layout_marginTop="12dp"
+            android:background="@color/md_theme_light_outline"
+            app:layout_constraintTop_toBottomOf="@id/tvTicketTypePrompt" />
+
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvTicketTypes"
             android:layout_width="match_parent"
-            android:layout_height="256dp"
-            android:layout_marginTop="32dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:paddingBottom="36dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toTopOf="@id/btnReserveTicket"
-            app:layout_constraintTop_toBottomOf="@id/tvDate"
+            app:layout_constraintTop_toBottomOf="@id/tvTicketTypePrompt"
             tools:itemCount="3"
             tools:listitem="@layout/item_ticket_reserve_bottom_sheet" />
 

diff --git a/android/festago/app/src/main/res/layout/item_ticket_reserve_header.xml b/android/festago/app/src/main/res/layout/item_ticket_reserve_header.xml
@@ -33,12 +33,13 @@
             android:textSize="16sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvUniversityName"
+            android:layout_marginBottom="20dp"
             tools:text="2023.07.03 - 2023.07.09" />
 
         <ImageView
             android:id="@+id/ivPoster"
             android:layout_width="match_parent"
-            android:layout_height="188dp"
+            android:layout_height="400dp"
             android:scaleType="centerCrop"
             tools:src="@drawable/ic_launcher_background" />
     </LinearLayout>

diff --git a/android/festago/app/src/main/res/values/strings.xml b/android/festago/app/src/main/res/values/strings.xml
@@ -55,6 +55,7 @@
     <string name="ticket_reserve_tv_btn_reserve_ticket">예매 하기</string>
     <string name="ticket_reserve_tv_btn_reserve_ticket_not_open">MM월 dd일 HH:mm 오픈예정</string>
     <string name="ticket_reserve_tv_signin">로그인 후 예매</string>
+    <string name="ticket_reserve_tv_ticket_type_prompt">예매 유형을 선택해주세요</string>
 
     <!-- Strings related to festival list -->
     <string name="festival_list_tv_date_format">yyyy.MM.dd</string>