From df4b5c1e81c1704a3d2852bc0d1a065f0cf3b8b5 Mon Sep 17 00:00:00 2001 From: Kez Date: Fri, 31 Jan 2025 22:11:53 +0900 Subject: [PATCH] =?UTF-8?q?fix(popup):=20popup=20design=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/dialog_common_one_button.xml | 2 +- .../src/main/res/layout/dialog_common_two_button.xml | 2 +- ...radius100.xml => shape_background_radius100_alpha0.xml} | 0 .../src/main/res/drawable/shape_gray7_radius10.xml | 7 +++++++ .../java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt | 2 +- feature/main/src/main/res/layout/item_banner.xml | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) rename core/designsystem/src/main/res/drawable/{shape_background_radius100.xml => shape_background_radius100_alpha0.xml} (100%) create mode 100644 core/designsystem/src/main/res/drawable/shape_gray7_radius10.xml diff --git a/core/common/src/main/res/layout/dialog_common_one_button.xml b/core/common/src/main/res/layout/dialog_common_one_button.xml index d99e04f8e..3583b5897 100644 --- a/core/common/src/main/res/layout/dialog_common_one_button.xml +++ b/core/common/src/main/res/layout/dialog_common_one_button.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_background_radius100" + android:background="@drawable/shape_gray7_radius10" android:paddingHorizontal="16dp" android:paddingTop="36dp" android:paddingBottom="24dp"> diff --git a/core/common/src/main/res/layout/dialog_common_two_button.xml b/core/common/src/main/res/layout/dialog_common_two_button.xml index 8b019b0a5..b28b7fc1f 100644 --- a/core/common/src/main/res/layout/dialog_common_two_button.xml +++ b/core/common/src/main/res/layout/dialog_common_two_button.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_background_radius100" + android:background="@drawable/shape_gray7_radius10" android:paddingHorizontal="16dp" android:paddingTop="36dp" android:paddingBottom="24dp"> diff --git a/core/designsystem/src/main/res/drawable/shape_background_radius100.xml b/core/designsystem/src/main/res/drawable/shape_background_radius100_alpha0.xml similarity index 100% rename from core/designsystem/src/main/res/drawable/shape_background_radius100.xml rename to core/designsystem/src/main/res/drawable/shape_background_radius100_alpha0.xml diff --git a/core/designsystem/src/main/res/drawable/shape_gray7_radius10.xml b/core/designsystem/src/main/res/drawable/shape_gray7_radius10.xml new file mode 100644 index 000000000..937e3ed78 --- /dev/null +++ b/core/designsystem/src/main/res/drawable/shape_gray7_radius10.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt b/feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt index 57a938172..d44509636 100644 --- a/feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt +++ b/feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt @@ -342,7 +342,7 @@ class ChallengeFragment : Fragment() { TwoButtonCommonDialog.newInstance( title = getString(R.string.delete_app_dialog_title, clickedAppNameToDialog), description = getString(R.string.delete_app_dialog_description), - confirmButtonText = getString(R.string.all_okay), + confirmButtonText = getString(R.string.all_delete), dismissButtonText = getString(R.string.all_cancel), ).apply { setConfirmButtonClickListener { diff --git a/feature/main/src/main/res/layout/item_banner.xml b/feature/main/src/main/res/layout/item_banner.xml index eef8e6084..c149d1709 100644 --- a/feature/main/src/main/res/layout/item_banner.xml +++ b/feature/main/src/main/res/layout/item_banner.xml @@ -12,7 +12,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="12dp" - app:background="@drawable/shape_background_radius100" + app:background="@drawable/shape_background_radius100_alpha0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"