Merge pull request #229 from GEON-PPANG/mod-detail-view

[mod] 상세페이지 홈페이지, 인스타, 전화번호 없는 경우에 대한 분기처리, 상세페이지, 검색뷰, 필터뷰 이슈 해결
GEON-PPANG · Feb 19, 2024 · 6495015 · 6495015
2 parents 0f3a1ac + 606d220
commit 6495015
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 74 deletions.
diff --git a/app/src/main/java/com/sopt/geonppang/data/model/response/ResponseDetailReview.kt b/app/src/main/java/com/sopt/geonppang/data/model/response/ResponseDetailReview.kt
@@ -33,7 +33,7 @@ data class ResponseDetailReview(
                 val recommendKeywordName: String
             )
 
-            fun toRecommentKeyword() = recommendKeywordList.map { recommendKeyword ->
+            fun toRecommendKeyword() = recommendKeywordList.map { recommendKeyword ->
                 DetailReview.RecommendKeyword(
                     recommendKeywordId = recommendKeyword.recommendKeywordId,
                     recommendKeywordName = recommendKeyword.recommendKeywordName
@@ -53,7 +53,7 @@ data class ResponseDetailReview(
                     memberNickname = review.memberNickname,
                     reviewId = review.reviewId,
                     reviewText = review.reviewText,
-                    recommendKeywordList = review.toRecommentKeyword()
+                    recommendKeywordList = review.toRecommendKeyword()
                 )
             }
         )

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/common/BakeryAdapter.kt b/app/src/main/java/com/sopt/geonppang/presentation/common/BakeryAdapter.kt
@@ -8,13 +8,14 @@ import com.google.android.material.chip.ChipGroup
 import com.sopt.geonppang.R
 import com.sopt.geonppang.databinding.ItemBakeryBinding
 import com.sopt.geonppang.domain.model.BakeryInformation
+import com.sopt.geonppang.presentation.type.BreadFilterType
 import com.sopt.geonppang.util.ItemDiffCallback
 import com.sopt.geonppang.util.extension.loadingImage
 import com.sopt.geonppang.util.extension.setOnSingleClickListener
 
 class BakeryAdapter(
     private val moveToDetail: (Int) -> Unit,
-    private val initBreadTypeChips: (ChipGroup, Int) -> Unit,
+    private val initBreadTypeChips: (ChipGroup, List<BreadFilterType>) -> Unit,
 ) : ListAdapter<BakeryInformation, BakeryAdapter.BakeryViewHolder>(
     ItemDiffCallback<BakeryInformation>(
         onItemsTheSame = { old, new -> old.bakeryId == new.bakeryId },
@@ -28,16 +29,15 @@ class BakeryAdapter(
         fun onBind(
             bakery: BakeryInformation,
             moveToDetail: (Int) -> Unit,
-            initBreadTypeChips: (ChipGroup, Int) -> Unit,
-            position: Int
+            initBreadTypeChips: (ChipGroup, List<BreadFilterType>) -> Unit
         ) {
             binding.bakery = bakery
             binding.executePendingBindings()
 
             // TODO: dana 다른 방식이 있는지 고민, 매 바인딩마다 removeAllViews 해야하는가 ?
             with(binding.cgBakeryBreadTypes) {
                 this.removeAllViews()
-                initBreadTypeChips(this, position)
+                initBreadTypeChips(this, bakery.breadTypeList)
             }
 
             binding.root.setOnSingleClickListener {
@@ -59,6 +59,6 @@ class BakeryAdapter(
     }
 
     override fun onBindViewHolder(holder: BakeryViewHolder, position: Int) {
-        holder.onBind(getItem(position), moveToDetail, initBreadTypeChips, position)
+        holder.onBind(getItem(position), moveToDetail, initBreadTypeChips)
     }
 }
diff --git a/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailBakeryInfoAdapter.kt b/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailBakeryInfoAdapter.kt
@@ -24,7 +24,10 @@ class DetailBakeryInfoAdapter(
             with(binding) {
                 binding.bakeryInfo = bakeryInfo
 
-                initBreadTypeChips(binding.chipGroupItemDetailBakeryInfoBreadType)
+                with(binding.chipGroupItemDetailBakeryInfoBreadType) {
+                    this.removeAllViews()
+                    initBreadTypeChips(this)
+                }
 
                 tvItemDetailBakeryInfoHomepage.setOnClickListener {
                     AmplitudeUtils.trackEvent(CLICK_WEBSITE)

diff --git a/.../main/java/com/sopt/geonppang/presentation/filterSetting/MainPurposeTypeFilterFragment.kt b/.../main/java/com/sopt/geonppang/presentation/filterSetting/MainPurposeTypeFilterFragment.kt
@@ -25,12 +25,9 @@ class MainPurposeTypeFilterFragment :
     }
 
     private fun addListeners() {
-        binding.layoutMainPurposeTypeFilterSkip.setOnClickListener {
-            moveToMain()
-        }
-
-        binding.tvMainPurposeTypeFilterSkip.setOnSingleClickListener {
+        binding.layoutMainPurposeTypeFilterSkip.setOnSingleClickListener {
             AmplitudeUtils.trackEvent(CLICK_SKIP)
+            moveToMain()
         }
     }
 

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/myPage/MyBookMarksActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/myPage/MyBookMarksActivity.kt
@@ -13,6 +13,7 @@ import com.sopt.geonppang.presentation.common.BakeryAdapter
 import com.sopt.geonppang.presentation.detail.DetailActivity
 import com.sopt.geonppang.presentation.detail.DetailActivity.Companion.SOURCE
 import com.sopt.geonppang.presentation.detail.DetailActivity.Companion.VIEW_DETAIL_PAGE_AT
+import com.sopt.geonppang.presentation.type.BreadFilterType
 import com.sopt.geonppang.util.AmplitudeUtils
 import com.sopt.geonppang.util.CustomItemDecoration
 import com.sopt.geonppang.util.UiState
@@ -85,17 +86,16 @@ class MyBookMarksActivity :
         startActivity(intent)
     }
 
-    private fun initBreadTypeChips(chipGroup: ChipGroup, position: Int) {
-        if (myBookMarkBakeryList.isNotEmpty()) {
-            myBookMarkBakeryList.get(position).breadTypeList.let { breadTypeList ->
-                chipGroup.breadTypeListToChips(
-                    breadTypeList = breadTypeList,
-                    toChip = {
-                        this.toBreadTypePointM2Chip(layoutInflater)
-                    }
-                )
+    private fun initBreadTypeChips(
+        chipGroup: ChipGroup,
+        breadTypeList: List<BreadFilterType>
+    ) {
+        chipGroup.breadTypeListToChips(
+            breadTypeList = breadTypeList,
+            toChip = {
+                this.toBreadTypePointM2Chip(layoutInflater)
             }
-        }
+        )
     }
 
     companion object {

diff --git a/app/src/main/java/com/sopt/geonppang/presentation/search/SearchActivity.kt b/app/src/main/java/com/sopt/geonppang/presentation/search/SearchActivity.kt
@@ -11,11 +11,11 @@ import androidx.recyclerview.widget.ConcatAdapter
 import com.google.android.material.chip.ChipGroup
 import com.sopt.geonppang.R
 import com.sopt.geonppang.databinding.ActivitySearchBinding
-import com.sopt.geonppang.domain.model.BakeryInformation
 import com.sopt.geonppang.presentation.common.BakeryAdapter
 import com.sopt.geonppang.presentation.detail.DetailActivity
 import com.sopt.geonppang.presentation.detail.DetailActivity.Companion.SOURCE
 import com.sopt.geonppang.presentation.detail.DetailActivity.Companion.VIEW_DETAIL_PAGE_AT
+import com.sopt.geonppang.presentation.type.BreadFilterType
 import com.sopt.geonppang.util.AmplitudeUtils
 import com.sopt.geonppang.util.CustomItemDecoration
 import com.sopt.geonppang.util.UiState
@@ -34,8 +34,6 @@ class SearchActivity : BindingActivity<ActivitySearchBinding>(R.layout.activity_
     private lateinit var bakeryAdapter: BakeryAdapter
     private lateinit var searchCountAdapter: SearchCountAdapter
 
-    private var bakeryInformationList = listOf<BakeryInformation>()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding.viewModel = viewModel
@@ -86,8 +84,6 @@ class SearchActivity : BindingActivity<ActivitySearchBinding>(R.layout.activity_
                     completeFilteringInParticularView()
                     viewModel.searchBakeryList()
                     searchCountAdapter.setSearchData(it.data)
-
-                    bakeryInformationList = it.data.bakeryList
                     bakeryAdapter.submitList(it.data.bakeryList)
                 }
 
@@ -129,17 +125,16 @@ class SearchActivity : BindingActivity<ActivitySearchBinding>(R.layout.activity_
         return super.dispatchTouchEvent(ev)
     }
 
-    private fun initBreadTypeChips(chipGroup: ChipGroup, position: Int) {
-        if (bakeryInformationList.isNotEmpty()) {
-            bakeryInformationList.get(position).breadTypeList.let { breadTypeIdList ->
-                chipGroup.breadTypeListToChips(
-                    breadTypeList = breadTypeIdList,
-                    toChip = {
-                        this.toBreadTypePointM2Chip(layoutInflater)
-                    }
-                )
+    private fun initBreadTypeChips(
+        chipGroup: ChipGroup,
+        breadTypeList: List<BreadFilterType>
+    ) {
+        chipGroup.breadTypeListToChips(
+            breadTypeList = breadTypeList,
+            toChip = {
+                this.toBreadTypePointM2Chip(layoutInflater)
             }
-        }
+        )
     }
 
     companion object {

diff --git a/app/src/main/res/layout/fragment_main_purpose_type_filter.xml b/app/src/main/res/layout/fragment_main_purpose_type_filter.xml
@@ -123,6 +123,7 @@
                         android:textColor="@color/gray_500"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toStartOf="@+id/iv_main_purpose_type_filter_skip"
+                        app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <ImageView

diff --git a/app/src/main/res/layout/item_bakery.xml b/app/src/main/res/layout/item_bakery.xml
@@ -139,8 +139,8 @@
 
         <TextView
             android:id="@+id/tv_nearest_station"
-            android:layout_width="72dp"
-            android:layout_height="17dp"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:text="@{bakery.secondNearStation.empty ? bakery.firstNearStation : @string/nearest_station(bakery.firstNearStation, bakery.secondNearStation)}"
             android:textAppearance="@style/TextAppearance.CaptionM1"

diff --git a/app/src/main/res/layout/item_detail_bakery_info.xml b/app/src/main/res/layout/item_detail_bakery_info.xml
@@ -108,7 +108,7 @@
             app:chipSpacingHorizontal="4dp"
             app:layout_constraintEnd_toEndOf="@+id/tv_item_detail_bakery_info_bakery_name"
             app:layout_constraintStart_toStartOf="@+id/tv_item_detail_bakery_info_bakery_name"
-            app:layout_constraintTop_toBottomOf="@id/tv_item_detail_bakery_info_bakery_name"/>
+            app:layout_constraintTop_toBottomOf="@id/tv_item_detail_bakery_info_bakery_name" />
 
         <ImageView
             android:id="@+id/iv_item_detail_bakery_info_bookmark"
@@ -228,7 +228,7 @@
 
             <TextView
                 android:id="@+id/tv_item_detail_bakery_info_homepage"
-                visibility="@{!bakeryInfo.homepageUrl.isEmpty()}"
+                visibility="@{!bakeryInfo.homepageUrl.trim().isEmpty()}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
@@ -244,7 +244,7 @@
 
             <TextView
                 android:id="@+id/tv_item_detail_bakery_info_instagram"
-                visibility="@{!bakeryInfo.instagramUrl.isEmpty()}"
+                visibility="@{!bakeryInfo.instagramUrl.trim().isEmpty()}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
@@ -338,39 +338,27 @@
             app:layout_constraintTop_toBottomOf="@+id/tv_item_detail_bakery_info_time_holiday"
             tools:text="수-금 12:00 ~ 19:00 / 토-일 13:00 ~ 19:00 " />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/layout_item_detail_bakery_info_call"
-            visibility="@{!bakeryInfo.phoneNumber.isEmpty()}"
-            android:layout_width="0dp"
+        <ImageView
+            android:id="@+id/iv_item_detail_bakery_info_call"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingTop="@dimen/spacing16"
-            app:layout_constraintEnd_toStartOf="@+id/gl_end"
+            android:layout_marginTop="@dimen/spacing16"
+            android:src="@drawable/ic_call"
             app:layout_constraintStart_toStartOf="@+id/gl_start"
-            app:layout_constraintTop_toBottomOf="@+id/tv_item_detail_bakery_info_time">
+            app:layout_constraintTop_toBottomOf="@+id/tv_item_detail_bakery_info_time" />
 
-            <ImageView
-                android:id="@+id/iv_item_detail_bakery_info_call"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_call"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_item_detail_bakery_info_call"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:text="@{bakeryInfo.phoneNumber}"
-                android:textAppearance="@style/TextAppearance.Subhead"
-                android:textColor="@color/gray_400"
-                app:layout_constraintBottom_toBottomOf="@+id/iv_item_detail_bakery_info_call"
-                app:layout_constraintStart_toEndOf="@+id/iv_item_detail_bakery_info_call"
-                app:layout_constraintTop_toTopOf="@+id/iv_item_detail_bakery_info_call"
-                tools:text="02-033-3333" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <TextView
+            android:id="@+id/tv_item_detail_bakery_info_call"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:text="@{bakeryInfo.phoneNumber}"
+            android:textAppearance="@style/TextAppearance.Subhead"
+            android:textColor="@color/gray_400"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_item_detail_bakery_info_call"
+            app:layout_constraintStart_toEndOf="@+id/iv_item_detail_bakery_info_call"
+            app:layout_constraintTop_toTopOf="@+id/iv_item_detail_bakery_info_call"
+            tools:text="02-033-3333" />
 
         <View
             android:id="@+id/view_item_detail_bakery_info_second_line"
@@ -380,7 +368,7 @@
             android:background="@color/gray_200"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/layout_item_detail_bakery_info_call" />
+            app:layout_constraintTop_toBottomOf="@id/iv_item_detail_bakery_info_call" />
 
         <TextView
             android:id="@+id/tv_item_detail_bakery_info_menu"