#40 feat/리뷰 작성 : 주소 검색 화면에서 주소 선택 시 address 를 전달하도록 수정

Author: HayleyKim0716

app/src/main/java/com/ftw/hometerview/ui/review/CreateReviewActivity.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
+import com.ftw.domain.entity.Address
 import com.ftw.domain.entity.Review
 import com.ftw.hometerview.R
 import com.ftw.hometerview.databinding.ActivityCreateReviewBinding
@@ -51,11 +52,11 @@ class CreateReviewActivity :
         )
     }
 
-    override fun onClickAddressFromFirstStepAddress(buildingId: String) {
-        viewModel.setAddress(buildingId)
+    override fun onClickAddressFromFirstStepAddress(address: Address) {
+        viewModel.setBuildingId(address.id)
         addFragment(
             R.id.fragment_container_view,
-            CreateReviewFirstStepSelectFloorFragment.newInstance(buildingId),
+            CreateReviewFirstStepSelectFloorFragment.newInstance(address.name),
             true
         )
     }

app/src/main/java/com/ftw/hometerview/ui/review/CreateReviewViewModel.kt

@@ -19,7 +19,7 @@ class CreateReviewViewModel(
     private var disadvantage: String? = null
     private var floor: String? = null
 
-    fun setAddress(buildingId: String) {
+    fun setBuildingId(buildingId: String) {
         this.buildingId = buildingId
     }
 

app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepInputAddressFragment.kt

@@ -10,6 +10,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import com.ftw.domain.entity.Address
 import com.ftw.hometerview.R
 import com.ftw.hometerview.adapter.DataBindingRecyclerAdapter
 import com.ftw.hometerview.adapter.DividerItemDecoration
@@ -27,7 +28,7 @@ class CreateReviewFirstStepInputAddressFragment : Fragment() {
     }
 
     interface Listener {
-        fun onClickAddressFromFirstStepAddress(buildingId: String)
+        fun onClickAddressFromFirstStepAddress(address: Address)
     }
 
     private var _binding: FragmentCreateReviewFirstStepInputAddressBinding? = null
@@ -86,7 +87,7 @@ class CreateReviewFirstStepInputAddressFragment : Fragment() {
                     when (event) {
                         is CreateReviewFirstStepInputAddressViewModel.Event.OnClickAddress -> {
                             hideKeyboard()
-                            (activity as? Listener)?.onClickAddressFromFirstStepAddress(event.buildingId)
+                            (activity as? Listener)?.onClickAddressFromFirstStepAddress(event.address)
                         }
                         is CreateReviewFirstStepInputAddressViewModel.Event.Error -> {
                             Toast.makeText(requireContext(), event.throwable.message, Toast.LENGTH_SHORT)

app/src/main/java/com/ftw/hometerview/ui/review/first/CreateReviewFirstStepInputAddressViewModel.kt

@@ -1,5 +1,6 @@
 package com.ftw.hometerview.ui.review.first
 
+import com.ftw.domain.entity.Address
 import com.ftw.domain.usecase.search.GetSearchedBuildingAddressesUseCase
 import com.ftw.hometerview.BR
 import com.ftw.hometerview.R
@@ -26,7 +27,7 @@ class CreateReviewFirstStepInputAddressViewModel(
     sealed class Event {
         object Nothing : Event()
         data class Error(val throwable: Throwable) : Event()
-        data class OnClickAddress(val buildingId: String) : Event()
+        data class OnClickAddress(val address: Address) : Event()
     }
 
     private val _event: MutableStateFlow<Event> = MutableStateFlow(Event.Nothing)
@@ -54,7 +55,7 @@ class CreateReviewFirstStepInputAddressViewModel(
                                 addresses.map { searchedAddress ->
                                     RecyclerItem(
                                         data = CreateReviewAddressItem(
-                                            buildingId = searchedAddress.id,
+                                            address = searchedAddress,
                                             onClick = { _event.value = Event.OnClickAddress(it) }
                                         ),
                                         layoutId = R.layout.list_item_create_review_search_address,
@@ -70,10 +71,10 @@ class CreateReviewFirstStepInputAddressViewModel(
 }
 
 data class CreateReviewAddressItem(
-    val buildingId: String,
-    val onClick: (String) -> Unit
+    val address: Address,
+    val onClick: (Address) -> Unit
 ) {
     fun onClick() {
-        this.onClick(buildingId)
+        this.onClick(address)
     }
 }

app/src/main/res/layout/fragment_create_review_first_step_select_floor.xml

@@ -46,6 +46,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_size_14"
+                    android:onClick="@{() -> viewModel.onClickBack()}"
                     app:srcCompat="@drawable/icon_back"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/list_item_create_review_search_address.xml

@@ -13,7 +13,7 @@
         android:padding="@dimen/dp_size_16"
         android:background="@color/white"
         android:onClick="@{() -> item.onClick()}"
-        android:text="@{item.buildingId}"
+        android:text="@{item.address.name}"
         android:fontFamily="@font/pretendard_regular"
         android:textSize="@dimen/sp_size_14"
         android:textColor="@color/gray_900"

domain/src/main/java/com/ftw/domain/usecase/search/GetSearchedBuildingAddressesUseCaseImpl.kt

@@ -7,15 +7,15 @@ class GetSearchedBuildingAddressesUseCaseImpl(
     private val repository: SearchRepository
 ) : GetSearchedBuildingAddressesUseCase {
     override suspend fun invoke(keyword: String): List<Address> {
-        return repository.buildings(keyword)
-//        return listOf(
-//            Address("0", "서울 마포구 월드컵북로"),
-//            Address("1", "서울 마포구 월드컵북로 1길 35"),
-//            Address("2", "서울 마포구 월드컵북로 2길 3"),
-//            Address("3", "서울 마포구 월드컵북로 4길 6"),
-//            Address("4", "서울 마포구 월드컵북로 5가길 12"),
-//            Address("5", "서울 마포구 월드컵북로 5나길 2"),
-//            Address("6", "서울 마포구 월드컵북로 52길 9")
-//        )
+//        return repository.buildings(key®word)
+        return listOf(
+            Address("0", "서울 마포구 월드컵북로"),
+            Address("1", "서울 마포구 월드컵북로 1길 35"),
+            Address("2", "서울 마포구 월드컵북로 2길 3"),
+            Address("3", "서울 마포구 월드컵북로 4길 6"),
+            Address("4", "서울 마포구 월드컵북로 5가길 12"),
+            Address("5", "서울 마포구 월드컵북로 5나길 2"),
+            Address("6", "서울 마포구 월드컵북로 52길 9")
+        )
     }
 }