diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt index 99f9b0b..bb1f515 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllAdapter.kt @@ -1,6 +1,9 @@ package kr.co.vividnext.sodalive.audio_content.all 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 @@ -8,8 +11,12 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView import coil.load import coil.transform.CircleCropTransformation -import coil.transform.RoundedCornersTransformation -import com.orhanobut.logger.Logger +import com.bumptech.glide.Glide +import com.bumptech.glide.load.resource.bitmap.CenterCrop +import com.bumptech.glide.load.resource.bitmap.RoundedCorners +import com.bumptech.glide.request.RequestOptions +import com.bumptech.glide.request.target.CustomTarget +import com.bumptech.glide.request.transition.Transition import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.main.GetAudioContentMainItem import kr.co.vividnext.sodalive.databinding.ItemAudioContentNewAllBinding @@ -23,23 +30,27 @@ class AudioContentNewAllAdapter( ) : RecyclerView.Adapter() { inner class ViewHolder( + private val context: Context, private val binding: ItemAudioContentNewAllBinding, private val onClickItem: (Long) -> Unit, private val onClickCreator: (Long) -> Unit ) : RecyclerView.ViewHolder(binding.root) { fun bind(item: GetAudioContentMainItem) { - binding.ivAudioContentCoverImage.load(item.coverImageUrl) { - crossfade(true) - placeholder(R.drawable.ic_place_holder) - transformations(RoundedCornersTransformation(2.7f.dpToPx())) + Glide + .with(context) + .load(item.coverImageUrl) + .apply( + RequestOptions().transform( + CenterCrop(), + RoundedCorners(8) + ) + ) + .into(binding.ivAudioContentCoverImage) - val layoutParams = binding.ivAudioContentCoverImage - .layoutParams as ConstraintLayout.LayoutParams - - layoutParams.width = itemWidth - layoutParams.height = itemWidth - binding.ivAudioContentCoverImage.layoutParams = layoutParams - } + val layoutParams = binding.ivAudioContentCoverImage.layoutParams as ConstraintLayout.LayoutParams + layoutParams.width = itemWidth + layoutParams.height = itemWidth + binding.ivAudioContentCoverImage.layoutParams = layoutParams binding.ivAudioContentCreator.load(item.creatorProfileImageUrl) { crossfade(true) @@ -71,6 +82,7 @@ class AudioContentNewAllAdapter( parent: ViewGroup, viewType: Int ) = ViewHolder( + parent.context, ItemAudioContentNewAllBinding.inflate( LayoutInflater.from(parent.context), parent, 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 56f31ec..94f6914 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 @@ -1,12 +1,21 @@ package kr.co.vividnext.sodalive.live.now 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.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView import coil.transform.CircleCropTransformation -import coil.transform.RoundedCornersTransformation +import com.bumptech.glide.Glide +import com.bumptech.glide.load.resource.bitmap.CenterCrop +import com.bumptech.glide.load.resource.bitmap.RoundedCorners +import com.bumptech.glide.request.RequestOptions +import com.bumptech.glide.request.target.CustomTarget +import com.bumptech.glide.request.transition.Transition import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.databinding.ItemLiveNowBinding import kr.co.vividnext.sodalive.extensions.dpToPx @@ -20,16 +29,28 @@ class LiveNowAdapter( var items = mutableListOf() inner class ViewHolder( + private val context: Context, private val binding: ItemLiveNowBinding ) : RecyclerView.ViewHolder(binding.root) { @SuppressLint("SetTextI18n") fun bind(item: GetRoomListResponse) { - binding.ivCover.loadUrl(item.coverImageUrl) { - crossfade(true) - placeholder(R.drawable.ic_place_holder) - transformations(RoundedCornersTransformation(4.7f.dpToPx())) - } + Glide + .with(context) + .load(item.coverImageUrl) + .apply( + RequestOptions().transform( + CenterCrop(), + RoundedCorners(8) + ) + ) + .into(binding.ivCover) + + val layoutParams = binding.ivCover.layoutParams as ConstraintLayout.LayoutParams + layoutParams.width = 117f.dpToPx().toInt() + layoutParams.height = 164f.dpToPx().toInt() + binding.ivCover.layoutParams = layoutParams + binding.ivLock.visibility = if (item.isPrivateRoom) { View.VISIBLE } else { @@ -71,6 +92,7 @@ class LiveNowAdapter( } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder( + parent.context, ItemLiveNowBinding.inflate( LayoutInflater.from(parent.context), parent, diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt index c812bd9..e92df81 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllAdapter.kt @@ -1,6 +1,9 @@ package kr.co.vividnext.sodalive.live.now.all 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 @@ -8,6 +11,12 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView import coil.transform.CircleCropTransformation import coil.transform.RoundedCornersTransformation +import com.bumptech.glide.Glide +import com.bumptech.glide.load.resource.bitmap.CenterCrop +import com.bumptech.glide.load.resource.bitmap.RoundedCorners +import com.bumptech.glide.request.RequestOptions +import com.bumptech.glide.request.target.CustomTarget +import com.bumptech.glide.request.transition.Transition import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.databinding.ItemLiveNowAllBinding import kr.co.vividnext.sodalive.extensions.dpToPx @@ -22,20 +31,26 @@ class LiveNowAllAdapter( var items = mutableListOf() inner class ViewHolder( + private val context: Context, private val binding: ItemLiveNowAllBinding ) : RecyclerView.ViewHolder(binding.root) { @SuppressLint("SetTextI18n") fun bind(item: GetRoomListResponse) { - binding.ivCover.loadUrl(item.coverImageUrl) { - crossfade(true) - placeholder(R.drawable.ic_place_holder) - transformations(RoundedCornersTransformation(4.7f.dpToPx())) + Glide + .with(context) + .load(item.coverImageUrl) + .apply( + RequestOptions().transform( + CenterCrop(), + RoundedCorners(14) + ) + ) + .into(binding.ivCover) - val lp = binding.ivCover.layoutParams as ConstraintLayout.LayoutParams - lp.width = itemWidth - lp.height = itemWidth * 144 / 102 - binding.ivCover.layoutParams = lp - } + val layoutParams = binding.ivCover + .layoutParams as ConstraintLayout.LayoutParams + layoutParams.width = itemWidth + layoutParams.height = itemWidth * 144 / 102 binding.ivLock.visibility = if (item.isPrivateRoom) { View.VISIBLE @@ -94,6 +109,7 @@ class LiveNowAllAdapter( } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder( + parent.context, ItemLiveNowAllBinding.inflate( LayoutInflater.from(parent.context), parent, diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock.png b/app/src/main/res/drawable-xxhdpi/ic_lock.png index 1a72e2f..00824c3 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock.png and b/app/src/main/res/drawable-xxhdpi/ic_lock.png differ diff --git a/app/src/main/res/layout/item_live_now.xml b/app/src/main/res/layout/item_live_now.xml index 6bf1554..32bd607 100644 --- a/app/src/main/res/layout/item_live_now.xml +++ b/app/src/main/res/layout/item_live_now.xml @@ -7,8 +7,8 @@ @@ -88,7 +88,7 @@ android:layout_marginStart="2dp" android:fontFamily="@font/gmarket_sans_medium" android:textColor="@color/color_3bb9f1" - android:textSize="10sp" + android:textSize="12sp" tools:ignore="SmallSp" tools:text="3" />