diff --git a/app/src/main/java/kr/co/vividnext/sodalive/common/ToastMessage.kt b/app/src/main/java/kr/co/vividnext/sodalive/common/ToastMessage.kt new file mode 100644 index 00000000..b5b29055 --- /dev/null +++ b/app/src/main/java/kr/co/vividnext/sodalive/common/ToastMessage.kt @@ -0,0 +1,8 @@ +package kr.co.vividnext.sodalive.common + +import androidx.annotation.StringRes + +data class ToastMessage( + @StringRes val resId: Int? = null, + val message: String? = null +) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeViewModel.kt index f425efcd..2177f6ab 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeViewModel.kt @@ -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 get() = _isLoading - private val _toastLiveData = MutableLiveData() - val toastLiveData: LiveData + private val _toastLiveData = MutableLiveData() + val toastLiveData: LiveData get() = _toastLiveData private var _liveListLiveData = MutableLiveData>() @@ -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 -) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt index 8cf4e48e..aa4d430b 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/MyPageViewModel.kt @@ -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() - val toastLiveData: LiveData + private val _toastLiveData = MutableLiveData() + val toastLiveData: LiveData 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 -) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/search/SearchViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/search/SearchViewModel.kt index 52e66cdf..a284a7c0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/search/SearchViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/search/SearchViewModel.kt @@ -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 get() = _currentTabLiveData - private val _toastLiveData = MutableLiveData() - val toastLiveData: LiveData + private val _toastLiveData = MutableLiveData() + val toastLiveData: LiveData 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 -) diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 2c2b925e..e8f0d152 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -119,7 +119,7 @@ New Complete Contents - An unknown error occurred. Please try again. + An unknown error occurred. Please try again. Character Works Talk @@ -153,7 +153,6 @@ Verify identity Register coupon Available after identity verification. - An unknown error occurred. Please try again. Search All Channels @@ -164,5 +163,4 @@ Contents Series No results found. - An unknown error occurred. Please try again. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ed64d550..2ee29a16 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -119,7 +119,7 @@ 新作 完結 コンテンツ - 不明なエラーが発生しました。もう一度お試しください。 + 不明なエラーが発生しました。もう一度お試しください。 キャラクター 作品別 トーク @@ -153,7 +153,6 @@ 本人認証 クーポン登録 本人認証後に利用できます。 - 不明なエラーが発生しました。もう一度お試しください。 検索 総合 チャンネル @@ -164,5 +163,4 @@ コンテンツ シリーズ 検索結果がありません。 - 不明なエラーが発生しました。もう一度お試しください。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd0b3938..90546315 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -118,7 +118,7 @@ 신작 완결 콘텐츠 - 알 수 없는 오류가 발생했습니다. 다시 시도해 주세요. + 알 수 없는 오류가 발생했습니다. 다시 시도해 주세요. 캐릭터 작품별 @@ -152,7 +152,6 @@ 본인인증 쿠폰등록 본인인증 후 사용가능합니다. - 알 수 없는 오류가 발생했습니다. 다시 시도해 주세요. 검색 통합 채널 @@ -163,5 +162,4 @@ 콘텐츠 시리즈 검색 결과가 없습니다. - 알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.