diff --git a/app/src/main/res/layout/layout_home_custompopup.xml b/app/src/main/res/layout/layout_home_custompopup.xml index 0ba8019..5b5a473 100644 --- a/app/src/main/res/layout/layout_home_custompopup.xml +++ b/app/src/main/res/layout/layout_home_custompopup.xml @@ -17,7 +17,7 @@ android:layout_width="24dp" android:layout_height="31dp" android:layout_marginTop="21dp" - android:src="@drawable/ic_hand_good" + android:src="@drawable/ic_hand_stop" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -30,7 +30,7 @@ android:layout_marginTop="18dp" android:fontFamily="@font/notosans_bold" android:gravity="center" - android:text="@string/profile_popup_mainText" + android:text="@string/home_popup_mainText" android:textColor="@color/color_sub_gray1" android:textFontWeight="700" android:textSize="18sp" @@ -46,7 +46,7 @@ android:layout_marginTop="12dp" android:fontFamily="@font/notosans_medium" android:gravity="center" - android:text="@string/profile_popup_subText" + android:text="@string/home_popup_subText" android:textColor="@color/color_sub_gray1" android:textFontWeight="500" android:textSize="12sp" @@ -58,35 +58,19 @@ android:id="@+id/btn_profilePopup_cancel" android:layout_width="0dp" android:layout_height="50dp" - android:layout_marginStart="27dp" + android:layout_marginHorizontal="28dp" android:layout_marginTop="24dp" android:layout_marginBottom="23dp" - android:background="@drawable/radius_gray7_radius_6" + android:background="@drawable/radius_main1_radius_6" android:fontFamily="@font/notosans_bold" - android:text="@string/profile_popup_cancel" - android:textColor="@color/color_sub_gray4" + android:text="@string/home_popup_check" + android:textColor="@color/white" android:textFontWeight="600" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/btn_profilePopup_exit" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_profilePopup_subText" /> - - + diff --git a/app/src/main/res/layout/layout_profile_custompopup.xml b/app/src/main/res/layout/layout_profile_custompopup.xml index 5b5a473..0ba8019 100644 --- a/app/src/main/res/layout/layout_profile_custompopup.xml +++ b/app/src/main/res/layout/layout_profile_custompopup.xml @@ -17,7 +17,7 @@ android:layout_width="24dp" android:layout_height="31dp" android:layout_marginTop="21dp" - android:src="@drawable/ic_hand_stop" + android:src="@drawable/ic_hand_good" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -30,7 +30,7 @@ android:layout_marginTop="18dp" android:fontFamily="@font/notosans_bold" android:gravity="center" - android:text="@string/home_popup_mainText" + android:text="@string/profile_popup_mainText" android:textColor="@color/color_sub_gray1" android:textFontWeight="700" android:textSize="18sp" @@ -46,7 +46,7 @@ android:layout_marginTop="12dp" android:fontFamily="@font/notosans_medium" android:gravity="center" - android:text="@string/home_popup_subText" + android:text="@string/profile_popup_subText" android:textColor="@color/color_sub_gray1" android:textFontWeight="500" android:textSize="12sp" @@ -58,19 +58,35 @@ android:id="@+id/btn_profilePopup_cancel" android:layout_width="0dp" android:layout_height="50dp" - android:layout_marginHorizontal="28dp" + android:layout_marginStart="27dp" android:layout_marginTop="24dp" android:layout_marginBottom="23dp" - android:background="@drawable/radius_main1_radius_6" + android:background="@drawable/radius_gray7_radius_6" android:fontFamily="@font/notosans_bold" - android:text="@string/home_popup_check" - android:textColor="@color/white" + android:text="@string/profile_popup_cancel" + android:textColor="@color/color_sub_gray4" android:textFontWeight="600" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/btn_profilePopup_exit" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_profilePopup_subText" /> - + +