feat : 최근 검색 select 구현 및 recyclerview 연결

koreatlwls · koreatlwls · commit 9247769834ac · 2022-12-05T02:22:40.000+09:00
diff --git a/data/src/main/java/com/stop/data/local/model/RecentPlaceSearchEntity.kt b/data/src/main/java/com/stop/data/local/model/RecentPlaceSearchEntity.kt
@@ -7,7 +7,7 @@ import com.stop.data.model.nearplace.PlaceRepositoryItem
 @Entity
 data class RecentPlaceSearchEntity(
     @PrimaryKey(autoGenerate = true)
-    val id: Long = 0,
+    val id: Int? = null,
     val name: String,
     val radius: String,
     val fullAddressRoad: String,
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchAdapter.kt b/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchAdapter.kt
@@ -8,9 +8,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.stop.databinding.ItemNearPlaceBinding
 import com.stop.domain.model.nearplace.PlaceUseCaseItem
 
-class NearPlaceAdapter : ListAdapter<PlaceUseCaseItem, NearPlaceAdapter.ViewHolder>(diffUtil) {
-
-    var onItemClick: ((PlaceUseCaseItem) -> Unit)? = null
+class PlaceSearchAdapter(
+    private val onItemClick: (PlaceUseCaseItem) -> Unit
+) : ListAdapter<PlaceUseCaseItem, PlaceSearchAdapter.ViewHolder>(diffUtil) {
 
     class ViewHolder(private val binding: ItemNearPlaceBinding) : RecyclerView.ViewHolder(binding.root) {
         fun bind(placeUseCaseItem: PlaceUseCaseItem) {
@@ -26,7 +26,7 @@ class NearPlaceAdapter : ListAdapter<PlaceUseCaseItem, NearPlaceAdapter.ViewHold
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.bind(currentList[position])
         holder.itemView.setOnClickListener {
-            onItemClick?.invoke(currentList[holder.adapterPosition])
+            onItemClick.invoke(currentList[holder.adapterPosition])
         }
     }
 
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchFragment.kt b/presentation/src/main/java/com/stop/ui/placesearch/PlaceSearchFragment.kt
@@ -16,6 +16,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import com.stop.R
 import com.stop.databinding.FragmentPlaceSearchBinding
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.debounce
@@ -31,7 +32,8 @@ class PlaceSearchFragment : Fragment() {
 
     private val placeSearchViewModel: PlaceSearchViewModel by activityViewModels()
 
-    private lateinit var nearPlaceAdapter: NearPlaceAdapter
+    private lateinit var placeSearchAdapter: PlaceSearchAdapter
+    private lateinit var recentPlaceSearchAdapter: RecentPlaceSearchAdapter
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -44,6 +46,13 @@ class PlaceSearchFragment : Fragment() {
         return binding.root
     }
 
+    private fun initBinding() {
+        binding.apply {
+            lifecycleOwner = viewLifecycleOwner
+            viewModel = placeSearchViewModel
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -55,16 +64,24 @@ class PlaceSearchFragment : Fragment() {
     }
 
     private fun initAdapter() {
-        nearPlaceAdapter = NearPlaceAdapter()
-        binding.recyclerViewPlace.adapter = nearPlaceAdapter
+        placeSearchAdapter = PlaceSearchAdapter{
+            clickPlace(it)
+        }
+        recentPlaceSearchAdapter = RecentPlaceSearchAdapter{
+            clickPlace(it)
+        }
+
+        binding.recyclerViewPlace.adapter = placeSearchAdapter
+        binding.layoutRecentSearch.recyclerViewRecentSearch.adapter = recentPlaceSearchAdapter
+    }
 
-        nearPlaceAdapter.onItemClick = {
-            placeSearchViewModel.setClickPlace(it)
-            placeSearchViewModel.setNearPlacesEmpty()
-            placeSearchViewModel.insertRecentSearchPlace(it)
+    private fun clickPlace(placeUseCaseItem: PlaceUseCaseItem) {
+        placeSearchViewModel.setClickPlace(placeUseCaseItem)
+        placeSearchViewModel.setNearPlacesEmpty()
+        placeSearchViewModel.insertRecentSearchPlace(placeUseCaseItem)
+
+        binding.root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
 
-            binding.root.findNavController().navigate(R.id.action_placeSearchFragment_to_mapFragment)
-        }
     }
 
     private fun buttonClick() {
@@ -80,13 +97,6 @@ class PlaceSearchFragment : Fragment() {
         }
     }
 
-    private fun initBinding() {
-        binding.apply {
-            lifecycleOwner = viewLifecycleOwner
-            viewModel = placeSearchViewModel
-        }
-    }
-
     private fun listenEditTextChange() {
         with(binding) {
             textInputEditTextPlaceSearch.setOnFocusChangeListener { _, hasFocus ->
diff --git a/presentation/src/main/java/com/stop/ui/placesearch/RecentPlaceSearchAdapter.kt b/presentation/src/main/java/com/stop/ui/placesearch/RecentPlaceSearchAdapter.kt
@@ -0,0 +1,45 @@
+package com.stop.ui.placesearch
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.stop.databinding.ItemRecentSearchBinding
+import com.stop.domain.model.nearplace.PlaceUseCaseItem
+
+class RecentPlaceSearchAdapter(
+    private var onItemClick: (PlaceUseCaseItem) -> Unit
+) : ListAdapter<PlaceUseCaseItem, RecentPlaceSearchAdapter.ViewHolder>(diffUtil) {
+
+    class ViewHolder(private val binding: ItemRecentSearchBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(placeUseCaseItem: PlaceUseCaseItem) {
+            binding.placeItem = placeUseCaseItem
+            binding.executePendingBindings()
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(ItemRecentSearchBinding.inflate(LayoutInflater.from(parent.context), parent, false))
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(currentList[position])
+        holder.itemView.setOnClickListener {
+            onItemClick.invoke(currentList[holder.adapterPosition])
+        }
+    }
+
+    companion object {
+        val diffUtil = object : DiffUtil.ItemCallback<PlaceUseCaseItem>() {
+            override fun areItemsTheSame(oldItem: PlaceUseCaseItem, newItem: PlaceUseCaseItem): Boolean {
+                return oldItem.name == newItem.name
+            }
+
+            override fun areContentsTheSame(oldItem: PlaceUseCaseItem, newItem: PlaceUseCaseItem): Boolean {
+                return oldItem == newItem
+            }
+        }
+    }
+
+}
diff --git a/presentation/src/main/res/drawable/ic_baseline_location_on_22.xml b/presentation/src/main/res/drawable/ic_baseline_location_on_22.xml
@@ -0,0 +1,5 @@
+<vector android:height="22dp" android:tint="#666666"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>
diff --git a/presentation/src/main/res/layout/item_recent_search.xml b/presentation/src/main/res/layout/item_recent_search.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="placeItem"
+            type="com.stop.domain.model.nearplace.PlaceUseCaseItem" />
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/text_view_recent_search_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="@{placeItem.name}"
+            android:textColor="@color/black"
+            android:textSize="22sp"
+            app:drawableStartCompat="@drawable/ic_baseline_location_on_22"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="아남타워" />
+
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="0dp"
+            android:layout_height="2dp"
+            app:dividerColor="@color/light_grey"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/text_view_recent_search_title" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
diff --git a/presentation/src/main/res/layout/layout_recent_search.xml b/presentation/src/main/res/layout/layout_recent_search.xml
@@ -27,12 +27,22 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <com.google.android.material.divider.MaterialDivider
+            android:layout_width="0dp"
+            android:layout_height="2dp"
+            android:layout_marginTop="12dp"
+            app:dividerColor="@color/light_grey"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/text_view_recent_search" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view_recent_search"
             items="@{viewModel.recentPlaceSearch}"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginVertical="12dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toTopOf="@id/button_delete_recent_search"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
