From a88f8c3316f676a8db408a232d552cd47731c73e Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 13 Feb 2024 14:08:41 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=90=EB=A0=88=EC=9D=B4=EC=85=98=20-=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=202=EA=B0=9C=EC=97=90=EC=84=9C=203?= =?UTF-8?q?=EA=B0=9C=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../all/AudioContentNewAllActivity.kt | 33 ++-------- .../all/AudioContentNewAllAdapter.kt | 12 ++++ .../main/GetAudioContentMainResponse.kt | 4 +- .../res/drawable-xxhdpi/ic_card_can_gray.png | Bin 0 -> 552 bytes .../ic_card_time_small_gray.png | Bin 0 -> 543 bytes .../drawable/bg_round_corner_10_b3333333.xml | 8 +++ .../res/layout/item_audio_content_new_all.xml | 62 ++++++++++++++++++ app/src/main/res/values/colors.xml | 1 + 8 files changed, 92 insertions(+), 28 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_card_can_gray.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_card_time_small_gray.png create mode 100644 app/src/main/res/drawable/bg_round_corner_10_b3333333.xml 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 0000000000000000000000000000000000000000..2cd88891d20d5ba207bf4700e56bb41cdb381a6b GIT binary patch literal 552 zcmV+@0@wYCP)^1cn8G3CISp0cC@3KUkE z*bvE2n#bTh-$PK7Yae_752Y=z(kWf#*mi}(JTHw6z%lzYD??`K0l(dq?OR-0bk(rf zfx4N2!yv~V7)t{zg1=F9S_vkFcfE>M4Z1I6rcSJhvxb@&>T&qww?(mfFjn(I44roj z5f?20BR18&6AEhr>0Rj9H^SJY$)4#P!q8aqLY|R5S-%a&7!z4+Si-frVF?$WoUrRClI3BCatu6JsF#5TnM0000XqccdL6c4px&W?pk*`X?L&;g%P3wis@a1g4UOUM6N_sIPW@B;k3{{@*?yO zMciDxjz~I6cI41M>Vjj_0kOI7NW}C-SBClAHT|EU`4zXp(_jx*6z1DtLpkYihzT}h z-#gq!AKWGc^E>_rZlj7@OR%WZc`Mk%1nww;`9;yY5?M93nR4^{m|ueV`)CF_y+SiJ z7OhYKecp=p!jks_wV=_Eb5z8|t&OMI)FEIXCOz`YV?|qC2Uzx0HJ6>Ty6F($nSo@% zX~vFE;e5OV=$hNx>-kgwonPMqII2R|zC4%b0&NFKFW3;Y56pvIh>F&r7#RV-#6uoB zWw1FBpSkvzRt`hNE0d}`h$LJ0{~5P+$DeZ4pTHRLs8e1%2VqhKeA7S-DCL?B@2?{Z h&6&Ex3$oJY_ydHuF8&X-8S?-D002ovPDHLkV1jQz>(T%K literal 0 HcmV?d00001 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