Skip to content

Commit

Permalink
[CHORE] #3-name error fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@librarywon
librarywon committed May 26, 2023
1 parent 815ae67 commit da8e6f3
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
34 changes: 9 additions & 25 deletions app/src/main/res/layout/layout_home_custompopup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_profilePopup_exit"
android:layout_width="0dp"
android:layout_height="0dp"
android:fontFamily="@font/notosans_bold"
android:layout_marginStart="6dp"
android:textColor="@color/white"
android:layout_marginEnd="27dp"
android:textFontWeight="600"
android:textSize="14sp"
android:background="@drawable/radius_main1_radius_6"
android:text="@string/profile_popup_exit"
app:layout_constraintBottom_toBottomOf="@id/btn_profilePopup_cancel"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_profilePopup_cancel"
app:layout_constraintTop_toTopOf="@id/btn_profilePopup_cancel" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
34 changes: 25 additions & 9 deletions app/src/main/res/layout/layout_profile_custompopup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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" />

</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_profilePopup_exit"
android:layout_width="0dp"
android:layout_height="0dp"
android:fontFamily="@font/notosans_bold"
android:layout_marginStart="6dp"
android:textColor="@color/white"
android:layout_marginEnd="27dp"
android:textFontWeight="600"
android:textSize="14sp"
android:background="@drawable/radius_main1_radius_6"
android:text="@string/profile_popup_exit"
app:layout_constraintBottom_toBottomOf="@id/btn_profilePopup_cancel"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_profilePopup_cancel"
app:layout_constraintTop_toTopOf="@id/btn_profilePopup_cancel" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit da8e6f3

Please sign in to comment.