From 96d14356be0b859433a92f2c3e97e5f8116c664c Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 3 Dec 2025 13:52:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=94=94=EC=98=A4=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=EC=8B=A0=EA=B7=9C/=EC=9D=B8=EA=B8=B0/?= =?UTF-8?q?=ED=85=8C=EB=A7=88=20=ED=99=94=EB=A9=B4=20=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=EC=97=B4=20=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 --- .../all/AudioContentNewAllActivity.kt | 8 ++++---- .../all/AudioContentNewAllAdapter.kt | 2 +- .../all/AudioContentNewAllViewModel.kt | 16 ++++++++-------- .../all/AudioContentRankingAllActivity.kt | 3 ++- .../all/AudioContentRankingAllAdapter.kt | 2 +- .../all/AudioContentRankingAllViewModel.kt | 16 ++++++++-------- .../by_theme/AudioContentAllByThemeActivity.kt | 2 +- .../by_theme/AudioContentAllByThemeViewModel.kt | 10 ++++++++-- .../activity_audio_content_all_by_theme.xml | 10 +++++----- .../layout/activity_audio_content_new_all.xml | 8 ++++---- .../activity_audio_content_ranking_all.xml | 2 +- .../layout/item_audio_content_ranking_all.xml | 16 ++++++++-------- app/src/main/res/values-en/strings.xml | 8 ++++++++ app/src/main/res/values-ja/strings.xml | 8 ++++++++ app/src/main/res/values/strings.xml | 8 ++++++++ 15 files changed, 75 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt index f22e262e..7091c50b 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt @@ -49,16 +49,16 @@ class AudioContentNewAllActivity : BaseActivity Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownError) } ) ) @@ -86,6 +87,7 @@ class AudioContentNewAllViewModel( } fun getThemeList() { + val unknownError = SodaLiveApplicationHolder.get().getString(R.string.common_error_unknown) compositeDisposable.add( repository.getNewContentThemeList(token = "Bearer ${SharedPreferenceManager.token}") .subscribeOn(Schedulers.io()) @@ -98,9 +100,7 @@ class AudioContentNewAllViewModel( if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownError) } } @@ -109,7 +109,7 @@ class AudioContentNewAllViewModel( { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownError) } ) ) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllActivity.kt index 31ed498b..3c130f42 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentRankingAllActivity.kt @@ -8,6 +8,7 @@ import android.view.View import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity import kr.co.vividnext.sodalive.audio_content.main.new_content.AudioContentMainNewContentThemeAdapter import kr.co.vividnext.sodalive.base.BaseActivity @@ -37,7 +38,7 @@ class AudioContentRankingAllActivity : BaseActivity Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownError) } ) ) @@ -85,6 +86,7 @@ class AudioContentRankingAllViewModel( } fun getAudioContentRankingSortType() { + val unknownError = SodaLiveApplicationHolder.get().getString(R.string.common_error_unknown) compositeDisposable.add( repository.getContentRankingSortType(token = "Bearer ${SharedPreferenceManager.token}") .subscribeOn(Schedulers.io()) @@ -97,15 +99,13 @@ class AudioContentRankingAllViewModel( if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownError) } } }, { it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownError) } ) ) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt index 89cbf584..ab9b05b2 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/by_theme/AudioContentAllByThemeActivity.kt @@ -38,7 +38,7 @@ class AudioContentAllByThemeActivity : BaseActivity Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue( + SodaLiveApplicationHolder.get() + .getString(R.string.common_error_unknown) + ) } ) ) diff --git a/app/src/main/res/layout/activity_audio_content_all_by_theme.xml b/app/src/main/res/layout/activity_audio_content_all_by_theme.xml index 21033d72..3fd5ef4e 100644 --- a/app/src/main/res/layout/activity_audio_content_all_by_theme.xml +++ b/app/src/main/res/layout/activity_audio_content_all_by_theme.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="최신순" + android:text="@string/screen_audio_content_sort_newest" android:textColor="@color/color_88e2e2e2" android:textSize="13.3sp" /> @@ -36,7 +36,7 @@ android:layout_marginHorizontal="13.3dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="높은 가격순" + android:text="@string/screen_audio_content_sort_price_high" android:textColor="@color/color_88e2e2e2" android:textSize="13.3sp" /> @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="낮은 가격순" + android:text="@string/screen_audio_content_sort_price_low" android:textColor="@color/color_88e2e2e2" android:textSize="13.3sp" /> @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="전체" + android:text="@string/audio_content_label_all" android:textColor="@color/color_e2e2e2" android:textSize="13.3sp" /> @@ -85,7 +85,7 @@ android:layout_marginStart="2dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="개" + android:text="@string/audio_content_total_unit" android:textColor="@color/color_e2e2e2" android:textSize="13.3sp" /> diff --git a/app/src/main/res/layout/activity_audio_content_new_all.xml b/app/src/main/res/layout/activity_audio_content_new_all.xml index 3fb689be..04f9b139 100644 --- a/app/src/main/res/layout/activity_audio_content_new_all.xml +++ b/app/src/main/res/layout/activity_audio_content_new_all.xml @@ -19,7 +19,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:paddingHorizontal="13.3dp" android:paddingVertical="8dp" - android:text="※ 최근 2주간 등록된 새로운 콘텐츠 입니다." + android:text="@string/screen_audio_content_new_all_notice" android:textSize="14.67sp" /> @@ -65,7 +65,7 @@ android:layout_marginStart="2dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="개" + android:text="@string/audio_content_total_unit" android:textColor="@color/color_e2e2e2" android:textSize="13.3sp" /> @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="최근 2주간 등록된 새로운 콘텐츠가 없습니다." + android:text="@string/screen_audio_content_new_all_empty" android:textColor="@color/color_bbbbbb" android:textSize="13sp" android:lineSpacingExtra="8dp" diff --git a/app/src/main/res/layout/activity_audio_content_ranking_all.xml b/app/src/main/res/layout/activity_audio_content_ranking_all.xml index 04ca0783..b8fb24ec 100644 --- a/app/src/main/res/layout/activity_audio_content_ranking_all.xml +++ b/app/src/main/res/layout/activity_audio_content_ranking_all.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:fontFamily="@font/gmarket_sans_light" - android:text="※ 인기 콘텐츠의 순위는 매주 업데이트됩니다." + android:text="@string/screen_audio_content_ranking_notice" android:textColor="@color/color_bbbbbb" android:textSize="13.3sp" /> 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 78255e8f..ae576bd1 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 @@ -72,14 +72,14 @@ android:id="@+id/tv_point" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:background="@drawable/bg_round_corner_2_6_7849bc" - android:fontFamily="@font/gmarket_sans_medium" - android:gravity="center" - android:padding="2.6dp" - android:text="포인트" - android:textColor="@color/white" - android:textSize="8sp" + android:layout_marginStart="8dp" + android:background="@drawable/bg_round_corner_2_6_7849bc" + android:fontFamily="@font/gmarket_sans_medium" + android:gravity="center" + android:padding="2.6dp" + android:text="@string/audio_content_badge_point" + android:textColor="@color/white" + android:textSize="8sp" android:visibility="gone" tools:ignore="SmallSp" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index da067e2f..e2be86d3 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -855,6 +855,14 @@ Total %1$d items No playlists yet. Create a playlist with your favorite content. + New short content + New free content + New short content posted in the last two weeks. + New content posted in the last two weeks. + No new content has been posted in the last two weeks. + Popular content + ※ Rankings are updated weekly. + Invalid request.\nPlease try again. hh:mm diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 43bc1810..cc67b889 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -855,6 +855,14 @@ 合計 %1$d件 プレイリストが空です。 よく聴くコンテンツで\nプレイリストを作成してください。 + 新しい短編 + 新しい無料コンテンツ + 過去2週間に登録された新しい短編です。 + 過去2週間に登録された新しいコンテンツです。 + 過去2週間に登録された新しいコンテンツはありません。 + 人気コンテンツ + ※人気コンテンツの順位は毎週更新されます。 + 無効なリクエストです。\nもう一度お試しください。 hh:mm diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b29ad684..bd96c3f6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -854,6 +854,14 @@ 총 %1$d개 재생목록이 비어있습니다. 자주 듣는 콘텐츠를\n재생목록으로 만들어 보세요. + 새로운 단편 + 새로운 무료 콘텐츠 + ※ 최근 2주간 등록된 새로운 단편 입니다. + ※ 최근 2주간 등록된 새로운 콘텐츠 입니다. + 최근 2주간 등록된 새로운 콘텐츠가 없습니다. + 인기 콘텐츠 + ※ 인기 콘텐츠의 순위는 매주 업데이트됩니다. + 잘못된 요청입니다.\n다시 시도해 주세요. hh:mm