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 index eed0bed8..b0106259 100644 --- a/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailBakeryInfoAdapter.kt +++ b/app/src/main/java/com/sopt/geonppang/presentation/detail/DetailBakeryInfoAdapter.kt @@ -10,12 +10,15 @@ import com.sopt.geonppang.util.CustomSnackbar class DetailBakeryInfoAdapter : RecyclerView.Adapter() { - private var bakeryInfo: BakeryInfo? = null + private val bakeryInfoList: MutableList = mutableListOf() class DetailBakeryInfoViewHolder(val binding: ItemDetailBakeryInfoBinding) : RecyclerView.ViewHolder(binding.root) { - fun onBind() { + fun onBind( + bakeryInfo: BakeryInfo + ) { with(binding) { + binding.bakeryInfo = bakeryInfo ivItemDetailBakeryInfoBookmark.setOnClickListener { CustomSnackbar.makeSnackbar( it, @@ -39,15 +42,15 @@ class DetailBakeryInfoAdapter : return DetailBakeryInfoViewHolder(binding) } - override fun getItemCount(): Int = 1 + override fun getItemCount(): Int = bakeryInfoList.size override fun onBindViewHolder(holder: DetailBakeryInfoViewHolder, position: Int) { - holder.binding.bakeryInfo = bakeryInfo - holder.onBind() + holder.onBind(bakeryInfoList[position]) } fun setBakeryInfo(bakeryInfo: BakeryInfo) { - this.bakeryInfo = bakeryInfo + bakeryInfoList.clear() + bakeryInfoList.add(bakeryInfo) notifyDataSetChanged() } } diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index 4cb3007c..8455765d 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -40,300 +40,327 @@ app:layout_constraintStart_toStartOf="@+id/gl_start" app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - - - - - - - - + android:layout_height="0dp" + android:layout_marginTop="19dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_my_page_title"> + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + + + + app:layout_constraintTop_toTopOf="@+id/chip_my_page_profile_purpose" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/layout_my_page_buttons" /> - + + + + app:layout_constraintTop_toBottomOf="@+id/tv_my_page_terms_of_use" /> + app:layout_constraintTop_toBottomOf="@+id/view_my_page_second_line" /> - - - - - - - - - - - + + + - + - - - + - + - + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_detail_bakery_info.xml b/app/src/main/res/layout/item_detail_bakery_info.xml index 02cee55d..88ae9a27 100644 --- a/app/src/main/res/layout/item_detail_bakery_info.xml +++ b/app/src/main/res/layout/item_detail_bakery_info.xml @@ -30,6 +30,7 @@