fix: #21 - 검색된 이벤트(행사)들에 대한 클릭이벤트

inu-appcenter · Mar 3, 2023 · b2cf4a3 · b2cf4a3
1 parent 56f0955
commit b2cf4a3
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/app/src/main/java/org/inu/events/ui/adapter/like/LikePagingAdapter.kt b/app/src/main/java/org/inu/events/ui/adapter/like/LikePagingAdapter.kt
@@ -1,16 +1,22 @@
 package org.inu.events.ui.adapter.like
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import org.inu.events.data.model.entity.Event
 import org.inu.events.databinding.ItemLikeEventBinding
 
-class LikePagingAdapter : PagingDataAdapter<Event, LikePagingAdapter.ViewHolder>(LikeDiffUtil) {
+class LikePagingAdapter(
+    val onClickLikeIcon: (eventId: Int, view: View) -> Unit,
+    val onClickDetail: (event: Event, view: View) -> Unit
+) : PagingDataAdapter<Event, LikePagingAdapter.ViewHolder>(LikeDiffUtil) {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ViewHolder.from(parent)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder.from(parent, onClickLikeIcon, onClickDetail)
+    }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         getItem(position)?.let { event ->
@@ -19,20 +25,40 @@ class LikePagingAdapter : PagingDataAdapter<Event, LikePagingAdapter.ViewHolder>
     }
 
     class ViewHolder private constructor(
+        onClickLikeIcon: (eventId: Int, view: View) -> Unit,
+        onClickDetail: (event: Event, view: View) -> Unit,
         val binding: ItemLikeEventBinding
     ) : RecyclerView.ViewHolder(binding.root) {
 
+        init {
+            binding.bookmarkIcon.setOnClickListener {
+                binding.item?.let { event ->
+                    onClickLikeIcon(event.id, it)
+                }
+            }
+
+            binding.cardWrap.setOnClickListener {
+                binding.item?.let { event ->
+                    onClickDetail(event, it)
+                }
+            }
+        }
+
         fun bind(item: Event) {
             binding.item = item
             binding.executePendingBindings()
         }
 
         companion object {
-            fun from(parent: ViewGroup): ViewHolder {
+            fun from(
+                parent: ViewGroup,
+                onClickLikeIcon: (eventId: Int, view: View) -> Unit,
+                onClickDetail: (event: Event, view: View) -> Unit
+            ): ViewHolder {
                 val layoutInflater = LayoutInflater.from(parent.context)
                 val binding = ItemLikeEventBinding.inflate(layoutInflater, parent, false)
 
-                return ViewHolder(binding)
+                return ViewHolder(onClickLikeIcon, onClickDetail, binding)
             }
         }
     }

diff --git a/app/src/main/java/org/inu/events/ui/home/SearchActivity.kt b/app/src/main/java/org/inu/events/ui/home/SearchActivity.kt
@@ -10,12 +10,21 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import org.inu.events.databinding.ActivitySearchBinding
 import org.inu.events.ui.adapter.like.LikePagingAdapter
+import org.inu.events.ui.mypage.store.LikeViewModel
 
 class SearchActivity : AppCompatActivity() {
 
     private val vm: SearchViewModel by viewModels()
+    private val likeVm: LikeViewModel by viewModels()
     private lateinit var binding: ActivitySearchBinding
-    private val adapter = LikePagingAdapter()
+    private val adapter = LikePagingAdapter(
+        onClickLikeIcon = { eventId, view ->
+            likeVm.onClickLikeIcon(eventId, view)
+        },
+        onClickDetail = { event, view ->
+            likeVm.onClickDetail(view, event)
+        }
+    )
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/java/org/inu/events/ui/home/SearchViewModel.kt b/app/src/main/java/org/inu/events/ui/home/SearchViewModel.kt
@@ -3,6 +3,7 @@ package org.inu.events.ui.home
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.PagingData
+import androidx.paging.cachedIn
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
@@ -51,7 +52,7 @@ class SearchViewModel : ViewModel(), KoinComponent {
                 categoryId = category.value,
                 eventStatus = eventStatus.value,
                 content = searchText.value
-            ).collectLatest { pagingData ->
+            ).cachedIn(viewModelScope).collectLatest { pagingData ->
                 searchResult.value = pagingData
             }
         }