공용 토스트 메시지로 unknown 오류를 통합
Toast 메시지를 공용 데이터 클래스로 정의합니다. 화면별 unknown 에러 문자열을 common_error_unknown으로 통일합니다.
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
package kr.co.vividnext.sodalive.home
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import com.orhanobut.logger.Logger
|
||||
@@ -12,6 +11,7 @@ import kr.co.vividnext.sodalive.audio_content.series.GetSeriesListResponse
|
||||
import kr.co.vividnext.sodalive.base.BaseViewModel
|
||||
import kr.co.vividnext.sodalive.chat.character.Character
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.common.ToastMessage
|
||||
import kr.co.vividnext.sodalive.explorer.GetExplorerSectionCreatorResponse
|
||||
import kr.co.vividnext.sodalive.live.GetRoomListResponse
|
||||
import kr.co.vividnext.sodalive.user.UserRepository
|
||||
@@ -26,8 +26,8 @@ class HomeViewModel(
|
||||
val isLoading: LiveData<Boolean>
|
||||
get() = _isLoading
|
||||
|
||||
private val _toastLiveData = MutableLiveData<HomeToastMessage?>()
|
||||
val toastLiveData: LiveData<HomeToastMessage?>
|
||||
private val _toastLiveData = MutableLiveData<ToastMessage?>()
|
||||
val toastLiveData: LiveData<ToastMessage?>
|
||||
get() = _toastLiveData
|
||||
|
||||
private var _liveListLiveData = MutableLiveData<List<GetRoomListResponse>>()
|
||||
@@ -117,9 +117,9 @@ class HomeViewModel(
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
if (it.message != null) {
|
||||
HomeToastMessage(message = it.message)
|
||||
ToastMessage(message = it.message)
|
||||
} else {
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -128,7 +128,7 @@ class HomeViewModel(
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
@@ -147,10 +147,10 @@ class HomeViewModel(
|
||||
_contentRankingLiveData.value = data
|
||||
} else {
|
||||
if (it.message != null) {
|
||||
_toastLiveData.postValue(HomeToastMessage(message = it.message))
|
||||
_toastLiveData.postValue(ToastMessage(message = it.message))
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -158,7 +158,7 @@ class HomeViewModel(
|
||||
{
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
@@ -182,7 +182,7 @@ class HomeViewModel(
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
@@ -210,7 +210,7 @@ class HomeViewModel(
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
@@ -238,7 +238,7 @@ class HomeViewModel(
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
@@ -261,10 +261,10 @@ class HomeViewModel(
|
||||
_isLoading.value = false
|
||||
if (!it.success || it.data == null) {
|
||||
if (it.message != null) {
|
||||
_toastLiveData.postValue(HomeToastMessage(message = it.message))
|
||||
_toastLiveData.postValue(ToastMessage(message = it.message))
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -273,15 +273,10 @@ class HomeViewModel(
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(
|
||||
HomeToastMessage(resId = R.string.screen_home_error_unknown)
|
||||
ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
data class HomeToastMessage(
|
||||
@StringRes val resId: Int? = null,
|
||||
val message: String? = null
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user