로그인 아이디 워딩 수정, 부엉이 로티 위치 수정

Hi-Knock-Knock · Apr 15, 2021 · 9d5f851 · 9d5f851
1 parent 19c4bea
commit 9d5f851
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/src/main/res/layout/activity_infant_gift_box.xml b/app/src/main/res/layout/activity_infant_gift_box.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
@@ -73,9 +72,9 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
         android:text="선물이야!"
+        android:textColor="#000000"
         android:textSize="25sp"
         android:textStyle="bold"
-        android:textColor="#000000"
         app:layout_constraintBottom_toBottomOf="@+id/infant_gift_talk2"
         app:layout_constraintEnd_toEndOf="@+id/infant_gift_talk2"
         app:layout_constraintStart_toStartOf="@+id/infant_gift_talk2"
@@ -84,9 +83,13 @@
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/infant_gift_box"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:layout_marginTop="328dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:lottie_autoPlay="true"
         app:lottie_fileName="leaves_gift.json"
@@ -98,11 +101,11 @@
         android:id="@+id/infant_gift_char"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="65dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.38"
         app:lottie_fileName="owl.json" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -50,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:text="계정"
+                    android:text="아이디"
                     android:textColor="#000000"
                     android:textSize="15sp"
                     app:layout_constraintStart_toStartOf="parent"
@@ -63,7 +63,7 @@
                     android:layout_marginTop="2dp"
                     android:layout_marginEnd="10dp"
                     android:background="@drawable/bg_login_edt"
-                    android:hint="email을 입력해주세요."
+                    android:hint="ID를 입력해주세요."
                     android:padding="5dp"
                     android:singleLine="true"
                     android:textColor="#858585"