diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt index 6361b082..21674f11 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/detail/AudioContentPlaylistDetailActivity.kt @@ -173,8 +173,9 @@ class AudioContentPlaylistDetailActivity : BaseActivity get() = _detailResponseLiveData + private val unknownErrorMessage: String + get() = SodaLiveApplicationHolder.get().getString(R.string.common_error_unknown) + + private val deleteSuccessMessage: String + get() = SodaLiveApplicationHolder.get().getString( + R.string.audio_content_playlist_detail_delete_success + ) + fun getPlaylistDetail(playlistId: Long) { _isLoading.value = true compositeDisposable.add( @@ -41,9 +51,7 @@ class AudioContentPlaylistDetailViewModel( if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownErrorMessage) } } _isLoading.value = false @@ -51,7 +59,7 @@ class AudioContentPlaylistDetailViewModel( { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) @@ -69,15 +77,13 @@ class AudioContentPlaylistDetailViewModel( .subscribe( { if (it.success) { - _toastLiveData.value = "삭제되었습니다." + _toastLiveData.value = deleteSuccessMessage onSuccess() } else { if (it.message != null) { _toastLiveData.postValue(it.message) } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) + _toastLiveData.postValue(unknownErrorMessage) } } _isLoading.value = false @@ -85,7 +91,7 @@ class AudioContentPlaylistDetailViewModel( { _isLoading.value = false it.message?.let { message -> Logger.e(message) } - _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.") + _toastLiveData.postValue(unknownErrorMessage) } ) ) diff --git a/app/src/main/res/layout/activity_audio_content_playlist_detail.xml b/app/src/main/res/layout/activity_audio_content_playlist_detail.xml index a041fbeb..540fec4a 100644 --- a/app/src/main/res/layout/activity_audio_content_playlist_detail.xml +++ b/app/src/main/res/layout/activity_audio_content_playlist_detail.xml @@ -246,7 +246,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:paddingVertical="11dp" - android:text="Play" + android:text="@string/audio_content_playlist_detail_play" android:textColor="@color/white" android:textSize="14.7sp" /> @@ -276,7 +276,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_bold" android:paddingVertical="11dp" - android:text="Shuffle" + android:text="@string/audio_content_playlist_detail_shuffle" android:textColor="@color/white" android:textSize="14.7sp" /> diff --git a/app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml b/app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml index a71586b0..8f98f3b4 100644 --- a/app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml +++ b/app/src/main/res/layout/fragment_audio_content_playlist_detail_notify.xml @@ -11,7 +11,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" - android:text="삭제" + android:text="@string/screen_audio_content_detail_delete" android:textColor="@color/color_eeeeee" android:textSize="13.3sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index f76ba069..3e86a89e 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -879,6 +879,12 @@ Total %1$d items No playlists yet. Create a playlist with your favorite content. + Play + Shuffle + Created on %1$s + Delete playlist + Delete \'%1$s\'? + Deleted. New short content New free content New short content posted in the last two weeks. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f04cfc86..0a0629a3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -879,6 +879,12 @@ 合計 %1$d件 プレイリストが空です。 よく聴くコンテンツで\nプレイリストを作成してください。 + 再生 + シャッフル + 作成日 %1$s + プレイリストを削除 + 「%1$s」を削除しますか? + 削除しました。 新しい短編 新しい無料コンテンツ 過去2週間に登録された新しい短編です。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57f04004..484b3130 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -878,6 +878,12 @@ 총 %1$d개 재생목록이 비어있습니다. 자주 듣는 콘텐츠를\n재생목록으로 만들어 보세요. + 재생 + 셔플 + 만든 날짜 %1$s + 재생목록 삭제 + \'%1$s\'을 삭제하시겠습니까? + 삭제되었습니다. 새로운 단편 새로운 무료 콘텐츠 ※ 최근 2주간 등록된 새로운 단편 입니다.