diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt index e18e38e9..678bc892 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAdapter.kt @@ -47,7 +47,7 @@ class SeriesContentAdapter( } else if (item.isRented) { binding.tvRented.visibility = View.VISIBLE } else if (item.price > 0) { - binding.tvPrice.text = "${item.price}" + binding.tvPrice.text = item.price.toString() binding.tvPrice.visibility = View.VISIBLE } else { binding.tvPriceFree.visibility = View.VISIBLE diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllActivity.kt index 46af87d8..c664936b 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllActivity.kt @@ -30,7 +30,11 @@ class SeriesContentAllActivity : BaseActivity( val seriesId = intent.getLongExtra(Constants.EXTRA_SERIES_ID, 0) if (seriesId <= 0) { - Toast.makeText(applicationContext, "잘못된 요청입니다.", Toast.LENGTH_LONG).show() + Toast.makeText( + applicationContext, + getString(R.string.screen_audio_content_error_invalid_request), + Toast.LENGTH_LONG + ).show() finish() } @@ -45,9 +49,12 @@ class SeriesContentAllActivity : BaseActivity( val seriesTitle = intent.getStringExtra(Constants.EXTRA_SERIES_TITLE) ?: "" binding.toolbar.tvBack.text = if (seriesTitle.isNotBlank()) { - "$seriesTitle - 전체회차 듣기" + getString( + R.string.screen_series_content_all_title_format, + seriesTitle + ) } else { - " 전체회차 듣기" + getString(R.string.screen_series_content_all_title_default) } binding.toolbar.tvBack.setOnClickListener { finish() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllViewModel.kt index 2b6af75a..472d3220 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/series/content/SeriesContentAllViewModel.kt @@ -10,6 +10,8 @@ import kr.co.vividnext.sodalive.audio_content.series.SeriesRepository import kr.co.vividnext.sodalive.audio_content.series.detail.GetSeriesContentListItem import kr.co.vividnext.sodalive.base.BaseViewModel import kr.co.vividnext.sodalive.common.SharedPreferenceManager +import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder +import kr.co.vividnext.sodalive.R class SeriesContentAllViewModel(private val repository: SeriesRepository) : BaseViewModel() { private val _toastLiveData = MutableLiveData() @@ -33,6 +35,8 @@ class SeriesContentAllViewModel(private val repository: SeriesRepository) : Base var page = 1 private var pageSize = 10 private var isLast = false + private val unknownErrorMessage: String + get() = SodaLiveApplicationHolder.get().getString(R.string.common_error_unknown) fun getSeriesContentList() { if (!_isLoading.value!! && !isLast) { @@ -59,18 +63,14 @@ class SeriesContentAllViewModel(private val repository: SeriesRepository) : Base isLast = true } } else { - if (it.message != null) { - _toastLiveData.value = it.message - } else { - _toastLiveData.value = "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - } + _toastLiveData.value = it.message ?: unknownErrorMessage } _isLoading.value = false }, { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) diff --git a/app/src/main/res/layout/activity_series_content_all.xml b/app/src/main/res/layout/activity_series_content_all.xml index 473148c0..b9aa2d94 100644 --- a/app/src/main/res/layout/activity_series_content_all.xml +++ b/app/src/main/res/layout/activity_series_content_all.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="최신순" + android:text="@string/screen_series_content_sort_newest" android:textColor="@color/color_88e2e2e2" android:textSize="13.3sp" /> @@ -40,7 +40,7 @@ android:layout_marginStart="13.3dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="등록순" + android:text="@string/screen_series_content_sort_oldest" android:textColor="@color/color_88e2e2e2" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/item_series_content.xml b/app/src/main/res/layout/item_series_content.xml index 309e1ef7..f364164e 100644 --- a/app/src/main/res/layout/item_series_content.xml +++ b/app/src/main/res/layout/item_series_content.xml @@ -49,7 +49,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" android:padding="2.6dp" - android:text="포인트" + android:text="@string/audio_content_badge_point" android:textColor="@color/white" android:textSize="8sp" android:visibility="gone" @@ -94,7 +94,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" - android:text="무료" + android:text="@string/audio_content_price_free" android:textColor="@color/white" android:textSize="13.3sp" android:visibility="gone" @@ -108,7 +108,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" - android:text="소장중" + android:text="@string/audio_content_badge_owned" android:textColor="@color/color_111111" android:textSize="13.3sp" android:visibility="gone" @@ -122,7 +122,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="5.3dp" android:paddingVertical="2.7dp" - android:text="대여중" + android:text="@string/audio_content_badge_rented" android:textColor="@color/white" android:textSize="13.3sp" android:visibility="gone" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 795c93e0..706ae723 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -167,6 +167,10 @@ Popular New Complete + %1$s - Full episodes + Full episodes + Newest + Oldest All series Home By day diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e7e9336e..c7d2872a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -167,6 +167,10 @@ 人気 新作 完結 + %1$s - 全話を聴く + 全話を聴く + 最新順 + 登録順 シリーズ一覧 ホーム 曜日別 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index abb82950..93f39247 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -166,6 +166,10 @@ 인기 신작 완결 + %1$s - 전체회차 듣기 + 전체회차 듣기 + 최신순 + 등록순 시리즈 전체보기 요일별