From 893c1f232d75e8d7727f566f3f02342067cea09e Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Fri, 17 Mar 2023 21:35:52 +0700
Subject: [PATCH] Improve layout and fix bug UI

---
 app/src/main/res/layout/activity_sign_in.xml  | 267 +++++------
 .../res/layout/activity_verify_account.xml    | 425 +++++++++---------
 2 files changed, 355 insertions(+), 337 deletions(-)

diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
index 6624ea4..97bcb12 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -6,147 +6,155 @@
     android:layout_height="match_parent"
     tools:context=".Activity.SignInActivity">
 
-    <ImageView
-        android:id="@+id/back_image"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:src="@drawable/back_button"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="25dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="35dp"
-        android:fontFamily="@font/bebas"
-        android:text="@string/sign_in_text"
-        android:textColor="@color/black"
-        android:textSize="50sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/back_image" />
-
-    <ImageView
-        android:id="@+id/logo_image"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_marginTop="32dp"
-        android:src="@drawable/logo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/textInput_email"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginBottom="10dp"
-        android:hint="@string/email_text"
-        app:boxBackgroundColor="@color/white"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/logo_image"
-        app:startIconDrawable="@drawable/baseline_person_24"
-        app:startIconTint="@color/primaryColor">
+        android:layout_height="match_parent"
+        android:clickable="false"
+        >
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/edt_email"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:inputType="textEmailAddress" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/textInput_password"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginTop="20dp"
-        android:hint="@string/password_text"
-        app:boxBackgroundColor="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textInput_email"
-        app:passwordToggleEnabled="true"
-        app:passwordToggleTint="@color/primaryColor"
-        app:startIconDrawable="@drawable/baseline_vpn_key_24"
-        app:startIconTint="@color/primaryColor">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/edt_password"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:inputType="textPassword" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <TextView
-        android:id="@+id/forgotPassword_textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="20dp"
-        android:fontFamily="@font/opensans"
-        android:text="@string/forgot_password"
-        android:textColor="@color/grayLight"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textInput_password" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/sign_in_button"
-        style="@style/DefaultSolid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
-        android:layout_marginEnd="40dp"
-        android:layout_marginTop="80dp"
-        android:fontFamily="@font/bebas"
-        android:padding="10dp"
-        android:text="@string/sign_in_text"
-        android:textSize="20sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textInput_password" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="20dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        <ImageView
+            android:id="@+id/back_image"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/back_button"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="25dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/textView2"
+            android:id="@+id/textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/dont_have_an_account"
-            android:textColor="@color/gray"
-            android:fontFamily="@font/opensans"
-            android:textStyle="bold" />
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="35dp"
+            android:fontFamily="@font/bebas"
+            android:text="@string/sign_in_text"
+            android:textColor="@color/black"
+            android:textSize="50sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/back_image" />
+
+        <ImageView
+            android:id="@+id/logo_image"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_marginTop="32dp"
+            android:src="@drawable/logo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/textInput_email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginBottom="10dp"
+            android:hint="@string/email_text"
+            app:boxBackgroundColor="@color/white"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/logo_image"
+            app:startIconDrawable="@drawable/baseline_person_24"
+            app:startIconTint="@color/primaryColor">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/edt_email"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:inputType="textEmailAddress" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/textInput_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginTop="20dp"
+            android:hint="@string/password_text"
+            app:boxBackgroundColor="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textInput_email"
+            app:passwordToggleEnabled="true"
+            app:passwordToggleTint="@color/primaryColor"
+            app:startIconDrawable="@drawable/baseline_vpn_key_24"
+            app:startIconTint="@color/primaryColor">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/edt_password"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:inputType="textPassword" />
+
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
-            android:id="@+id/sign_up_textView"
+            android:id="@+id/forgotPassword_textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:text="@string/sign_up_text"
-            android:textColor="@color/secondary"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="20dp"
             android:fontFamily="@font/opensans"
-            android:textStyle="bold" />
+            android:text="@string/forgot_password"
+            android:textColor="@color/grayLight"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textInput_password" />
 
-    </LinearLayout>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/sign_in_button"
+            style="@style/DefaultSolid"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="40dp"
+            android:layout_marginEnd="40dp"
+            android:layout_marginTop="80dp"
+            android:fontFamily="@font/bebas"
+            android:padding="10dp"
+            android:text="@string/sign_in_text"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textInput_password" />
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dont_have_an_account"
+                android:textColor="@color/gray"
+                android:fontFamily="@font/opensans"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/sign_up_textView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:text="@string/sign_up_text"
+                android:textColor="@color/secondary"
+                android:fontFamily="@font/opensans"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -154,6 +162,7 @@
         android:background="#80000000"
         android:id="@+id/progress_layout"
         android:visibility="gone"
+        android:clickable="true"
         >
 
         <ProgressBar
diff --git a/app/src/main/res/layout/activity_verify_account.xml b/app/src/main/res/layout/activity_verify_account.xml
index 6a77ad2..84bb3c9 100644
--- a/app/src/main/res/layout/activity_verify_account.xml
+++ b/app/src/main/res/layout/activity_verify_account.xml
@@ -6,232 +6,240 @@
     android:layout_height="match_parent"
     tools:context=".Activity.VerifyAccountActivity">
 
-    <ImageView
-        android:id="@+id/close_image"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:src="@drawable/close_icon"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="25dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="90dp"
-        android:fontFamily="@font/bebas"
-        android:text="@string/confirm_code"
-        android:textColor="@color/black"
-        android:textSize="50sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/close_image" />
-
-    <TextView
-        android:id="@+id/forgot_Password_description"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:text="@string/confirm_code_description"
-        android:fontFamily="@font/opensans"
-        android:textColor="@color/gray"
-        android:textStyle="bold"
-        android:layout_marginEnd="20dp"
-        android:layout_marginStart="20dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView"
-        app:layout_constraintEnd_toEndOf="parent"
-        />
+        android:layout_height="match_parent"
+        android:clickable="false"
+        >
 
+        <ImageView
+            android:id="@+id/close_image"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/close_icon"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="25dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="90dp"
+            android:fontFamily="@font/bebas"
+            android:text="@string/confirm_code"
+            android:textColor="@color/black"
+            android:textSize="50sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/close_image" />
 
-        <EditText
-            android:id="@+id/inputCode1"
-            android:layout_width="48dp"
-            android:layout_height="50dp"
-            android:backgroundTint="@color/gray"
-            android:gravity="center"
-            android:imeOptions="actionNext"
-            android:importantForAutofill="no"
-            android:inputType="number"
-            android:maxLength="1"
+        <TextView
+            android:id="@+id/forgot_Password_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="@string/confirm_code_description"
+            android:fontFamily="@font/opensans"
             android:textColor="@color/gray"
-            android:textSize="24sp"
             android:textStyle="bold"
-            android:hint="*"
+            android:layout_marginEnd="20dp"
+            android:layout_marginStart="20dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView"
+            app:layout_constraintEnd_toEndOf="parent"
             />
 
-        <EditText
-            android:id="@+id/inputCode2"
-            android:layout_width="48dp"
-            android:layout_height="50dp"
-            android:backgroundTint="@color/gray"
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
-            android:imeOptions="actionNext"
-            android:importantForAutofill="no"
-            android:inputType="number"
-            android:maxLength="1"
-            android:textColor="@color/gray"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            android:hint="*"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <EditText
+                android:id="@+id/inputCode1"
+                android:layout_width="48dp"
+                android:layout_height="50dp"
+                android:backgroundTint="@color/gray"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/gray"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:hint="*"
+                />
+
+            <EditText
+                android:id="@+id/inputCode2"
+                android:layout_width="48dp"
+                android:layout_height="50dp"
+                android:backgroundTint="@color/gray"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/gray"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:hint="*"
+                />
+
+            <EditText
+                android:id="@+id/inputCode3"
+                android:layout_width="48dp"
+                android:layout_height="50dp"
+                android:backgroundTint="@color/gray"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/gray"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:hint="*"
+                />
+
+            <EditText
+                android:id="@+id/inputCode4"
+                android:layout_width="48dp"
+                android:layout_height="50dp"
+                android:backgroundTint="@color/gray"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/gray"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:hint="*"
+                />
+
+            <EditText
+                android:id="@+id/inputCode5"
+                android:layout_width="48dp"
+                android:layout_height="50dp"
+                android:backgroundTint="@color/gray"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/gray"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:hint="*"
+                />
+
+            <EditText
+                android:id="@+id/inputCode6"
+                android:layout_width="48dp"
+                android:layout_height="50dp"
+                android:backgroundTint="@color/gray"
+                android:gravity="center"
+                android:imeOptions="actionNext"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLength="1"
+                android:textColor="@color/gray"
+                android:textSize="24sp"
+                android:textStyle="bold"
+                android:hint="*"
+                />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/errorText"
+            android:textSize="12sp"
+            android:textColor="@color/red"
+            android:layout_marginBottom="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@id/textview1"
+            app:layout_constraintStart_toStartOf="parent"
             />
 
-        <EditText
-            android:id="@+id/inputCode3"
-            android:layout_width="48dp"
-            android:layout_height="50dp"
-            android:backgroundTint="@color/gray"
-            android:gravity="center"
-            android:imeOptions="actionNext"
-            android:importantForAutofill="no"
-            android:inputType="number"
-            android:maxLength="1"
-            android:textColor="@color/gray"
-            android:textSize="24sp"
+        <TextView
+            android:id="@+id/textview1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/opensans"
+            android:text="@string/did_not_receive_code"
+            android:textColor="@color/black"
+            android:textSize="15sp"
             android:textStyle="bold"
-            android:hint="*"
+            android:layout_marginBottom="50dp"
+            android:layout_marginStart="20dp"
+            app:layout_constraintBottom_toTopOf="@+id/confirm_code"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/textview_resendCode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15sp"
+            android:text="Gửi lại sau: "
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:layout_margin="20dp"
+            app:layout_constraintBottom_toTopOf="@+id/confirm_code"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <TextView
+            android:id="@+id/textview_countdown"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/opensans"
+            android:text="00:35"
+            android:layout_marginBottom="20dp"
+            android:textColor="@color/secondary"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@id/textview_resendCode"
+            app:layout_constraintBottom_toTopOf="@+id/confirm_code"
             />
 
-        <EditText
-            android:id="@+id/inputCode4"
-            android:layout_width="48dp"
-            android:layout_height="50dp"
-            android:backgroundTint="@color/gray"
-            android:gravity="center"
-            android:imeOptions="actionNext"
-            android:importantForAutofill="no"
-            android:inputType="number"
-            android:maxLength="1"
-            android:textColor="@color/gray"
-            android:textSize="24sp"
+        <TextView
+            android:id="@+id/textview_resendCode_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15sp"
+            android:text="@string/resend_code"
+            android:fontFamily="@font/opensans"
+            android:textColor="@color/primaryColor"
             android:textStyle="bold"
-            android:hint="*"
+            android:layout_margin="20dp"
+            app:layout_constraintBottom_toTopOf="@+id/confirm_code"
+            app:layout_constraintStart_toStartOf="parent"
+            android:visibility="gone"
             />
 
-        <EditText
-            android:id="@+id/inputCode5"
-            android:layout_width="48dp"
-            android:layout_height="50dp"
-            android:backgroundTint="@color/gray"
-            android:gravity="center"
-            android:imeOptions="actionNext"
-            android:importantForAutofill="no"
-            android:inputType="number"
-            android:maxLength="1"
-            android:textColor="@color/gray"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            android:hint="*"
-            />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/confirm_code"
+            style="@style/DefaultSolid"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:fontFamily="@font/bebas"
+            android:padding="10dp"
+            android:text="@string/confirm"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <EditText
-            android:id="@+id/inputCode6"
-            android:layout_width="48dp"
-            android:layout_height="50dp"
-            android:backgroundTint="@color/gray"
-            android:gravity="center"
-            android:imeOptions="actionNext"
-            android:importantForAutofill="no"
-            android:inputType="number"
-            android:maxLength="1"
-            android:textColor="@color/gray"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            android:hint="*"
-            />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/errorText"
-        android:textSize="12sp"
-        android:textColor="@color/red"
-        android:layout_marginBottom="20dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/textview1"
-        app:layout_constraintStart_toStartOf="parent"
-        />
-
-    <TextView
-        android:id="@+id/textview1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="@font/opensans"
-        android:text="@string/did_not_receive_code"
-        android:textColor="@color/black"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        android:layout_marginBottom="50dp"
-        android:layout_marginStart="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/confirm_code"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/textview_resendCode"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="15sp"
-        android:text="Gửi lại sau: "
-        android:fontFamily="@font/opensans"
-        android:textColor="@color/black"
-        android:textStyle="bold"
-        android:layout_margin="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/confirm_code"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/textview_countdown"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:fontFamily="@font/opensans"
-        android:text="00:35"
-        android:layout_marginBottom="20dp"
-        android:textColor="@color/secondary"
-        android:textSize="15sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/textview_resendCode"
-        app:layout_constraintBottom_toTopOf="@+id/confirm_code"
-        />
-
-    <TextView
-        android:id="@+id/textview_resendCode_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="15sp"
-        android:text="@string/resend_code"
-        android:fontFamily="@font/opensans"
-        android:textColor="@color/primaryColor"
-        android:textStyle="bold"
-        android:layout_margin="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/confirm_code"
-        app:layout_constraintStart_toStartOf="parent"
-        android:visibility="gone"
-        />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/confirm_code"
-        style="@style/DefaultSolid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="20dp"
-        android:fontFamily="@font/bebas"
-        android:padding="10dp"
-        android:text="@string/confirm"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -239,6 +247,7 @@
         android:background="#80000000"
         android:id="@+id/progress_layout"
         android:visibility="gone"
+        android:clickable="true"
         >
 
         <ProgressBar