From 3bf4f273d2de4aea42335991f3e836bb8cd2353d Mon Sep 17 00:00:00 2001 From: klaus Date: Fri, 6 Oct 2023 17:31:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=A7=80?= =?UTF-8?q?=EA=B8=88=20=EC=98=88=EC=95=BD=EC=A4=91=20-=20=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=B8=8C=20=EC=BB=A4=EB=B2=84=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=EA=B0=80=20=EC=9E=91?= =?UTF-8?q?=EA=B2=8C=20=EB=B3=B4=EC=9D=B4=EB=8D=98=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/LiveReservationAdapter.kt | 64 ++++++++++++++---- .../res/drawable-xxhdpi/ic_mic_colored.png | Bin 1111 -> 1179 bytes .../drawable/bg_round_corner_10_2e6279.xml | 8 +++ .../bg_round_corner_8_transparent_3bb9f1.xml | 8 +++ .../main/res/layout/item_live_reservation.xml | 2 +- .../res/layout/item_my_live_reservation.xml | 4 +- .../res/layout/layout_live_reservation.xml | 2 +- app/src/main/res/values/colors.xml | 2 + 8 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable/bg_round_corner_10_2e6279.xml create mode 100644 app/src/main/res/drawable/bg_round_corner_8_transparent_3bb9f1.xml 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 e139a5c..42acbe3 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 @@ -1,13 +1,16 @@ package kr.co.vividnext.sodalive.live.reservation import android.annotation.SuppressLint +import android.content.Context +import android.graphics.Bitmap +import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import coil.load -import coil.transform.RoundedCornersTransformation -import kr.co.vividnext.sodalive.R +import com.bumptech.glide.Glide +import com.bumptech.glide.request.target.CustomTarget +import com.bumptech.glide.request.transition.Transition import kr.co.vividnext.sodalive.common.SharedPreferenceManager import kr.co.vividnext.sodalive.databinding.ItemLiveReservationBinding import kr.co.vividnext.sodalive.databinding.ItemMyLiveReservationBinding @@ -24,6 +27,7 @@ class LiveReservationAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { return if (viewType == 1) { MyLiveViewHolder( + parent.context, ItemMyLiveReservationBinding.inflate( LayoutInflater.from(parent.context), parent, @@ -32,6 +36,7 @@ class LiveReservationAdapter( ) } else { ViewHolder( + parent.context, ItemLiveReservationBinding.inflate( LayoutInflater.from(parent.context), parent, @@ -70,15 +75,31 @@ class LiveReservationAdapter( } inner class ViewHolder( + private val context: Context, private val binding: ItemLiveReservationBinding ) : RecyclerView.ViewHolder(binding.root) { fun bind(item: GetRoomListResponse) { - binding.ivCover.load(item.coverImageUrl) { - crossfade(true) - placeholder(R.drawable.ic_place_holder) - transformations(RoundedCornersTransformation(4.7f.dpToPx())) - } + val lp = binding.ivCover.layoutParams + lp.width = 80f.dpToPx().toInt() + lp.height = 116.7f.dpToPx().toInt() + + Glide + .with(context) + .asBitmap() + .load(item.coverImageUrl) + .into(object : CustomTarget() { + override fun onResourceReady( + resource: Bitmap, + transition: Transition? + ) { + binding.ivCover.setImageBitmap(resource) + binding.ivCover.layoutParams = lp + } + + override fun onLoadCleared(placeholder: Drawable?) { + } + }) binding.tvDate.text = item.beginDateTime binding.tvNickname.text = item.creatorNickname binding.tvTitle.text = item.title @@ -106,6 +127,7 @@ class LiveReservationAdapter( } inner class MyLiveViewHolder( + private val context: Context, private val binding: ItemMyLiveReservationBinding ) : RecyclerView.ViewHolder(binding.root) { fun bind(item: GetRoomListResponse, position: Int) { @@ -114,11 +136,27 @@ class LiveReservationAdapter( } else { View.GONE } - binding.ivCover.load(item.coverImageUrl) { - crossfade(true) - placeholder(R.drawable.ic_place_holder) - transformations(RoundedCornersTransformation(4f.dpToPx())) - } + + val lp = binding.ivCover.layoutParams + lp.width = 80f.dpToPx().toInt() + lp.height = 116.7f.dpToPx().toInt() + + Glide + .with(context) + .asBitmap() + .load(item.coverImageUrl) + .into(object : CustomTarget() { + override fun onResourceReady( + resource: Bitmap, + transition: Transition? + ) { + binding.ivCover.setImageBitmap(resource) + binding.ivCover.layoutParams = lp + } + + override fun onLoadCleared(placeholder: Drawable?) { + } + }) binding.tvDate.text = item.beginDateTime binding.tvNickname.text = item.creatorNickname binding.tvTitle.text = item.title diff --git a/app/src/main/res/drawable-xxhdpi/ic_mic_colored.png b/app/src/main/res/drawable-xxhdpi/ic_mic_colored.png index c97a2b23268feb5190de43631d46d9e585bb0aeb..db062ee8a967dc8b8903d6a6336e0190fbcf7b76 100644 GIT binary patch delta 1109 zcmV-b1giVj2%8CzReuC9NklBeaN~ zH^b^Cx^%DctG}vFU0#HkWG?tlN9d$h>Mg%a0pig>t;?I!{)X)Z3Nl8kp$aLr)`M7K zRIVNSv^Q&eL8gMoR`zBQwDrpxK(_L%t?0~Ln#XJrm70g-AeK|=Hm)-f%#paDlv?l6 zjiYE@_@%FHJb&_cOdT?DX-}z&1F?dCFbq$lI;3u4u`Ua4fIA|soVtaN3JRBu>|cT+ zn4h0A%6kZIL3Z1_rpD9-BTxYxgQ%{X+EN!xs7tJR2i#IHHKZ%Lzn(32^M4keSc zl!EBN%EN+F(Foh7rc?xvt?X99&L4@sm$+yRbyJgb!GE0z0?dxD{xsFiwS+|zdAMw9 zbXsYhn;;-ARPSFdo$I$6%!zLzs5PDfj6i=hs#904nHrs0SV~Cr)ZD3)M8z;mvun#C z5li!Q^Idei116T5BL~B(W}G0nvvj0&1t%764Xc-tvmqCjMrgJ*U)P1i1xt|P!%WwX z$%-a*sDH~gtC@+qG`r*tBvp%b5#l_%cRA!hzn7P zE&cZFX)8+;%=6s$maSMJ5eu^$OLP>=-ZP3aH9A|m<VJjmlz%E3kAG-Bg|q4E$}`08%cI4%vMlcMJ_%(+$$qZn!}vsn2^L=n-Kqc{J) z0Y~&6v=Dq=Y7L2?R5yt|`AE?#mK>+r-@y?>&;t^rTA=5`UR)D}E`$eSk3W)`*n35B ziGM9Ph?)cyFccRU;;zSHTbGP`NHSh)Tq!;2Hz;)@R?rH9l*cK8)Hm}Taf1*i_2HpJ z)L?gTXul&C!qS#3bCG_v`M`e$DG+xIk8*MGKC(w=Z?__S$5(dcgH9U7a{WtMm(mj3 zd88$g#YJy4q}X@u!e_Cv@X_vk1(FfVS$~O^q$EsRtkBiM(Zxkm&W(S!*pb8L8%K|7Y04N(EVFf8GXdV%lnE!MfDGavb$=EXi%_l_zo}2&q?Q?u7 zQAtTj$v=dk1>>kK`B1}egOAsUZgRmdqOTRA!5F{2NL4Prmie9hR#<#nRfW+X{QlgjQDD$d zZ<)^JF8C)=6NeFnrDi&jyWmHW7(jHL!i&~YNLtE4^up!g(4sF)Cvp*t+}qKWE76?-tB?m9s(ll=FdloIng5H@<1|4Z7Cw~Zd*~!C5G?Ujoi|53*tMN2( ziLx==iNvbuWH5)-5VAX623ZZA(`ed!@ZvP4imz?wgE-u4OCH|!$&e2NI&F2A3F0tj zED>3fe;}tX$MJnuybD%AYJ1joo<(!hXt}IrdTr8Zl55qtDLaD-^w7LpnrHFBrFjqW zakejY+;`noth&b!sB|BdUrUyw>>MvS9LJSz zn3}tY)7O2tEvL(;oPLkvGJYeJoZ|O3&GPJoDtSPyKK>;ZWv8fAW2)%0G zw1^G(BYLybM~`J6gNb$if0kVbCX>UH-2&a}BY(u6>}gUD1JRdc=$9s^eKB_*?!{tP zDjK(JV%0}7Mqe2_{E7mRC1@>I^bvGm5lepeZ}X2`|D=tCY;2{VUTF=vgaAgqFWar)uG z1qZ3jOD~~QjtjHWl4)>}3YBuUifF<~jDLcU?1Kweu2RlUj!}3PwxHE;S-G&lDW|o& zKw=rA!x^_V3rRUH*c|>u=_xejxL}RayhT!R|FfdPQ;rKRdDuntLZloQoQ9S*(TkLF zTyP#sYeeTd%kf3p=^=}LihqvKg!kd<3H|Tzz7ds_l$4Z|1mQOg7>vFw&mpS-015yA LNkvXXu0mjf;v@eo diff --git a/app/src/main/res/drawable/bg_round_corner_10_2e6279.xml b/app/src/main/res/drawable/bg_round_corner_10_2e6279.xml new file mode 100644 index 0000000..fb488fd --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_10_2e6279.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_8_transparent_3bb9f1.xml b/app/src/main/res/drawable/bg_round_corner_8_transparent_3bb9f1.xml new file mode 100644 index 0000000..195e8d7 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_8_transparent_3bb9f1.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/item_live_reservation.xml b/app/src/main/res/layout/item_live_reservation.xml index c762f87..3aa6396 100644 --- a/app/src/main/res/layout/item_live_reservation.xml +++ b/app/src/main/res/layout/item_live_reservation.xml @@ -93,7 +93,7 @@ android:id="@+id/tv_complete_reservation" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_10_533d89" + android:background="@drawable/bg_round_corner_10_2e6279" android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="7.5dp" android:paddingVertical="4.3dp" 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 4ff43e4..e17a7b3 100644 --- a/app/src/main/res/layout/item_my_live_reservation.xml +++ b/app/src/main/res/layout/item_my_live_reservation.xml @@ -15,14 +15,14 @@ android:drawablePadding="8dp" android:fontFamily="@font/gmarket_sans_bold" android:text="내가 개설한 라이브" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_80d8ff" android:textSize="16sp" app:drawableStartCompat="@drawable/ic_mic_colored" /> diff --git a/app/src/main/res/layout/layout_live_reservation.xml b/app/src/main/res/layout/layout_live_reservation.xml index 3621bee..7ce68de 100644 --- a/app/src/main/res/layout/layout_live_reservation.xml +++ b/app/src/main/res/layout/layout_live_reservation.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:text="예약중" - android:textColor="@color/color_9970ff" + android:textColor="@color/color_3bb9f1" android:textSize="18.3sp" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 83b7f36..fe7b819 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -98,4 +98,6 @@ #FFE368 #CCF0FF #13181B + #3BB9F1 + #2E6279