From fcd341a1f4f0a11b7b0dff0bb4763c9360be38eb Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 18 Jul 2025 22:51:21 +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=98=88=EC=95=BD=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20-=20=EC=9C=A0=EB=A3=8C=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=EA=B8=88=EC=95=A1=20=EB=82=98=EC=98=A4=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8D=98=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?-=20=ED=8C=94=EB=A1=9C=EC=9E=89=20=EC=B1=84=EB=84=90=20-=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=BB=A4=EB=AE=A4=EB=8B=88=ED=8B=B0?= =?UTF-8?q?=EC=99=80=20=EC=A7=80=EA=B8=88=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=20?= =?UTF-8?q?=EC=A4=91=20=EC=82=AC=EC=9D=B4=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../live/reservation/LiveReservationAdapter.kt | 6 +++--- app/src/main/res/layout/fragment_live.xml | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 50d29d9e..9b165031 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 177 - versionName "1.39.1" + versionCode 178 + versionName "1.40.0" } buildTypes { 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 7eb7b827..eb858df2 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 @@ -100,17 +100,17 @@ class LiveReservationAdapter( binding.tvDay.text = dateMap["day"] if (item.isReservation) { - binding.tvCan.visibility = View.GONE + binding.llCan.visibility = View.GONE binding.tvFree.visibility = View.GONE binding.tvCompleteReservation.visibility = View.VISIBLE } else if (item.price <= 0) { - binding.tvCan.visibility = View.GONE + binding.llCan.visibility = View.GONE binding.tvCompleteReservation.visibility = View.GONE binding.tvFree.visibility = View.VISIBLE } else { binding.tvFree.visibility = View.GONE binding.tvCompleteReservation.visibility = View.GONE - binding.tvCan.visibility = View.VISIBLE + binding.llCan.visibility = View.VISIBLE binding.tvCan.text = item.price.moneyFormat() } diff --git a/app/src/main/res/layout/fragment_live.xml b/app/src/main/res/layout/fragment_live.xml index 56c7e765..c9ddb1f0 100644 --- a/app/src/main/res/layout/fragment_live.xml +++ b/app/src/main/res/layout/fragment_live.xml @@ -75,6 +75,13 @@ android:layout_height="wrap_content" android:layout_marginBottom="48dp" /> + + - -