diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagFragment.kt index f0f13281..5070a69c 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagFragment.kt @@ -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) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagViewModel.kt index e5d7b808..33102dcb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/profile/tag/MemberTagViewModel.kt @@ -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() - val toastLiveData: LiveData + private val _toastLiveData = MutableLiveData() + val toastLiveData: LiveData get() = _toastLiveData private val _tagLiveData = MutableLiveData>() @@ -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)) } ) ) diff --git a/app/src/main/res/layout/fragment_creator_tag.xml b/app/src/main/res/layout/fragment_creator_tag.xml index b1823844..348ff5e0 100644 --- a/app/src/main/res/layout/fragment_creator_tag.xml +++ b/app/src/main/res/layout/fragment_creator_tag.xml @@ -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" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index c6315fda..daf9bd24 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -354,6 +354,9 @@ Please enter a nickname. Nickname changed. Please check nickname availability. + + Select interests + Apply selection Blocked users Total diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 99a7e0ca..79e5aaf2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -354,6 +354,9 @@ ニックネームを入力してください。 ニックネームを変更しました。 ニックネームの重複チェックを行ってください。 + + 関心事を選択 + 選択する ブロックリスト diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 92ec141f..564f790f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -353,6 +353,9 @@ 닉네임을 입력하세요. 닉네임이 변경되었습니다. 닉네임 중복체크를 해주세요. + + 관심사 선택 + 선택하기 차단 리스트