From e02ea116ff25f053f33077535f78cb4418867156 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Thu, 14 Mar 2024 17:22:37 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EA=B8=88=20=EB=9D=BC=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=8C=20=EC=A4=91=20-=20=EC=B0=B8=EC=97=AC=20=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5=20=EC=9D=B8=EC=9B=90=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sodalive/live/now/LiveNowAdapter.kt       |  13 ++++++
 app/src/main/res/drawable-xxhdpi/ic_lock.png  | Bin 824 -> 621 bytes
 .../main/res/drawable/bg_circle_b3333333.xml  |   4 ++
 .../bg_round_corner_13_3_b3333333.xml         |   8 ++++
 app/src/main/res/layout/item_live_now.xml     |  39 +++++++++++++++++-
 app/src/main/res/layout/item_live_now_all.xml |   2 +
 .../main/res/layout/item_live_reservation.xml |   2 +
 .../res/layout/item_my_live_reservation.xml   |   2 +
 8 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/bg_circle_b3333333.xml
 create mode 100644 app/src/main/res/drawable/bg_round_corner_13_3_b3333333.xml

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 3dfbd74b..788fad0a 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
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import coil.transform.CircleCropTransformation
 import coil.transform.RoundedCornersTransformation
@@ -23,6 +24,7 @@ class LiveNowAdapter(
         private val binding: ItemLiveNowBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
+        @SuppressLint("SetTextI18n")
         fun bind(item: GetRoomListResponse) {
             binding.ivCover.loadUrl(item.coverImageUrl) {
                 crossfade(true)
@@ -65,6 +67,17 @@ class LiveNowAdapter(
                 transformations(CircleCropTransformation())
             }
 
+            if (item.numberOfPeople > item.numberOfParticipate) {
+                binding.tvRemainingParticipantNumber.visibility = View.VISIBLE
+                binding.tvRemainingParticipant.text = "잔여"
+                binding.tvRemainingParticipantNumber.text =
+                    "${item.numberOfPeople - item.numberOfParticipate}"
+            } else {
+                binding.tvRemainingParticipantNumber.visibility = View.GONE
+                binding.tvRemainingParticipant.text = "Sold out"
+                binding.tvRemainingParticipantNumber.text = ""
+            }
+
             binding.root.setOnClickListener { onClick(item) }
         }
     }
diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock.png b/app/src/main/res/drawable-xxhdpi/ic_lock.png
index 39e287d984fb39bc47cfb487d3a07da41ea5d9a0..1a72e2ff567385c03fd2abb72228818a0151a921 100644
GIT binary patch
delta 581
zcmV-L0=oUU2JHkPiBL{Q4GJ0x0000DNk~Le0000e0000e2nGNE0F3^)ZIK~0e*#HF
zK~#7F?U><JgD?=s51#|DfjEI~P;>#ifo#xj&~9Lzpl+Z}&^iI?0x*Gg0?)fgcwUh}
z5|Yvn{k?auDNS<!CgJV?;K+%<6NnhoN36c?qA1$I*sv(F1=$Awlat+(B`^lc`8W1c
za9=niYSnaN3e9f|I0WQq*0w@ef1Sa)4{v?eB6bcT;q%nk)@LcKrGKpY)bQ8@LP3*1
zHC8S*7{elSF>VE+XsljpF)nSaV(%Yw5htA#U<vM@$JBJ(8JKe|+OJ^Gn`W*~Yy`?}
zamf;;X0A?b1dhVd3p_XJr0%*aacM%=mSD$3v@bXwQbAF|5L95^U^v$3e;T-zxB|md
zbcu{Q1ahoP#HB6lhl(Naahb}wX}fR06s!`xBn8i475JSp6AzXN{s96(b1#LTwavgh
z<mw4O*TPTU)<+iyWuz~`%vpWMvzca!oyI5h33MSNOO<8diBOruTRC;g#Y6Ea@J_TR
z;0d1sWf7W!CwvNg)U*d-e^hRnK)G~I@$W^ox8MnH0vQKky^j&PEq)j6DFlF4n?K~a
zHGj@&B=G`0zYSn<WS6*KZ??W*iZm1O(sMmnZ$U}6B>MojC%UFj4oNfkt2f!#t<@ty
zOHCMxA2PRN!~-#G+5bhBLC<pciA<mhynIIFYhJ7W+W5{l;V0SZ8z^2CpBR&0Gq=dX
T&wsoz00000NkvXXu0mjf6qyA2

delta 785
zcmV+s1Md9o1h@tviBL{Q4GJ0x0000DNk~Le0000y0000y2nGNE06P5Ha*-i5f6Ylm
zK~#7F?VJB`(=ZgrzvlR#bOUz*5+)!lK)V590YX^-cLAUaP?&)00yJHKrVP-)0!b&R
z`rcW(yz1QAu4PGe^|^cJAF&mEqbKX>$pI3HL6N}|N~sZTCS<ubW<z#Cw#>5Z3PXT|
zPRUNmHtK$Uk?rHLLY2?8(6;>He|ymry|^@0cut#wY-D}3)b?K=k5Rh!#4dvD6S?^}
z#14u5Y_%A>a-sWh)%C_3epvTib6JQPs^HA3^m$YF)WUbkR+i{@h!NdN8%yk{Wf^Qc
z`d-6Y_1LE$jOCK6wqiv&Mzn0{--rp_x{@3n(4ya1u02I8Sgm^u2T(bge^u^R#De91
zQ#hcamDh*?s>nq4T{uLy@<zDz1RZ&X?&M<s0`55x`%ws%l~}?(W>UdXVUCWt5Zosm
zVmh5g#V*)6N$}8la)MjWhjolR#rEm^S|2kDvNO2luJU<ASoE42BC&H-pQ`c6O7%5o
zrh<=EynJt}<9U;dRQW5;f5fQ;%BU(-rjfhV9=3r9Cm#MfNeNLwBXxUnP#^+SIk_lA
zy*N?upgFi*@V+S2>Exg*s+?S$>bmjdVz2I=Cc~19l}`{KX2QZF&a1kM+m6Grtq!z~
zwNs?!3x4Q?Ac$ZR`yS;`0^c+mhh0J<XS6Ya0xSLrkA!I9T<q_{e>3T!HFT2TKH*Rh
z<(jZz?E6XWyM@1y$=4cqzko-43!YV+`v8xmKHM`$*0J}%!)v5P83~@Szo1?78p9Et
zJA_BPhn6JpfHnsRMC!vsCkd{hdsfgb9J%d?<Jz#TiD0?NJr0$ruo3lmYfh1!qboWu
zy_R`togU3}Za9RQXYZGJ>B}a0=|+obRM1D-$k&Gcp-kC^%3`t`zr=Qtja&E7>6otK
zU0dP=ypwmsszkF3UFt6h4cCFY+PsYh7wf|zU>D|x>DgfZI*>>t5>?y)%U@h1h8H>n
P00000NkvXXu0mjfid%ue

diff --git a/app/src/main/res/drawable/bg_circle_b3333333.xml b/app/src/main/res/drawable/bg_circle_b3333333.xml
new file mode 100644
index 00000000..174e87ca
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circle_b3333333.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/color_b3333333" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_round_corner_13_3_b3333333.xml b/app/src/main/res/drawable/bg_round_corner_13_3_b3333333.xml
new file mode 100644
index 00000000..e578fb47
--- /dev/null
+++ b/app/src/main/res/drawable/bg_round_corner_13_3_b3333333.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_b3333333" />
+    <corners android:radius="13.3dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/color_b3333333" />
+</shape>
diff --git a/app/src/main/res/layout/item_live_now.xml b/app/src/main/res/layout/item_live_now.xml
index bffb0f8b..cb0e0332 100644
--- a/app/src/main/res/layout/item_live_now.xml
+++ b/app/src/main/res/layout/item_live_now.xml
@@ -48,12 +48,49 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="3.3dp"
         android:layout_marginEnd="3.3dp"
+        android:background="@drawable/bg_circle_b3333333"
         android:contentDescription="@null"
+        android:padding="2.7dp"
         android:src="@drawable/ic_lock"
-        android:visibility="visible"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="3.3dp"
+        android:layout_marginBottom="11dp"
+        android:background="@drawable/bg_round_corner_13_3_b3333333"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingHorizontal="4dp"
+        android:paddingVertical="3dp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_title"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:id="@+id/tv_remaining_participant"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/gmarket_sans_medium"
+            android:textColor="@color/color_eeeeee"
+            android:textSize="10sp"
+            tools:ignore="SmallSp"
+            tools:text="잔여" />
+
+        <TextView
+            android:id="@+id/tv_remaining_participant_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:fontFamily="@font/gmarket_sans_medium"
+            android:textColor="@color/color_3bb9f1"
+            android:textSize="10sp"
+            tools:ignore="SmallSp"
+            tools:text="3" />
+    </LinearLayout>
+
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/item_live_now_all.xml b/app/src/main/res/layout/item_live_now_all.xml
index cea5498a..6942f989 100644
--- a/app/src/main/res/layout/item_live_now_all.xml
+++ b/app/src/main/res/layout/item_live_now_all.xml
@@ -21,7 +21,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="13.3dp"
         android:layout_marginEnd="13.3dp"
+        android:background="@drawable/bg_circle_b3333333"
         android:contentDescription="@null"
+        android:padding="2.7dp"
         android:src="@drawable/ic_lock"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_live_reservation.xml b/app/src/main/res/layout/item_live_reservation.xml
index 3aa6396f..9502b356 100644
--- a/app/src/main/res/layout/item_live_reservation.xml
+++ b/app/src/main/res/layout/item_live_reservation.xml
@@ -64,7 +64,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="13.3dp"
+        android:background="@drawable/bg_circle_b3333333"
         android:contentDescription="@null"
+        android:padding="2.7dp"
         android:src="@drawable/ic_lock"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_my_live_reservation.xml b/app/src/main/res/layout/item_my_live_reservation.xml
index e17a7b35..d49556cd 100644
--- a/app/src/main/res/layout/item_my_live_reservation.xml
+++ b/app/src/main/res/layout/item_my_live_reservation.xml
@@ -83,7 +83,9 @@
             android:layout_alignParentEnd="true"
             android:layout_marginTop="13.3dp"
             android:layout_marginEnd="13.3dp"
+            android:background="@drawable/bg_circle_b3333333"
             android:contentDescription="@null"
+            android:padding="2.7dp"
             android:src="@drawable/ic_lock"
             android:visibility="gone" />
     </RelativeLayout>