From 96a4cce0f3866576417721cdccad4cd15bf6978c Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Thu, 20 Jul 2023 23:43:46 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[feat]=20#57=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=B7=B0=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_my_page.xml | 545 ++++++++++--------- 1 file changed, 286 insertions(+), 259 deletions(-) diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index cfc449c4..c1debdb4 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 From f15d3e9d3dd90664c19adfc6ac45c8ea4be3407d Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Thu, 20 Jul 2023 23:51:58 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[chore]=20#57=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=B9=A9=20=EB=B0=94=EC=9D=B8=EB=94=A9=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_my_page.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index c1debdb4..a7bf0ed9 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -114,7 +114,7 @@ Date: Thu, 20 Jul 2023 23:59:08 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[chore]=20#57=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EB=B2=84=ED=8A=BC=20ripple=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_signup_email.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/activity_signup_email.xml b/app/src/main/res/layout/activity_signup_email.xml index e439766f..3196024a 100644 --- a/app/src/main/res/layout/activity_signup_email.xml +++ b/app/src/main/res/layout/activity_signup_email.xml @@ -129,6 +129,7 @@ app:layout_constraintEnd_toEndOf="@id/gl_end" app:layout_constraintStart_toStartOf="@id/gl_start" app:layout_constraintTop_toBottomOf="@id/linear_email" + app:rippleColor="@color/white" app:strokeColor="@{viewModel.isValidEmail() == true ? @color/main_2 : @color/gray_300}" /> Date: Fri, 21 Jul 2023 01:22:18 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[mod]=20#57=20=EC=83=81=EC=84=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=95=88=20?= =?UTF-8?q?=EB=9C=A8=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/DetailBakeryInfoAdapter.kt | 15 +++++++++------ .../main/res/layout/item_detail_bakery_info.xml | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) 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/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 @@ Date: Fri, 21 Jul 2023 01:38:55 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[chore]=20#57=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=B7=B0=20=EB=8B=89=EB=84=A4=EC=9E=84=20?= =?UTF-8?q?2=EA=B0=9C=20=EC=83=9D=EA=B8=B0=EB=8A=94=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_my_page.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index e5001f73..8455765d 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -82,23 +82,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@{viewModel.mypageInfoState.memberNickname}" + android:text="@{viewModel.nickName}" android:textAppearance="@style/TextAppearance.Title2" android:textColor="@color/gray_600" app:layout_constraintStart_toStartOf="@+id/chip_my_page_profile_purpose" app:layout_constraintTop_toBottomOf="@+id/chip_my_page_profile_purpose" tools:text="닉네임 입력" /> -