From e44bd681523dabb8d9ada03ac164077f5c85a45f Mon Sep 17 00:00:00 2001 From: klaus Date: Mon, 1 Dec 2025 17:49:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B7=9C=20=EC=BA=90=EB=A6=AD?= =?UTF-8?q?=ED=84=B0=20=EC=A0=84=EC=B2=B4=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 --- .../newcharacters/NewCharactersAllActivity.kt | 5 +++-- .../newcharacters/NewCharactersAllViewModel.kt | 13 ++++++++----- .../main/res/layout/activity_new_characters_all.xml | 4 ++-- app/src/main/res/values-en/strings.xml | 3 +++ app/src/main/res/values-ja/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 3 +++ 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllActivity.kt index 63ba9002..73f60648 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllActivity.kt @@ -6,6 +6,7 @@ import android.view.View 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.base.BaseActivity import kr.co.vividnext.sodalive.chat.character.detail.CharacterDetailActivity import kr.co.vividnext.sodalive.chat.character.detail.CharacterDetailActivity.Companion.EXTRA_CHARACTER_ID @@ -32,7 +33,7 @@ class NewCharactersAllActivity : BaseActivity( override fun setupView() { loadingDialog = LoadingDialog(this, layoutInflater) - binding.toolbar.tvBack.text = "신규 캐릭터 전체보기" + binding.toolbar.tvBack.text = getString(R.string.screen_new_characters_all_title) binding.toolbar.tvBack.setOnClickListener { finish() } val spanCount = 2 @@ -86,7 +87,7 @@ class NewCharactersAllActivity : BaseActivity( } viewModel.toastLiveData.observe(this) { message -> - message?.let { showToast(it) } + message?.let { showToast(it.asString(this)) } } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllViewModel.kt index eb699a9f..9a0beed3 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllViewModel.kt @@ -5,16 +5,18 @@ import androidx.lifecycle.MutableLiveData 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.chat.character.Character import kr.co.vividnext.sodalive.common.SharedPreferenceManager +import kr.co.vividnext.sodalive.common.UiText class NewCharactersAllViewModel( private val repository: NewCharactersRepository ) : BaseViewModel() { - private val _toastLiveData = MutableLiveData() - val toastLiveData: LiveData get() = _toastLiveData + private val _toastLiveData = MutableLiveData() + val toastLiveData: LiveData get() = _toastLiveData private val _isLoading = MutableLiveData(false) val isLoading: LiveData get() = _isLoading @@ -54,14 +56,15 @@ class NewCharactersAllViewModel( isLast = true } } else { - _toastLiveData.value = response.message - ?: "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." + _toastLiveData.value = response.message?.takeIf { it.isNotBlank() } + ?.let { UiText.DynamicString(it) } + ?: UiText.StringResource(R.string.common_error_unknown) } _isLoading.value = false }, { e -> _isLoading.value = false e.message?.let { Logger.e(it) } - _toastLiveData.value = "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." + _toastLiveData.value = UiText.StringResource(R.string.common_error_unknown) }) ) } diff --git a/app/src/main/res/layout/activity_new_characters_all.xml b/app/src/main/res/layout/activity_new_characters_all.xml index ca6851b5..d7869007 100644 --- a/app/src/main/res/layout/activity_new_characters_all.xml +++ b/app/src/main/res/layout/activity_new_characters_all.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="전체" + android:text="@string/screen_new_characters_all_total_label" android:textColor="@color/color_e2e2e2" android:textSize="13.3sp" /> @@ -45,7 +45,7 @@ android:layout_marginStart="2dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="개" + android:text="@string/screen_new_characters_all_total_unit" android:textColor="@color/color_e2e2e2" android:textSize="13.3sp" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index b2749d4a..73d00554 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -243,6 +243,9 @@ New characters Recommended characters N + All new characters + Total + items Character Works Talk diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9dbb579c..7dc3faa2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -243,6 +243,9 @@ 新着キャラクター おすすめキャラクター N + 新着キャラクター一覧 + 合計 + 件 キャラクター 作品別 トーク diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ebce1405..84c92bb1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -242,6 +242,9 @@ 신규 캐릭터 추천 캐릭터 N + 신규 캐릭터 전체보기 + 전체 + 개 캐릭터 작품별 톡