From 7f27f461f321ba31979f90843d374c29b6a1aa18 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 2 Dec 2025 13:45:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B0=A8=EB=8B=A8=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=A6=AC?= =?UTF-8?q?=EC=86=8C=EC=8A=A4=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mypage/block/BlockMemberActivity.kt | 15 ++++++++++--- .../mypage/block/BlockMemberAdapter.kt | 6 +++-- .../mypage/block/BlockMemberViewModel.kt | 22 +++++++++---------- .../main/res/layout/activity_block_member.xml | 8 +++---- .../res/layout/item_blocked_member_list.xml | 3 ++- 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 +++++++ 8 files changed, 56 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberActivity.kt index b0009cf2..911dd513 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberActivity.kt @@ -7,6 +7,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.LoadingDialog import kr.co.vividnext.sodalive.databinding.ActivityBlockMemberBinding @@ -30,7 +31,7 @@ class BlockMemberActivity : BaseActivity( override fun setupView() { loadingDialog = LoadingDialog(this, layoutInflater) - binding.toolbar.tvBack.text = "차단 리스트" + binding.toolbar.tvBack.text = getString(R.string.screen_block_member_title) binding.toolbar.tvBack.setOnClickListener { finish() } adapter = BlockMemberAdapter( @@ -78,7 +79,10 @@ class BlockMemberActivity : BaseActivity( @SuppressLint("SetTextI18n") private fun bindData() { viewModel.toastLiveData.observe(this) { - it?.let { Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show() } + val message = it?.resId?.let(::getString) ?: it?.message + message?.let { text -> + Toast.makeText(applicationContext, text, Toast.LENGTH_LONG).show() + } } viewModel.isLoading.observe(this) { @@ -94,7 +98,12 @@ class BlockMemberActivity : BaseActivity( } viewModel.blockedMemberTotalCountLiveData.observe(this) { - binding.tvTotalCount.text = " $it " + binding.tvTotalCount.text = " ${ + getString( + R.string.screen_block_member_total_count, + it + ) + } " if (it > 0) { binding.tvNone.visibility = View.GONE diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberAdapter.kt index a97e88ab..30d02099 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberAdapter.kt @@ -26,6 +26,8 @@ class BlockMemberAdapter( @SuppressLint("NotifyDataSetChanged") fun bind(item: GetBlockedMemberListItem) { binding.tvNickname.text = item.nickname + val blockText = context.getString(R.string.screen_block_member_block) + val unBlockText = context.getString(R.string.screen_block_member_unblock) binding.ivProfile.load(item.profileImageUrl) { transformations(CircleCropTransformation()) placeholder(R.drawable.bg_placeholder) @@ -34,7 +36,7 @@ class BlockMemberAdapter( binding.tvBlock.visibility = View.VISIBLE if (item.isBlocked) { - binding.tvBlock.text = "차단해제" + binding.tvBlock.text = unBlockText binding.tvBlock.background = ContextCompat.getDrawable( context, R.drawable.bg_round_corner_13_3_333bb9f1_3bb9f1 @@ -48,7 +50,7 @@ class BlockMemberAdapter( unBlockMember(item.memberId) } } else { - binding.tvBlock.text = "차단" + binding.tvBlock.text = blockText binding.tvBlock.background = ContextCompat.getDrawable( context, R.drawable.bg_round_corner_13_3_transparent_3bb9f1 diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberViewModel.kt index 177c69b5..21e7a319 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/block/BlockMemberViewModel.kt @@ -6,7 +6,9 @@ import com.orhanobut.logger.Logger import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers import kr.co.vividnext.sodalive.base.BaseViewModel +import kr.co.vividnext.sodalive.common.ToastMessage import kr.co.vividnext.sodalive.common.SharedPreferenceManager +import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.user.UserRepository class BlockMemberViewModel(private val userRepository: UserRepository) : BaseViewModel() { @@ -22,8 +24,8 @@ class BlockMemberViewModel(private val userRepository: UserRepository) : BaseVie val isLoading: LiveData get() = _isLoading - private val _toastLiveData = MutableLiveData() - val toastLiveData: LiveData + private val _toastLiveData = MutableLiveData() + val toastLiveData: LiveData get() = _toastLiveData var page = 1 @@ -55,21 +57,17 @@ class BlockMemberViewModel(private val userRepository: UserRepository) : BaseVie _blockedMemberListLiveData.value = data.items } } else { - if (it.message != null) { - _toastLiveData.postValue(it.message) - } else { - _toastLiveData.postValue( - "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요." - ) - } + _toastLiveData.postValue( + it.message?.let { message -> + ToastMessage(message = message) + } ?: 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)) } ) ) diff --git a/app/src/main/res/layout/activity_block_member.xml b/app/src/main/res/layout/activity_block_member.xml index 1d358ec8..9dcd108c 100644 --- a/app/src/main/res/layout/activity_block_member.xml +++ b/app/src/main/res/layout/activity_block_member.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/screen_block_member_total_prefix" android:textColor="@color/color_eeeeee" android:textSize="12sp" /> @@ -35,13 +35,13 @@ android:fontFamily="@font/gmarket_sans_medium" android:textColor="@color/color_dd4500" android:textSize="12sp" - tools:text=" 10" /> + tools:text=" 10 " /> @@ -66,7 +66,7 @@ android:layout_marginTop="13.3dp" android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" - android:text="차단한 유저가 없습니다." + android:text="@string/screen_block_member_empty" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_blocked_member_list.xml b/app/src/main/res/layout/item_blocked_member_list.xml index 9ee65916..8b94d61e 100644 --- a/app/src/main/res/layout/item_blocked_member_list.xml +++ b/app/src/main/res/layout/item_blocked_member_list.xml @@ -32,10 +32,11 @@ android:fontFamily="@font/gmarket_sans_medium" android:gravity="center" android:minWidth="83dp" + android:paddingHorizontal="12dp" android:paddingVertical="7dp" android:textColor="@color/color_3bb9f1" tools:background="@drawable/bg_round_corner_13_3_333bb9f1_3bb9f1" - tools:text="차단해제" /> + tools:text="@string/screen_block_member_unblock" /> Please enter a nickname. Nickname changed. Please check nickname availability. + + Blocked users + Total + %1$d + users + No blocked users. + Block + Unblock View my channel Charge cans Point reward diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e06bc090..99a7e0ca 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -354,6 +354,14 @@ ニックネームを入力してください。 ニックネームを変更しました。 ニックネームの重複チェックを行ってください。 + + ブロックリスト + 総 + %1$d + 人 + ブロックしたユーザーがいません。 + ブロック + ブロック解除 マイチャンネルを見る CANチャージ ポイントリワード diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 86046bf7..92ec141f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -353,6 +353,14 @@ 닉네임을 입력하세요. 닉네임이 변경되었습니다. 닉네임 중복체크를 해주세요. + + 차단 리스트 + 총 + %1$d + 명 + 차단한 유저가 없습니다. + 차단 + 차단해제 내 채널 보기 캔 충전 포인트 리워드