Merge pull request #119 from ChoSooMin/develop

change layout in activity_login.xml
artic-development · Aug 13, 2019 · 23b925e · 23b925e
2 parents cae9bdc + ebd02f3
commit 23b925e
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 8 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/...main/java/com/articrew/artic/ui/setting/setting_editprofile/SettingEditProfileActivity.kt b/...main/java/com/articrew/artic/ui/setting/setting_editprofile/SettingEditProfileActivity.kt
@@ -151,6 +151,7 @@ class SettingEditProfileActivity : BaseActivity() {
 
         })
 
+        // 완료 버튼
         edit_profile_finish_btn.setOnClickListener {
             if (flag == 1) {
                 logger.log("edit profile finish btn")
@@ -180,6 +181,8 @@ class SettingEditProfileActivity : BaseActivity() {
                         }
                         )
                 }
+
+
             }
             else {
                 toast("정보를 바꿔주세요")

diff --git a/app/src/main/res/alarmCharacter.png b/app/src/main/res/alarmCharacter.png
diff --git a/app/src/main/res/alarmCharacter@2x.png b/app/src/main/res/alarmCharacter@2x.png
diff --git a/app/src/main/res/alarmCharacter@3x.png b/app/src/main/res/alarmCharacter@3x.png
diff --git a/app/src/main/res/drawable-hdpi/login_character.png b/app/src/main/res/drawable-hdpi/login_character.png
diff --git a/app/src/main/res/drawable-hdpi/logo_login.png b/app/src/main/res/drawable-hdpi/logo_login.png
diff --git a/app/src/main/res/drawable-mdpi/login_character.png b/app/src/main/res/drawable-mdpi/login_character.png
diff --git a/app/src/main/res/drawable-mdpi/logo_login.png b/app/src/main/res/drawable-mdpi/logo_login.png
diff --git a/app/src/main/res/drawable-xhdpi/login_character.png b/app/src/main/res/drawable-xhdpi/login_character.png
diff --git a/app/src/main/res/drawable-xhdpi/logo_login.png b/app/src/main/res/drawable-xhdpi/logo_login.png
diff --git a/app/src/main/res/drawable-xxhdpi/login_character.png b/app/src/main/res/drawable-xxhdpi/login_character.png
diff --git a/app/src/main/res/drawable-xxhdpi/logo_login.png b/app/src/main/res/drawable-xxhdpi/logo_login.png
diff --git a/app/src/main/res/drawable-xxxhdpi/login_character.png b/app/src/main/res/drawable-xxxhdpi/login_character.png
diff --git a/app/src/main/res/drawable-xxxhdpi/logo_login.png b/app/src/main/res/drawable-xxxhdpi/logo_login.png
diff --git a/app/src/main/res/drawable/drawable-hdpi/logo_login.png b/app/src/main/res/drawable/drawable-hdpi/logo_login.png
diff --git a/app/src/main/res/drawable/drawable-mdpi/logo_login.png b/app/src/main/res/drawable/drawable-mdpi/logo_login.png
diff --git a/app/src/main/res/drawable/drawable-xhdpi/logo_login.png b/app/src/main/res/drawable/drawable-xhdpi/logo_login.png
diff --git a/app/src/main/res/drawable/drawable-xxhdpi/logo_login.png b/app/src/main/res/drawable/drawable-xxhdpi/logo_login.png
diff --git a/app/src/main/res/drawable/drawable-xxxhdpi/logo_login.png b/app/src/main/res/drawable/drawable-xxxhdpi/logo_login.png
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -14,7 +14,7 @@
         android:layout_marginStart="120dp"
         android:layout_marginTop="64dp"
         android:layout_marginEnd="120dp"
-        android:src="@drawable/artic_logo"
+        android:src="@drawable/logo_login"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -24,8 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="53dp"
-        android:layout_marginEnd="36dp"
+        android:layout_marginTop="56dp"
+        android:layout_marginEnd="20dp"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -62,8 +62,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="55dp"
-        android:layout_marginEnd="36dp"
+        android:layout_marginTop="50dp"
+        android:layout_marginEnd="20dp"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -100,7 +100,7 @@
         android:layout_width="match_parent"
         android:layout_height="37dp"
         android:layout_marginStart="80dp"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="41dp"
         android:layout_marginEnd="80dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -112,4 +112,40 @@
         android:fontFamily="@font/nanum_barungothic_regular"
         android:includeFontPadding="false"/>
 
+    <LinearLayout
+        android:id="@+id/linear_act_login_start_go_to_signup_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_login_complete"
+        android:orientation="vertical"
+        android:layout_marginTop="26dp"
+        android:layout_gravity="center">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="비밀번호를 잊어버리셨나요?"
+            android:textSize="14sp"
+            android:textColor="#242424"
+            android:fontFamily="@font/nanum_barungothic_light"
+            android:includeFontPadding="false"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#242424"
+            android:layout_marginTop="-2dp"/>
+
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/login_character"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_make_new_archive.xml b/app/src/main/res/layout/activity_make_new_archive.xml
@@ -33,7 +33,7 @@
             android:textColor="#707070"
             android:fontFamily="@font/nanum_barungothic_regular"
             android:includeFontPadding="false"
-            android:padding="20dp"/>
+            android:padding="11dp"/>
 
     </RelativeLayout>