diff --git a/app/build.gradle b/app/build.gradle index ed092f4..6724abf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,8 +40,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 33 - versionCode 7 - versionName "1.0.6" + versionCode 8 + versionName "1.0.7" } buildTypes { 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 679cfc5..b344a97 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 @@ -504,8 +504,14 @@ class AudioContentDetailActivity : BaseActivity Unit, @@ -57,7 +58,7 @@ class AudioContentOrderConfirmDialog( } dialogView.tvDuration.text = duration - dialogView.tvPrice.text = if (orderType == OrderType.RENTAL) { + dialogView.tvPrice.text = if (orderType == OrderType.RENTAL && !isOnlyRental) { "${ceil(price * 0.6).toInt()}" } else { "$price" diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt index 52e0c8f..87361d6 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderFragment.kt @@ -10,6 +10,7 @@ import kotlin.math.ceil class AudioContentOrderFragment( private val price: Int, + private val isOnlyRental: Boolean, private val onClickRental: () -> Unit, private val onClickKeep: () -> Unit ) : BottomSheetDialogFragment() { @@ -28,12 +29,18 @@ class AudioContentOrderFragment( override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.tvKeep.text = "$price" - binding.tvRental.text = "${ceil(price * 0.6).toInt()}" + if (isOnlyRental) { + binding.tvRental.text = "$price" + binding.rlKeep.visibility = View.GONE + } else { + binding.tvKeep.text = "$price" + binding.tvRental.text = "${ceil(price * 0.6).toInt()}" - binding.llKeep.setOnClickListener { - onClickKeep() - dismiss() + binding.rlKeep.visibility = View.VISIBLE + binding.llKeep.setOnClickListener { + onClickKeep() + dismiss() + } } binding.llRental.setOnClickListener { 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 be01b3b..7aedcb3 100644 --- a/app/src/main/res/layout/activity_audio_content_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_detail.xml @@ -430,6 +430,7 @@ android:textSize="12sp" /> @@ -64,9 +64,11 @@ + android:layout_marginTop="26.7dp" + android:visibility="gone">