Skip to content

Commit 9e88f1f

Browse files
authored
Merge pull request #302 from Team-HMH/fix/popup_design
[Fix/popup design]: popup design 오류 수정
2 parents b22f204 + d0b2f28 commit 9e88f1f

File tree

6 files changed

+11
-4
lines changed

6 files changed

+11
-4
lines changed

core/common/src/main/res/layout/dialog_common_one_button.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
7-
android:background="@drawable/shape_background_radius100"
7+
android:background="@drawable/shape_gray7_radius10"
88
android:paddingHorizontal="16dp"
99
android:paddingTop="36dp"
1010
android:paddingBottom="24dp">

core/common/src/main/res/layout/dialog_common_two_button.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
7-
android:background="@drawable/shape_background_radius100"
7+
android:background="@drawable/shape_gray7_radius10"
88
android:paddingHorizontal="16dp"
99
android:paddingTop="36dp"
1010
android:paddingBottom="24dp">
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<solid android:color="@color/gray7" />
5+
<corners android:radius="10dp" />
6+
7+
</shape>

feature/challenge/src/main/java/com/hmh/hamyeonham/challenge/ChallengeFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ class ChallengeFragment : Fragment() {
342342
TwoButtonCommonDialog.newInstance(
343343
title = getString(R.string.delete_app_dialog_title, clickedAppNameToDialog),
344344
description = getString(R.string.delete_app_dialog_description),
345-
confirmButtonText = getString(R.string.all_okay),
345+
confirmButtonText = getString(R.string.all_delete),
346346
dismissButtonText = getString(R.string.all_cancel),
347347
).apply {
348348
setConfirmButtonClickListener {

feature/main/src/main/res/layout/item_banner.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:layout_width="0dp"
1313
android:layout_height="0dp"
1414
android:layout_marginTop="12dp"
15-
app:background="@drawable/shape_background_radius100"
15+
app:background="@drawable/shape_background_radius100_alpha0"
1616
app:layout_constraintBottom_toBottomOf="parent"
1717
app:layout_constraintEnd_toEndOf="parent"
1818
app:layout_constraintStart_toStartOf="parent"

0 commit comments

Comments
 (0)