Skip to content

layout수정(백버튼) #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryujeeKim wants to merge 1 commit into
base: merge_week6
Choose a base branch
from
Open

layout수정(백버튼) #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:src="@drawable/arrow_left"
android:background="@null"
android:layout_alignParentLeft="true"
android:layout_marginLeft="26dp"
android:layout_marginStart="12dp"
android:layout_alignParentTop="true"
android:layout_marginTop="24dp" />

Expand Down
16 changes: 9 additions & 7 deletions app/src/main/res/layout/activity_closet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


<ScrollView
<ScrollView
android:id="@+id/closetFragment"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app2="http://schemas.android.com/apk/res-auto"
Expand All @@ -17,14 +17,16 @@
android:background="#000000">

<!-- 뒤로가기 버튼 -->
<ImageView
<ImageButton
android:id="@+id/backButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="11dp"
android:layout_marginTop="11dp"
android:src="@drawable/arrow_left"
android:contentDescription="뒤로가기" />
android:background="@null"
android:layout_alignParentLeft="true"
android:layout_marginStart="12dp"
android:layout_alignParentTop="true"
android:layout_marginTop="24dp" />

<!-- 상단 텍스트 -->
<LinearLayout
Expand All @@ -47,7 +49,7 @@
android:id="@+id/tv_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="사용자"
android:text=""
android:textColor="#FFFFFF"
android:textSize="34sp"
android:textStyle="bold" />
Expand Down Expand Up @@ -333,5 +335,5 @@

</androidx.constraintlayout.widget.ConstraintLayout>
<!-- GridLayout for 옷장 아이템 -->
</RelativeLayout>
</RelativeLayout>
</ScrollView>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
android:src="@drawable/arrow_left"
android:background="@null"
android:layout_alignParentLeft="true"
android:layout_marginLeft="26dp"
android:layout_marginStart="12dp"
android:layout_alignParentTop="true"
android:layout_marginTop="24dp" />


<!-- 옷 종류 텍스트 -->
<TextView
android:id="@+id/mainTitleTextView"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_fit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:src="@drawable/arrow_left"
android:background="@null"
android:layout_alignParentLeft="true"
android:layout_marginLeft="26dp"
android:layout_marginStart="12dp"
android:layout_alignParentTop="true"
android:layout_marginTop="24dp" />

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_search_outer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
android:id="@+id/backButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="11dp"
android:layout_marginTop="11dp"
android:layout_marginStart="12dp"
android:layout_marginTop="24dp"
android:src="@drawable/arrow_left"
android:contentDescription="뒤로가기" />

Expand All @@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="11dp"
android:layout_marginTop="24dp"
android:layout_toEndOf="@id/backButton"
android:fontFamily="@font/pretendard_medium"
android:text="OUTER"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_size.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:src="@drawable/arrow_left"
android:background="@null"
android:layout_alignParentLeft="true"
android:layout_marginLeft="31dp"
android:layout_marginStart="12dp"
android:layout_alignParentTop="true"
android:layout_marginTop="24dp" />

Expand Down
Loading