Merge pull request #150 from tshion/hotfix/#146_be_single_error_dialog

#146 検索画面で、エラーダイアログが多重表示される問題の修正

Author: tshion

app/src/main/kotlin/jp/co/yumemi/android/code_check/pages/search/SearchFragment.kt

@@ -17,6 +17,7 @@ import jp.co.yumemi.android.code_check.R
 import jp.co.yumemi.android.code_check.databinding.PageSearchBinding
 import jp.co.yumemi.android.code_check.organisms.repository_list_view.RepositoryListViewAdapter
 import jp.co.yumemi.android.code_check.pages.detail.DetailViewData
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.io.IOException
@@ -73,39 +74,44 @@ class SearchFragment : Fragment(R.layout.page_search) {
         // ViewModel と表示の結びつけ
         viewLifecycleOwner.lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
+                launch {
+                    viewModel.error.filterNotNull().collect { e ->
+                        when (e) {
+                            is IllegalArgumentException,
+                            is IndexOutOfBoundsException -> NavGraphEntryPointDirections.navShowNotifyDialog(
+                                title = getString(R.string.page_search_error_title_invalid),
+                                message = getString(R.string.page_search_error_message_invalid),
+                            )
+
+                            is IOException -> NavGraphEntryPointDirections.navShowNotifyDialog(
+                                title = getString(R.string.page_search_error_title_http),
+                                message = getString(R.string.page_search_error_message_offline),
+                            )
+
+                            else -> {
+                                Timber.e(e)
+                                NavGraphEntryPointDirections.navShowNotifyDialog(
+                                    title = getString(R.string.page_search_error_title_http),
+                                    message = getString(R.string.page_search_error_message_http),
+                                )
+                            }
+                        }.also {
+                            findNavController().navigate(it)
+                            viewModel.showedError()
+                        }
+                    }
+                }
+
                 launch {
                     viewModel.isLoading.collect {
                         binding?.pageSearchLoading?.isVisible = it
                     }
                 }
 
                 launch {
-                    viewModel.searchResult.collect { result ->
-                        result?.onSuccess {
-                            binding?.pageSearchList?.adapter?.submitList(it)
-                            binding?.pageSearchListEmpty?.isVisible = it.isEmpty()
-                        }?.onFailure { e ->
-                            when (e) {
-                                is IllegalArgumentException,
-                                is IndexOutOfBoundsException -> NavGraphEntryPointDirections.navShowNotifyDialog(
-                                    title = getString(R.string.page_search_error_title_invalid),
-                                    message = getString(R.string.page_search_error_message_invalid),
-                                )
-
-                                is IOException -> NavGraphEntryPointDirections.navShowNotifyDialog(
-                                    title = getString(R.string.page_search_error_title_http),
-                                    message = getString(R.string.page_search_error_message_offline),
-                                )
-
-                                else -> {
-                                    Timber.e(e)
-                                    NavGraphEntryPointDirections.navShowNotifyDialog(
-                                        title = getString(R.string.page_search_error_title_http),
-                                        message = getString(R.string.page_search_error_message_http),
-                                    )
-                                }
-                            }.also { findNavController().navigate(it) }
-                        }
+                    viewModel.repositories.filterNotNull().collect {
+                        binding?.pageSearchList?.adapter?.submitList(it)
+                        binding?.pageSearchListEmpty?.isVisible = it.isEmpty()
                     }
                 }
             }

app/src/main/kotlin/jp/co/yumemi/android/code_check/pages/search/SearchViewModel.kt

@@ -23,18 +23,23 @@ class SearchViewModel(
     private val dispatcherDefault: CoroutineDispatcher = Dispatchers.Default,
 ) : ViewModel() {
 
+    /** エラー */
+    val error: StateFlow<Exception?>
+    private val _error = MutableStateFlow<Exception?>(null)
+
     /** 読み込み中かどうか */
     val isLoading: StateFlow<Boolean>
     private val _isLoading = MutableStateFlow(false)
 
-    /** 検索結果 */
-    val searchResult: StateFlow<Result<List<RepositoryListItemViewData>>?>
-    private val _searchResult = MutableStateFlow<Result<List<RepositoryListItemViewData>>?>(null)
+    /** リポジトリ情報 */
+    val repositories: StateFlow<List<RepositoryListItemViewData>?>
+    private val _repositories = MutableStateFlow<List<RepositoryListItemViewData>?>(null)
 
 
     init {
+        error = _error
         isLoading = _isLoading
-        searchResult = _searchResult
+        repositories = _repositories
     }
 
 
@@ -45,19 +50,29 @@ class SearchViewModel(
      */
     fun search(keyword: String) {
         viewModelScope.launch {
+            _error.value = null
             _isLoading.value = true
-            _searchResult.value = null
-
-            _searchResult.value = withContext(dispatcherDefault) {
-                runCatching {
+            _repositories.value = null
+            try {
+                val mapped = withContext(dispatcherDefault) {
                     val result = searchUseCase.searchRepositories(keyword, 1)
                     result.items.map { RepositoryListItemViewData(it) }
                 }
+                _repositories.value = mapped
+            } catch (e: Exception) {
+                _error.value = e
             }
             _isLoading.value = false
         }
     }
 
+    /**
+     * エラー表示の完了
+     */
+    fun showedError() {
+        _error.value = null
+    }
+
 
     companion object {
         val Factory = viewModelFactory {

variables.gradle

@@ -8,7 +8,7 @@ ext {
     // アプリバージョン
     def appVersionMajor = 1
     def appVersionMinor = 2
-    def appVersionPatch = 1
+    def appVersionPatch = 2
     appVersionCode = 10000 * appVersionMajor + 100 * appVersionMinor + appVersionPatch
     appVersionName = "${appVersionMajor}.${appVersionMinor}.${appVersionPatch}"