From d3f6a02be28f18fbb34391ff0bde735d025abb13 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 10 Jun 2025 20:49:06 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=BF=A0=ED=8F=B0=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?,=20=EC=9D=B8=EA=B8=B0=20=EB=8B=A8=ED=8E=B8=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=EB=B3=B4=EA=B8=B0=20-=20=EC=BF=A0=ED=8F=B0=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=ED=9B=84=20=EC=BA=94=20=EB=82=B4=EC=97=AD?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EA=B0=80=20=EC=95=84=EB=8B=8C=20?= =?UTF-8?q?=EB=B0=94=EB=A1=9C=20=EC=9D=B4=EC=A0=84=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=20-=20=EC=9D=B8=EA=B8=B0=20?= =?UTF-8?q?=EB=8B=A8=ED=8E=B8=20=EC=A0=84=EC=B2=B4=EB=B3=B4=EA=B8=B0?= =?UTF-8?q?=EC=97=90=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../all/AudioContentRankingAllAdapter.kt | 7 +++++++ .../mypage/can/coupon/CanCouponActivity.kt | 7 +------ .../mypage/can/coupon/CanCouponViewModel.kt | 12 +++++------- .../res/layout/item_audio_content_ranking_all.xml | 15 +++++++++++++++ 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b5608534..9a13ecf7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 169 - versionName "1.37.1" + versionCode 170 + versionName "1.37.3" } buildTypes { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllAdapter.kt index ea9ff40d..43a3aaa5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllAdapter.kt @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.audio_content.all import android.content.Context import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView @@ -29,6 +30,12 @@ class AudioContentRankingAllAdapter( transformations(RoundedCornersTransformation(5.3f.dpToPx())) } + binding.tvPoint.visibility = if (item.isPointAvailable) { + View.VISIBLE + } else { + View.GONE + } + binding.tvTitle.text = item.title binding.tvRank.text = index.plus(1).toString() binding.tvTheme.text = item.themeStr diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponActivity.kt index f52043e5..38605636 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponActivity.kt @@ -1,13 +1,11 @@ package kr.co.vividnext.sodalive.mypage.can.coupon -import android.content.Intent import android.os.Bundle import android.text.InputFilter import android.widget.Toast import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.LoadingDialog import kr.co.vividnext.sodalive.databinding.ActivityCanCouponBinding -import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity import org.koin.android.ext.android.inject @@ -33,10 +31,7 @@ class CanCouponActivity : BaseActivity( binding.tvRegistration.setOnClickListener { val couponNumber = binding.etCouponNumber.text.toString() - viewModel.useCoupon(couponNumber) { - finish() - startActivity(Intent(applicationContext, CanStatusActivity::class.java)) - } + viewModel.useCoupon(couponNumber) { finish() } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponViewModel.kt index 14610b77..e9d5d022 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/can/coupon/CanCouponViewModel.kt @@ -31,25 +31,23 @@ class CanCouponViewModel(private val repository: CanRepository) : BaseViewModel( { _isLoading.value = false if (it.success && it.data != null) { - _toastLiveData.postValue("해당 쿠폰의 캔이 충전되었습니다.") + _toastLiveData.value = it.message onSuccess() } else { if (it.message != null) { - _toastLiveData.postValue(it.message) + _toastLiveData.value = it.message } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.value = "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." } } }, { _isLoading.value = false if (it.message != null) { - _toastLiveData.postValue(it.message) + _toastLiveData.value = it.message Logger.e(it.message!!) } else { - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.value = "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." } } diff --git a/app/src/main/res/layout/item_audio_content_ranking_all.xml b/app/src/main/res/layout/item_audio_content_ranking_all.xml index a78c1064..78255e8f 100644 --- a/app/src/main/res/layout/item_audio_content_ranking_all.xml +++ b/app/src/main/res/layout/item_audio_content_ranking_all.xml @@ -67,6 +67,21 @@ android:textSize="8sp" tools:ignore="SmallSp" tools:text="00:30:20" /> + +