From 0e2e8c2cfdaf54f17440bc1c6137fb65c4bbaeae Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:23:41 +0900 Subject: [PATCH 01/52] =?UTF-8?q?#18=20[UI]=20:=20drawable=20=EB=B0=B0?= =?UTF-8?q?=EA=B2=BD=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/shape_gray200_line_16_rect.xml | 9 +++++++++ .../src/main/res/drawable/shape_gray500_fill_4_rect.xml | 5 +++++ .../main/res/drawable/shape_purple50_fill_12_rect.xml | 5 +++++ .../main/res/drawable/shape_white_fill_top_16_rect.xml | 7 +++++++ 4 files changed, 26 insertions(+) create mode 100644 core/ui/src/main/res/drawable/shape_gray200_line_16_rect.xml create mode 100644 core/ui/src/main/res/drawable/shape_gray500_fill_4_rect.xml create mode 100644 core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml create mode 100644 core/ui/src/main/res/drawable/shape_white_fill_top_16_rect.xml diff --git a/core/ui/src/main/res/drawable/shape_gray200_line_16_rect.xml b/core/ui/src/main/res/drawable/shape_gray200_line_16_rect.xml new file mode 100644 index 00000000..cfe88b4d --- /dev/null +++ b/core/ui/src/main/res/drawable/shape_gray200_line_16_rect.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/core/ui/src/main/res/drawable/shape_gray500_fill_4_rect.xml b/core/ui/src/main/res/drawable/shape_gray500_fill_4_rect.xml new file mode 100644 index 00000000..70cd433a --- /dev/null +++ b/core/ui/src/main/res/drawable/shape_gray500_fill_4_rect.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml b/core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml new file mode 100644 index 00000000..2163ac77 --- /dev/null +++ b/core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/core/ui/src/main/res/drawable/shape_white_fill_top_16_rect.xml b/core/ui/src/main/res/drawable/shape_white_fill_top_16_rect.xml new file mode 100644 index 00000000..6620f877 --- /dev/null +++ b/core/ui/src/main/res/drawable/shape_white_fill_top_16_rect.xml @@ -0,0 +1,7 @@ + + + + + From 914fe81925a6b08147ade1135effec47f557654a Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:23:52 +0900 Subject: [PATCH 02/52] =?UTF-8?q?#18=20[UI]=20:=20appbar=20UI=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/view_profile_appbar.xml | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 feature/profile/src/main/res/layout/view_profile_appbar.xml diff --git a/feature/profile/src/main/res/layout/view_profile_appbar.xml b/feature/profile/src/main/res/layout/view_profile_appbar.xml new file mode 100644 index 00000000..f4c1e979 --- /dev/null +++ b/feature/profile/src/main/res/layout/view_profile_appbar.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + From cefd5a621da63ceab5e3273b55c31df5457f680d Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:24:14 +0900 Subject: [PATCH 03/52] =?UTF-8?q?#18=20[RENAME]=20:=20hamberger=20->=20ham?= =?UTF-8?q?burger=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{ic_profile_hamberger_btn.xml => ic_profile_hamburger_btn.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename core/common/src/main/res/drawable/{ic_profile_hamberger_btn.xml => ic_profile_hamburger_btn.xml} (100%) diff --git a/core/common/src/main/res/drawable/ic_profile_hamberger_btn.xml b/core/common/src/main/res/drawable/ic_profile_hamburger_btn.xml similarity index 100% rename from core/common/src/main/res/drawable/ic_profile_hamberger_btn.xml rename to core/common/src/main/res/drawable/ic_profile_hamburger_btn.xml From e3c005c68171daa5c91819accbaea94bb220de0a Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:24:46 +0900 Subject: [PATCH 04/52] =?UTF-8?q?#18=20[UI]=20:=20main=20nav=20graph=20pro?= =?UTF-8?q?file=20nav=20graph=20include=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/main/src/main/res/navigation/graph_main.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/main/src/main/res/navigation/graph_main.xml b/feature/main/src/main/res/navigation/graph_main.xml index a2f91854..2d3f539a 100644 --- a/feature/main/src/main/res/navigation/graph_main.xml +++ b/feature/main/src/main/res/navigation/graph_main.xml @@ -30,4 +30,5 @@ android:name="com.teamwable.posting.PostingFragment" android:label="PostingFragment" tools:layout="@layout/fragment_posting" /> + From ca24ea2a0f497a150ef654eb73be7f06660441fb Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:24:56 +0900 Subject: [PATCH 05/52] =?UTF-8?q?#18=20[UI]=20:=20profile=20nav=20graph=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/navigation/graph_profile.xml | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 feature/profile/src/main/res/navigation/graph_profile.xml diff --git a/feature/profile/src/main/res/navigation/graph_profile.xml b/feature/profile/src/main/res/navigation/graph_profile.xml new file mode 100644 index 00000000..8e31c971 --- /dev/null +++ b/feature/profile/src/main/res/navigation/graph_profile.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + From 65374d399a3ef737abc969bb52ad84dc3834af7d Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:25:06 +0900 Subject: [PATCH 06/52] =?UTF-8?q?#18=20[UI]=20:=20profile=20fragment=20UI?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/profile/src/main/res/layout/fragment_profile.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/feature/profile/src/main/res/layout/fragment_profile.xml b/feature/profile/src/main/res/layout/fragment_profile.xml index 82859f26..3bcfa545 100644 --- a/feature/profile/src/main/res/layout/fragment_profile.xml +++ b/feature/profile/src/main/res/layout/fragment_profile.xml @@ -4,6 +4,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + - \ No newline at end of file + From 9f65293fe163f4dc9f35be02c6a980cc425d7899 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:25:14 +0900 Subject: [PATCH 07/52] =?UTF-8?q?#18=20[UI]=20:=20profile=20delete=20confi?= =?UTF-8?q?rm=20fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment_profile_delete_confirm.xml | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml diff --git a/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml new file mode 100644 index 00000000..b59f6416 --- /dev/null +++ b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 07315abdf57bb94304ec9e7d913fb07926f4084c Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:25:22 +0900 Subject: [PATCH 08/52] =?UTF-8?q?#18=20[UI]=20:=20profile=20delete=20reaso?= =?UTF-8?q?n=20fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/fragment_profile_delete_reason.xml | 240 ++++++++++++++++++ 1 file changed, 240 insertions(+) create mode 100644 feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml diff --git a/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml b/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml new file mode 100644 index 00000000..6e9760ba --- /dev/null +++ b/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a6d62621c46849568894d9da9ba7391f25f215c0 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:25:28 +0900 Subject: [PATCH 09/52] =?UTF-8?q?#18=20[UI]=20:=20profile=20information=20?= =?UTF-8?q?fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/fragment_profile_information.xml | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 feature/profile/src/main/res/layout/fragment_profile_information.xml diff --git a/feature/profile/src/main/res/layout/fragment_profile_information.xml b/feature/profile/src/main/res/layout/fragment_profile_information.xml new file mode 100644 index 00000000..e19b7eb8 --- /dev/null +++ b/feature/profile/src/main/res/layout/fragment_profile_information.xml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a39e2d3cba32eec79a163f1b20836d341077070b Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:25:36 +0900 Subject: [PATCH 10/52] =?UTF-8?q?#18=20[UI]=20:=20push=20notification=20fr?= =?UTF-8?q?agment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/fragment_push_notification.xml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 feature/profile/src/main/res/layout/fragment_push_notification.xml diff --git a/feature/profile/src/main/res/layout/fragment_push_notification.xml b/feature/profile/src/main/res/layout/fragment_push_notification.xml new file mode 100644 index 00000000..5e5e9aac --- /dev/null +++ b/feature/profile/src/main/res/layout/fragment_push_notification.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + From bc3aa0578b464f3fe270fa1f094e75fc250a10da Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:25:42 +0900 Subject: [PATCH 11/52] =?UTF-8?q?#18=20[UI]=20:=20delete=20dialog=20fragme?= =?UTF-8?q?nt=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/fragment_delete_dialog.xml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 feature/profile/src/main/res/layout/fragment_delete_dialog.xml diff --git a/feature/profile/src/main/res/layout/fragment_delete_dialog.xml b/feature/profile/src/main/res/layout/fragment_delete_dialog.xml new file mode 100644 index 00000000..75605378 --- /dev/null +++ b/feature/profile/src/main/res/layout/fragment_delete_dialog.xml @@ -0,0 +1,60 @@ + + + + + + + + + + From 1392b33cd0fbdde9c7f5be8128bd493738feee00 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:25:57 +0900 Subject: [PATCH 12/52] =?UTF-8?q?#18=20[UI]=20:=20profile=20hamburger=20bo?= =?UTF-8?q?ttomsheet=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/bottomsheet_profile_hamburger.xml | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml diff --git a/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml b/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml new file mode 100644 index 00000000..478d4e37 --- /dev/null +++ b/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + From 33a36756605de6133c9dc1dcf72d232352ea748f Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:26:14 +0900 Subject: [PATCH 13/52] =?UTF-8?q?#18=20[FEAT]=20:=20profile=20fragment=20U?= =?UTF-8?q?I=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teamwable/profile/ProfileFragment.kt | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileFragment.kt index d8e80b07..1b77201f 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileFragment.kt @@ -1,5 +1,6 @@ package com.teamwable.profile +import android.view.View import com.teamwable.profile.databinding.FragmentProfileBinding import com.teamwable.ui.base.BindingFragment import dagger.hilt.android.AndroidEntryPoint @@ -7,5 +8,29 @@ import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class ProfileFragment : BindingFragment(FragmentProfileBinding::inflate) { override fun initView() { + initAppbarBtnVisibility() + setAppbarText() + initAppbarHamburgerClickListener() + } + + private fun setAppbarText() { + binding.viewProfileAppbar.tvProfileAppbarTitle.text = "배 차은우" + } + + private fun initAppbarBtnVisibility() { + with(binding.viewProfileAppbar) { + btnProfileAppbarBack.visibility = View.GONE + btnProfileAppbarHamburger.visibility = View.VISIBLE + } + } + + private fun initAppbarHamburgerClickListener() { + binding.viewProfileAppbar.btnProfileAppbarHamburger.setOnClickListener { + ProfileHamburgerBottomSheet().show(childFragmentManager, PROFILE_HAMBURGER_BOTTOM_SHEET) + } + } + + companion object { + const val PROFILE_HAMBURGER_BOTTOM_SHEET = "ProfileHamburgerBottomSheet" } } From e0053809170fcd621832d6cc5fd76b63a4e2bdda Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:26:22 +0900 Subject: [PATCH 14/52] =?UTF-8?q?#18=20[FEAT]=20:=20profile=20hamburger=20?= =?UTF-8?q?bottomsheeet=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/ProfileHamburgerBottomSheet.kt | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt new file mode 100644 index 00000000..921f24df --- /dev/null +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt @@ -0,0 +1,51 @@ +package com.teamwable.profile + +import android.content.Intent +import android.net.Uri +import androidx.navigation.fragment.findNavController +import com.teamwable.profile.databinding.BottomsheetProfileHamburgerBinding +import com.teamwable.ui.base.BindingBottomSheetFragment + +class ProfileHamburgerBottomSheet : BindingBottomSheetFragment(BottomsheetProfileHamburgerBinding::inflate) { + override fun initView() { + initAccountInformationBtnClickListener() + initNotificationSettingBtnClickListener() + initFeedbackBtnClickListener() + initCustomerServiceBtnClickListener() + initLogoutBtnClickListener() + } + + private fun initAccountInformationBtnClickListener() { + binding.tvHamburgerAccountInformation.setOnClickListener { + findNavController().navigate(R.id.action_navigation_profile_hamburger_to_navigation_profile_information) + } + } + + private fun initNotificationSettingBtnClickListener() { + binding.tvHamburgerNotificationSetting.setOnClickListener { + findNavController().navigate(R.id.action_navigation_profile_hamburger_to_navigation_push_notification) + } + } + + private fun initFeedbackBtnClickListener() { + // navigateToWeb("") + } + + private fun initCustomerServiceBtnClickListener() { + // navigateToWeb("") + } + + private fun initLogoutBtnClickListener() { + binding.tvHamburgerLogout.setOnClickListener { + LogoutDialogFragment().show(childFragmentManager, LOGOUT_DIALOG) + } + } + + private fun navigateToWeb(uri: String) { + Intent(Intent.ACTION_VIEW, Uri.parse(uri)).also { startActivity(it) } + } + + companion object { + const val LOGOUT_DIALOG = "LogoutDialog" + } +} From 1fbc20d000d6e77753efa6a45270578eb35758cb Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:26:30 +0900 Subject: [PATCH 15/52] =?UTF-8?q?#18=20[FEAT]=20:=20profile=20information?= =?UTF-8?q?=20fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/ProfileInformationFragment.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt new file mode 100644 index 00000000..987fe045 --- /dev/null +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt @@ -0,0 +1,22 @@ +package com.teamwable.profile + +import androidx.navigation.fragment.findNavController +import com.teamwable.profile.databinding.FragmentProfileInformationBinding +import com.teamwable.ui.base.BindingFragment + +class ProfileInformationFragment : BindingFragment(FragmentProfileInformationBinding::inflate) { + override fun initView() { + setAppbarText() + initDeleteBtnClickListener() + } + + private fun setAppbarText() { + binding.viewProfileInformationAppbar.tvProfileAppbarTitle.text = "계정 정보" + } + + private fun initDeleteBtnClickListener() { + binding.tvProfileInformationDelete.setOnClickListener { + findNavController().navigate(R.id.action_navigation_profile_information_to_navigation_profile_delete_reason) + } + } +} From de5ac803ac3c28b5f751948340333a803daa8a55 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:26:37 +0900 Subject: [PATCH 16/52] =?UTF-8?q?#18=20[FEAT]=20:=20profile=20delete=20rea?= =?UTF-8?q?son=20fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/ProfileDeleteReasonFragment.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt new file mode 100644 index 00000000..95e1c8be --- /dev/null +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt @@ -0,0 +1,22 @@ +package com.teamwable.profile + +import androidx.navigation.fragment.findNavController +import com.teamwable.profile.databinding.FragmentProfileDeleteReasonBinding +import com.teamwable.ui.base.BindingFragment + +class ProfileDeleteReasonFragment : BindingFragment(FragmentProfileDeleteReasonBinding::inflate) { + override fun initView() { + setAppbarText() + initNextBtnClickListener() + } + + private fun setAppbarText() { + binding.viewProfileDeleteReasonAppbar.tvProfileAppbarTitle.text = "계정 삭제" + } + + private fun initNextBtnClickListener() { + binding.btnProfileDeleteReasonNext.setOnClickListener { + findNavController().navigate(R.id.action_navigation_profile_delete_reason_to_navigation_profile_delete_confirm) + } + } +} From 5d7c72f1ac30edb70108df34d2bb7fbc7e5a25a6 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:26:49 +0900 Subject: [PATCH 17/52] =?UTF-8?q?#18=20[FEAT]=20:=20profile=20delete=20con?= =?UTF-8?q?firm=20fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/ProfileDeleteConfirmFragment.kt | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt new file mode 100644 index 00000000..37c663a6 --- /dev/null +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt @@ -0,0 +1,25 @@ +package com.teamwable.profile + +import com.teamwable.profile.databinding.FragmentProfileDeleteConfirmBinding +import com.teamwable.ui.base.BindingFragment + +class ProfileDeleteConfirmFragment : BindingFragment(FragmentProfileDeleteConfirmBinding::inflate) { + override fun initView() { + setAppbarText() + initNextBtnClickListener() + } + + private fun setAppbarText() { + binding.viewProfileDeleteConfirmAppbar.tvProfileAppbarTitle.text = "계정 삭제" + } + + private fun initNextBtnClickListener() { + binding.btnProfileDeleteConfirmNext.setOnClickListener { + ProfileDeleteDialogFragment().show(childFragmentManager, PROFILE_DELETE_DIALOG) + } + } + + companion object { + const val PROFILE_DELETE_DIALOG = "ProfileDeleteDialog" + } +} From f5b6e89f28a2844b902e576be927548e34999682 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:27:02 +0900 Subject: [PATCH 18/52] =?UTF-8?q?#18=20[FEAT]=20:=20logout=20dialog=20frag?= =?UTF-8?q?ment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teamwable/profile/LogoutDialogFragment.kt | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt diff --git a/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt new file mode 100644 index 00000000..0984ce53 --- /dev/null +++ b/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt @@ -0,0 +1,37 @@ +package com.teamwable.profile + +import com.teamwable.profile.databinding.FragmentDeleteDialogBinding +import com.teamwable.ui.base.BindingDialogFragment +import com.teamwable.ui.extensions.dialogFragmentResize + +class LogoutDialogFragment : BindingDialogFragment(R.layout.fragment_delete_dialog, FragmentDeleteDialogBinding::inflate) { + override fun initView() { + initText() + initCancelBtnClickListener() + initDeleteBtnClickListener() + } + + private fun initText() { + with(binding) { + tvDeleteDialogTitle.text = "로그아웃하시겠어요?" + btnDeleteDialogDelete.text = "로그아웃하기" + } + } + + override fun onResume() { + super.onResume() + context?.dialogFragmentResize(this, 30.0f) + } + + private fun initCancelBtnClickListener() { + binding.btnDeleteDialogCancel.setOnClickListener { + dismiss() + } + } + + private fun initDeleteBtnClickListener() { + binding.btnDeleteDialogDelete.setOnClickListener { + // Todo : 나중에 추가해야 함 + } + } +} From cb68d18e6bdea9104e28ec0adb4360b8b168112b Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:27:09 +0900 Subject: [PATCH 19/52] =?UTF-8?q?#18=20[FEAT]=20:=20profile=20delete=20dia?= =?UTF-8?q?log=20fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/ProfileDeleteDialogFragment.kt | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteDialogFragment.kt diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteDialogFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteDialogFragment.kt new file mode 100644 index 00000000..0dc2043b --- /dev/null +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteDialogFragment.kt @@ -0,0 +1,36 @@ +package com.teamwable.profile + +import com.teamwable.profile.databinding.FragmentDeleteDialogBinding +import com.teamwable.ui.base.BindingDialogFragment +import com.teamwable.ui.extensions.dialogFragmentResize + +class ProfileDeleteDialogFragment : BindingDialogFragment(R.layout.fragment_delete_dialog, FragmentDeleteDialogBinding::inflate) { + override fun initView() { + initText() + initCancelBtnClickListener() + initDeleteBtnClickListener() + } + + private fun initText() { + with(binding) { + tvDeleteDialogTitle.text = "계정을 삭제하시겠어요?" + } + } + + override fun onResume() { + super.onResume() + context?.dialogFragmentResize(this, 30.0f) + } + + private fun initCancelBtnClickListener() { + binding.btnDeleteDialogCancel.setOnClickListener { + dismiss() + } + } + + private fun initDeleteBtnClickListener() { + binding.btnDeleteDialogDelete.setOnClickListener { + // Todo : 나중에 추가해야 함 + } + } +} From 97519f539c7185968017130cbecdf8ca9b062154 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 03:27:17 +0900 Subject: [PATCH 20/52] =?UTF-8?q?#18=20[FEAT]=20:=20push=20notification=20?= =?UTF-8?q?fragment=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teamwable/profile/PushNotificationFragment.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt diff --git a/feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt new file mode 100644 index 00000000..84c56084 --- /dev/null +++ b/feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt @@ -0,0 +1,14 @@ +package com.teamwable.profile + +import com.teamwable.profile.databinding.FragmentPushNotificationBinding +import com.teamwable.ui.base.BindingFragment + +class PushNotificationFragment : BindingFragment(FragmentPushNotificationBinding::inflate) { + override fun initView() { + setAppbarText() + } + + private fun setAppbarText() { + binding.viewPushNotificationAppbar.tvProfileAppbarTitle.text = "알림 설정" + } +} From 822b6fb9e1500f8c81d9d7f389241b24b0068c4e Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:10:13 +0900 Subject: [PATCH 21/52] =?UTF-8?q?#18=20[UI]=20:=20checkbox=20sel=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/fragment_profile_delete_confirm.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml index b59f6416..77c2d2b8 100644 --- a/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml +++ b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml @@ -80,7 +80,7 @@ android:layout_height="0dp" android:layout_marginStart="@dimen/padding_horizontal" android:layout_marginBottom="12dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintBottom_toTopOf="@id/btn_profile_delete_confirm_next" app:layout_constraintDimensionRatio="1" @@ -106,14 +106,14 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/padding_horizontal" android:layout_marginBottom="@dimen/margin_bottom" - android:background="@drawable/shape_purple50_fill_12_rect" + android:background="@drawable/sel_profile_delete_btn" android:clickable="true" android:gravity="center" android:paddingTop="15dp" android:paddingBottom="12dp" android:text="계속" android:textAppearance="@style/TextAppearance.Wable.Head2" - android:textColor="@color/white" + android:textColor="@color/gray_600" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> From a314663f5e5e9ab94e626dea5f32a06e4a1cd2fb Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:10:16 +0900 Subject: [PATCH 22/52] =?UTF-8?q?#18=20[UI]=20:=20checkbox=20sel=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/fragment_profile_delete_reason.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml b/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml index 6e9760ba..18458eba 100644 --- a/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml +++ b/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml @@ -42,7 +42,7 @@ android:layout_width="48dp" android:layout_height="0dp" android:layout_marginTop="32dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toStartOf="@id/tv_profile_delete_reason_content_1" @@ -68,7 +68,7 @@ android:layout_width="48dp" android:layout_height="0dp" android:layout_marginTop="4dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toStartOf="@id/tv_profile_delete_reason_content_1" @@ -94,7 +94,7 @@ android:layout_width="48dp" android:layout_height="0dp" android:layout_marginTop="4dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toStartOf="@id/tv_profile_delete_reason_content_2" @@ -120,7 +120,7 @@ android:layout_width="48dp" android:layout_height="0dp" android:layout_marginTop="4dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toStartOf="@id/tv_profile_delete_reason_content_3" @@ -146,7 +146,7 @@ android:layout_width="48dp" android:layout_height="0dp" android:layout_marginTop="4dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toStartOf="@id/tv_profile_delete_reason_content_4" @@ -172,7 +172,7 @@ android:layout_width="48dp" android:layout_height="0dp" android:layout_marginTop="4dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toStartOf="@id/tv_profile_delete_reason_content_5" @@ -198,7 +198,7 @@ android:layout_width="48dp" android:layout_height="0dp" android:layout_marginTop="4dp" - android:background="@drawable/ic_sign_up_checkbox_unselected" + android:background="@drawable/sel_profile_delete_checkbox" android:button="@null" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toStartOf="@id/tv_profile_delete_reason_content_6" @@ -225,14 +225,14 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/padding_horizontal" android:layout_marginBottom="@dimen/margin_bottom" - android:background="@drawable/shape_purple50_fill_12_rect" + android:background="@drawable/sel_profile_delete_btn" android:clickable="true" android:gravity="center" android:paddingTop="15dp" android:paddingBottom="12dp" android:text="계속" android:textAppearance="@style/TextAppearance.Wable.Head2" - android:textColor="@color/white" + android:textColor="@color/gray_600" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> From 4e840592fe81366ce6f1f0652b876f7321071a80 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:10:34 +0900 Subject: [PATCH 23/52] =?UTF-8?q?#18=20[UI]=20:=20textView=20clickable=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/fragment_profile_information.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/feature/profile/src/main/res/layout/fragment_profile_information.xml b/feature/profile/src/main/res/layout/fragment_profile_information.xml index e19b7eb8..7e8bf037 100644 --- a/feature/profile/src/main/res/layout/fragment_profile_information.xml +++ b/feature/profile/src/main/res/layout/fragment_profile_information.xml @@ -143,6 +143,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="79dp" + android:clickable="true" + android:focusable="true" android:text="자세히 보기" android:textAppearance="@style/TextAppearance.Wable.Body2" android:textColor="@color/black" /> From 56ef08b63268b298b128e31bb9663b8ba83a6c43 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:10:47 +0900 Subject: [PATCH 24/52] =?UTF-8?q?#18=20[UI]=20:=20btn=20sel=20drawable=20f?= =?UTF-8?q?ile=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/src/main/res/drawable/sel_profile_delete_btn.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml diff --git a/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml b/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml new file mode 100644 index 00000000..e4ecb572 --- /dev/null +++ b/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml @@ -0,0 +1,5 @@ + + + + + From bc95fdef2faf80002b61cdfbb15b42e66b787bdc Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:10:53 +0900 Subject: [PATCH 25/52] =?UTF-8?q?#18=20[UI]=20:=20checkbox=20sel=20drawabl?= =?UTF-8?q?e=20file=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/sel_profile_delete_checkbox.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 feature/profile/src/main/res/drawable/sel_profile_delete_checkbox.xml diff --git a/feature/profile/src/main/res/drawable/sel_profile_delete_checkbox.xml b/feature/profile/src/main/res/drawable/sel_profile_delete_checkbox.xml new file mode 100644 index 00000000..aa87dec6 --- /dev/null +++ b/feature/profile/src/main/res/drawable/sel_profile_delete_checkbox.xml @@ -0,0 +1,5 @@ + + + + + From cd3fe8a25eb23c0523c97036fd37aba3a92ab69a Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:11:05 +0900 Subject: [PATCH 26/52] =?UTF-8?q?#18=20[UI]=20:=20checkbox=20background=20?= =?UTF-8?q?drawable=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml diff --git a/core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml b/core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml new file mode 100644 index 00000000..d593a3d6 --- /dev/null +++ b/core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml @@ -0,0 +1,5 @@ + + + + + From a0a0155224802b4592e98e7d7a21b6837e66bbdf Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:11:36 +0900 Subject: [PATCH 27/52] =?UTF-8?q?#18=20[FEAT]=20:=20backBtnClick=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teamwable/profile/ProfileInformationFragment.kt | 7 +++++++ .../com/teamwable/profile/PushNotificationFragment.kt | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt index 987fe045..c38bd4fd 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt @@ -7,6 +7,7 @@ import com.teamwable.ui.base.BindingFragment class ProfileInformationFragment : BindingFragment(FragmentProfileInformationBinding::inflate) { override fun initView() { setAppbarText() + initBackBtnClickListener() initDeleteBtnClickListener() } @@ -14,6 +15,12 @@ class ProfileInformationFragment : BindingFragment(FragmentPushNotificationBinding::inflate) { override fun initView() { setAppbarText() + initBackBtnClickListener() } private fun setAppbarText() { binding.viewPushNotificationAppbar.tvProfileAppbarTitle.text = "알림 설정" } + + private fun initBackBtnClickListener() { + binding.viewPushNotificationAppbar.btnProfileAppbarBack.setOnClickListener { + findNavController().popBackStack() + } + } } From c29322dbf1c55dd3498ef65beef464f57b6220f2 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Thu, 15 Aug 2024 04:11:58 +0900 Subject: [PATCH 28/52] =?UTF-8?q?#18=20[FEAT]=20:=20backBtnClick=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20/=20checkbox=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/ProfileDeleteConfirmFragment.kt | 30 ++++++++++-- .../profile/ProfileDeleteReasonFragment.kt | 46 +++++++++++++++++-- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt index 37c663a6..f911c4b1 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt @@ -1,24 +1,46 @@ package com.teamwable.profile +import androidx.navigation.fragment.findNavController import com.teamwable.profile.databinding.FragmentProfileDeleteConfirmBinding import com.teamwable.ui.base.BindingFragment class ProfileDeleteConfirmFragment : BindingFragment(FragmentProfileDeleteConfirmBinding::inflate) { override fun initView() { setAppbarText() - initNextBtnClickListener() + initBackBtnClickListener() + initCheckBoxClickListener() + } + + private fun initCheckBoxClickListener() { + binding.cbProfileDeleteConfirm.setOnClickListener { + binding.btnProfileDeleteConfirmNext.apply { + isEnabled = binding.cbProfileDeleteConfirm.isChecked + if (isEnabled) { + setTextColor(context.getColor(com.teamwable.ui.R.color.white)) + setOnClickListener { + showToProfileDeleteDialogFragment() + } + } else { + setTextColor(context.getColor(com.teamwable.ui.R.color.gray_600)) + } + } + } } private fun setAppbarText() { binding.viewProfileDeleteConfirmAppbar.tvProfileAppbarTitle.text = "계정 삭제" } - private fun initNextBtnClickListener() { - binding.btnProfileDeleteConfirmNext.setOnClickListener { - ProfileDeleteDialogFragment().show(childFragmentManager, PROFILE_DELETE_DIALOG) + private fun initBackBtnClickListener() { + binding.viewProfileDeleteConfirmAppbar.btnProfileAppbarBack.setOnClickListener { + findNavController().popBackStack() } } + private fun showToProfileDeleteDialogFragment() { + ProfileDeleteDialogFragment().show(childFragmentManager, PROFILE_DELETE_DIALOG) + } + companion object { const val PROFILE_DELETE_DIALOG = "ProfileDeleteDialog" } diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt index 95e1c8be..34be4022 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt @@ -5,18 +5,56 @@ import com.teamwable.profile.databinding.FragmentProfileDeleteReasonBinding import com.teamwable.ui.base.BindingFragment class ProfileDeleteReasonFragment : BindingFragment(FragmentProfileDeleteReasonBinding::inflate) { + private val checkBoxList by lazy { + with(binding) { + listOf( + cbProfileDeleteReasonCheck1, + cbProfileDeleteReasonCheck2, + cbProfileDeleteReasonCheck3, + cbProfileDeleteReasonCheck4, + cbProfileDeleteReasonCheck5, + cbProfileDeleteReasonCheck6, + cbProfileDeleteReasonCheck7 + ) + } + } + override fun initView() { setAppbarText() - initNextBtnClickListener() + initBackBtnClickListener() + initCheckBoxClickListener() + } + + private fun initCheckBoxClickListener() { + checkBoxList.forEach { checkBox -> + checkBox.setOnCheckedChangeListener { _, _ -> + val anyChecked = checkBoxList.any { it.isChecked } + binding.btnProfileDeleteReasonNext.apply { + isEnabled = anyChecked + if (isEnabled) { + setTextColor(context.getColor(com.teamwable.ui.R.color.white)) + setOnClickListener { + navigateUpToProfileDeleteConfirmFragment() + } + } else { + setTextColor(context.getColor(com.teamwable.ui.R.color.gray_600)) + } + } + } + } } private fun setAppbarText() { binding.viewProfileDeleteReasonAppbar.tvProfileAppbarTitle.text = "계정 삭제" } - private fun initNextBtnClickListener() { - binding.btnProfileDeleteReasonNext.setOnClickListener { - findNavController().navigate(R.id.action_navigation_profile_delete_reason_to_navigation_profile_delete_confirm) + private fun initBackBtnClickListener() { + binding.viewProfileDeleteReasonAppbar.btnProfileAppbarBack.setOnClickListener { + findNavController().popBackStack() } } + + private fun navigateUpToProfileDeleteConfirmFragment() { + findNavController().navigate(R.id.action_navigation_profile_delete_reason_to_navigation_profile_delete_confirm) + } } From 5674af2a06bf6313fb03ca5866b18afeedc78988 Mon Sep 17 00:00:00 2001 From: Sohyun Date: Thu, 15 Aug 2024 05:33:35 +0900 Subject: [PATCH 29/52] #18 [FEAT] : add safeargs dependency --- .../java/com/teamwable/wable/plugin/AndroidFeaturePlugin.kt | 6 +++++- build.gradle.kts | 1 + gradle/libs.versions.toml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build-logic/src/main/java/com/teamwable/wable/plugin/AndroidFeaturePlugin.kt b/build-logic/src/main/java/com/teamwable/wable/plugin/AndroidFeaturePlugin.kt index fc4590c5..208b76e5 100644 --- a/build-logic/src/main/java/com/teamwable/wable/plugin/AndroidFeaturePlugin.kt +++ b/build-logic/src/main/java/com/teamwable/wable/plugin/AndroidFeaturePlugin.kt @@ -11,9 +11,13 @@ class AndroidFeaturePlugin : Plugin { plugins.apply("com.android.library") configureAndroidCommonPlugin() + with(plugins) { + apply("androidx.navigation.safeargs") + } + val libs = extensions.getByType().named("libs") dependencies { "implementation"(libs.findLibrary("androidx.constraintlayout").get()) } } -} \ No newline at end of file +} diff --git a/build.gradle.kts b/build.gradle.kts index 372ee04e..44cea1f9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ buildscript { classpath(libs.kotlin.gradleplugin) classpath(libs.hilt.plugin) classpath(libs.agp) + classpath(libs.androidx.navigation.safe.args) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 347fd079..d105b81e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -88,6 +88,7 @@ paging = { module = "androidx.paging:paging-runtime-ktx", version.ref = "paging" paging-domain = { module = "androidx.paging:paging-common", version.ref = "paging" } androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" } androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" } +androidx-navigation-safe-args = { group = "androidx.navigation", name = "navigation-safe-args-gradle-plugin", version.ref = "navigationFragmentKtx" } lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } From c43eb5f855359905d79a6d9097038fee1572a671 Mon Sep 17 00:00:00 2001 From: Sohyun Date: Thu, 15 Aug 2024 05:40:51 +0900 Subject: [PATCH 30/52] #18 [FIX] : fix bottom navigation logic --- .../src/main/res/navigation/graph_home.xml | 13 +++++++ .../java/com/teamwable/main/MainActivity.kt | 6 ++-- .../main/res/menu/menu_main_navigation.xml | 8 ++--- .../src/main/res/navigation/graph_main.xml | 34 ++++--------------- .../src/main/res/navigation/graph_news.xml | 13 +++++++ .../res/navigation/graph_notification.xml | 13 +++++++ .../src/main/res/navigation/graph_posting.xml | 13 +++++++ .../profile/ProfileHamburgerBottomSheet.kt | 4 +-- .../src/main/res/navigation/graph_profile.xml | 23 +++++-------- 9 files changed, 75 insertions(+), 52 deletions(-) create mode 100644 feature/home/src/main/res/navigation/graph_home.xml create mode 100644 feature/news/src/main/res/navigation/graph_news.xml create mode 100644 feature/notification/src/main/res/navigation/graph_notification.xml create mode 100644 feature/posting/src/main/res/navigation/graph_posting.xml diff --git a/feature/home/src/main/res/navigation/graph_home.xml b/feature/home/src/main/res/navigation/graph_home.xml new file mode 100644 index 00000000..3d536f56 --- /dev/null +++ b/feature/home/src/main/res/navigation/graph_home.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/feature/main/src/main/java/com/teamwable/main/MainActivity.kt b/feature/main/src/main/java/com/teamwable/main/MainActivity.kt index de3bd832..dbfb4c41 100644 --- a/feature/main/src/main/java/com/teamwable/main/MainActivity.kt +++ b/feature/main/src/main/java/com/teamwable/main/MainActivity.kt @@ -51,16 +51,16 @@ class MainActivity : AppCompatActivity() { private fun initBottomNavigationChangedListener(navController: NavController) { navController.addOnDestinationChangedListener { controller, destination, arguments -> handleBottomNavigationVisibility(destination) - if (destination.id == R.id.navigation_notification) setBadgeOnNotification(false) + if (destination.id == com.teamwable.notification.R.id.navigation_notification) setBadgeOnNotification(false) } } private fun handleBottomNavigationVisibility(destination: NavDestination) { - binding.groupMainBnv.visible(destination.id != R.id.navigation_posting) + binding.groupMainBnv.visible(destination.id != com.teamwable.posting.R.id.navigation_posting) } private fun setBadgeOnNotification(isVisible: Boolean) { - binding.bnvMain.getOrCreateBadge(R.id.navigation_notification).apply { + binding.bnvMain.getOrCreateBadge(R.id.graph_notification).apply { this.isVisible = isVisible horizontalOffset = 1 if (isVisible) backgroundColor = colorOf(com.teamwable.ui.R.color.error) else clearNumber() diff --git a/feature/main/src/main/res/menu/menu_main_navigation.xml b/feature/main/src/main/res/menu/menu_main_navigation.xml index aa0b5213..0b7f97d9 100644 --- a/feature/main/src/main/res/menu/menu_main_navigation.xml +++ b/feature/main/src/main/res/menu/menu_main_navigation.xml @@ -1,19 +1,19 @@ diff --git a/feature/main/src/main/res/navigation/graph_main.xml b/feature/main/src/main/res/navigation/graph_main.xml index 2d3f539a..0ea25202 100644 --- a/feature/main/src/main/res/navigation/graph_main.xml +++ b/feature/main/src/main/res/navigation/graph_main.xml @@ -1,34 +1,12 @@ + app:startDestination="@id/graph_home"> - - - - - - + + + + + diff --git a/feature/news/src/main/res/navigation/graph_news.xml b/feature/news/src/main/res/navigation/graph_news.xml new file mode 100644 index 00000000..da9baacf --- /dev/null +++ b/feature/news/src/main/res/navigation/graph_news.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/feature/notification/src/main/res/navigation/graph_notification.xml b/feature/notification/src/main/res/navigation/graph_notification.xml new file mode 100644 index 00000000..4452946f --- /dev/null +++ b/feature/notification/src/main/res/navigation/graph_notification.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/feature/posting/src/main/res/navigation/graph_posting.xml b/feature/posting/src/main/res/navigation/graph_posting.xml new file mode 100644 index 00000000..8d4fe646 --- /dev/null +++ b/feature/posting/src/main/res/navigation/graph_posting.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt index 921f24df..fc929251 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt @@ -17,13 +17,13 @@ class ProfileHamburgerBottomSheet : BindingBottomSheetFragment + android:id="@+id/graph_profile" + app:startDestination="@id/navigation_profile"> + android:id="@+id/navigation_profile" + android:name="com.teamwable.profile.ProfileFragment" + android:label="ProfileFragment" + tools:layout="@layout/fragment_profile"> - - Date: Fri, 16 Aug 2024 19:23:31 +0900 Subject: [PATCH 31/52] =?UTF-8?q?#18=20[UI]=20:=20view=20id=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20string=20export?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/bottomsheet_profile_hamburger.xml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml b/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml index 478d4e37..14bd4cb2 100644 --- a/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml +++ b/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml @@ -10,13 +10,13 @@ android:layout_width="42dp" android:layout_height="4dp" android:layout_marginTop="@dimen/padding_horizontal" - android:background="@drawable/shape_gray500_fill_4_rect" + android:background="@drawable/shape_gray500_fill_2_rect" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/tv_profile_hamburger_account_information" /> + app:layout_constraintTop_toBottomOf="@id/tv_profile_hamburger_notification_setting" /> + app:layout_constraintTop_toBottomOf="@id/tv_profile_hamburger_feedback" /> + app:layout_constraintTop_toBottomOf="@id/tv_profile_hamburger_customer_service" /> From 498a5feec0b88a8bff8b1d9eaad31ab1fc826fd1 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 19:23:37 +0900 Subject: [PATCH 32/52] #18 [UI] : string export --- feature/profile/src/main/res/layout/fragment_delete_dialog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/profile/src/main/res/layout/fragment_delete_dialog.xml b/feature/profile/src/main/res/layout/fragment_delete_dialog.xml index 75605378..ebe9af16 100644 --- a/feature/profile/src/main/res/layout/fragment_delete_dialog.xml +++ b/feature/profile/src/main/res/layout/fragment_delete_dialog.xml @@ -47,7 +47,7 @@ android:layout_height="0dp" android:layout_marginEnd="@dimen/padding_dialog_bottom" android:backgroundTint="@color/purple_50" - android:text="삭제하기" + android:text="@string/btn_delete_dialog_delete" android:textAppearance="@style/TextAppearance.Wable.Body1" android:textColor="@color/white" app:cornerRadius="12dp" From 8ac7427a5e81f6831b2677c83babd8caf71a374c Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 19:23:53 +0900 Subject: [PATCH 33/52] #18 [UI] : string export --- .../fragment_profile_delete_confirm.xml | 19 ++++++++-------- .../layout/fragment_profile_delete_reason.xml | 22 +++++++++---------- .../res/layout/fragment_push_notification.xml | 7 ++++-- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml index 77c2d2b8..6c6c7b0c 100644 --- a/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml +++ b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/padding_horizontal" android:layout_marginTop="@dimen/padding_horizontal" - android:text="계정을 삭제하기 전,\n아래 내용을 꼭 확인해 주세요" + android:text="@string/tv_profile_delete_confirm_title" android:textAppearance="@style/TextAppearance.Wable.Head0" android:textColor="@color/black" app:layout_constraintStart_toStartOf="parent" @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/padding_horizontal" android:layout_marginTop="48dp" - android:background="@color/gray_100" + android:background="@drawable/shape_gray100_fill_12_rect" android:orientation="vertical" android:paddingHorizontal="8dp" android:paddingVertical="40dp" @@ -35,7 +35,7 @@ android:id="@+id/tv_profile_delete_confirm_dot_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="•" + android:text="@string/tv_profile_delete_confirm_dot" android:textAppearance="@style/TextAppearance.Wable.Body2" android:textColor="@color/gray_800" app:layout_constraintStart_toStartOf="parent" @@ -45,7 +45,7 @@ android:id="@+id/tv_profile_delete_confirm_content_1" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="계정 삭제 처리된 이메일 아이디는 재가입 방지를 위해 30일간 보존된 후 삭제 처리됩니다." + android:text="@string/tv_profile_delete_confirm_content_1" android:textAppearance="@style/TextAppearance.Wable.Body2" android:textColor="@color/gray_800" app:layout_constraintEnd_toEndOf="parent" @@ -56,16 +56,17 @@ android:id="@+id/tv_profile_delete_confirm_dot_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="•" + android:text="@string/tv_profile_delete_confirm_dot" android:textAppearance="@style/TextAppearance.Wable.Body2" android:textColor="@color/gray_800" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_profile_delete_confirm_content_1" /> Date: Fri, 16 Aug 2024 19:23:57 +0900 Subject: [PATCH 34/52] #18 [UI] : string export --- .../profile/src/main/res/values/strings.xml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 feature/profile/src/main/res/values/strings.xml diff --git a/feature/profile/src/main/res/values/strings.xml b/feature/profile/src/main/res/values/strings.xml new file mode 100644 index 00000000..226ec828 --- /dev/null +++ b/feature/profile/src/main/res/values/strings.xml @@ -0,0 +1,58 @@ + + + + 계정 정보 + 알림 설정 + 피드백 남기기 + 고객센터 + 로그아웃 + + + 삭제하기 + + + 로그아웃하시겠어요? + 로그아웃하기 + + + 계정을 삭제하시겠어요? + + + 계정을 삭제하기 전,\n아래 내용을 꼭 확인해 주세요 + • + 계정 삭제 처리된 이메일 아이디는 재가입 방지를 위해 30일간 보존된 후 삭제 처리됩니다. + 탈퇴와 재가입을 통해 아이디를 교체하며 선량한 이용자들께 피해를 끼치는 행위를 방지하려는 조치 오니 넓은 양해 부탁드립니다. + 안내사항을 모두 확인하였으며, 이에 동의합니다. + + + 정말 떠나시는 건가요? + 계정을 삭제하시려는 이유를 말씀해 주세요\n서비스 개선에 중요한 자료로 활용하겠습니다 + 온화하지 못한 내용이 많이 보여요. + 원하는 콘텐츠가 없어요. + 필요한 커뮤니티 기능이 없어요. + 자주 사용하지 않아요. + 앱 오류가 있어 사용하기 불편해요. + 가입할 때 사용한 소셜 계정이 바뀔 예정이에요. + 기타 + + + 계속 + 계정 삭제 + + + 소셜 로그인 + 버전 정보 + 아이디 + 가입일 + 이용약관 + 자세히 보기 + 계정 삭제하기 + 계정 정보 + + + 푸시 알림 + on + off + 알림 설정 + + From 9431808e96b7665e3572092f0106c780d399f6d8 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 19:24:07 +0900 Subject: [PATCH 35/52] =?UTF-8?q?#18=20[UI]=20:=20string=20export=20?= =?UTF-8?q?=EB=B0=8F=20view=20=EB=B0=B0=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/fragment_profile_information.xml | 265 +++++++++--------- 1 file changed, 128 insertions(+), 137 deletions(-) diff --git a/feature/profile/src/main/res/layout/fragment_profile_information.xml b/feature/profile/src/main/res/layout/fragment_profile_information.xml index 7e8bf037..db2af62b 100644 --- a/feature/profile/src/main/res/layout/fragment_profile_information.xml +++ b/feature/profile/src/main/res/layout/fragment_profile_information.xml @@ -9,147 +9,138 @@ android:id="@+id/view_profile_information_appbar" layout="@layout/view_profile_appbar" /> - - - - - - - - - + + - - - - - - - - + + - - - - - - - - + + - - - - - - - - + + + + + + - - - - - - + android:layout_marginTop="38dp" + android:text="@string/tv_profile_information_id_title" + android:textAppearance="@style/TextAppearance.Wable.Body2" + android:textColor="@color/gray_600" + app:layout_constraintStart_toStartOf="@id/guide_profile_information_title" + app:layout_constraintTop_toBottomOf="@id/tv_profile_information_version_title" /> + + + + + + + + + + + + From 7cf6e42b4992c9c4ae47cdfe8d98a30fc4117f7b Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 19:24:28 +0900 Subject: [PATCH 36/52] =?UTF-8?q?#18=20[UI]=20:=20drawable=20background=20?= =?UTF-8?q?file=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml diff --git a/core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml b/core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml new file mode 100644 index 00000000..c0fb39ee --- /dev/null +++ b/core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml @@ -0,0 +1,5 @@ + + + + + From 25408e5d8518e30d77647b52ba0524ff064022e3 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 19:24:39 +0900 Subject: [PATCH 37/52] =?UTF-8?q?#18=20[UI]=20:=20sel=20=EC=86=8D=EC=84=B1?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/src/main/res/drawable/sel_profile_delete_btn.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml b/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml index e4ecb572..321af808 100644 --- a/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml +++ b/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml @@ -1,5 +1,5 @@ - - + + From 498c100348a646d7b32555c2e3e6f496e2d42378 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 19:24:44 +0900 Subject: [PATCH 38/52] =?UTF-8?q?#18=20[UI]=20:=20drawable=20radius=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...pe_gray500_fill_4_rect.xml => shape_gray500_fill_2_rect.xml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/ui/src/main/res/drawable/{shape_gray500_fill_4_rect.xml => shape_gray500_fill_2_rect.xml} (81%) diff --git a/core/ui/src/main/res/drawable/shape_gray500_fill_4_rect.xml b/core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml similarity index 81% rename from core/ui/src/main/res/drawable/shape_gray500_fill_4_rect.xml rename to core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml index 70cd433a..44aa43a0 100644 --- a/core/ui/src/main/res/drawable/shape_gray500_fill_4_rect.xml +++ b/core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml @@ -1,5 +1,5 @@ - + From b8c741c000b9bcdba497e50e3c232108895eb0ef Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 19:25:55 +0900 Subject: [PATCH 39/52] #18 [MOD] : string export --- .../teamwable/profile/LogoutDialogFragment.kt | 4 +-- .../profile/ProfileDeleteConfirmFragment.kt | 2 +- .../profile/ProfileDeleteDialogFragment.kt | 2 +- .../profile/ProfileDeleteReasonFragment.kt | 31 +++++++++++-------- .../profile/ProfileInformationFragment.kt | 12 ++++++- .../profile/PushNotificationFragment.kt | 2 +- 6 files changed, 34 insertions(+), 19 deletions(-) diff --git a/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt index 0984ce53..1496d1b4 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt @@ -13,8 +13,8 @@ class LogoutDialogFragment : BindingDialogFragment( private fun initText() { with(binding) { - tvDeleteDialogTitle.text = "로그아웃하시겠어요?" - btnDeleteDialogDelete.text = "로그아웃하기" + tvDeleteDialogTitle.text = getString(R.string.tv_logout_dialog_title) + btnDeleteDialogDelete.text = getString(R.string.btn_logout_dialog_delete) } } diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt index f911c4b1..fb19ba31 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt @@ -28,7 +28,7 @@ class ProfileDeleteConfirmFragment : BindingFragment(FragmentProfileDeleteReasonBinding::inflate) { private val checkBoxList by lazy { @@ -23,29 +24,33 @@ class ProfileDeleteReasonFragment : BindingFragment checkBox.setOnCheckedChangeListener { _, _ -> - val anyChecked = checkBoxList.any { it.isChecked } - binding.btnProfileDeleteReasonNext.apply { - isEnabled = anyChecked - if (isEnabled) { - setTextColor(context.getColor(com.teamwable.ui.R.color.white)) - setOnClickListener { - navigateUpToProfileDeleteConfirmFragment() - } - } else { - setTextColor(context.getColor(com.teamwable.ui.R.color.gray_600)) - } - } + Timber.tag("dd").d("바뀜") + updateButtonState() } } } private fun setAppbarText() { - binding.viewProfileDeleteReasonAppbar.tvProfileAppbarTitle.text = "계정 삭제" + binding.viewProfileDeleteReasonAppbar.tvProfileAppbarTitle.text = getString(R.string.appbar_profile_delete_title) } private fun initBackBtnClickListener() { diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt index c38bd4fd..45387e0e 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileInformationFragment.kt @@ -7,12 +7,22 @@ import com.teamwable.ui.base.BindingFragment class ProfileInformationFragment : BindingFragment(FragmentProfileInformationBinding::inflate) { override fun initView() { setAppbarText() + setInformationText() initBackBtnClickListener() initDeleteBtnClickListener() } + private fun setInformationText() { + with(binding) { + tvProfileInformationSocialContent.text = "카카오톡 소셜 로긘" + tvProfileInformationVersionContent.text = "0.0.0" + tvProfileInformationIdContent.text = "wable" + tvProfileInformationRegistrationDateContent.text = "2024-08-15" + } + } + private fun setAppbarText() { - binding.viewProfileInformationAppbar.tvProfileAppbarTitle.text = "계정 정보" + binding.viewProfileInformationAppbar.tvProfileAppbarTitle.text = getString(R.string.appbar_profile_information_title) } private fun initBackBtnClickListener() { diff --git a/feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt index 37562e8c..2a913f02 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/PushNotificationFragment.kt @@ -11,7 +11,7 @@ class PushNotificationFragment : BindingFragment Date: Fri, 16 Aug 2024 19:26:03 +0900 Subject: [PATCH 40/52] =?UTF-8?q?#18=20[MOD]=20:=20view=20id=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teamwable/profile/ProfileHamburgerBottomSheet.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt index fc929251..b7346722 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt @@ -16,13 +16,13 @@ class ProfileHamburgerBottomSheet : BindingBottomSheetFragment Date: Fri, 16 Aug 2024 20:02:03 +0900 Subject: [PATCH 41/52] =?UTF-8?q?#18=20[MOD]=20:=20onResume=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teamwable/profile/ProfileDeleteReasonFragment.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt index b3aea8aa..59dfde2f 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt @@ -3,7 +3,6 @@ package com.teamwable.profile import androidx.navigation.fragment.findNavController import com.teamwable.profile.databinding.FragmentProfileDeleteReasonBinding import com.teamwable.ui.base.BindingFragment -import timber.log.Timber class ProfileDeleteReasonFragment : BindingFragment(FragmentProfileDeleteReasonBinding::inflate) { private val checkBoxList by lazy { @@ -27,6 +26,11 @@ class ProfileDeleteReasonFragment : BindingFragment checkBox.setOnCheckedChangeListener { _, _ -> - Timber.tag("dd").d("바뀜") updateButtonState() } } From ead6691a9da2d565c64fee4926fc819f33b6e148 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 20:10:24 +0900 Subject: [PATCH 42/52] =?UTF-8?q?#18=20[UI]=20:=20profile=20nav=20graph=20?= =?UTF-8?q?dialog=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profile/src/main/res/navigation/graph_profile.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/feature/profile/src/main/res/navigation/graph_profile.xml b/feature/profile/src/main/res/navigation/graph_profile.xml index 7fab8fde..4d5e3f1e 100644 --- a/feature/profile/src/main/res/navigation/graph_profile.xml +++ b/feature/profile/src/main/res/navigation/graph_profile.xml @@ -38,16 +38,7 @@ android:id="@+id/navigation_profile_delete_confirm" android:name="com.teamwable.profile.ProfileDeleteConfirmFragment" android:label="ProfileDeleteConfirmFragment" - tools:layout="@layout/fragment_profile_delete_confirm"> - - - + tools:layout="@layout/fragment_profile_delete_confirm"/> Date: Fri, 16 Aug 2024 23:29:11 +0900 Subject: [PATCH 43/52] =?UTF-8?q?#18=20[UI]=20:=20background=20=EB=B0=8F?= =?UTF-8?q?=20backgroundTint,=20src=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/bottomsheet_profile_hamburger.xml | 15 ++++++++------- .../layout/fragment_profile_delete_confirm.xml | 13 +++++++++---- .../res/layout/fragment_profile_delete_reason.xml | 6 ++++-- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml b/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml index 14bd4cb2..a66bb45d 100644 --- a/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml +++ b/feature/profile/src/main/res/layout/bottomsheet_profile_hamburger.xml @@ -3,14 +3,15 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_white_fill_top_16_rect"> + android:background="@drawable/shape_fill_top_16_rect" + android:backgroundTint="@color/white"> - @@ -27,7 +28,7 @@ android:text="@string/tv_profile_hamburger_account_information" android:textAppearance="@style/TextAppearance.Wable.Body1" android:textColor="@color/black" - app:layout_constraintTop_toBottomOf="@id/view_profile_hamburger_bar" /> + app:layout_constraintTop_toBottomOf="@id/iv_profile_hamburger_bar" /> diff --git a/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml b/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml index 87a61796..e5ee91e3 100644 --- a/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml +++ b/feature/profile/src/main/res/layout/fragment_profile_delete_reason.xml @@ -222,10 +222,11 @@ From 4930453b7ead27c221f5c89c3125ba9bea045184 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 23:30:02 +0900 Subject: [PATCH 44/52] =?UTF-8?q?#18=20[FEAT]=20:=20bottomSheetTag,=20Dial?= =?UTF-8?q?ogTag=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/ui/src/main/java/com/teamwable/ui/util/Constants.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/ui/src/main/java/com/teamwable/ui/util/Constants.kt b/core/ui/src/main/java/com/teamwable/ui/util/Constants.kt index 1e465786..f1d13b64 100644 --- a/core/ui/src/main/java/com/teamwable/ui/util/Constants.kt +++ b/core/ui/src/main/java/com/teamwable/ui/util/Constants.kt @@ -1,2 +1,11 @@ package com.teamwable.ui.util + // 전역적으로 쓰이는 키 값 관리 +object BottomSheetTag { + const val PROFILE_HAMBURGER_BOTTOM_SHEET = "ProfileHamburgerBottomSheet" +} + +object DialogTag { + const val PROFILE_DELETE_DIALOG = "ProfileDeleteDialog" + const val LOGOUT_DIALOG = "LogoutDialog" +} From 1a70506dd09b97946c3cf6409182eb1a1b230ad1 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 23:30:16 +0900 Subject: [PATCH 45/52] =?UTF-8?q?#18=20[UI]=20:=20bottomSheet=20bar=20icon?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/ic_share_bottomsheet_bar.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 core/common/src/main/res/drawable/ic_share_bottomsheet_bar.xml diff --git a/core/common/src/main/res/drawable/ic_share_bottomsheet_bar.xml b/core/common/src/main/res/drawable/ic_share_bottomsheet_bar.xml new file mode 100644 index 00000000..04e2a8f9 --- /dev/null +++ b/core/common/src/main/res/drawable/ic_share_bottomsheet_bar.xml @@ -0,0 +1,13 @@ + + + From 828faea1586a2a8342cc78f7cb0466ec8c480f30 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 23:30:50 +0900 Subject: [PATCH 46/52] =?UTF-8?q?#18=20[UI]=20:=20=ED=95=98=EB=8B=A8=20btn?= =?UTF-8?q?=20background=20color=20selector=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/ui/src/main/res/color/sel_bottom_btn_color.xml | 5 +++++ core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml | 5 ----- .../ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml | 5 ----- .../profile/src/main/res/drawable/sel_profile_delete_btn.xml | 5 ----- 4 files changed, 5 insertions(+), 15 deletions(-) create mode 100644 core/ui/src/main/res/color/sel_bottom_btn_color.xml delete mode 100644 core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml delete mode 100644 core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml delete mode 100644 feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml diff --git a/core/ui/src/main/res/color/sel_bottom_btn_color.xml b/core/ui/src/main/res/color/sel_bottom_btn_color.xml new file mode 100644 index 00000000..d0fbcef7 --- /dev/null +++ b/core/ui/src/main/res/color/sel_bottom_btn_color.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml b/core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml deleted file mode 100644 index d593a3d6..00000000 --- a/core/ui/src/main/res/drawable/shape_gray200_fill_12_rect.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml b/core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml deleted file mode 100644 index 2163ac77..00000000 --- a/core/ui/src/main/res/drawable/shape_purple50_fill_12_rect.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml b/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml deleted file mode 100644 index 321af808..00000000 --- a/feature/profile/src/main/res/drawable/sel_profile_delete_btn.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - From 6945479ace11e7679a8b347b57366a28b30afaf2 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 23:31:16 +0900 Subject: [PATCH 47/52] =?UTF-8?q?#18=20[UI]=20:=20drawable=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=83=89=EC=83=81=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{shape_gray100_fill_12_rect.xml => shape_fill_12_rect.xml} | 1 - ...ape_white_fill_top_16_rect.xml => shape_fill_top_16_rect.xml} | 1 - 2 files changed, 2 deletions(-) rename core/ui/src/main/res/drawable/{shape_gray100_fill_12_rect.xml => shape_fill_12_rect.xml} (76%) rename core/ui/src/main/res/drawable/{shape_white_fill_top_16_rect.xml => shape_fill_top_16_rect.xml} (82%) diff --git a/core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml b/core/ui/src/main/res/drawable/shape_fill_12_rect.xml similarity index 76% rename from core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml rename to core/ui/src/main/res/drawable/shape_fill_12_rect.xml index c0fb39ee..d57fde86 100644 --- a/core/ui/src/main/res/drawable/shape_gray100_fill_12_rect.xml +++ b/core/ui/src/main/res/drawable/shape_fill_12_rect.xml @@ -1,5 +1,4 @@ - diff --git a/core/ui/src/main/res/drawable/shape_white_fill_top_16_rect.xml b/core/ui/src/main/res/drawable/shape_fill_top_16_rect.xml similarity index 82% rename from core/ui/src/main/res/drawable/shape_white_fill_top_16_rect.xml rename to core/ui/src/main/res/drawable/shape_fill_top_16_rect.xml index 6620f877..f5b894a8 100644 --- a/core/ui/src/main/res/drawable/shape_white_fill_top_16_rect.xml +++ b/core/ui/src/main/res/drawable/shape_fill_top_16_rect.xml @@ -1,6 +1,5 @@ - From 27e3c6b130f410d89e89e25037afc1a71a387768 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 23:31:27 +0900 Subject: [PATCH 48/52] =?UTF-8?q?#18=20[DEL]=20:=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml diff --git a/core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml b/core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml deleted file mode 100644 index 44aa43a0..00000000 --- a/core/ui/src/main/res/drawable/shape_gray500_fill_2_rect.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - From d0df648faf92dfbab303aaafdef5c38937a51d28 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 23:32:50 +0900 Subject: [PATCH 49/52] =?UTF-8?q?#18=20[MOD]=20:=20=ED=99=95=EC=9E=A5?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20=EC=83=81?= =?UTF-8?q?=EC=88=98=20constants=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teamwable/profile/LogoutDialogFragment.kt | 5 +++-- .../profile/ProfileDeleteConfirmFragment.kt | 13 ++++++------- .../profile/ProfileDeleteDialogFragment.kt | 3 ++- .../java/com/teamwable/profile/ProfileFragment.kt | 11 ++++------- .../profile/ProfileHamburgerBottomSheet.kt | 5 +---- .../teamwable/profile/ProfileInformationFragment.kt | 3 ++- .../teamwable/profile/PushNotificationFragment.kt | 3 ++- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt index 1496d1b4..de6909b7 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/LogoutDialogFragment.kt @@ -3,6 +3,7 @@ package com.teamwable.profile import com.teamwable.profile.databinding.FragmentDeleteDialogBinding import com.teamwable.ui.base.BindingDialogFragment import com.teamwable.ui.extensions.dialogFragmentResize +import com.teamwable.ui.extensions.stringOf class LogoutDialogFragment : BindingDialogFragment(R.layout.fragment_delete_dialog, FragmentDeleteDialogBinding::inflate) { override fun initView() { @@ -13,8 +14,8 @@ class LogoutDialogFragment : BindingDialogFragment( private fun initText() { with(binding) { - tvDeleteDialogTitle.text = getString(R.string.tv_logout_dialog_title) - btnDeleteDialogDelete.text = getString(R.string.btn_logout_dialog_delete) + tvDeleteDialogTitle.text = stringOf(R.string.tv_logout_dialog_title) + btnDeleteDialogDelete.text = stringOf(R.string.btn_logout_dialog_delete) } } diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt index fb19ba31..880af5d0 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteConfirmFragment.kt @@ -3,6 +3,9 @@ package com.teamwable.profile import androidx.navigation.fragment.findNavController import com.teamwable.profile.databinding.FragmentProfileDeleteConfirmBinding import com.teamwable.ui.base.BindingFragment +import com.teamwable.ui.extensions.colorOf +import com.teamwable.ui.extensions.stringOf +import com.teamwable.ui.util.DialogTag.PROFILE_DELETE_DIALOG class ProfileDeleteConfirmFragment : BindingFragment(FragmentProfileDeleteConfirmBinding::inflate) { override fun initView() { @@ -16,19 +19,19 @@ class ProfileDeleteConfirmFragment : BindingFragment(R.layout.fragment_delete_dialog, FragmentDeleteDialogBinding::inflate) { override fun initView() { @@ -13,7 +14,7 @@ class ProfileDeleteDialogFragment : BindingDialogFragment(FragmentProfileB private fun initAppbarBtnVisibility() { with(binding.viewProfileAppbar) { - btnProfileAppbarBack.visibility = View.GONE - btnProfileAppbarHamburger.visibility = View.VISIBLE + btnProfileAppbarBack.visible(false) + btnProfileAppbarHamburger.visible(true) } } @@ -29,8 +30,4 @@ class ProfileFragment : BindingFragment(FragmentProfileB ProfileHamburgerBottomSheet().show(childFragmentManager, PROFILE_HAMBURGER_BOTTOM_SHEET) } } - - companion object { - const val PROFILE_HAMBURGER_BOTTOM_SHEET = "ProfileHamburgerBottomSheet" - } } diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt index b7346722..90f1f03a 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileHamburgerBottomSheet.kt @@ -5,6 +5,7 @@ import android.net.Uri import androidx.navigation.fragment.findNavController import com.teamwable.profile.databinding.BottomsheetProfileHamburgerBinding import com.teamwable.ui.base.BindingBottomSheetFragment +import com.teamwable.ui.util.DialogTag.LOGOUT_DIALOG class ProfileHamburgerBottomSheet : BindingBottomSheetFragment(BottomsheetProfileHamburgerBinding::inflate) { override fun initView() { @@ -44,8 +45,4 @@ class ProfileHamburgerBottomSheet : BindingBottomSheetFragment(FragmentProfileInformationBinding::inflate) { override fun initView() { @@ -22,7 +23,7 @@ class ProfileInformationFragment : BindingFragment(FragmentPushNotificationBinding::inflate) { override fun initView() { @@ -11,7 +12,7 @@ class PushNotificationFragment : BindingFragment Date: Fri, 16 Aug 2024 23:33:06 +0900 Subject: [PATCH 50/52] =?UTF-8?q?#18=20[MOD]=20:=20handleBottomNavigationV?= =?UTF-8?q?isibility=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/teamwable/main/MainActivity.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/feature/main/src/main/java/com/teamwable/main/MainActivity.kt b/feature/main/src/main/java/com/teamwable/main/MainActivity.kt index dbfb4c41..eadd3266 100644 --- a/feature/main/src/main/java/com/teamwable/main/MainActivity.kt +++ b/feature/main/src/main/java/com/teamwable/main/MainActivity.kt @@ -56,7 +56,17 @@ class MainActivity : AppCompatActivity() { } private fun handleBottomNavigationVisibility(destination: NavDestination) { - binding.groupMainBnv.visible(destination.id != com.teamwable.posting.R.id.navigation_posting) + if (destination.id in listOf( + com.teamwable.home.R.id.navigation_home, + com.teamwable.news.R.id.navigation_news, + com.teamwable.notification.R.id.navigation_notification, + com.teamwable.profile.R.id.navigation_profile, + ) + ) { + binding.groupMainBnv.visible(true) + } else { + binding.groupMainBnv.visible(false) + } } private fun setBadgeOnNotification(isVisible: Boolean) { From 01da90978f6ba2e9a89a9b9f732604b1f8395409 Mon Sep 17 00:00:00 2001 From: Eonji-sw Date: Fri, 16 Aug 2024 23:33:37 +0900 Subject: [PATCH 51/52] =?UTF-8?q?#18=20[FIX]=20:=20checkBox=20lazy=20?= =?UTF-8?q?=EC=84=A0=EC=96=B8=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 --- .../profile/ProfileDeleteReasonFragment.kt | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt index 59dfde2f..5f7b1156 100644 --- a/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt +++ b/feature/profile/src/main/java/com/teamwable/profile/ProfileDeleteReasonFragment.kt @@ -1,34 +1,32 @@ package com.teamwable.profile +import android.widget.CheckBox import androidx.navigation.fragment.findNavController import com.teamwable.profile.databinding.FragmentProfileDeleteReasonBinding import com.teamwable.ui.base.BindingFragment +import com.teamwable.ui.extensions.colorOf class ProfileDeleteReasonFragment : BindingFragment(FragmentProfileDeleteReasonBinding::inflate) { - private val checkBoxList by lazy { - with(binding) { - listOf( - cbProfileDeleteReasonCheck1, - cbProfileDeleteReasonCheck2, - cbProfileDeleteReasonCheck3, - cbProfileDeleteReasonCheck4, - cbProfileDeleteReasonCheck5, - cbProfileDeleteReasonCheck6, - cbProfileDeleteReasonCheck7 - ) - } - } + private lateinit var checkBoxList: List override fun initView() { setAppbarText() initBackBtnClickListener() + initCheckBoxList() initCheckBoxClickListener() updateButtonState() } - override fun onResume() { - super.onResume() - updateButtonState() + private fun initCheckBoxList() = with(binding) { + checkBoxList = listOf( + cbProfileDeleteReasonCheck1, + cbProfileDeleteReasonCheck2, + cbProfileDeleteReasonCheck3, + cbProfileDeleteReasonCheck4, + cbProfileDeleteReasonCheck5, + cbProfileDeleteReasonCheck6, + cbProfileDeleteReasonCheck7, + ) } private fun updateButtonState() { @@ -36,11 +34,11 @@ class ProfileDeleteReasonFragment : BindingFragment Date: Fri, 16 Aug 2024 23:36:36 +0900 Subject: [PATCH 52/52] =?UTF-8?q?#18=20[UI]=20:=20bottom=20btn=20padding?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/fragment_profile_delete_confirm.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml index f9191488..e006fdd8 100644 --- a/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml +++ b/feature/profile/src/main/res/layout/fragment_profile_delete_confirm.xml @@ -116,6 +116,7 @@ android:enabled="false" android:gravity="center" android:paddingTop="15dp" + android:paddingBottom="12dp" android:text="@string/btn_profile_delete_next" android:textAppearance="@style/TextAppearance.Wable.Head2" android:textColor="@color/gray_600"