From 110fcab7105bdbe4e7e28d3a7c7746a23d0943f5 Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 28 Aug 2023 18:15:57 +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-=205=EC=BA=94(500=EC=9B=90)=20=EB=B6=80=ED=84=B0?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95,=20=EB=8C=80=EC=97=AC=EA=B0=80=EA=B2=A9=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=2060%=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audio_content/order/AudioContentOrderConfirmDialog.kt | 2 +- .../audio_content/upload/AudioContentUploadViewModel.kt | 4 ++-- app/src/main/res/layout/activity_audio_content_upload.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 9feee31..0d023ea 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 @@ -58,7 +58,7 @@ class AudioContentOrderConfirmDialog( dialogView.tvDuration.text = duration dialogView.tvPrice.text = if (orderType == OrderType.RENTAL) { - "${ceil(price * 0.7).toInt()}" + "${ceil(price * 0.6).toInt()}" } else { "$price" } 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 8c2bdb3..9e5a55a 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 @@ -211,8 +211,8 @@ class AudioContentUploadViewModel( return false } - if (!isPriceFreeLiveData.value!! && price < 10) { - _toastLiveData.postValue("콘텐츠의 최소금액은 10캔 입니다.") + if (!isPriceFreeLiveData.value!! && price < 5) { + _toastLiveData.postValue("콘텐츠의 최소금액은 5캔 입니다.") return false } 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 a8d84c2..cb04212 100644 --- a/app/src/main/res/layout/activity_audio_content_upload.xml +++ b/app/src/main/res/layout/activity_audio_content_upload.xml @@ -441,7 +441,7 @@ android:layout_height="wrap_content" android:layout_marginTop="3dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="※ 대여가격은 소장가격의 70%로 자동 반영" + android:text="※ 대여가격은 소장가격의 60%로 자동 반영" android:textColor="@color/color_777777" android:textSize="13.3sp" /> @@ -450,7 +450,7 @@ android:layout_height="wrap_content" android:layout_marginTop="3dp" android:fontFamily="@font/gmarket_sans_medium" - android:text="※ 콘텐츠의 최소금액은 10캔 입니다" + android:text="※ 콘텐츠의 최소금액은 5캔 입니다" android:textColor="@color/color_777777" android:textSize="13.3sp" />