From 4a5627bf36a12bcf8e5a0d866802442ae30b361a Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 3 Dec 2025 18:44:18 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EB=A6=AC=EC=A6=88=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4=20=EB=AA=A9=EB=A1=9D=20=EB=AC=B8=EC=9E=90=EC=97=B4=20?= =?UTF-8?q?=EB=A6=AC=EC=86=8C=EC=8A=A4=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../audio_content/series/SeriesListAdapter.kt | 5 ++++- .../audio_content/series/SeriesListAllActivity.kt | 7 ++++--- .../audio_content/series/SeriesListAllViewModel.kt | 13 ++++++------- app/src/main/res/layout/item_series_list.xml | 6 +++--- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAdapter.kt index d14d1de3..e74ef210 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAdapter.kt @@ -38,7 +38,10 @@ class SeriesListAdapter( } binding.tvTitle.text = item.title - binding.tvSeriesContentCount.text = "총 ${item.numberOfContent}화" + binding.tvSeriesContentCount.text = binding.root.context.getString( + R.string.screen_home_series_episode_count, + item.numberOfContent + ) binding.tvPublishedDaysOfWeek.text = item.publishedDaysOfWeek binding.tvNew.visibility = if (item.isNew) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllActivity.kt index 8727b458..2d7dee3c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllActivity.kt @@ -6,6 +6,7 @@ import android.widget.Toast import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity import kr.co.vividnext.sodalive.base.BaseActivity import kr.co.vividnext.sodalive.common.Constants @@ -57,11 +58,11 @@ class SeriesListAllActivity : BaseActivity( loadingDialog = LoadingDialog(this, layoutInflater) binding.toolbar.tvBack.text = if (intent.getBooleanExtra(Constants.EXTRA_IS_COMPLETED, false)) { - "완결 시리즈" + getString(R.string.screen_series_main_completed_title) } else if (intent.getBooleanExtra(Constants.EXTRA_IS_ORIGINAL, false)) { - "오직 보이스온에서만" + getString(R.string.voiceon_original_only) } else { - "시리즈 전체보기" + getString(R.string.screen_series_main_title) } binding.toolbar.tvBack.setOnClickListener { finish() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllViewModel.kt index a4d2be1e..73b977d0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/SeriesListAllViewModel.kt @@ -6,8 +6,10 @@ import com.google.gson.annotations.SerializedName import com.orhanobut.logger.Logger import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.base.BaseViewModel import kr.co.vividnext.sodalive.common.SharedPreferenceManager +import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder class SeriesListAllViewModel(private val repository: SeriesRepository) : BaseViewModel() { @@ -34,6 +36,8 @@ class SeriesListAllViewModel(private val repository: SeriesRepository) : BaseVie var isLast = false var page = 1 private val size = 20 + private val unknownErrorMessage: String + get() = SodaLiveApplicationHolder.get().getString(R.string.common_error_unknown) fun getSeriesList() { if (!_isLoading.value!! && !isLast) { @@ -62,12 +66,7 @@ class SeriesListAllViewModel(private val repository: SeriesRepository) : BaseVie isLast = true } } else { - if (it.message != null) { - _toastLiveData.value = it.message - } else { - _toastLiveData.value = "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - - } + _toastLiveData.value = it.message ?: unknownErrorMessage } _isLoading.value = false @@ -75,7 +74,7 @@ class SeriesListAllViewModel(private val repository: SeriesRepository) : BaseVie { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) diff --git a/app/src/main/res/layout/item_series_list.xml b/app/src/main/res/layout/item_series_list.xml index 7db27d7e..8df8a3d4 100644 --- a/app/src/main/res/layout/item_series_list.xml +++ b/app/src/main/res/layout/item_series_list.xml @@ -43,7 +43,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" - android:text="신작" + android:text="@string/screen_home_series_new" android:textColor="@color/white" android:textSize="10.3sp" android:visibility="gone" @@ -57,7 +57,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" - android:text="완결" + android:text="@string/screen_home_series_complete" android:textColor="@color/white" android:textSize="10.3sp" android:visibility="gone" @@ -71,7 +71,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="3.7dp" - android:text="인기" + android:text="@string/screen_home_series_popular" android:textColor="@color/white" android:textSize="10.3sp" android:visibility="gone"