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 d7e4c24..9ed8bf9 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 @@ -197,6 +197,8 @@ class AudioContentUploadActivity : BaseActivity get() = _isPriceFreeLiveData + private val _isGeneratePreviewLiveData = MutableLiveData(true) + val isGeneratePreviewLiveData: LiveData + get() = _isGeneratePreviewLiveData + private val _isActiveReservationLiveData = MutableLiveData(false) val isActiveReservationLiveData: LiveData get() = _isActiveReservationLiveData @@ -89,9 +93,14 @@ class AudioContentUploadViewModel( if (isPriceFree) { _isOnlyRentalLiveData.postValue(false) + _isGeneratePreviewLiveData.postValue(true) } } + fun setGeneratePreview(isGeneratePreview: Boolean) { + _isGeneratePreviewLiveData.value = isGeneratePreview + } + fun setIsOnlyRental(isOnlyRental: Boolean) { _isOnlyRentalLiveData.postValue(isOnlyRental) } @@ -104,6 +113,8 @@ class AudioContentUploadViewModel( if (!_isLoading.value!! && validateData()) { _isLoading.postValue(true) + val isGeneratePreview = _isGeneratePreviewLiveData.value!! + val request = CreateAudioContentRequest( title = title, detail = detail, @@ -118,9 +129,18 @@ class AudioContentUploadViewModel( themeId = theme!!.id, isAdult = _isAdultLiveData.value!!, isOnlyRental = _isOnlyRentalLiveData.value!!, + isGeneratePreview = isGeneratePreview, isCommentAvailable = _isAvailableCommentLiveData.value!!, - previewStartTime = previewStartTime, - previewEndTime = previewEndTime + previewStartTime = if (isGeneratePreview) { + previewStartTime + } else { + null + }, + previewEndTime = if (isGeneratePreview) { + previewEndTime + } else { + null + } ) val requestJson = Gson().toJson(request) 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 8f3b9a1..4bf6855 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 @@ -12,6 +12,7 @@ data class CreateAudioContentRequest( @SerializedName("themeId") val themeId: Long, @SerializedName("isAdult") val isAdult: Boolean, @SerializedName("isOnlyRental") val isOnlyRental: Boolean, + @SerializedName("isGeneratePreview") val isGeneratePreview: 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 6f5325f..58ebe58 100644 --- a/app/src/main/res/layout/activity_audio_content_upload.xml +++ b/app/src/main/res/layout/activity_audio_content_upload.xml @@ -535,7 +535,7 @@ - - + android:background="@drawable/bg_round_corner_6_7_13181b" + android:gravity="center" + android:paddingVertical="14.3dp"> - + android:layout_marginEnd="6.7dp" + android:contentDescription="@null" + android:src="@drawable/ic_select_check" + android:visibility="gone" /> - + android:text="생성" + android:textColor="@color/color_3bb9f1" + android:textSize="14.7sp" /> + android:background="@drawable/bg_round_corner_6_7_13181b" + android:gravity="center" + android:paddingVertical="14.3dp"> - + android:layout_marginEnd="6.7dp" + android:contentDescription="@null" + android:src="@drawable/ic_select_check" + android:visibility="gone" /> - + android:text="생성 안 함" + android:textColor="@color/color_3bb9f1" + android:textSize="14.7sp" /> + + + + + + + + + + + + + + + + + + + + + + + +