diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt index 79adf0f..6df932a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt @@ -90,8 +90,10 @@ class AudioContentNewAllActivity : BaseActivity Unit ) : RecyclerView.ViewHolder(binding.root) { fun bind(item: GetAudioContentMainItem) { - Logger.e("item: $item") binding.ivAudioContentCoverImage.load(item.coverImageUrl) { crossfade(true) placeholder(R.drawable.ic_place_holder) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt index 76605e3..2a26a0c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt @@ -56,8 +56,10 @@ class AudioContentAllByThemeActivity : BaseActivity item.numberOfParticipate) { - binding.tvRemainingParticipantNumber.visibility = View.VISIBLE - binding.tvRemainingParticipant.text = "잔여" - binding.tvRemainingParticipantNumber.text = - "${item.numberOfPeople - item.numberOfParticipate}" + if (item.numberOfPeople - item.numberOfParticipate <= 2) { + binding.llRemainingParticipant.visibility = View.VISIBLE + 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 = "" + } } else { - binding.tvRemainingParticipantNumber.visibility = View.GONE - binding.tvRemainingParticipant.text = "Sold out" - binding.tvRemainingParticipantNumber.text = "" + binding.llRemainingParticipant.visibility = View.GONE } binding.root.setOnClickListener { onClick(item) } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt index c1b80e8..7852ae8 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/now/all/LiveNowAllActivity.kt @@ -46,8 +46,10 @@ class LiveNowAllActivity : BaseActivity( binding.toolbar.tvBack.setOnClickListener { finish() } loadingDialog = LoadingDialog(this, layoutInflater) + val spanCount = 3 + val spacing = 40 val recyclerView = binding.rvLive - adapter = LiveNowAllAdapter { + adapter = LiveNowAllAdapter(itemWidth = (screenWidth - (spacing * spanCount)) / 3) { val detailFragment = LiveRoomDetailFragment( it.roomId, onClickParticipant = { enterLiveRoom(it.roomId) }, @@ -63,8 +65,8 @@ class LiveNowAllActivity : BaseActivity( ) } - recyclerView.layoutManager = GridLayoutManager(this, 3) - recyclerView.addItemDecoration(GridSpacingItemDecoration(3, 13, true)) + recyclerView.layoutManager = GridLayoutManager(this, spanCount) + recyclerView.addItemDecoration(GridSpacingItemDecoration(spanCount, spacing, true)) recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { 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 1d9fa64..327afd8 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,23 +1,21 @@ package kr.co.vividnext.sodalive.live.now.all import android.annotation.SuppressLint -import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.content.ContextCompat +import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView -import coil.load import coil.transform.CircleCropTransformation import coil.transform.RoundedCornersTransformation import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.databinding.ItemLiveNowAllBinding import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.extensions.loadUrl -import kr.co.vividnext.sodalive.extensions.moneyFormat import kr.co.vividnext.sodalive.live.GetRoomListResponse class LiveNowAllAdapter( + private val itemWidth: Int, private val onClick: (GetRoomListResponse) -> Unit ) : RecyclerView.Adapter() { @@ -33,6 +31,12 @@ class LiveNowAllAdapter( placeholder(R.drawable.ic_place_holder) transformations(RoundedCornersTransformation(4.7f.dpToPx())) } + + val lp = binding.ivCover.layoutParams as ConstraintLayout.LayoutParams + lp.width = itemWidth + lp.height = itemWidth * 144 / 102 + binding.ivCover.layoutParams = lp + binding.ivLock.visibility = if (item.isPrivateRoom) { View.VISIBLE } else { diff --git a/app/src/main/res/layout/item_audio_content_new_all.xml b/app/src/main/res/layout/item_audio_content_new_all.xml index a531f06..ee623d0 100644 --- a/app/src/main/res/layout/item_audio_content_new_all.xml +++ b/app/src/main/res/layout/item_audio_content_new_all.xml @@ -7,8 +7,8 @@ diff --git a/app/src/main/res/layout/item_live_now.xml b/app/src/main/res/layout/item_live_now.xml index cb0e033..f1e7d51 100644 --- a/app/src/main/res/layout/item_live_now.xml +++ b/app/src/main/res/layout/item_live_now.xml @@ -57,6 +57,7 @@ app:layout_constraintTop_toTopOf="parent" />