#111[mod] ui signup

BCSDLab · Jan 2, 2024 · 36f7178 · 36f7178
1 parent afe69b1
commit 36f7178
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 39 deletions.
diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/view/JEditText.kt b/app/src/main/java/com/jjbaksa/jjbaksa/view/JEditText.kt
@@ -5,6 +5,8 @@ import android.content.Context
 import android.text.InputFilter
 import android.text.InputType
 import android.text.TextWatcher
+import android.text.method.HideReturnsTransformationMethod
+import android.text.method.PasswordTransformationMethod
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.LayoutInflater
@@ -99,6 +101,7 @@ class JEditText @JvmOverloads constructor(
             binding.tvTail.background = ContextCompat.getDrawable(context, drawableRes)
             binding.tvTail.setTextColor(ContextCompat.getColor(context, textColor))
             binding.tvTail.visibility = View.VISIBLE
+            binding.tvTail.text= text
         }
     }
     fun hideTailButtonText() {
@@ -134,6 +137,16 @@ class JEditText @JvmOverloads constructor(
     }
     fun setTailImgSelected(isSelected: Boolean) {
         binding.ivJ.isSelected = isSelected
+        binding.etJ.transformationMethod =
+            PasswordTransformationMethod.getInstance()
+
+        binding.etJ.let { editText ->
+            editText.transformationMethod =
+                HideReturnsTransformationMethod.getInstance()
+            editText.setSelection(editText.length())
+        }
+
+
     }
     fun getTailImgSelected(): Boolean {
         return binding.ivJ.isSelected

diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml
@@ -14,47 +14,38 @@
             android:layout_height="match_parent"
             android:layout_marginHorizontal="72dp">
 
-          <!--  <include
+            <include
                 android:id="@+id/include_sign_up_header"
                 layout="@layout/header_sign_up"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" /> -->
-
-            <ImageView
-                android:id="@+id/image_view_login_logo"
-                android:layout_width="133dp"
-                android:layout_height="31dp"
-                android:src="@drawable/jj_login_logo"
-                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.1" />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
                 android:id="@+id/image_view_sign_up_alert"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="130dp"
                 android:src="@drawable/sel_sign_up_alert_shown"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toTopOf="@id/j_edit_text_sign_up_id"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/text_view_sign_up_alert"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_view_sign_up_alert" />
+                app:layout_constraintTop_toBottomOf="@id/include_sign_up_header" />
 
             <TextView
                 android:id="@+id/text_view_sign_up_alert"
                 android:layout_width="wrap_content"
-                android:layout_height="33dp"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
                 android:textColor="#ff7f23"
                 android:textSize="11sp"
                 android:visibility="invisible"
+                app:layout_constraintBottom_toBottomOf="@id/image_view_sign_up_alert"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/image_view_login_logo" />
+                app:layout_constraintStart_toEndOf="@id/image_view_sign_up_alert"
+                app:layout_constraintTop_toTopOf="@id/image_view_sign_up_alert" />
+
 
             <com.jjbaksa.jjbaksa.view.JEditText
                 android:id="@+id/j_edit_text_sign_up_id"
@@ -127,7 +118,7 @@
                 android:layout_width="0dp"
                 android:layout_height="40dp"
                 android:layout_marginTop="45dp"
-                android:layout_marginBottom="170dp"
+                android:layout_marginBottom="101dp"
                 android:background="@drawable/sel_sign_up_button"
                 android:enabled="false"
                 android:text="@string/next"
@@ -138,7 +129,6 @@
                 app:layout_constraintTop_toBottomOf="@id/j_edit_text_sign_up_password_confirm"
                 app:layout_constraintVertical_bias="1" />
 
-
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </layout>
diff --git a/app/src/main/res/layout/header_sign_up.xml b/app/src/main/res/layout/header_sign_up.xml
@@ -6,27 +6,13 @@
 
     <ImageView
         android:id="@+id/image_view_sign_up_icon"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
+        android:layout_width="133dp"
+        android:layout_height="31dp"
         android:layout_marginTop="104dp"
-        android:src="@drawable/shape_circ_c4c4c4_solid"
-        app:layout_constraintEnd_toStartOf="@id/text_view_sign_up_title"
+        android:src="@drawable/jj_login_logo"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/text_view_sign_up_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
-        android:text="@string/app_name_kr"
-        android:textColor="@color/black"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/image_view_sign_up_icon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/image_view_sign_up_icon"
-        app:layout_constraintTop_toTopOf="@id/image_view_sign_up_icon" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>