From 012d1d94d532b108a1cd6915738d014b4ecab775 Mon Sep 17 00:00:00 2001 From: klaus Date: Thu, 14 Mar 2024 16:50:57 +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=EB=9D=BC=EC=9D=B4=EB=B8=8C=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=9C=A0/=EB=AC=B4=EB=A3=8C=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?-=20=EB=AC=B4=EB=A3=8C=20=EB=B0=B0=EA=B2=BD=EC=83=89=20:=20#111?= =?UTF-8?q?111=20-=20=EC=9C=A0=EB=A3=8C=20=EB=B0=B0=EA=B2=BD=EC=83=89=20:?= =?UTF-8?q?=20#DD4500=20-=20=EC=9C=A0=EB=A3=8C=20=ED=91=9C=EC=8B=9C=20-=20?= =?UTF-8?q?white=20=EC=BA=94=EA=B3=BC=20=ED=95=A8=EA=BB=98=20100=20?= =?UTF-8?q?=EA=B3=BC=20=EA=B0=99=EC=9D=B4=20=EA=B0=80=EA=B2=A9=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vividnext/sodalive/live/now/LiveNowAdapter.kt | 13 ++++++++++--- app/src/main/res/drawable-xxhdpi/ic_can_white.png | Bin 0 -> 563 bytes ...881609.xml => bg_round_corner_13_3_111111.xml} | 6 +++--- .../res/drawable/bg_round_corner_13_3_dd4500.xml | 8 ++++++++ app/src/main/res/layout/item_live_now.xml | 10 ++++++---- 5 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_can_white.png rename app/src/main/res/drawable/{bg_round_corner_10_881609.xml => bg_round_corner_13_3_111111.xml} (53%) create mode 100644 app/src/main/res/drawable/bg_round_corner_13_3_dd4500.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 b65b463..3dfbd74 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 @@ -36,11 +36,18 @@ class LiveNowAdapter( } if (item.price > 0) { - binding.tvPrice.text = "유료" - binding.tvPrice.setBackgroundResource(R.drawable.bg_round_corner_10_881609) + binding.tvPrice.text = "${item.price}" + binding.tvPrice.setCompoundDrawablesWithIntrinsicBounds( + R.drawable.ic_can_white, + 0, + 0, + 0 + ) + binding.tvPrice.setBackgroundResource(R.drawable.bg_round_corner_13_3_dd4500) } else { binding.tvPrice.text = "무료" - binding.tvPrice.setBackgroundResource(R.drawable.bg_round_corner_10_3bb9f1) + binding.tvPrice.setCompoundDrawables(null, null, null, null) + binding.tvPrice.setBackgroundResource(R.drawable.bg_round_corner_13_3_111111) } if (item.tags.isNotEmpty()) { diff --git a/app/src/main/res/drawable-xxhdpi/ic_can_white.png b/app/src/main/res/drawable-xxhdpi/ic_can_white.png new file mode 100644 index 0000000000000000000000000000000000000000..f3157c47455a2dbfca2aaa5f3953ae09bfec0a80 GIT binary patch literal 563 zcmV-30?hr1P)@A9-9AiPj4Ov>0d}2%};DZfJc9Q2yjD@rMrSse?AZl|) zgF#p_%85CY0t);AB;Z%PNz2>=8E@a7>U5izRg$W+PwE$V&JATTliXV6QAb_d*`rfpKK40BB<)$V|sU`BGH9-McH z6EzjPfdZ8PT1kSkpEEBMaAh-H1aWX9?|J1PP@p{mW`nX1u2 zWLeMD4b6Ro60cS)<;V5@glb-7^4Z)cIOB5!RzyaFy4Cj4wF851LmFRA0umV)2*;x4 zyPdJ`gl*UI6T%(=!<})a74Yx>3%K45!jj?~`3A|s4B%Vc2W|iW002ovPDHLkV1n32 B@Q45a literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_round_corner_10_881609.xml b/app/src/main/res/drawable/bg_round_corner_13_3_111111.xml similarity index 53% rename from app/src/main/res/drawable/bg_round_corner_10_881609.xml rename to app/src/main/res/drawable/bg_round_corner_13_3_111111.xml index cae42d1..483f82a 100644 --- a/app/src/main/res/drawable/bg_round_corner_10_881609.xml +++ b/app/src/main/res/drawable/bg_round_corner_13_3_111111.xml @@ -1,8 +1,8 @@ - - + + + android:color="@color/color_111111" /> diff --git a/app/src/main/res/drawable/bg_round_corner_13_3_dd4500.xml b/app/src/main/res/drawable/bg_round_corner_13_3_dd4500.xml new file mode 100644 index 0000000..f167e6a --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_13_3_dd4500.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/item_live_now.xml b/app/src/main/res/layout/item_live_now.xml index d78d9e0..bffb0f8 100644 --- a/app/src/main/res/layout/item_live_now.xml +++ b/app/src/main/res/layout/item_live_now.xml @@ -30,14 +30,16 @@ android:layout_height="wrap_content" android:layout_marginStart="3.3dp" android:layout_marginTop="3.3dp" + android:drawablePadding="1dp" android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="7.3dp" android:paddingVertical="4dp" android:textColor="@color/white" - android:textSize="12sp" + android:textSize="10sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:background="@drawable/bg_round_corner_10_881609" + tools:background="@drawable/bg_round_corner_13_3_111111" + tools:ignore="SmallSp" tools:text="유료" /> @@ -106,8 +108,8 @@ android:id="@+id/tv_nickname" android:layout_width="match_parent" android:layout_height="wrap_content" - android:fontFamily="@font/gmarket_sans_medium" android:layout_marginStart="5.3dp" + android:fontFamily="@font/gmarket_sans_medium" android:gravity="center_vertical" android:textColor="@color/color_777777" android:textSize="10sp"