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 a865b27..8f87e45 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 get() = _isAdultLiveData + private val _isOnlyRentalLiveData = MutableLiveData(false) + val isOnlyRentalLiveData: LiveData + get() = _isOnlyRentalLiveData + private val _isAvailableCommentLiveData = MutableLiveData(true) val isAvailableCommentLiveData: LiveData 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 013fc77..70f95ec 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 0956bfb..b2e3bfd 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 @@ + + + + + + + + + + + + + + + + + + + @@ -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" />