FollowingCreator 문자열 리소스화

app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorActivity.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.base.BaseActivity
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
@@ -34,7 +35,7 @@ class FollowingCreatorActivity : BaseActivity<ActivityFollowingCreatorBinding>(
 
     override fun setupView() {
         loadingDialog = LoadingDialog(this, layoutInflater)
-        binding.toolbar.tvBack.text = "팔로잉 리스트"
+        binding.toolbar.tvBack.text = getString(R.string.screen_following_creator_title)
         binding.toolbar.tvBack.setOnClickListener { finish() }
 
         adapter = FollowingCreatorAdapter(
@@ -106,8 +107,13 @@ class FollowingCreatorActivity : BaseActivity<ActivityFollowingCreatorBinding>(
 
     @SuppressLint("SetTextI18n")
     private fun bindData() {
-        viewModel.toastLiveData.observe(this) {
+        viewModel.toastLiveData.observe(this) { toastMessage ->
-            it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() }
+            toastMessage?.let {
+                val message = it.message ?: it.resId?.let(::getString)
+                message?.let { text ->
+                    Toast.makeText(applicationContext, text, Toast.LENGTH_LONG).show()
+                }
+            }
         }
 
         viewModel.isLoading.observe(this) {
@@ -124,7 +130,10 @@ class FollowingCreatorActivity : BaseActivity<ActivityFollowingCreatorBinding>(
         }
 
         viewModel.creatorListTotalCountLiveData.observe(this) {
-            binding.tvTotalCount.text = "  $it "
+            binding.tvTotalCount.text = " ${getString(
+                R.string.following_creator_total_count_value,
+                it
+            )} "
 
             if (it > 0) {
                 binding.tvNone.visibility = View.GONE

app/src/main/java/kr/co/vividnext/sodalive/following/FollowingCreatorViewModel.kt

@@ -5,8 +5,10 @@ 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.common.SharedPreferenceManager
+import kr.co.vividnext.sodalive.common.ToastMessage
 import kr.co.vividnext.sodalive.user.UserRepository
 
 class FollowingCreatorViewModel(
@@ -26,8 +28,8 @@ class FollowingCreatorViewModel(
     val isLoading: LiveData<Boolean>
         get() = _isLoading
 
-    private val _toastLiveData = MutableLiveData<String?>()
+    private val _toastLiveData = MutableLiveData<ToastMessage?>()
-    val toastLiveData: LiveData<String?>
+    val toastLiveData: LiveData<ToastMessage?>
         get() = _toastLiveData
 
     var page = 1
@@ -59,21 +61,19 @@ class FollowingCreatorViewModel(
                                     _creatorListTotalCountLiveData.value = data.totalCount
                                     _creatorListLiveData.value = data.items
                                 }
-                            } else {
+                            } else if (it.message != null) {
-                                if (it.message != null) {
+                                _toastLiveData.postValue(ToastMessage(message = it.message))
-                                    _toastLiveData.postValue(it.message)
                             } else {
                                 _toastLiveData.postValue(
-                                        "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                    ToastMessage(resId = R.string.common_error_unknown)
                                 )
                             }
-                            }
                         },
                         {
                             _isLoading.value = false
                             it.message?.let { message -> Logger.e(message) }
                             _toastLiveData.postValue(
-                                "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                ToastMessage(resId = R.string.common_error_unknown)
                             )
                         }
                     )
@@ -100,20 +100,20 @@ class FollowingCreatorViewModel(
                             pageSize *= page
                             page = 1
                             getFollowedCreatorAllList()
-                        } else {
+                        } else if (it.message != null) {
-                            if (it.message != null) {
+                            _toastLiveData.postValue(ToastMessage(message = it.message))
-                                _toastLiveData.postValue(it.message)
                         } else {
                             _toastLiveData.postValue(
-                                    "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                ToastMessage(resId = R.string.common_error_unknown)
                             )
                         }
-                        }
                     },
                     {
                         _isLoading.value = false
                         it.message?.let { message -> Logger.e(message) }
-                        _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                        _toastLiveData.postValue(
+                            ToastMessage(resId = R.string.common_error_unknown)
+                        )
                     }
                 )
         )

app/src/main/res/layout/activity_following_creator.xml

@@ -24,7 +24,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/gmarket_sans_medium"
-            android:text="총"
+            android:text="@string/following_creator_total_prefix"
             android:textColor="@color/color_eeeeee"
             android:textSize="12sp" />
 
@@ -41,7 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/gmarket_sans_medium"
-            android:text="명"
+            android:text="@string/following_creator_total_suffix"
             android:textColor="@color/color_eeeeee"
             android:textSize="12sp" />
     </LinearLayout>
@@ -66,7 +66,7 @@
         android:layout_marginTop="13.3dp"
         android:fontFamily="@font/gmarket_sans_medium"
         android:gravity="center"
-        android:text="팔로우 중인 채널이 없습니다."
+        android:text="@string/following_creator_empty"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

app/src/main/res/values-en/strings.xml

@@ -178,6 +178,13 @@
     <string name="screen_search_series_title">Series</string>
     <string name="screen_search_no_result">No results found.</string>
 
+    <!-- Following Creator -->
+    <string name="screen_following_creator_title">Following list</string>
+    <string name="following_creator_total_prefix">Total</string>
+    <string name="following_creator_total_count_value">%1$d</string>
+    <string name="following_creator_total_suffix">creators</string>
+    <string name="following_creator_empty">You are not following any channels.</string>
+
     <!-- Settings / Notices / Events -->
     <string name="screen_settings_title">Settings</string>
     <string name="screen_settings_notification">Notification settings</string>

app/src/main/res/values-ja/strings.xml

@@ -178,6 +178,13 @@
     <string name="screen_search_series_title">シリーズ</string>
     <string name="screen_search_no_result">検索結果がありません。</string>
 
+    <!-- Following Creator -->
+    <string name="screen_following_creator_title">フォロー中リスト</string>
+    <string name="following_creator_total_prefix">合計</string>
+    <string name="following_creator_total_count_value">%1$d</string>
+    <string name="following_creator_total_suffix">人</string>
+    <string name="following_creator_empty">フォロー中のチャンネルがありません。</string>
+
     <!-- Settings / Notices / Events -->
     <string name="screen_settings_title">設定</string>
     <string name="screen_settings_notification">通知設定</string>

app/src/main/res/values/strings.xml

@@ -177,6 +177,13 @@
     <string name="screen_search_series_title">시리즈</string>
     <string name="screen_search_no_result">검색 결과가 없습니다.</string>
 
+    <!-- Following Creator -->
+    <string name="screen_following_creator_title">팔로잉 리스트</string>
+    <string name="following_creator_total_prefix">총</string>
+    <string name="following_creator_total_count_value">%1$d</string>
+    <string name="following_creator_total_suffix">명</string>
+    <string name="following_creator_empty">팔로우 중인 채널이 없습니다.</string>
+
     <!-- Settings / Notices / Events -->
     <string name="screen_settings_title">설정</string>
     <string name="screen_settings_notification">알림 설정</string>