[DESIGN/#5] 로그인, 회원가입, 로그아웃 버튼의 높이와 위치 변경

GO-SOPT-ANDROID · May 7, 2023 · 8f99e9d · 8f99e9d
1 parent 82129c3
commit 8f99e9d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -24,7 +24,7 @@
             android:id="@+id/tv_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
+            android:layout_marginTop="40dp"
             android:text="@string/login_id_label"
             android:textAppearance="?textAppearanceHeadlineMedium"
             app:layout_constraintStart_toStartOf="parent"
@@ -72,10 +72,10 @@
             android:id="@+id/btn_login"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:padding="12dp"
+            android:layout_marginTop="40dp"
+            android:padding="14dp"
             android:text="@string/login_btn_text"
-            android:textAppearance="?textAppearanceBodyMedium"
+            android:textAppearance="?textAppearanceBodyLarge"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/et_pw" />
@@ -85,9 +85,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:padding="12dp"
+            android:padding="14dp"
             android:text="@string/sign_up_start_btn_text"
-            android:textAppearance="?textAppearanceBodyMedium"
+            android:textAppearance="?textAppearanceBodyLarge"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_login" />

diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
@@ -174,13 +174,13 @@
             android:id="@+id/btn_sign_up"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:padding="12dp"
+            android:layout_marginBottom="36dp"
+            android:padding="14dp"
             android:text="@string/sign_up_finish_btn_text"
-            android:textAppearance="?textAppearanceBodyMedium"
+            android:textAppearance="?textAppearanceBodyLarge"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/et_hobby" />
+            app:layout_constraintStart_toStartOf="parent" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml
@@ -44,10 +44,11 @@
             android:id="@+id/btn_logout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_margin="36dp"
-            android:padding="12dp"
+            android:layout_marginHorizontal="42dp"
+            android:layout_marginBottom="55dp"
+            android:padding="14dp"
             android:text="@string/logout_btn_text"
-            android:textAppearance="?textAppearanceBodyMedium"
+            android:textAppearance="?textAppearanceBodyLarge"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
     <string name="sign_up_hobby_label">Hobby</string>
     <string name="sign_up_hobby_err">* 필수</string>
     <string name="sign_up_hobby_hint">취미를 입력하세요.</string>
-    <string name="sign_up_finish_btn_text">회원가입 완료</string>
+    <string name="sign_up_finish_btn_text">Complete</string>
 
 
     <!-- main -->