fix: 다시 콜백으로 변경

ㅠㅠ
AlmostFullStack · Apr 8, 2024 · cddc490 · cddc490
1 parent c58b2b9
commit cddc490
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/app/src/main/java/com/easyhz/picly/view/MainFragment.kt b/app/src/main/java/com/easyhz/picly/view/MainFragment.kt
@@ -116,6 +116,7 @@ class MainFragment:Fragment() {
     private fun resetSearchBar() {
         binding.toolbar.apply {
             searchEditText.setText("")
+            viewModel.setSearchText("")
             searchEditText.clearFocus()
             val layoutParams = ConstraintLayout.LayoutParams(112.toPx(requireContext()), searchEditText.height)
             layoutParams.apply {

diff --git a/app/src/main/java/com/easyhz/picly/view/album/AlbumAdapter.kt b/app/src/main/java/com/easyhz/picly/view/album/AlbumAdapter.kt
@@ -9,17 +9,14 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.easyhz.picly.databinding.ItemAlbumBinding
 import com.easyhz.picly.domain.model.album.AlbumItem
-import com.easyhz.picly.domain.model.album.SearchData
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 class AlbumAdapter(
+    private val noResult: (Boolean , String) -> Unit,
     private val onClickLinkButton: (AlbumItem) -> Unit,
     private val onClickListener: (AlbumItem) -> Unit,
 ):RecyclerView.Adapter<AlbumAdapter.AlbumViewHolder>(), Filterable {
     var originalList: List<AlbumItem> = listOf()
     private val postFiler = PostFilter()
-    private var searchData = SearchData()
 
     inner class AlbumViewHolder(val binding: ItemAlbumBinding) : RecyclerView.ViewHolder(binding.root)
 
@@ -82,16 +79,8 @@ class AlbumAdapter(
 
         override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
             val filteredList = results?.values as? List<AlbumItem> ?: emptyList()
-            searchData.apply {
-                this.isEmpty = filteredList.isEmpty()
-                this.string = constraint.toString()
-            }
+            noResult(filteredList.isEmpty(), constraint.toString())
             differ.submitList(filteredList)
         }
     }
-    suspend fun getSearchData(): SearchData {
-        return suspendCoroutine<SearchData> { continuation ->
-            continuation.resume(searchData)
-        }
-    }
 }
diff --git a/app/src/main/java/com/easyhz/picly/view/album/AlbumFragment.kt b/app/src/main/java/com/easyhz/picly/view/album/AlbumFragment.kt
@@ -63,6 +63,7 @@ class AlbumFragment: Fragment() {
 
     private fun setRecyclerView() {
         albumAdapter = AlbumAdapter(
+            noResult = { isEmpty, s -> setNoResult(isEmpty, s) },
             onClickLinkButton = { onClickLinkButton(it) }
         ) {
             NavControllerManager.navigateMainToDetail(it)
@@ -90,9 +91,6 @@ class AlbumFragment: Fragment() {
     private fun observeSearchText() {
         viewModel.searchText.observe(viewLifecycleOwner) {
             albumAdapter.filter.filter(it)
-            CoroutineScope(Dispatchers.Main).launch {
-                setNoResult()
-            }
         }
     }
 
@@ -107,10 +105,9 @@ class AlbumFragment: Fragment() {
         clipboardManager.setPrimaryClip(clipData)
         BlueSnackBar.make(binding.root, getString(R.string.link_copy)).show()
     }
-    private suspend fun setNoResult() {
-        val searchData = albumAdapter.getSearchData()
-        if (searchData.string.isEmpty() && albumAdapter.originalList.isEmpty()) updateNoResultMessage(true, getString(R.string.no_data_text))
-        else updateNoResultMessage(searchData.isEmpty, getString(R.string.no_search_text))
+    private fun setNoResult(isEmpty: Boolean, s: String) {
+        if (s.isEmpty() && albumAdapter.originalList.isEmpty()) updateNoResultMessage(true, getString(R.string.no_data_text))
+        else updateNoResultMessage(isEmpty, getString(R.string.no_search_text))
     }
 
     private fun updateNoResultMessage(isEmpty: Boolean, message: String) {