From d7cc8746844a23c4c3b9296dd6545e73ffc2dcd5 Mon Sep 17 00:00:00 2001 From: klaus Date: Sat, 19 Jul 2025 02:17:47 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=A9=94=EC=9D=B8=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20-=20=EC=B5=9C=EA=B7=BC=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=ED=95=9C=20=EB=9D=BC=EC=9D=B4=EB=B8=8C,=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=EB=8B=A4=EC=8B=9C=20=EB=93=A3=EA=B8=B0,=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=98=88=EC=95=BD=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/live/LiveFragment.kt | 4 +- .../sodalive/live/now/LiveNowAdapter.kt | 6 + .../reservation/LiveReservationAdapter.kt | 12 ++ app/src/main/res/layout/item_home_content.xml | 7 +- .../res/layout/item_latest_finished_live.xml | 141 +++++++++--------- app/src/main/res/layout/item_live_now.xml | 17 ++- .../res/layout/item_my_live_reservation.xml | 13 ++ app/src/main/res/layout/live_booking_card.xml | 30 +++- 8 files changed, 148 insertions(+), 82 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index 3f0dc0e6..66ba8ae7 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -221,7 +221,7 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl .pager .layoutParams as LinearLayout.LayoutParams - val pagerWidth = screenWidth.toDouble() - 26.7f.dpToPx() + val pagerWidth = screenWidth.toDouble() val pagerHeight = (pagerWidth * 0.53).roundToInt() layoutParams.width = pagerWidth.roundToInt() layoutParams.height = pagerHeight @@ -388,7 +388,7 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl outRect.right = 8f.dpToPx().toInt() } - liveRecommendChannelAdapter.itemCount - 1 -> { + adapter.itemCount - 1 -> { outRect.left = 8f.dpToPx().toInt() outRect.right = 0 } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/LiveNowAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/LiveNowAdapter.kt index 7f2263fa..bdd734c0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/LiveNowAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/LiveNowAdapter.kt @@ -39,6 +39,12 @@ class LiveNowAdapter( binding.tvTitle.text = item.title binding.tvNickname.text = item.creatorNickname + binding.ivLock.visibility = if (item.isPrivateRoom) { + View.VISIBLE + } else { + View.GONE + } + if (item.price > 0) { binding.llCan.visibility = View.VISIBLE binding.tvCan.text = item.price.moneyFormat() diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt index eb858df2..d8c57537 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/reservation/LiveReservationAdapter.kt @@ -115,6 +115,12 @@ class LiveReservationAdapter( binding.tvCan.text = item.price.moneyFormat() } + binding.ivLock.visibility = if (item.isPrivateRoom) { + View.VISIBLE + } else { + View.GONE + } + binding.root.setOnClickListener { onClick(item) } } } @@ -158,6 +164,12 @@ class LiveReservationAdapter( binding.tvCan.text = item.price.moneyFormat() } + binding.ivLock.visibility = if (item.isPrivateRoom) { + View.VISIBLE + } else { + View.GONE + } + binding.root.setOnClickListener { onClick(item) } } } diff --git a/app/src/main/res/layout/item_home_content.xml b/app/src/main/res/layout/item_home_content.xml index 5da9a5d2..28a598f6 100644 --- a/app/src/main/res/layout/item_home_content.xml +++ b/app/src/main/res/layout/item_home_content.xml @@ -2,13 +2,13 @@ @@ -54,5 +54,4 @@ app:layout_constraintStart_toStartOf="@+id/tv_content_title" app:layout_constraintTop_toBottomOf="@+id/tv_content_title" tools:text="빛이 나는 사람" /> - diff --git a/app/src/main/res/layout/item_latest_finished_live.xml b/app/src/main/res/layout/item_latest_finished_live.xml index 8f4994f4..cc1dad3f 100644 --- a/app/src/main/res/layout/item_latest_finished_live.xml +++ b/app/src/main/res/layout/item_latest_finished_live.xml @@ -1,77 +1,84 @@ - + android:layout_width="144dp" + android:layout_height="204dp" + app:cardBackgroundColor="#263238" + app:cardCornerRadius="16dp"> - - + - - + + - + + - + - + - - + + + + + + + diff --git a/app/src/main/res/layout/item_live_now.xml b/app/src/main/res/layout/item_live_now.xml index bc45a11e..8816e918 100644 --- a/app/src/main/res/layout/item_live_now.xml +++ b/app/src/main/res/layout/item_live_now.xml @@ -10,13 +10,25 @@ + android:padding="10dp"> + + + + + android:padding="12dp"> + + @@ -79,7 +93,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/pretendard_regular" android:textColor="#78909C" - android:textSize="16sp" + android:textSize="14sp" tools:text="월" /> + android:textSize="14sp" />