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 c97a2b2..db062ee 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_mic_colored.png and b/app/src/main/res/drawable-xxhdpi/ic_mic_colored.png differ 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