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 2b64be6..0d8f135 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,7 +90,7 @@ class AudioContentNewAllActivity : BaseActivity { - outRect.top = 13.3f.dpToPx().toInt() - outRect.bottom = 6.7f.dpToPx().toInt() - } - - newContentAdapter.itemCount - 1, newContentAdapter.itemCount - 2 -> { - outRect.top = 6.7f.dpToPx().toInt() - outRect.bottom = 13.3f.dpToPx().toInt() - } - - else -> { - outRect.top = 6.7f.dpToPx().toInt() - outRect.bottom = 6.7f.dpToPx().toInt() - } - } + outRect.top = 6.7f.dpToPx().toInt() + outRect.bottom = 6.7f.dpToPx().toInt() + outRect.left = 6.7f.dpToPx().toInt() + outRect.right = 6.7f.dpToPx().toInt() } }) 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 3b496b9..001ca63 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 @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.audio_content.all import android.annotation.SuppressLint import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView @@ -26,6 +27,7 @@ class AudioContentNewAllAdapter( private val onClickCreator: (Long) -> 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) @@ -48,6 +50,16 @@ class AudioContentNewAllAdapter( binding.tvAudioContentTitle.text = item.title binding.tvAudioContentCreatorNickname.text = item.creatorNickname + if (item.price > 0) { + binding.ivCan.visibility = View.VISIBLE + binding.tvCan.text = "${item.price}" + } else { + binding.ivCan.visibility = View.GONE + binding.tvCan.text = "무료" + } + + binding.tvTime.text = item.duration + binding.ivAudioContentCreator.setOnClickListener { onClickCreator(item.creatorId) } binding.root.setOnClickListener { onClickItem(item.contentId) } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/GetAudioContentMainResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/GetAudioContentMainResponse.kt index ec746d3..b4c5aa3 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/GetAudioContentMainResponse.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/main/GetAudioContentMainResponse.kt @@ -15,7 +15,9 @@ data class GetAudioContentMainItem( @SerializedName("title") val title: String, @SerializedName("creatorId") val creatorId: Long, @SerializedName("creatorProfileImageUrl") val creatorProfileImageUrl: String, - @SerializedName("creatorNickname") val creatorNickname: String + @SerializedName("creatorNickname") val creatorNickname: String, + @SerializedName("price") val price: Int, + @SerializedName("duration") val duration: String ) data class GetAudioContentRanking( diff --git a/app/src/main/res/drawable-xxhdpi/ic_card_can_gray.png b/app/src/main/res/drawable-xxhdpi/ic_card_can_gray.png new file mode 100644 index 0000000..2cd8889 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_card_can_gray.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_card_time_small_gray.png b/app/src/main/res/drawable-xxhdpi/ic_card_time_small_gray.png new file mode 100644 index 0000000..e5f4a44 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_card_time_small_gray.png differ diff --git a/app/src/main/res/drawable/bg_round_corner_10_b3333333.xml b/app/src/main/res/drawable/bg_round_corner_10_b3333333.xml new file mode 100644 index 0000000..0fa2258 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_10_b3333333.xml @@ -0,0 +1,8 @@ + + + + + + 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 d06591f..4c5af8b 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 @@ -13,6 +13,68 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + + + #CCC25264 #B3909090 + #B3333333 #88909090 #339970FF #7FE2E2E2