klaus/sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

공용 토스트 메시지로 unknown 오류를 통합

Browse Source 
Toast 메시지를 공용 데이터 클래스로 정의합니다.

화면별 unknown 에러 문자열을 common_error_unknown으로 통일합니다.
This commit is contained in:
klaus
2025-12-01 13:40:31 +09:00
parent 492077ddb2
commit 4d1e859bbf
7 changed files with 54 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/kr/co/vividnext/sodalive/search/SearchViewModel.kt
View File

@@ -1,6 +1,5 @@
package kr.co.vividnext.sodalive.search
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.R
import kr.co.vividnext.sodalive.base.BaseViewModel
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
import kr.co.vividnext.sodalive.common.ToastMessage
class SearchViewModel(
private val repository: SearchRepository
@@ -29,8 +29,8 @@ class SearchViewModel(
val currentTabLiveData: LiveData<SearchPageTab>
get() = _currentTabLiveData
private val _toastLiveData = MutableLiveData<SearchToastMessage?>()
val toastLiveData: LiveData<SearchToastMessage?>
private val _toastLiveData = MutableLiveData<ToastMessage?>()
val toastLiveData: LiveData<ToastMessage?>
get() = _toastLiveData
private var _isLoading = MutableLiveData(false)
@@ -94,9 +94,9 @@ class SearchViewModel(
_searchUnifiedLiveData.value = it.data!!
} else {
_toastLiveData.value = if (it.message != null) {
SearchToastMessage(message = it.message)
ToastMessage(message = it.message)
} else {
SearchToastMessage(resId = R.string.screen_search_error_unknown)
ToastMessage(resId = R.string.common_error_unknown)
}
}
},
@@ -104,8 +104,8 @@ class SearchViewModel(
_isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData
.value = SearchToastMessage(
resId = R.string.screen_search_error_unknown
.value = ToastMessage(
resId = R.string.common_error_unknown
)
}
)
@@ -139,9 +139,9 @@ class SearchViewModel(
}
} else {
_toastLiveData.value = if (it.message != null) {
SearchToastMessage(message = it.message)
ToastMessage(message = it.message)
} else {
SearchToastMessage(resId = R.string.screen_search_error_unknown)
ToastMessage(resId = R.string.common_error_unknown)
}
}
},
@@ -149,8 +149,8 @@ class SearchViewModel(
_isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData
.value = SearchToastMessage(
resId = R.string.screen_search_error_unknown
.value = ToastMessage(
resId = R.string.common_error_unknown
)
}
)
@@ -186,9 +186,9 @@ class SearchViewModel(
}
} else {
_toastLiveData.value = if (it.message != null) {
SearchToastMessage(message = it.message)
ToastMessage(message = it.message)
} else {
SearchToastMessage(resId = R.string.screen_search_error_unknown)
ToastMessage(resId = R.string.common_error_unknown)
}
}
},
@@ -196,8 +196,8 @@ class SearchViewModel(
_isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData
.value = SearchToastMessage(
resId = R.string.screen_search_error_unknown
.value = ToastMessage(
resId = R.string.common_error_unknown
)
}
)
@@ -233,9 +233,9 @@ class SearchViewModel(
}
} else {
_toastLiveData.value = if (it.message != null) {
SearchToastMessage(message = it.message)
ToastMessage(message = it.message)
} else {
SearchToastMessage(resId = R.string.screen_search_error_unknown)
ToastMessage(resId = R.string.common_error_unknown)
}
}
},
@@ -243,8 +243,8 @@ class SearchViewModel(
_isLoading.value = false
it.message?.let { message -> Logger.e(message) }
_toastLiveData
.value = SearchToastMessage(
resId = R.string.screen_search_error_unknown
.value = ToastMessage(
resId = R.string.common_error_unknown
)
}
)
@@ -254,8 +254,3 @@ class SearchViewModel(
}
}
}
data class SearchToastMessage(
@StringRes val resId: Int? = null,
val message: String? = null
)