공용 토스트 메시지로 unknown 오류를 통합
Toast 메시지를 공용 데이터 클래스로 정의합니다. 화면별 unknown 에러 문자열을 common_error_unknown으로 통일합니다.
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
package kr.co.vividnext.sodalive.mypage
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import com.orhanobut.logger.Logger
|
||||
@@ -9,6 +8,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
|
||||
import kr.co.vividnext.sodalive.base.BaseViewModel
|
||||
import kr.co.vividnext.sodalive.common.ApiResponse
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.common.ToastMessage
|
||||
import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
|
||||
import kr.co.vividnext.sodalive.mypage.auth.AuthVerifyRequest
|
||||
import kr.co.vividnext.sodalive.settings.ContentType
|
||||
@@ -22,8 +22,8 @@ class MyPageViewModel(
|
||||
private val authRepository: AuthRepository,
|
||||
private val noticeRepository: NoticeRepository
|
||||
) : BaseViewModel() {
|
||||
private val _toastLiveData = MutableLiveData<MyPageToastMessage?>()
|
||||
val toastLiveData: LiveData<MyPageToastMessage?>
|
||||
private val _toastLiveData = MutableLiveData<ToastMessage?>()
|
||||
val toastLiveData: LiveData<ToastMessage?>
|
||||
get() = _toastLiveData
|
||||
|
||||
private var _isLoading = MutableLiveData(false)
|
||||
@@ -54,9 +54,9 @@ class MyPageViewModel(
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
if (it.message != null) {
|
||||
MyPageToastMessage(message = it.message)
|
||||
ToastMessage(message = it.message)
|
||||
} else {
|
||||
MyPageToastMessage(resId = R.string.screen_my_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -66,7 +66,7 @@ class MyPageViewModel(
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
MyPageToastMessage(resId = R.string.screen_my_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
@@ -95,9 +95,9 @@ class MyPageViewModel(
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
if (it.message != null) {
|
||||
MyPageToastMessage(message = it.message)
|
||||
ToastMessage(message = it.message)
|
||||
} else {
|
||||
MyPageToastMessage(resId = R.string.screen_my_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -108,7 +108,7 @@ class MyPageViewModel(
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
MyPageToastMessage(resId = R.string.screen_my_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
@@ -136,8 +136,3 @@ class MyPageViewModel(
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
data class MyPageToastMessage(
|
||||
@StringRes val resId: Int? = null,
|
||||
val message: String? = null
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user