From 19b351ef2a71e73347ff55074ff519b8d6626325 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Sat, 21 Oct 2023 00:56:15 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=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=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../upload/AudioContentUploadActivity.kt      | 154 +++++++++++++-----
 .../upload/AudioContentUploadViewModel.kt     |  13 ++
 .../upload/CreateAudioContentRequest.kt       |   1 +
 .../layout/activity_audio_content_upload.xml  |  83 +++++++++-
 4 files changed, 206 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadActivity.kt
index a865b27f..8f87e454 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadActivity.kt
@@ -169,6 +169,8 @@ class AudioContentUploadActivity : BaseActivity<ActivityAudioContentUploadBindin
 
         binding.llPricePaid.setOnClickListener { viewModel.setPriceFree(false) }
         binding.llPriceFree.setOnClickListener { viewModel.setPriceFree(true) }
+        binding.llRentalAndKeep.setOnClickListener { viewModel.setIsOnlyRental(false) }
+        binding.llOnlyRental.setOnClickListener { viewModel.setIsOnlyRental(true) }
         binding.llCommentNo.setOnClickListener { viewModel.setAvailableComment(false) }
         binding.llCommentYes.setOnClickListener { viewModel.setAvailableComment(true) }
 
@@ -298,51 +300,17 @@ class AudioContentUploadActivity : BaseActivity<ActivityAudioContentUploadBindin
 
         viewModel.isPriceFreeLiveData.observe(this) {
             if (it) {
-                viewModel.price = 0
-                binding.etSetPrice.setText("0")
-                binding.llSetPrice.visibility = View.GONE
-
-                binding.ivPriceFree.visibility = View.VISIBLE
-                binding.tvPriceFree.setTextColor(
-                    ContextCompat.getColor(
-                        applicationContext,
-                        R.color.color_eeeeee
-                    )
-                )
-                binding.llPriceFree.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff)
-
-                binding.ivPricePaid.visibility = View.GONE
-                binding.tvPricePaid.setTextColor(
-                    ContextCompat.getColor(
-                        applicationContext,
-                        R.color.color_9970ff
-                    )
-                )
-                binding.llPricePaid.setBackgroundResource(
-                    R.drawable.bg_round_corner_6_7_1f1734_9970ff
-                )
+                checkPriceFree()
             } else {
-                binding.llSetPrice.visibility = View.VISIBLE
+                checkPricePaid()
+            }
+        }
 
-                binding.ivPricePaid.visibility = View.VISIBLE
-                binding.tvPricePaid.setTextColor(
-                    ContextCompat.getColor(
-                        applicationContext,
-                        R.color.color_eeeeee
-                    )
-                )
-                binding.llPricePaid.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff)
-
-                binding.ivPriceFree.visibility = View.GONE
-                binding.tvPriceFree.setTextColor(
-                    ContextCompat.getColor(
-                        applicationContext,
-                        R.color.color_9970ff
-                    )
-                )
-                binding.llPriceFree.setBackgroundResource(
-                    R.drawable.bg_round_corner_6_7_1f1734_9970ff
-                )
+        viewModel.isOnlyRentalLiveData.observe(this) {
+            if (it) {
+                checkOnlyRental()
+            } else {
+                checkRentalAndKeep()
             }
         }
 
@@ -440,6 +408,106 @@ class AudioContentUploadActivity : BaseActivity<ActivityAudioContentUploadBindin
         }
     }
 
+    private fun checkPriceFree() {
+        viewModel.price = 0
+        binding.etSetPrice.setText("0")
+        binding.llSetPrice.visibility = View.GONE
+        binding.llConfigKeep.visibility = View.GONE
+        binding.tvTitleConfigKeep.visibility = View.GONE
+
+        binding.ivPriceFree.visibility = View.VISIBLE
+        binding.tvPriceFree.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_eeeeee
+            )
+        )
+        binding.llPriceFree.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff)
+
+        binding.ivPricePaid.visibility = View.GONE
+        binding.tvPricePaid.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_9970ff
+            )
+        )
+        binding.llPricePaid.setBackgroundResource(
+            R.drawable.bg_round_corner_6_7_1f1734_9970ff
+        )
+    }
+
+    private fun checkPricePaid() {
+        binding.llSetPrice.visibility = View.VISIBLE
+        binding.llConfigKeep.visibility = View.VISIBLE
+        binding.tvTitleConfigKeep.visibility = View.VISIBLE
+
+        binding.ivPricePaid.visibility = View.VISIBLE
+        binding.tvPricePaid.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_eeeeee
+            )
+        )
+        binding.llPricePaid.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff)
+
+        binding.ivPriceFree.visibility = View.GONE
+        binding.tvPriceFree.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_9970ff
+            )
+        )
+        binding.llPriceFree.setBackgroundResource(
+            R.drawable.bg_round_corner_6_7_1f1734_9970ff
+        )
+    }
+
+    private fun checkRentalAndKeep() {
+        binding.tvPriceTitle.text = "소장 가격"
+        binding.ivRentalAndKeep.visibility = View.VISIBLE
+        binding.tvRentalAndKeep.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_eeeeee
+            )
+        )
+        binding.llRentalAndKeep.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff)
+
+        binding.ivOnlyRental.visibility = View.GONE
+        binding.tvOnlyRental.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_9970ff
+            )
+        )
+        binding.llOnlyRental.setBackgroundResource(
+            R.drawable.bg_round_corner_6_7_1f1734_9970ff
+        )
+    }
+
+    private fun checkOnlyRental() {
+        binding.tvPriceTitle.text = "대여 가격"
+        binding.ivOnlyRental.visibility = View.VISIBLE
+        binding.tvOnlyRental.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_eeeeee
+            )
+        )
+        binding.llOnlyRental.setBackgroundResource(R.drawable.bg_round_corner_6_7_9970ff)
+
+        binding.ivRentalAndKeep.visibility = View.GONE
+        binding.tvRentalAndKeep.setTextColor(
+            ContextCompat.getColor(
+                applicationContext,
+                R.color.color_9970ff
+            )
+        )
+        binding.llRentalAndKeep.setBackgroundResource(
+            R.drawable.bg_round_corner_6_7_1f1734_9970ff
+        )
+    }
+
     private fun getFileName(uri: Uri): String? {
         val scheme = uri.scheme
         var fileName: String? = null
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt
index 05b6b49d..a54cd3f2 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/AudioContentUploadViewModel.kt
@@ -37,6 +37,10 @@ class AudioContentUploadViewModel(
     val isAdultLiveData: LiveData<Boolean>
         get() = _isAdultLiveData
 
+    private val _isOnlyRentalLiveData = MutableLiveData(false)
+    val isOnlyRentalLiveData: LiveData<Boolean>
+        get() = _isOnlyRentalLiveData
+
     private val _isAvailableCommentLiveData = MutableLiveData(true)
     val isAvailableCommentLiveData: LiveData<Boolean>
         get() = _isAvailableCommentLiveData
@@ -67,6 +71,14 @@ class AudioContentUploadViewModel(
 
     fun setPriceFree(isPriceFree: Boolean) {
         _isPriceFreeLiveData.postValue(isPriceFree)
+
+        if (isPriceFree) {
+            _isOnlyRentalLiveData.postValue(false)
+        }
+    }
+
+    fun setIsOnlyRental(isOnlyRental: Boolean) {
+        _isOnlyRentalLiveData.postValue(isOnlyRental)
     }
 
     fun uploadAudioContent(onSuccess: () -> Unit) {
@@ -80,6 +92,7 @@ class AudioContentUploadViewModel(
                 price = price,
                 themeId = theme!!.id,
                 isAdult = _isAdultLiveData.value!!,
+                isOnlyRental = _isOnlyRentalLiveData.value!!,
                 isCommentAvailable = _isAvailableCommentLiveData.value!!,
                 previewStartTime = previewStartTime,
                 previewEndTime = previewEndTime
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/CreateAudioContentRequest.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/CreateAudioContentRequest.kt
index 013fc77c..70f95ec7 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/CreateAudioContentRequest.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/upload/CreateAudioContentRequest.kt
@@ -9,6 +9,7 @@ data class CreateAudioContentRequest(
     @SerializedName("price") val price: Int,
     @SerializedName("themeId") val themeId: Long,
     @SerializedName("isAdult") val isAdult: Boolean,
+    @SerializedName("isOnlyRental") val isOnlyRental: Boolean,
     @SerializedName("isCommentAvailable") val isCommentAvailable: Boolean,
     @SerializedName("previewStartTime") val previewStartTime: String? = null,
     @SerializedName("previewEndTime") val previewEndTime: String? = null
diff --git a/app/src/main/res/layout/activity_audio_content_upload.xml b/app/src/main/res/layout/activity_audio_content_upload.xml
index 0956bfbb..b2e3bfd1 100644
--- a/app/src/main/res/layout/activity_audio_content_upload.xml
+++ b/app/src/main/res/layout/activity_audio_content_upload.xml
@@ -366,6 +366,84 @@
                 </LinearLayout>
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/tv_title_config_keep"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="13.3dp"
+                android:layout_marginTop="26.7dp"
+                android:fontFamily="@font/gmarket_sans_bold"
+                android:lineSpacingExtra="5sp"
+                android:text="소장 설정"
+                android:textColor="@color/color_eeeeee"
+                android:textSize="16.7sp" />
+
+            <LinearLayout
+                android:id="@+id/ll_config_keep"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="13.3dp"
+                android:layout_marginTop="13.3dp"
+                android:baselineAligned="false">
+
+                <LinearLayout
+                    android:id="@+id/ll_rental_and_keep"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_round_corner_6_7_1f1734"
+                    android:gravity="center"
+                    android:paddingVertical="14.3dp">
+
+                    <ImageView
+                        android:id="@+id/iv_rental_and_keep"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="6.7dp"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_select_check"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_rental_and_keep"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="@font/gmarket_sans_bold"
+                        android:text="소장/대여"
+                        android:textColor="@color/color_9970ff"
+                        android:textSize="14.7sp" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_only_rental"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="13.3dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_round_corner_6_7_1f1734"
+                    android:gravity="center"
+                    android:paddingVertical="14.3dp">
+
+                    <ImageView
+                        android:id="@+id/iv_only_rental"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="6.7dp"
+                        android:contentDescription="@null"
+                        android:src="@drawable/ic_select_check"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_only_rental"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="@font/gmarket_sans_bold"
+                        android:text="대여만"
+                        android:textColor="@color/color_9970ff"
+                        android:textSize="14.7sp" />
+                </LinearLayout>
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ll_set_price"
                 android:layout_width="match_parent"
@@ -376,10 +454,11 @@
                 android:visibility="visible">
 
                 <TextView
+                    android:id="@+id/tv_price_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/gmarket_sans_medium"
-                    android:text="소장가격"
+                    android:text="소장 가격"
                     android:textColor="@color/color_eeeeee"
                     android:textSize="13.3sp" />
 
@@ -432,7 +511,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/gmarket_sans_medium"
-                    android:text="※ 이용기간 : 대여(7일) | 소장(서비스종료시까지)"
+                    android:text="※ 이용기간 : 대여(15일) | 소장(서비스종료시까지)"
                     android:textColor="@color/color_777777"
                     android:textSize="13.3sp" />