관심사 태그 선택 문자열 리소스화
This commit is contained in:
@@ -98,7 +98,10 @@ class MemberTagFragment(
|
||||
@SuppressLint("NotifyDataSetChanged")
|
||||
private fun bindData() {
|
||||
viewModel.toastLiveData.observe(viewLifecycleOwner) {
|
||||
it?.let { Toast.makeText(requireActivity(), it, Toast.LENGTH_LONG).show() }
|
||||
val message = it?.resId?.let(::getString) ?: it?.message
|
||||
message?.let { text ->
|
||||
Toast.makeText(requireActivity(), text, Toast.LENGTH_LONG).show()
|
||||
}
|
||||
}
|
||||
|
||||
viewModel.tagLiveData.observe(viewLifecycleOwner) {
|
||||
|
||||
@@ -6,11 +6,13 @@ 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
|
||||
|
||||
class MemberTagViewModel(private val repository: MemberTagRepository) : BaseViewModel() {
|
||||
private val _toastLiveData = MutableLiveData<String?>()
|
||||
val toastLiveData: LiveData<String?>
|
||||
private val _toastLiveData = MutableLiveData<ToastMessage?>()
|
||||
val toastLiveData: LiveData<ToastMessage?>
|
||||
get() = _toastLiveData
|
||||
|
||||
private val _tagLiveData = MutableLiveData<List<MemberTagResponse>>()
|
||||
@@ -32,20 +34,18 @@ class MemberTagViewModel(private val repository: MemberTagRepository) : BaseView
|
||||
if (it.success && it.data != null) {
|
||||
_tagLiveData.postValue(it.data!!)
|
||||
} 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
|
||||
},
|
||||
{
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
|
||||
_toastLiveData.postValue(ToastMessage(resId = R.string.common_error_unknown))
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
android:layout_marginStart="26.7dp"
|
||||
android:layout_marginTop="26.7dp"
|
||||
android:fontFamily="@font/gmarket_sans_bold"
|
||||
android:text="관심사 선택"
|
||||
android:text="@string/screen_member_tag_title"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="18.3sp" />
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
android:fontFamily="@font/gmarket_sans_bold"
|
||||
android:gravity="center"
|
||||
android:paddingVertical="16dp"
|
||||
android:text="선택하기"
|
||||
android:text="@string/screen_member_tag_confirm"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="18.3sp" />
|
||||
|
||||
|
||||
@@ -354,6 +354,9 @@
|
||||
<string name="msg_nickname_update_input_required">Please enter a nickname.</string>
|
||||
<string name="msg_nickname_update_success">Nickname changed.</string>
|
||||
<string name="msg_nickname_update_check_required">Please check nickname availability.</string>
|
||||
<!-- Member Tag -->
|
||||
<string name="screen_member_tag_title">Select interests</string>
|
||||
<string name="screen_member_tag_confirm">Apply selection</string>
|
||||
<!-- Block Member -->
|
||||
<string name="screen_block_member_title">Blocked users</string>
|
||||
<string name="screen_block_member_total_prefix">Total</string>
|
||||
|
||||
@@ -354,6 +354,9 @@
|
||||
<string name="msg_nickname_update_input_required">ニックネームを入力してください。</string>
|
||||
<string name="msg_nickname_update_success">ニックネームを変更しました。</string>
|
||||
<string name="msg_nickname_update_check_required">ニックネームの重複チェックを行ってください。</string>
|
||||
<!-- Member Tag -->
|
||||
<string name="screen_member_tag_title">関心事を選択</string>
|
||||
<string name="screen_member_tag_confirm">選択する</string>
|
||||
<!-- Block Member -->
|
||||
<string name="screen_block_member_title">ブロックリスト</string>
|
||||
<string name="screen_block_member_total_prefix">総</string>
|
||||
|
||||
@@ -353,6 +353,9 @@
|
||||
<string name="msg_nickname_update_input_required">닉네임을 입력하세요.</string>
|
||||
<string name="msg_nickname_update_success">닉네임이 변경되었습니다.</string>
|
||||
<string name="msg_nickname_update_check_required">닉네임 중복체크를 해주세요.</string>
|
||||
<!-- Member Tag -->
|
||||
<string name="screen_member_tag_title">관심사 선택</string>
|
||||
<string name="screen_member_tag_confirm">선택하기</string>
|
||||
<!-- Block Member -->
|
||||
<string name="screen_block_member_title">차단 리스트</string>
|
||||
<string name="screen_block_member_total_prefix">총</string>
|
||||
|
||||
Reference in New Issue
Block a user