From 1441637d1d332d7c37f6d8294e844d026be52c79 Mon Sep 17 00:00:00 2001
From: Sangho Kim <marchbreeze03@gmail.com>
Date: Fri, 2 Jun 2023 15:20:47 +0900
Subject: [PATCH] =?UTF-8?q?#11=20/=20[UI]=20login=20=EB=AA=A8=EB=91=90=20T?=
 =?UTF-8?q?extInput=EC=9C=BC=EB=A1=9C=20=EB=B3=80=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sopt/presentation/auth/SignUpActivity.kt  |  4 +-
 .../sopt/presentation/auth/SignUpViewModel.kt |  3 +-
 app/src/main/res/layout/activity_login.xml    | 55 ++++++++++++-------
 app/src/main/res/layout/activity_sign_up.xml  | 37 ++++++-------
 4 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpActivity.kt b/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpActivity.kt
index ec7396d..3d84f6c 100644
--- a/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpActivity.kt
+++ b/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpActivity.kt
@@ -84,8 +84,8 @@ class SignUpActivity : BindingActivity<ActivitySignUpBinding>(R.layout.activity_
     }
 
     private fun setKeyboardHeight() {
-        keyboardVisibilityUtils = KeyboardVisibilityUtils(window,
-            onShowKeyboard = { keyboardHeight ->
+        keyboardVisibilityUtils =
+            KeyboardVisibilityUtils(window, onShowKeyboard = { keyboardHeight ->
                 binding.svSignUp.run {
                     smoothScrollTo(scrollX, scrollY + keyboardHeight)
                 }
diff --git a/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpViewModel.kt b/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpViewModel.kt
index 33c2f62..bb02bf6 100644
--- a/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpViewModel.kt
+++ b/app/src/main/java/org/android/go/sopt/presentation/auth/SignUpViewModel.kt
@@ -11,7 +11,6 @@ import org.android.go.sopt.module.AuthServicePool
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import timber.log.Timber
 import java.util.regex.Pattern
 
 class SignUpViewModel : ViewModel() {
@@ -70,7 +69,7 @@ class SignUpViewModel : ViewModel() {
     fun setButtonState() {
         buttonVaild.value =
             (isIdValid.value == true && isPwValid.value == true && idText.value!!.isNotBlank() && pwText.value!!.isNotBlank())
-        Log.d("qqqq","${buttonVaild}")
+        Log.d("qqqq", "${buttonVaild}")
     }
 
     companion object {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 4780142..41c6c68 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -34,21 +34,28 @@
             android:textSize="25sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@id/tv_login_title"
-            app:layout_constraintBottom_toTopOf="@id/et_login_id"/>
+            app:layout_constraintBottom_toTopOf="@id/layout_login_id"/>
 
-        <EditText
-            android:id="@+id/et_login_id"
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/layout_login_id"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="0dp"
+            android:layout_marginBottom="15dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="30dp"
-            android:autofillHints="username"
-            android:hint="@string/et_login_id_hint"
-            android:imeOptions="actionNext"
-            android:layout_marginBottom="15dp"
-            android:inputType="text"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/tv_login_pw"/>
+            app:layout_constraintBottom_toTopOf="@id/tv_login_pw">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_login_id"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:inputType="text" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
             android:id="@+id/tv_login_pw"
@@ -58,29 +65,36 @@
             android:text="@string/tv_login_pw_title"
             android:textSize="25sp"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="@id/et_login_id"
-            app:layout_constraintBottom_toTopOf="@id/et_login_pw"/>
+            app:layout_constraintStart_toStartOf="@id/tv_login_title"
+            app:layout_constraintBottom_toTopOf="@id/layout_login_pw"/>
 
-        <EditText
-            android:id="@+id/et_login_pw"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/layout_login_pw"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="0dp"
+            android:layout_marginBottom="20dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="30dp"
-            android:autofillHints="password"
-            android:hint="@string/et_login_pw_hint"
-            android:imeOptions="actionDone"
-            android:inputType="textPassword"
-            android:layout_marginBottom="20dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/btn_login"/>
+            app:layout_constraintBottom_toTopOf="@id/btn_login">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_login_pw"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
+                android:autofillHints="password"
+                android:inputType="textPassword" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
         <Button
             android:id="@+id/btn_login"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="30dp"
-            android:padding="24dp"
+            android:padding="20dp"
             android:text="@string/btn_login_login"
             android:textSize="15sp"
             app:layout_constraintBottom_toTopOf="@+id/btn_sign_up"
@@ -93,6 +107,7 @@
             android:layout_height="48dp"
             android:layout_marginHorizontal="30dp"
             android:layout_marginBottom="10dp"
+            android:backgroundTint="@color/light_blue_A700"
             android:text="@string/btn_login_sign_up"
             android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 2c6844a..18976f2 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -48,28 +48,28 @@
                 android:textStyle="bold"
                 app:layout_constraintStart_toStartOf="@id/tv_sign_up_title"
                 app:layout_constraintTop_toBottomOf="@+id/tv_sign_up_title" />
-            
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/layout_sign_up_id"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_marginHorizontal="30dp"
                 android:layout_marginTop="5dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_sign_up_id">
-                
+
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_sign_up_id"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username"
-                    android:text="@={vm.idText}"
                     android:hint="@string/et_signup_id_hint"
                     android:imeOptions="actionNext"
-                    android:inputType="text"/>
-                
+                    android:inputType="text"
+                    android:text="@={vm.idText}" />
+
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
@@ -85,10 +85,10 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/layout_sign_up_pw"
-                android:layout_width="0dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_marginHorizontal="30dp"
                 android:layout_marginTop="5dp"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -100,10 +100,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username"
-                    android:text="@={vm.pwText}"
                     android:hint="@string/et_signup_pw_hint"
                     android:imeOptions="actionNext"
-                    android:inputType="text"/>
+                    android:inputType="text"
+                    android:text="@={vm.pwText}" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -119,25 +119,24 @@
                 app:layout_constraintTop_toBottomOf="@+id/layout_sign_up_pw" />
 
 
-
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/layout_sign_up_name"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_marginHorizontal="30dp"
                 android:layout_marginTop="5dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_sign_up_name" >
+                app:layout_constraintTop_toBottomOf="@id/tv_sign_up_name">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_sign_up_name"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@={vm.nameText}"
                     android:imeOptions="actionNext"
-                    android:inputType="text"/>
+                    android:inputType="text"
+                    android:text="@={vm.nameText}" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -155,22 +154,22 @@
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/layout_sign_up_skill"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_marginHorizontal="30dp"
                 android:layout_marginTop="5dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_sign_up_skill" >
+                app:layout_constraintTop_toBottomOf="@id/tv_sign_up_skill">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_sign_up_skill"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@={vm.skillText}"
                     android:imeOptions="actionNext"
-                    android:inputType="text"/>
+                    android:inputType="text"
+                    android:text="@={vm.skillText}" />
 
             </com.google.android.material.textfield.TextInputLayout>