#86 fix : 팔로워 맛집 클릭시 음식점 상세보기 이동 구현

BENDENG1 · Dec 13, 2023 · 70bf63b · 70bf63b
1 parent 3023dc6
commit 70bf63b
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 6 deletions.
diff --git a/...java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiUserDetailDataMapper.kt b/...java/com/avengers/nibobnebob/presentation/ui/main/global/mapper/UiUserDetailDataMapper.kt
@@ -21,6 +21,7 @@ internal fun UserDetailData.toUiUserDetailData() = UiUserDetailData(
 
 
 internal fun UserDetailRestaurantData.toUiUserDetailRestaurantData() = UiUserDetailRestaurantData(
+    id = id,
     name = name,
     address = address,
     phoneNumber = phoneNumber

diff --git a/...c/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiUserDetailData.kt b/...c/main/java/com/avengers/nibobnebob/presentation/ui/main/global/model/UiUserDetailData.kt
@@ -11,6 +11,7 @@ data class UiUserDetailData(
 
 
 data class UiUserDetailRestaurantData(
+    val id : Int,
     val name: String,
     val address: String,
     val phoneNumber: String

diff --git a/...java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailFragment.kt b/...java/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailFragment.kt
@@ -4,6 +4,7 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
+import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.avengers.nibobnebob.R
@@ -22,11 +23,12 @@ class UserDetailFragment : BaseFragment<FragmentUserDetailBinding>(R.layout.frag
     private val viewModel: UserDetailViewModel by viewModels()
     private val args: UserDetailFragmentArgs by navArgs()
     private val nickName by lazy { args.nickName }
+    private val adapter = UserDetailRestaurantAdapter { id -> viewModel.restaurantDetail(id) }
 
-    override fun initView() {
-        binding.vm = viewModel
+    override fun initView() = with(binding) {
+        vm = viewModel
         viewModel.setNick(nickName)
-        binding.rvRestaurant.adapter = UserDetailRestaurantAdapter()
+        rvRestaurant.adapter = adapter
         customBack(requireActivity(), findNavController())
     }
 
@@ -39,6 +41,11 @@ class UserDetailFragment : BaseFragment<FragmentUserDetailBinding>(R.layout.frag
         repeatOnStarted {
             viewModel.events.collect {
                 when (it) {
+                    is UserDetailEvents.NavigateToRestaurantDetail ->
+                        findNavController().toRestaurantDetail(
+                            it.id
+                        )
+
                     is UserDetailEvents.NavigateToBack -> findNavController().navigateUp()
                     is UserDetailEvents.ShowSnackMessage -> showSnackBar(it.msg)
                     is UserDetailEvents.ShowToastMessage -> showToastMessage(it.msg)
@@ -50,4 +57,11 @@ class UserDetailFragment : BaseFragment<FragmentUserDetailBinding>(R.layout.frag
             }
         }
     }
+
+
+    private fun NavController.toRestaurantDetail(id: Int) {
+        val action =
+            UserDetailFragmentDirections.actionUserDetailFragmentToRestaurantDetailFragment(id)
+        navigate(action)
+    }
 }
diff --git a/...ava/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailViewModel.kt b/...ava/com/avengers/nibobnebob/presentation/ui/main/global/userdetail/UserDetailViewModel.kt
@@ -34,6 +34,7 @@ sealed class UserDetailEvents {
     data class ShowToastMessage(val msg: String) : UserDetailEvents()
     data object NavigateToBack : UserDetailEvents()
     data class ShowBiggerImageDialog(val img: String) : UserDetailEvents()
+    data class NavigateToRestaurantDetail(val id: Int) : UserDetailEvents()
 }
 
 @HiltViewModel
@@ -126,4 +127,10 @@ class UserDetailViewModel @Inject constructor(
             _events.emit(UserDetailEvents.NavigateToBack)
         }
     }
+
+    fun restaurantDetail(id : Int) {
+        viewModelScope.launch {
+            _events.emit(UserDetailEvents.NavigateToRestaurantDetail(id))
+        }
+    }
 }
diff --git a/.../nibobnebob/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt b/.../nibobnebob/presentation/ui/main/global/userdetail/adapter/UserDetailRestaurantAdapter.kt
@@ -8,7 +8,9 @@ import com.avengers.nibobnebob.databinding.ItemUserDetailRestaurantBinding
 import com.avengers.nibobnebob.presentation.ui.main.global.model.UiUserDetailRestaurantData
 import com.avengers.nibobnebob.presentation.util.DefaultDiffUtil
 
-class UserDetailRestaurantAdapter() :
+class UserDetailRestaurantAdapter(
+    private val restaurantClick: (Int) -> Unit
+) :
     ListAdapter<UiUserDetailRestaurantData, UserDetailRestaurantViewHolder>(DefaultDiffUtil<UiUserDetailRestaurantData>()) {
 
     override fun onCreateViewHolder(
@@ -24,14 +26,18 @@ class UserDetailRestaurantAdapter() :
     }
 
     override fun onBindViewHolder(holder: UserDetailRestaurantViewHolder, position: Int) {
-        holder.bind(getItem(position))
+        holder.bind(getItem(position), restaurantClick)
     }
 
 }
 
 class UserDetailRestaurantViewHolder(private val binding: ItemUserDetailRestaurantBinding) :
     RecyclerView.ViewHolder(binding.root) {
-    fun bind(item: UiUserDetailRestaurantData) {
+    fun bind(
+        item: UiUserDetailRestaurantData,
+        restaurantClick: (Int) -> Unit
+    ) {
         binding.item = item
+        binding.root.setOnClickListener { restaurantClick(item.id) }
     }
 }
diff --git a/Aos/app/src/main/res/navigation/nav_graph.xml b/Aos/app/src/main/res/navigation/nav_graph.xml
@@ -46,6 +46,9 @@
             android:name="nickName"
             app:argType="string"
             android:defaultValue=""/>
+        <action
+            android:id="@+id/action_userDetailFragment_to_restaurantDetailFragment"
+            app:destination="@id/restaurantDetailFragment" />
     </fragment>
 
     <fragment