Skip to content

Commit

Permalink
[CHORE/#5] Line Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
SYAAINN committed Aug 12, 2024
1 parent 499c08f commit a499fec
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 40 deletions.
42 changes: 20 additions & 22 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/mainActivity"
android:layout_width="match_parent"
android:layout_height="match_parent">
Expand All @@ -10,12 +9,11 @@
android:id="@+id/ivMyPageProfile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60.dp"
android:layout_marginStart="60.dp"
android:layout_marginTop="60.dp"
android:src="@drawable/ic_android_black"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tvMyPageNickname"
Expand All @@ -24,9 +22,9 @@
android:layout_marginStart="40.dp"
android:text="@string/mypage_user_nickname"
android:textSize="20.sp"
app:layout_constraintTop_toTopOf="@+id/ivMyPageProfile"
app:layout_constraintBottom_toBottomOf="@id/ivMyPageProfile"
app:layout_constraintStart_toEndOf="@+id/ivMyPageProfile" />
app:layout_constraintStart_toEndOf="@+id/ivMyPageProfile"
app:layout_constraintTop_toTopOf="@+id/ivMyPageProfile" />

<TextView
android:id="@+id/tvMyPageIdTitle"
Expand All @@ -37,17 +35,17 @@
android:text="@string/mypage_user_id_title"
android:textSize="20.sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivMyPageProfile"/>
app:layout_constraintTop_toBottomOf="@+id/ivMyPageProfile" />

<TextView
android:id="@+id/tvMyPageIdContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mypage_user_id_content"
android:textSize="15.sp"
app:layout_constraintBottom_toBottomOf="@+id/tvMyPageIdTitle"
app:layout_constraintStart_toEndOf="@+id/tvMyPageIdTitle"
app:layout_constraintTop_toTopOf="@+id/tvMyPageIdTitle"
app:layout_constraintBottom_toBottomOf="@+id/tvMyPageIdTitle"/>
app:layout_constraintTop_toTopOf="@+id/tvMyPageIdTitle" />

<TextView
android:id="@+id/tvMyPagePwTitle"
Expand All @@ -57,17 +55,17 @@
android:text="@string/mypage_user_pw_title"
android:textSize="20.sp"
app:layout_constraintStart_toStartOf="@+id/tvMyPageIdTitle"
app:layout_constraintTop_toBottomOf="@+id/tvMyPageIdTitle"/>
app:layout_constraintTop_toBottomOf="@+id/tvMyPageIdTitle" />

<TextView
android:id="@+id/tvMyPagePwContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mypage_user_pw_content"
android:textSize="15.sp"
app:layout_constraintBottom_toBottomOf="@+id/tvMyPagePwTitle"
app:layout_constraintStart_toEndOf="@+id/tvMyPagePwTitle"
app:layout_constraintTop_toTopOf="@+id/tvMyPagePwTitle"
app:layout_constraintBottom_toBottomOf="@+id/tvMyPagePwTitle"/>
app:layout_constraintTop_toTopOf="@+id/tvMyPagePwTitle" />

<TextView
android:id="@+id/tvMyPagePhoneNumberTitle"
Expand All @@ -77,46 +75,46 @@
android:text="@string/mypage_user_phone_number_title"
android:textSize="20.sp"
app:layout_constraintStart_toStartOf="@id/tvMyPagePwTitle"
app:layout_constraintTop_toBottomOf="@+id/tvMyPagePwTitle"/>
app:layout_constraintTop_toBottomOf="@+id/tvMyPagePwTitle" />

<TextView
android:id="@+id/tvMyPagePhoneNumberContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mypage_user_phone_number_content"
android:textSize="15.sp"
app:layout_constraintBottom_toBottomOf="@+id/tvMyPagePhoneNumberTitle"
app:layout_constraintStart_toEndOf="@+id/tvMyPagePhoneNumberTitle"
app:layout_constraintTop_toTopOf="@+id/tvMyPagePhoneNumberTitle"
app:layout_constraintBottom_toBottomOf="@+id/tvMyPagePhoneNumberTitle"/>
app:layout_constraintTop_toTopOf="@+id/tvMyPagePhoneNumberTitle" />

<Button
android:id="@+id/btnMyPageNicknameChange"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="240.dp"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="240.dp"
android:backgroundTint="@color/mainYellow"
android:text="@string/mypage_nickname_change_button"
android:textColor="@color/gray01"
android:backgroundTint="@color/mainYellow"
app:layout_constraintTop_toBottomOf="@+id/tvMyPagePhoneNumberTitle"/>
app:layout_constraintTop_toBottomOf="@+id/tvMyPagePhoneNumberTitle" />

<Button
android:id="@+id/btnMyPageLogout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:backgroundTint="@color/mainYellow"
android:text="@string/mypage_logout_button"
android:textColor="@color/gray01"
android:backgroundTint="@color/mainYellow"
app:layout_constraintTop_toBottomOf="@+id/btnMyPageNicknameChange"/>
app:layout_constraintTop_toBottomOf="@+id/btnMyPageNicknameChange" />

<Button
android:id="@+id/btnMyPageRevoke"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:backgroundTint="@color/red"
android:text="@string/mypage_revoke_button"
android:textColor="@color/white"
android:backgroundTint="@color/red"
app:layout_constraintTop_toBottomOf="@+id/btnMyPageLogout"/>
app:layout_constraintTop_toBottomOf="@+id/btnMyPageLogout" />
</androidx.constraintlayout.widget.ConstraintLayout>
16 changes: 8 additions & 8 deletions app/src/main/res/layout/activity_signin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="10.dp"
android:hint="@string/signin_id_hint"
android:backgroundTint="@color/gray04"
android:hint="@string/signin_id_hint"
android:inputType="text"
android:maxLines="1"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -60,34 +60,34 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="10.dp"
android:hint="@string/signin_pw_hint"
android:backgroundTint="@color/gray04"
android:hint="@string/signin_pw_hint"
android:inputType="textPassword"
android:maxLines="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSignInPw"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSignInPw" />

<Button
android:id="@+id/btnSignInSignIn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="240.dp"
android:backgroundTint="@color/mainYellow"
android:text="@string/signin_signin_button"
android:textColor="@color/gray01"
android:backgroundTint="@color/mainYellow"
app:layout_constraintTop_toBottomOf="@+id/etSignInPw"/>
app:layout_constraintTop_toBottomOf="@+id/etSignInPw" />

<Button
android:id="@+id/btnSignInSignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="5.dp"
android:backgroundTint="@color/mainYellow"
android:text="@string/signin_signup_button"
android:textColor="@color/gray01"
android:backgroundTint="@color/mainYellow"
app:layout_constraintTop_toBottomOf="@+id/btnSignInSignIn"/>
app:layout_constraintTop_toBottomOf="@+id/btnSignInSignIn" />

</androidx.constraintlayout.widget.ConstraintLayout>
19 changes: 9 additions & 10 deletions app/src/main/res/layout/activity_signup.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/signUpActivity"
android:layout_width="match_parent"
android:layout_height="match_parent">
Expand All @@ -26,16 +25,16 @@
android:text="@string/signup_id_title"
android:textSize="20.sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSignUpTitle"/>
app:layout_constraintTop_toBottomOf="@+id/tvSignUpTitle" />

<EditText
android:id="@+id/etSignUpId"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="5.dp"
android:hint="@string/signup_id_hint"
android:backgroundTint="@color/gray04"
android:hint="@string/signup_id_hint"
android:inputType="text"
android:maxLines="1"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -51,18 +50,18 @@
android:text="@string/signup_pw_title"
android:textSize="20.sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etSignUpId"/>
app:layout_constraintTop_toBottomOf="@+id/etSignUpId" />

<EditText
android:id="@+id/etSignUpPw"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="5.dp"
android:backgroundTint="@color/gray04"
android:hint="@string/signup_pw_hint"
android:inputType="textPassword"
android:maxLines="1"
android:backgroundTint="@color/gray04"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSignUpPw" />
Expand All @@ -76,16 +75,16 @@
android:text="@string/signup_nickname_title"
android:textSize="20.sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etSignUpPw"/>
app:layout_constraintTop_toBottomOf="@+id/etSignUpPw" />

<EditText
android:id="@+id/etSignUpNickname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="5.dp"
android:hint="@string/signup_nickname_hint"
android:backgroundTint="@color/gray04"
android:hint="@string/signup_nickname_hint"
android:inputType="text"
android:maxLines="1"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -101,16 +100,16 @@
android:text="@string/signup_phone_number_title"
android:textSize="20.sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/etSignUpNickname"/>
app:layout_constraintTop_toBottomOf="@+id/etSignUpNickname" />

<EditText
android:id="@+id/etSignUpPhoneNumber"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="5.dp"
android:hint="@string/signup_phone_number_hint"
android:backgroundTint="@color/gray04"
android:hint="@string/signup_phone_number_hint"
android:inputType="phone"
android:maxLines="1"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -123,9 +122,9 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="30.dp"
android:layout_marginTop="100.dp"
android:backgroundTint="@color/mainYellow"
android:text="@string/signup_signup_button"
android:textColor="@color/gray01"
android:backgroundTint="@color/mainYellow"
app:layout_constraintTop_toBottomOf="@+id/etSignUpPhoneNumber" />


Expand Down

0 comments on commit a499fec

Please sign in to comment.