feat: 検索結果が見つからなかった時に、スナックバーを表示するよう変更 (#8)

kokoichi206 · Dec 7, 2022 · 560a930 · 560a930
1 parent d49b49a
commit 560a930
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainView.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainView.kt
@@ -143,12 +143,12 @@ fun MainView(
         val snackBarHostState = remember { SnackbarHostState() }
         var snackBarJob: Job? by remember { mutableStateOf(null) }
 
-        val snackBarMessage = stringResource(id = R.string.apiErrorMessage)
         LaunchedEffect(uiState.error) {
             if (uiState.error.isNotEmpty()) {
                 snackBarJob?.cancel()
                 snackBarJob = snackBarCoroutineScope.launch {
-                    snackBarHostState.showSnackbar(snackBarMessage)
+                    // uiState のエラーをそのまま表示する
+                    snackBarHostState.showSnackbar(uiState.error)
                 }
                 viewModel.resetError()
             }

diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/main/MainViewModel.kt
@@ -3,11 +3,13 @@
  */
 package jp.co.yumemi.android.code_check.presentation.main
 
+import android.app.Application
 import android.util.Log
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.data.repository.GitHubRepository
 import jp.co.yumemi.android.code_check.data.repository.SearchResultRepository
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -23,6 +25,7 @@ import javax.inject.Inject
 class MainViewModel @Inject constructor(
     private val repository: GitHubRepository,
     private val searchRepository: SearchResultRepository,
+    private val application: Application,
 ) : ViewModel() {
 
     companion object {
@@ -43,16 +46,28 @@ class MainViewModel @Inject constructor(
 
         viewModelScope.launch {
             try {
-                _uiState.update { it.copy(isLoading = true) }
+                _uiState.update { it.copy(isLoading = true, repositories = emptyList()) }
 
                 val result = repository.searchRepositories(inputText)
+
+                if (result.isEmpty()) {
+                    val noRecordMsg = application.getString(R.string.noRecordFound)
+                    _uiState.update {
+                        it.copy(isLoading = false, error = noRecordMsg)
+                    }
+                    return@launch
+                }
                 _uiState.update { it.copy(isLoading = false, repositories = result) }
 
                 searchRepository.insertRecord(inputText, true)
             } catch (e: Exception) {
                 e.localizedMessage?.let { msg ->
                     Log.e(TAG, msg)
-                    _uiState.update { it.copy(isLoading = false, error = msg) }
+
+                    val errorMsg = application.getString(R.string.apiErrorMessage)
+                    _uiState.update {
+                        it.copy(isLoading = false, error = errorMsg)
+                    }
                 }
                 searchRepository.insertRecord(inputText, false)
             }

diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/user/UserView.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/user/UserView.kt
@@ -127,12 +127,12 @@ fun UserViewMain(
     val snackBarHostState = remember { SnackbarHostState() }
     var snackBarJob: Job? by remember { mutableStateOf(null) }
 
-    val snackBarMessage = stringResource(id = R.string.apiErrorMessage)
     LaunchedEffect(uiState.error) {
         if (uiState.error.isNotEmpty()) {
             snackBarJob?.cancel()
             snackBarJob = snackBarCoroutineScope.launch {
-                snackBarHostState.showSnackbar(snackBarMessage)
+                // uiState のエラーをそのまま表示する
+                snackBarHostState.showSnackbar(uiState.error)
             }
             onSnackBarShow()
         }

diff --git a/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/user/UserViewModel.kt b/app/src/main/kotlin/jp/co/yumemi/android/code_check/presentation/user/UserViewModel.kt
@@ -3,13 +3,14 @@
  */
 package jp.co.yumemi.android.code_check.presentation.user
 
+import android.app.Application
 import android.util.Log
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.data.repository.GitHubRepository
-import jp.co.yumemi.android.code_check.data.repository.SearchResultRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -22,7 +23,7 @@ import javax.inject.Inject
 @HiltViewModel
 class UserViewModel @Inject constructor(
     private val repository: GitHubRepository,
-    private val searchRepository: SearchResultRepository,
+    private val application: Application,
 ) : ViewModel() {
 
     companion object {
@@ -43,14 +44,20 @@ class UserViewModel @Inject constructor(
 
         viewModelScope.launch {
             try {
-                _uiState.update { it.copy(isLoading = true) }
+                _uiState.update { it.copy(isLoading = true, users = emptyList()) }
 
                 val result = repository.searchUsers(inputText)
+                if (result.isEmpty()) {
+                    val noRecordMsg = application.getString(R.string.noRecordFound)
+                    _uiState.update { it.copy(isLoading = false, error = noRecordMsg) }
+                    return@launch
+                }
                 _uiState.update { it.copy(isLoading = false, users = result) }
             } catch (e: Exception) {
                 e.localizedMessage?.let { msg ->
                     Log.e(TAG, msg)
-                    _uiState.update { it.copy(isLoading = false, error = msg) }
+                    val errorMsg = application.getString(R.string.apiErrorMessage)
+                    _uiState.update { it.copy(isLoading = false, error = errorMsg) }
                 }
             }
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,5 +12,6 @@
     <!--UserView-->
     <string name="searchInputText_hint_users">GitHub のユーザーを検索できるよー</string>
 
+    <string name="noRecordFound">"結果が1件も見つかりませんでした。\n検索ワードを変えて再度お試しください。"</string>
     <string name="apiErrorMessage">"通信エラーが発生しました。\n時間をおいて再度お試しください。"</string>
 </resources>