From 83575aa1ebc1173e6fa595b994ddf9019a18fb55 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Fri, 20 Oct 2023 23:13:16 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20-=20=EB=8C=80=EC=97=AC=EB=A7=8C=20=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EC=BD=98=ED=85=90=EC=B8=A0=EC=9D=98=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=86=8C=EC=9E=A5=20=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=EC=9D=B4=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20=EC=95=8A=EA=B3=A0=20?=
 =?UTF-8?q?=EA=B0=80=EA=B2=A9=EC=9D=98=20100%=EA=B0=80=20=EB=B3=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 ++--
 .../detail/AudioContentDetailActivity.kt      | 20 +++++++++++++++----
 .../detail/AudioContentDetailViewModel.kt     |  8 +++++++-
 .../detail/GetAudioContentDetailResponse.kt   |  1 +
 .../order/AudioContentOrderConfirmDialog.kt   |  3 ++-
 .../order/AudioContentOrderFragment.kt        | 17 +++++++++++-----
 .../layout/activity_audio_content_detail.xml  |  1 +
 .../layout/fragment_audio_content_order.xml   |  6 ++++--
 8 files changed, 45 insertions(+), 15 deletions(-)

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<ActivityAudioContentDetailBindin
             binding.llPurchase.visibility = View.VISIBLE
             binding.tvPrice.text = response.price.toString()
 
+            binding.tvStrPurchaseOrRental.text = if (response.isOnlyRental) {
+                " 대여하기"
+            } else {
+                " 구매하기"
+            }
+
             binding.llPurchase.setOnClickListener {
-                showOrderDialog(audioContent = response)
+                showOrderDialog(audioContent = response, isOnlyRental = response.isOnlyRental)
             }
         } else {
             binding.llPurchase.visibility = View.GONE
@@ -684,11 +690,15 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
         }
     }
 
-    private fun showOrderDialog(audioContent: GetAudioContentDetailResponse) {
+    private fun showOrderDialog(
+        audioContent: GetAudioContentDetailResponse,
+        isOnlyRental: Boolean = false
+    ) {
         val dialog = AudioContentOrderFragment(
             price = audioContent.price,
-            onClickKeep = { showOrderConfirmDialog(audioContent, OrderType.KEEP) },
-            onClickRental = { showOrderConfirmDialog(audioContent, OrderType.RENTAL) }
+            isOnlyRental = isOnlyRental,
+            onClickKeep = { showOrderConfirmDialog(audioContent, isOnlyRental, OrderType.KEEP) },
+            onClickRental = { showOrderConfirmDialog(audioContent, isOnlyRental, OrderType.RENTAL) }
         )
 
         dialog.show(
@@ -699,6 +709,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
 
     private fun showOrderConfirmDialog(
         audioContent: GetAudioContentDetailResponse,
+        isOnlyRental: Boolean = false,
         orderType: OrderType
     ) {
         AudioContentOrderConfirmDialog(
@@ -710,6 +721,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
             profileImageUrl = audioContent.creator.profileImageUrl,
             nickname = audioContent.creator.nickname,
             duration = audioContent.duration,
+            isOnlyRental = isOnlyRental,
             orderType = orderType,
             price = audioContent.price,
             confirmButtonClick = {
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt
index 7d349bb..0b1a0ba 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt
@@ -190,7 +190,13 @@ class AudioContentDetailViewModel(
                     {
                         if (it.success && it.data != null) {
                             getAudioContentDetail(audioContentId = contentId)
-                            _toastLiveData.postValue("구매가 완료되었습니다.")
+                            _toastLiveData.postValue(
+                                if (orderType == OrderType.RENTAL) {
+                                    "대여가 완료되었습니다."
+                                } else {
+                                    "구매가 완료되었습니다."
+                                }
+                            )
                         } else {
                             if (it.message != null) {
                                 _toastLiveData.postValue(it.message)
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/GetAudioContentDetailResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/GetAudioContentDetailResponse.kt
index e32fb46..3d2e021 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/GetAudioContentDetailResponse.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/GetAudioContentDetailResponse.kt
@@ -16,6 +16,7 @@ data class GetAudioContentDetailResponse(
     @SerializedName("duration") val duration: String,
     @SerializedName("isAdult") val isAdult: Boolean,
     @SerializedName("isMosaic") val isMosaic: Boolean,
+    @SerializedName("isOnlyRental") val isOnlyRental: Boolean,
     @SerializedName("existOrdered") val existOrdered: Boolean,
     @SerializedName("orderType") val orderType: OrderType?,
     @SerializedName("remainingTime") val remainingTime: String?,
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
index 0d023ea..d2c7481 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderConfirmDialog.kt
@@ -23,6 +23,7 @@ class AudioContentOrderConfirmDialog(
     profileImageUrl: String,
     nickname: String,
     duration: String,
+    isOnlyRental: Boolean,
     orderType: OrderType,
     price: Int,
     confirmButtonClick: () -> 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" />
 
                     <TextView
+                        android:id="@+id/tv_str_purchase_or_rental"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:fontFamily="@font/gmarket_sans_bold"
diff --git a/app/src/main/res/layout/fragment_audio_content_order.xml b/app/src/main/res/layout/fragment_audio_content_order.xml
index 72b3d68..8deae51 100644
--- a/app/src/main/res/layout/fragment_audio_content_order.xml
+++ b/app/src/main/res/layout/fragment_audio_content_order.xml
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/gmarket_sans_light"
-                android:text="(이용기간 7일)"
+                android:text="(이용기간 15일)"
                 android:textColor="@color/white"
                 android:textSize="12sp" />
         </LinearLayout>
@@ -64,9 +64,11 @@
     </RelativeLayout>
 
     <RelativeLayout
+        android:id="@+id/rl_keep"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="26.7dp">
+        android:layout_marginTop="26.7dp"
+        android:visibility="gone">
 
         <LinearLayout
             android:layout_width="wrap_content"