From d67bb8be503513162c221f711f130d7096743d5f Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 10 Jan 2024 01:57:04 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=97=90=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EC=B1=84=EB=84=90,=20=EC=BD=98=ED=85=90=EC=B8=A0=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20-=20=EC=98=A4=ED=94=88=EC=98=88=EC=A0=95?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audio_content/AudioContentAdapter.kt | 7 + .../detail/AudioContentDetailActivity.kt | 67 ++++++-- .../detail/GetAudioContentDetailResponse.kt | 1 + .../profile/GetCreatorProfileResponse.kt | 3 +- .../drawable/bg_round_corner_2_6_003851.xml | 8 + .../drawable/bg_round_corner_5_3_3bb9f1.xml | 8 + .../layout/activity_audio_content_detail.xml | 148 +++++++++++------- .../main/res/layout/item_audio_content.xml | 14 ++ app/src/main/res/values/colors.xml | 1 + 9 files changed, 184 insertions(+), 73 deletions(-) create mode 100644 app/src/main/res/drawable/bg_round_corner_2_6_003851.xml create mode 100644 app/src/main/res/drawable/bg_round_corner_5_3_3bb9f1.xml diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt index db208eb..22e4c57 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentAdapter.kt @@ -1,6 +1,7 @@ package kr.co.vividnext.sodalive.audio_content import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import coil.load @@ -33,6 +34,12 @@ class AudioContentAdapter( binding.tvLikeCount.text = item.likeCount.moneyFormat() binding.tvCommentCount.text = item.commentCount.moneyFormat() + binding.tvScheduledToOpen.visibility = if (item.isScheduledToOpen) { + View.VISIBLE + } else { + View.GONE + } + if (item.price < 1) { binding.tvPrice.text = "무료" binding.tvPrice.setCompoundDrawables(null, null, null, null) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt index eb8e781..68265bf 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt @@ -14,6 +14,7 @@ import android.widget.RelativeLayout import android.widget.SeekBar import android.widget.Toast import androidx.appcompat.widget.PopupMenu +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import coil.load @@ -497,14 +498,30 @@ class AudioContentDetailActivity : BaseActivity 0 && !response.existOrdered && response.orderType == null && response.creator.creatorId != SharedPreferenceManager.userId ) { + binding.tvReleaseDate.visibility = View.GONE binding.llPurchase.visibility = View.VISIBLE + binding.llPurchasePrice.visibility = View.VISIBLE binding.tvPrice.text = response.price.toString() + binding.llPurchase.background = ContextCompat.getDrawable( + applicationContext, + R.drawable.bg_round_corner_5_3_3bb9f1 + ) binding.tvStrPurchaseOrRental.text = if (response.isOnlyRental) { " 대여하기" @@ -530,22 +547,33 @@ class AudioContentDetailActivity : BaseActivity 0 - ) - } - ) + if (response.releaseDate == null) { + binding.ivPlayOrPause.visibility = View.VISIBLE + binding.ivPlayOrPause.setOnClickListener { + startService( + Intent(this, AudioContentPlayService::class.java).apply { + putExtra( + Constants.EXTRA_AUDIO_CONTENT_COVER_IMAGE_URL, + response.coverImageUrl + ) + putExtra(Constants.EXTRA_AUDIO_CONTENT_URL, response.contentUrl) + putExtra(Constants.EXTRA_NICKNAME, response.creator.nickname) + putExtra(Constants.EXTRA_AUDIO_CONTENT_TITLE, response.title) + putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, response.contentId) + putExtra( + Constants.EXTRA_AUDIO_CONTENT_CREATOR_ID, + response.creator.creatorId + ) + putExtra(Constants.EXTRA_AUDIO_CONTENT_FREE, response.price <= 0) + putExtra( + Constants.EXTRA_AUDIO_CONTENT_PREVIEW, + !response.existOrdered && response.price > 0 + ) + } + ) + } + } else { + binding.ivPlayOrPause.visibility = View.GONE } binding.tvTotalDuration.text = " / ${response.duration}" @@ -553,6 +581,11 @@ class AudioContentDetailActivity : BaseActivity + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_5_3_3bb9f1.xml b/app/src/main/res/drawable/bg_round_corner_5_3_3bb9f1.xml new file mode 100644 index 0000000..b18187b --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_5_3_3bb9f1.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_audio_content_detail.xml b/app/src/main/res/layout/activity_audio_content_detail.xml index c4c608d..27c571e 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -115,6 +115,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:contentDescription="@null" + android:visibility="gone" tools:src="@drawable/btn_audio_content_play" /> - + android:layout_height="wrap_content"> - + + + + + + @@ -371,7 +388,7 @@ android:id="@+id/rl_preview_alert" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/bg_round_corner_5_3_e51e0e45_9970ff" + android:background="@drawable/bg_round_corner_5_3_13181b_3bb9f1" android:padding="13.3dp" android:visibility="gone"> @@ -393,51 +410,72 @@ - - - - + + + + + + + + + + + - - - - - + android:textSize="13.3sp" + android:visibility="gone" + tools:text="2024년 10월 20일 15시 30분 오픈" /> + + + #FFE500 #B38FFF #004B6C + #003851