From 00b4615301525281be3c19eeed13f1aa1d90e5f6 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Wed, 27 Jul 2022 09:35:32 +0700
Subject: [PATCH 01/22] First commit

---
 .idea/gradle.xml | 1 +
 .idea/vcs.xml    | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a9f4e52..a2d7c21 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From d7c2ec8bf057f564bf55829e0f417de8bc2dd56b Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Wed, 27 Jul 2022 09:36:43 +0700
Subject: [PATCH 02/22] First commit

---
 app/src/main/res/layout/activity_main.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 17eab17..df7085a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:text="Xin chào"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From cb75b9ab0e7ccbb428c39f955db7c75e34553fad Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Wed, 27 Jul 2022 09:39:20 +0700
Subject: [PATCH 03/22] First commit

---
 .idea/misc.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2a4d5b5..999170b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.1" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

From 13be5046d1b5a8b6507c370d406de1f9984423b4 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 21:07:53 +0700
Subject: [PATCH 04/22] Commit UI

---
 .idea/misc.xml                                |   4 +
 app/build.gradle                              |  10 +-
 .../java/com/sudo/androidd20/LoginFragment.kt |  62 +++++++++
 .../com/sudo/androidd20/RegisterFragment.kt   |  61 +++++++++
 .../main/res/drawable/ic_login_background.xml |   8 ++
 .../main/res/drawable/login_background.xml    |  10 ++
 app/src/main/res/layout/activity_main.xml     |   2 +-
 app/src/main/res/layout/fragment_login.xml    | 102 +++++++++++++++
 app/src/main/res/layout/fragment_register.xml | 118 ++++++++++++++++++
 app/src/main/res/values/dimens.xml            |   5 +
 app/src/main/res/values/strings.xml           |  16 +++
 11 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/sudo/androidd20/LoginFragment.kt
 create mode 100644 app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
 create mode 100644 app/src/main/res/drawable/ic_login_background.xml
 create mode 100644 app/src/main/res/drawable/login_background.xml
 create mode 100644 app/src/main/res/layout/fragment_login.xml
 create mode 100644 app/src/main/res/layout/fragment_register.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 999170b..e236ad9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,11 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_login_background.xml" value="0.1" />
+        <entry key="..\:/AndroidD20/app/src/main/res/drawable/login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.1" />
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_register.xml" value="0.22" />
       </map>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index bd2a8f5..8f5b228 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,9 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-
+    buildFeatures {
+        viewBinding = true
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -29,6 +31,9 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
@@ -37,6 +42,9 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.annotation:annotation:1.2.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
new file mode 100644
index 0000000..9413dc5
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -0,0 +1,62 @@
+package com.sudo.androidd20
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.sudo.androidd20.databinding.FragmentLoginBinding
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [LoginFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class LoginFragment : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+    private lateinit var binding: FragmentLoginBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+
+
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = FragmentLoginBinding.inflate(inflater,container,false)
+        return binding.root
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment LoginFragment.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            LoginFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
new file mode 100644
index 0000000..795a690
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -0,0 +1,61 @@
+package com.sudo.androidd20
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.sudo.androidd20.databinding.FragmentRegisterBinding
+
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [RegisterFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
+class RegisterFragment : Fragment() {
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+    private lateinit var binding: FragmentRegisterBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        binding = FragmentRegisterBinding.inflate(inflater,container,false)
+        return binding.root
+    }
+
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment RegisterFragment.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            RegisterFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
+                }
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_login_background.xml b/app/src/main/res/drawable/ic_login_background.xml
new file mode 100644
index 0000000..f6577d1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_login_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="64dp"/>
+    <solid android:color="@color/teal_200"/>
+
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/login_background.xml b/app/src/main/res/drawable/login_background.xml
new file mode 100644
index 0000000..f84695a
--- /dev/null
+++ b/app/src/main/res/drawable/login_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:endColor="#3cdcf3"
+        android:startColor="@color/white"
+        />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index df7085a..389f580 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Xin chào"
+        android:text="@string/hello"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
new file mode 100644
index 0000000..b1c27ac
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/fragment_horizontal_margin"
+    android:paddingTop="@dimen/fragment_vertical_margin"
+    android:paddingRight="@dimen/fragment_horizontal_margin"
+    android:paddingBottom="@dimen/fragment_vertical_margin"
+    android:background="@drawable/login_background"
+    tools:context="LoginFragment">
+
+    <TextView
+        android:id="@+id/tv_login"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:gravity="center"
+        android:text="@string/tv_login"
+        android:textColor="@color/white"
+        android:textSize="36sp"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="60dp"/>
+
+    <EditText
+        android:id="@+id/username"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="126dp"
+        android:layout_marginEnd="24dp"
+        android:hint="@string/prompt_email"
+        android:autofillHints="emailAddress"
+        android:inputType="textEmailAddress"
+        android:selectAllOnFocus="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/password"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
+        android:hint="@string/prompt_password"
+        android:imeActionLabel="@string/action_sign_in_short"
+        android:imeOptions="actionDone"
+        android:inputType="textPassword"
+        android:selectAllOnFocus="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/username"
+        android:autofillHints="password" />
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:layout_marginStart="48dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="48dp"
+        android:layout_marginBottom="64dp"
+        android:enabled="false"
+        android:background="@drawable/ic_login_background"
+        android:text="@string/action_sign_in_short"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/password"
+        app:layout_constraintVertical_bias="0.2" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:text="@string/dont_have_account"
+        android:textColor="@color/black"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_sign_up"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_sign_up"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/tv_btn_sign_up"
+        android:textColor="@color/black"
+        android:textSize="26sp"
+        android:textStyle="italic"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
new file mode 100644
index 0000000..a30f2c8
--- /dev/null
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/fragment_horizontal_margin"
+    android:paddingTop="@dimen/fragment_vertical_margin"
+    android:paddingRight="@dimen/fragment_horizontal_margin"
+    android:paddingBottom="@dimen/fragment_vertical_margin"
+    android:background="@drawable/login_background"
+    tools:context="RegisterFragment">
+
+    <TextView
+        android:id="@+id/tv_login"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:gravity="center"
+        android:text="@string/tv_login"
+        android:textColor="@color/white"
+        android:textSize="36sp"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="60dp"/>
+
+    <EditText
+        android:id="@+id/username"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="126dp"
+        android:layout_marginEnd="24dp"
+        android:hint="@string/prompt_email"
+        android:inputType="textEmailAddress"
+        android:selectAllOnFocus="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:autofillHints="username" />
+
+    <EditText
+        android:id="@+id/password"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
+        android:hint="@string/prompt_password"
+        android:imeActionLabel="@string/action_sign_in_short"
+        android:imeOptions="actionDone"
+        android:inputType="textPassword"
+        android:selectAllOnFocus="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/username"
+        android:autofillHints="password" />
+    <EditText
+        android:id="@+id/confirmed_password"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
+        android:hint="@string/confirmed_password"
+        android:imeActionLabel="@string/action_sign_in_short"
+        android:imeOptions="actionDone"
+        android:inputType="textPassword"
+        android:selectAllOnFocus="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/password"
+        android:autofillHints="password" />
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start"
+        android:layout_marginStart="48dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="48dp"
+        android:layout_marginBottom="64dp"
+        android:enabled="false"
+        android:background="@drawable/ic_login_background"
+        android:text="@string/tv_btn_sign_up"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/password"
+        app:layout_constraintVertical_bias="0.2" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:text="@string/dont_have_account"
+        android:textColor="@color/black"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_sign_up"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_sign_up"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/tv_btn_sign_up"
+        android:textColor="@color/black"
+        android:textSize="26sp"
+        android:textStyle="italic"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..82da40b
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="fragment_horizontal_margin">16dp</dimen>
+    <dimen name="fragment_vertical_margin">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76218f3..76dfb70 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,19 @@
 <resources>
     <string name="app_name">AndroidD20</string>
+    <!-- Strings related to login -->
+    <string name="prompt_email">Email</string>
+    <string name="prompt_password">Password</string>
+    <string name="confirmed_password">Confirmed password</string>
+    <string name="action_sign_in">Sign in or register</string>
+    <string name="action_sign_in_short">Sign in</string>
+    <string name="welcome">"Welcome!"</string>
+    <string name="invalid_username">Not a valid username</string>
+    <string name="invalid_password">Password must be >5 characters</string>
+    <string name="login_failed">"Login failed"</string>
+    <string name="tv_login">Login</string>
+    <string name="tv_btn_sign_up">Sign up</string>
+    <string name="dont_have_account">Don\'t have account</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="hello">Xin chào</string>
 </resources>
\ No newline at end of file

From fafa385d8466b3eb52382d8733c28e53e99eeaa0 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 21:13:15 +0700
Subject: [PATCH 05/22] Commit UI

---
 app/src/main/java/com/sudo/androidd20/LoginFragment.kt    | 2 +-
 app/src/main/java/com/sudo/androidd20/RegisterFragment.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 9413dc5..4e134ea 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -35,7 +35,7 @@ class LoginFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = FragmentLoginBinding.inflate(inflater,container,false)
         return binding.root
     }
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index 795a690..c482d1d 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -33,7 +33,7 @@ class RegisterFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         // Inflate the layout for this fragment
         binding = FragmentRegisterBinding.inflate(inflater,container,false)
         return binding.root

From 38311dd3489bdefc40a92d2a6de0b62068079932 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 21:42:31 +0700
Subject: [PATCH 06/22] Commit UI

---
 .idea/misc.xml                                  |  4 +++-
 .../com/sudo/androidd20/RegisterFragment.kt     | 17 ++++++++++++++++-
 app/src/main/res/layout/fragment_register.xml   |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e236ad9..0749f67 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,11 +3,13 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/AndroidD20/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1" />
+        <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.1" />
-        <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_register.xml" value="0.22" />
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_register.xml" value="0.1" />
       </map>
     </option>
   </component>
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index c482d1d..5eb8b6a 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -1,10 +1,10 @@
 package com.sudo.androidd20
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import com.sudo.androidd20.databinding.FragmentRegisterBinding
 
 // TODO: Rename parameter arguments, choose names that match
@@ -36,9 +36,24 @@ class RegisterFragment : Fragment() {
     ): View {
         // Inflate the layout for this fragment
         binding = FragmentRegisterBinding.inflate(inflater,container,false)
+        binding.register.setOnClickListener {
+            signup(binding.username.toString(),binding.password.toString(),binding.confirmedPassword.toString())
+        }
         return binding.root
     }
 
+    private fun signup(username: String?, password: String?, confirmedPassword: String?) {
+        if (username == null || password == null || confirmedPassword == null) {
+            // TODO
+        }
+        else if(password != confirmedPassword){
+            // TODO
+        }
+        else{
+            //TODO
+        }
+    }
+
     companion object {
         /**
          * Use this factory method to create a new instance of
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index a30f2c8..263217f 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -73,7 +73,7 @@
         android:autofillHints="password" />
 
     <Button
-        android:id="@+id/login"
+        android:id="@+id/register"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="start"

From 70edbdb1558cfa37aed7703c0409aad737861fa4 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 22:39:58 +0700
Subject: [PATCH 07/22] Commit UI

---
 .idea/misc.xml                                |  2 +-
 .../main/java/com/sudo/androidd20/CallBack.kt |  6 ++++++
 .../java/com/sudo/androidd20/LoginFragment.kt |  8 ++++++++
 .../java/com/sudo/androidd20/MainActivity.kt  | 20 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     | 13 +++++-------
 5 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/sudo/androidd20/CallBack.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0749f67..0cb5f12 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,7 +7,7 @@
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/login_background.xml" value="0.1" />
-        <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_register.xml" value="0.1" />
       </map>
diff --git a/app/src/main/java/com/sudo/androidd20/CallBack.kt b/app/src/main/java/com/sudo/androidd20/CallBack.kt
new file mode 100644
index 0000000..7ec3565
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/CallBack.kt
@@ -0,0 +1,6 @@
+package com.sudo.androidd20
+
+interface CallBack {
+    fun changeFragment(Fragment: androidx.fragment.app.Fragment)
+    fun changeActivity(Activity: androidx.appcompat.app.AppCompatActivity)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 4e134ea..561eb13 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -22,6 +22,7 @@ class LoginFragment : Fragment() {
     private var param1: String? = null
     private var param2: String? = null
     private lateinit var binding: FragmentLoginBinding
+    private var callBackFragment: CallBack? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -37,9 +38,16 @@ class LoginFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentLoginBinding.inflate(inflater,container,false)
+        binding.tvSignUp.setOnClickListener{
+            callBackFragment?.changeFragment(RegisterFragment())
+        }
         return binding.root
     }
 
+    fun setCallBackFragment(callBackFragment: CallBack) {
+        this.callBackFragment = callBackFragment
+    }
+
     companion object {
         /**
          * Use this factory method to create a new instance of
diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index 4249a08..414920e 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -2,10 +2,30 @@ package com.sudo.androidd20
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction
+import com.sudo.androidd20.CallBack
 
 class MainActivity : AppCompatActivity() {
+    private var fragment: Fragment? = null
+    private var fragmentManager: FragmentManager? = null
+    private var fragmentTransaction: FragmentTransaction? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        addFragment()
     }
+
+    private fun addFragment() {
+        val fragment = LoginFragment()
+        fragmentManager = supportFragmentManager
+        fragmentTransaction = fragmentManager?.beginTransaction()
+        fragmentTransaction?.add(
+            R.id.frame_container,
+            fragment
+        )
+        fragmentTransaction?.commit()
+    }
+    
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 389f580..e8f77e8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,13 +6,10 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/hello"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <FrameLayout
+        android:id="@+id/frame_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e66af956b424f01bf2c63ba5c54096c139d0eb9f Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 22:42:53 +0700
Subject: [PATCH 08/22] Commit UI

---
 app/src/main/res/layout/fragment_register.xml | 2 +-
 app/src/main/res/values/strings.xml           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 263217f..0aebf34 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:gravity="center"
-        android:text="@string/tv_login"
+        android:text="@string/tv_register"
         android:textColor="@color/white"
         android:textSize="36sp"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76dfb70..5764bf7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
     <string name="invalid_password">Password must be >5 characters</string>
     <string name="login_failed">"Login failed"</string>
     <string name="tv_login">Login</string>
+    <string name="tv_register">Register</string>
     <string name="tv_btn_sign_up">Sign up</string>
     <string name="dont_have_account">Don\'t have account</string>
     <!-- TODO: Remove or change this placeholder text -->

From deaa023f988211822334f34e5690cfe1771959b4 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 22:42:53 +0700
Subject: [PATCH 09/22] Commit UI

---
 app/src/main/res/layout/fragment_register.xml | 2 +-
 app/src/main/res/values/strings.xml           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 263217f..0aebf34 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:gravity="center"
-        android:text="@string/tv_login"
+        android:text="@string/tv_register"
         android:textColor="@color/white"
         android:textSize="36sp"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76dfb70..5764bf7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
     <string name="invalid_password">Password must be >5 characters</string>
     <string name="login_failed">"Login failed"</string>
     <string name="tv_login">Login</string>
+    <string name="tv_register">Register</string>
     <string name="tv_btn_sign_up">Sign up</string>
     <string name="dont_have_account">Don\'t have account</string>
     <!-- TODO: Remove or change this placeholder text -->

From cb335fdf204d8d058de5cb122865f3aa5270c91a Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 22:48:35 +0700
Subject: [PATCH 10/22] Commit UI

---
 app/src/main/res/layout/fragment_login.xml    | 4 ++--
 app/src/main/res/layout/fragment_register.xml | 4 ++--
 app/src/main/res/values-night/themes.xml      | 2 +-
 app/src/main/res/values/themes.xml            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index b1c27ac..70f11af 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -76,7 +76,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
+        android:layout_marginEnd="18dp"
         android:text="@string/dont_have_account"
         android:textColor="@color/black"
         android:textSize="18sp"
@@ -87,7 +87,7 @@
         android:id="@+id/tv_sign_up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
+        android:layout_marginEnd="18dp"
         android:layout_marginBottom="16dp"
         android:clickable="true"
         android:focusable="true"
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 0aebf34..45161a7 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -92,7 +92,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
+        android:layout_marginEnd="18dp"
         android:text="@string/dont_have_account"
         android:textColor="@color/black"
         android:textSize="18sp"
@@ -103,7 +103,7 @@
         android:id="@+id/tv_sign_up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
+        android:layout_marginEnd="18dp"
         android:layout_marginBottom="16dp"
         android:clickable="true"
         android:focusable="true"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b40d904..e945b9c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.AndroidD20" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.AndroidD20" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ce08ffa..b9938d8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.AndroidD20" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.AndroidD20" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

From 9cba247541e24c276d648130d27274960e85cd3f Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Thu, 28 Jul 2022 23:17:42 +0700
Subject: [PATCH 11/22] Commit UI

---
 .idea/misc.xml                                            | 2 +-
 app/src/main/java/com/sudo/androidd20/CallBack.kt         | 6 ------
 app/src/main/java/com/sudo/androidd20/LoginFragment.kt    | 8 ++++----
 app/src/main/java/com/sudo/androidd20/MainActivity.kt     | 5 ++---
 app/src/main/java/com/sudo/androidd20/RegisterFragment.kt | 3 +++
 app/src/main/res/layout/fragment_register.xml             | 8 ++++----
 app/src/main/res/values/strings.xml                       | 1 +
 7 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/java/com/sudo/androidd20/CallBack.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0cb5f12..3745cfe 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
-        <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.1" />
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.34782608695652173" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_register.xml" value="0.1" />
       </map>
     </option>
diff --git a/app/src/main/java/com/sudo/androidd20/CallBack.kt b/app/src/main/java/com/sudo/androidd20/CallBack.kt
deleted file mode 100644
index 7ec3565..0000000
--- a/app/src/main/java/com/sudo/androidd20/CallBack.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.sudo.androidd20
-
-interface CallBack {
-    fun changeFragment(Fragment: androidx.fragment.app.Fragment)
-    fun changeActivity(Activity: androidx.appcompat.app.AppCompatActivity)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 561eb13..5874033 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -22,7 +22,6 @@ class LoginFragment : Fragment() {
     private var param1: String? = null
     private var param2: String? = null
     private lateinit var binding: FragmentLoginBinding
-    private var callBackFragment: CallBack? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -39,15 +38,16 @@ class LoginFragment : Fragment() {
     ): View {
         binding = FragmentLoginBinding.inflate(inflater,container,false)
         binding.tvSignUp.setOnClickListener{
-            callBackFragment?.changeFragment(RegisterFragment())
+            changeFragment()
         }
         return binding.root
     }
 
-    fun setCallBackFragment(callBackFragment: CallBack) {
-        this.callBackFragment = callBackFragment
+    private fun changeFragment() {
+        parentFragmentManager.beginTransaction().replace(R.id.frame_container,RegisterFragment()).addToBackStack(null).commit()
     }
 
+
     companion object {
         /**
          * Use this factory method to create a new instance of
diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index 414920e..5a305ee 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -5,10 +5,8 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
-import com.sudo.androidd20.CallBack
 
 class MainActivity : AppCompatActivity() {
-    private var fragment: Fragment? = null
     private var fragmentManager: FragmentManager? = null
     private var fragmentTransaction: FragmentTransaction? = null
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -27,5 +25,6 @@ class MainActivity : AppCompatActivity() {
         )
         fragmentTransaction?.commit()
     }
-    
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index 5eb8b6a..51865f8 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -39,6 +39,9 @@ class RegisterFragment : Fragment() {
         binding.register.setOnClickListener {
             signup(binding.username.toString(),binding.password.toString(),binding.confirmedPassword.toString())
         }
+        binding.tvSignIn.setOnClickListener {
+            parentFragmentManager.beginTransaction().replace(R.id.frame_container,LoginFragment()).addToBackStack(null).commit()
+        }
         return binding.root
     }
 
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 45161a7..0a58a91 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -93,21 +93,21 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="18dp"
-        android:text="@string/dont_have_account"
+        android:text="@string/already_have_an_account"
         android:textColor="@color/black"
         android:textSize="18sp"
-        app:layout_constraintBottom_toTopOf="@+id/tv_sign_up"
+        app:layout_constraintBottom_toTopOf="@+id/tv_sign_in"
         app:layout_constraintEnd_toEndOf="parent" />
 
     <TextView
-        android:id="@+id/tv_sign_up"
+        android:id="@+id/tv_sign_in"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="18dp"
         android:layout_marginBottom="16dp"
         android:clickable="true"
         android:focusable="true"
-        android:text="@string/tv_btn_sign_up"
+        android:text="@string/action_sign_in_short"
         android:textColor="@color/black"
         android:textSize="26sp"
         android:textStyle="italic"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5764bf7..1a676c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
     <string name="tv_register">Register</string>
     <string name="tv_btn_sign_up">Sign up</string>
     <string name="dont_have_account">Don\'t have account</string>
+    <string name="already_have_an_account">Already have an account</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="hello">Xin chào</string>

From 683a3a9930f46b8b8c6aee73f0d0e2206324dc6b Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 00:02:49 +0700
Subject: [PATCH 12/22] Commit UI

---
 app/src/main/java/com/sudo/androidd20/RegisterFragment.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index 51865f8..be4c484 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -40,7 +40,7 @@ class RegisterFragment : Fragment() {
             signup(binding.username.toString(),binding.password.toString(),binding.confirmedPassword.toString())
         }
         binding.tvSignIn.setOnClickListener {
-            parentFragmentManager.beginTransaction().replace(R.id.frame_container,LoginFragment()).addToBackStack(null).commit()
+            parentFragmentManager.popBackStack()
         }
         return binding.root
     }

From 73de98f26a6aac73cf4ea8bbff7b3167d287d7a0 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 08:40:10 +0700
Subject: [PATCH 13/22] =?UTF-8?q?=C4=90ang=20l=E1=BB=97i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sudo/androidd20/LoginFragment.kt |  9 ++++++++
 .../java/com/sudo/androidd20/MainActivity.kt  |  7 +++++++
 .../com/sudo/androidd20/RegisterFragment.kt   | 21 +++++++++++++------
 app/src/main/java/com/sudo/androidd20/User.kt |  8 +++++++
 app/src/main/res/layout/fragment_login.xml    |  3 +--
 app/src/main/res/layout/fragment_register.xml |  9 +-------
 6 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/com/sudo/androidd20/User.kt

diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 5874033..cab8136 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.FragmentResultListener
 import com.sudo.androidd20.databinding.FragmentLoginBinding
 
 // TODO: Rename parameter arguments, choose names that match
@@ -37,9 +38,17 @@ class LoginFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentLoginBinding.inflate(inflater,container,false)
+        parentFragmentManager.setFragmentResultListener("result_to_fragment_login",
+        this,
+        FragmentResultListener{_,it->
+            val result = it.getString("userName")
+            binding.username.setText(result)
+
+        })
         binding.tvSignUp.setOnClickListener{
             changeFragment()
         }
+
         return binding.root
     }
 
diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index 5a305ee..f17716c 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentTransaction
 class MainActivity : AppCompatActivity() {
     private var fragmentManager: FragmentManager? = null
     private var fragmentTransaction: FragmentTransaction? = null
+    private lateinit var listUser: MutableList<User>
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -25,6 +26,12 @@ class MainActivity : AppCompatActivity() {
         )
         fragmentTransaction?.commit()
     }
+    public fun getUsersList(): MutableList<User> {
+        return listUser
+    }
 
+    public fun updateUsersList(user: User) {
+        listUser.add(user)
+    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index be4c484..a64d31b 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -1,9 +1,11 @@
 package com.sudo.androidd20
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.sudo.androidd20.databinding.FragmentRegisterBinding
 
@@ -37,7 +39,8 @@ class RegisterFragment : Fragment() {
         // Inflate the layout for this fragment
         binding = FragmentRegisterBinding.inflate(inflater,container,false)
         binding.register.setOnClickListener {
-            signup(binding.username.toString(),binding.password.toString(),binding.confirmedPassword.toString())
+            println("${binding.username.toString()}+${binding.password.toString()}+${binding.confirmedPassword.toString()} find any something")
+            signup(binding.username.toString().trim(),binding.password.toString().trim(),binding.confirmedPassword.toString().trim())
         }
         binding.tvSignIn.setOnClickListener {
             parentFragmentManager.popBackStack()
@@ -46,14 +49,20 @@ class RegisterFragment : Fragment() {
     }
 
     private fun signup(username: String?, password: String?, confirmedPassword: String?) {
-        if (username == null || password == null || confirmedPassword == null) {
-            // TODO
+        if (username.isNullOrEmpty()  || password.isNullOrEmpty() || confirmedPassword.isNullOrEmpty() ) {
+            Toast.makeText(context,"Please complete all information",Toast.LENGTH_SHORT).show()
         }
-        else if(password != confirmedPassword){
-            // TODO
+        else if(password.compareTo(confirmedPassword)!=0){
+            Toast.makeText(context,"Password does not match",Toast.LENGTH_SHORT).show()
         }
         else{
-            //TODO
+            (activity as MainActivity).updateUsersList(User(username,password))
+            parentFragmentManager.apply {
+                val bundle = Bundle()
+                bundle.putString("userName",username)
+                setFragmentResult("result_to_fragment_login", bundle)
+                popBackStack()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/sudo/androidd20/User.kt b/app/src/main/java/com/sudo/androidd20/User.kt
new file mode 100644
index 0000000..1c3b8fa
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/User.kt
@@ -0,0 +1,8 @@
+package com.sudo.androidd20
+
+import java.io.Serializable
+
+data class User(
+    var email:String,
+    var password:String
+):Serializable
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 70f11af..2fe13a5 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -34,7 +34,6 @@
         android:hint="@string/prompt_email"
         android:autofillHints="emailAddress"
         android:inputType="textEmailAddress"
-        android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -65,7 +64,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="48dp"
         android:layout_marginBottom="64dp"
-        android:enabled="false"
+        android:enabled="true"
         android:background="@drawable/ic_login_background"
         android:text="@string/action_sign_in_short"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 0a58a91..67dfb71 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -33,7 +33,6 @@
         android:layout_marginEnd="24dp"
         android:hint="@string/prompt_email"
         android:inputType="textEmailAddress"
-        android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -47,10 +46,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
         android:hint="@string/prompt_password"
-        android:imeActionLabel="@string/action_sign_in_short"
-        android:imeOptions="actionDone"
         android:inputType="textPassword"
-        android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/username"
@@ -63,10 +59,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
         android:hint="@string/confirmed_password"
-        android:imeActionLabel="@string/action_sign_in_short"
-        android:imeOptions="actionDone"
         android:inputType="textPassword"
-        android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/password"
@@ -81,7 +74,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="48dp"
         android:layout_marginBottom="64dp"
-        android:enabled="false"
+        android:enabled="true"
         android:background="@drawable/ic_login_background"
         android:text="@string/tv_btn_sign_up"
         app:layout_constraintBottom_toBottomOf="parent"

From 19b5a579b132550f41511f5ab28518d8fb91724f Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 08:43:11 +0700
Subject: [PATCH 14/22] =?UTF-8?q?=C4=90ang=20l=E1=BB=97i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sudo/androidd20/RegisterFragment.kt | 5 ++---
 app/src/main/res/layout/fragment_register.xml             | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index a64d31b..92bff04 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -1,7 +1,6 @@
 package com.sudo.androidd20
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -39,8 +38,8 @@ class RegisterFragment : Fragment() {
         // Inflate the layout for this fragment
         binding = FragmentRegisterBinding.inflate(inflater,container,false)
         binding.register.setOnClickListener {
-            println("${binding.username.toString()}+${binding.password.toString()}+${binding.confirmedPassword.toString()} find any something")
-            signup(binding.username.toString().trim(),binding.password.toString().trim(),binding.confirmedPassword.toString().trim())
+
+            signup(binding.username.text.toString(),binding.password.text.toString(),binding.confirmedPassword.text.toString())
         }
         binding.tvSignIn.setOnClickListener {
             parentFragmentManager.popBackStack()
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 67dfb71..c3593f4 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -33,6 +33,7 @@
         android:layout_marginEnd="24dp"
         android:hint="@string/prompt_email"
         android:inputType="textEmailAddress"
+        android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -46,7 +47,10 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
         android:hint="@string/prompt_password"
+        android:imeActionLabel="@string/action_sign_in_short"
+        android:imeOptions="actionDone"
         android:inputType="textPassword"
+        android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/username"
@@ -59,7 +63,10 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
         android:hint="@string/confirmed_password"
+        android:imeActionLabel="@string/action_sign_in_short"
+        android:imeOptions="actionDone"
         android:inputType="textPassword"
+        android:selectAllOnFocus="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/password"

From 178d1dd2038972295a512dc7d5d708114a29c7cb Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 09:15:00 +0700
Subject: [PATCH 15/22] =?UTF-8?q?=C4=90ang=20l=E1=BB=97i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sudo/androidd20/LoginFragment.kt   | 17 +++++++++--------
 .../com/sudo/androidd20/RegisterFragment.kt     |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index cab8136..975b50a 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -1,10 +1,10 @@
 package com.sudo.androidd20
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentResultListener
 import com.sudo.androidd20.databinding.FragmentLoginBinding
 
@@ -30,7 +30,6 @@ class LoginFragment : Fragment() {
             param2 = it.getString(ARG_PARAM2)
         }
 
-
     }
 
     override fun onCreateView(
@@ -38,13 +37,15 @@ class LoginFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentLoginBinding.inflate(inflater,container,false)
-        parentFragmentManager.setFragmentResultListener("result_to_fragment_login",
-        this,
-        FragmentResultListener{_,it->
-            val result = it.getString("userName")
-            binding.username.setText(result)
+        parentFragmentManager.apply {
+            setFragmentResultListener("result_to_fragment_login",
+                this@LoginFragment,
+            FragmentResultListener{_,bundle->
+                val result = bundle.getString("userName")
+                binding.username.setText(result)
+            })
+        }
 
-        })
         binding.tvSignUp.setOnClickListener{
             changeFragment()
         }
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index 92bff04..316c274 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -55,7 +55,8 @@ class RegisterFragment : Fragment() {
             Toast.makeText(context,"Password does not match",Toast.LENGTH_SHORT).show()
         }
         else{
-            (activity as MainActivity).updateUsersList(User(username,password))
+//            (activity as MainActivity).updateUsersList(User(username,password))
+            Toast.makeText(context,"Create account success",Toast.LENGTH_SHORT).show()
             parentFragmentManager.apply {
                 val bundle = Bundle()
                 bundle.putString("userName",username)

From d83efde4277ae0b9d1933d5ced50bc49d464d53f Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 09:30:20 +0700
Subject: [PATCH 16/22] None Done

---
 .idea/misc.xml                                        |  1 +
 app/src/main/AndroidManifest.xml                      |  3 +++
 .../main/java/com/sudo/androidd20/LoginFragment.kt    |  6 +++++-
 .../main/java/com/sudo/androidd20/SecondActivity.kt   | 11 +++++++++++
 app/src/main/res/layout/activity_second.xml           |  9 +++++++++
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/sudo/androidd20/SecondActivity.kt
 create mode 100644 app/src/main/res/layout/activity_second.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3745cfe..ec9164f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,6 +8,7 @@
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_second.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.34782608695652173" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_register.xml" value="0.1" />
       </map>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6b425a5..da5a8e6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidD20"
         tools:targetApi="31">
+        <activity
+            android:name=".SecondActivity"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true">
diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 975b50a..9cd9259 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -1,5 +1,6 @@
 package com.sudo.androidd20
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -49,7 +50,10 @@ class LoginFragment : Fragment() {
         binding.tvSignUp.setOnClickListener{
             changeFragment()
         }
-
+        binding.login.setOnClickListener {
+            val intent = Intent(context,SecondActivity::class.java)
+            startActivity(intent)
+        }
         return binding.root
     }
 
diff --git a/app/src/main/java/com/sudo/androidd20/SecondActivity.kt b/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
new file mode 100644
index 0000000..338a6f0
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
@@ -0,0 +1,11 @@
+package com.sudo.androidd20
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class SecondActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_second)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
new file mode 100644
index 0000000..9569f77
--- /dev/null
+++ b/app/src/main/res/layout/activity_second.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="match_parent"
+    tools:context=".SecondActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 27b437d05a40b4a7f77923d86a0d3f30ebc5d8de Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 09:36:30 +0700
Subject: [PATCH 17/22] None Done

---
 app/src/main/java/com/sudo/androidd20/LoginFragment.kt    | 4 ++--
 app/src/main/java/com/sudo/androidd20/RegisterFragment.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 9cd9259..73c45f9 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -42,8 +42,8 @@ class LoginFragment : Fragment() {
             setFragmentResultListener("result_to_fragment_login",
                 this@LoginFragment,
             FragmentResultListener{_,bundle->
-                val result = bundle.getString("userName")
-                binding.username.setText(result)
+                val result = bundle.getSerializable("userName") as User
+                binding.username.setText(result.email)
             })
         }
 
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index 316c274..a4b4ff8 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -59,7 +59,7 @@ class RegisterFragment : Fragment() {
             Toast.makeText(context,"Create account success",Toast.LENGTH_SHORT).show()
             parentFragmentManager.apply {
                 val bundle = Bundle()
-                bundle.putString("userName",username)
+                bundle.putSerializable("userName",User(username,password))
                 setFragmentResult("result_to_fragment_login", bundle)
                 popBackStack()
             }

From 2cdd02c25e05e2431a4a7dfe723feaaa3b432caf Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 10:15:45 +0700
Subject: [PATCH 18/22] =?UTF-8?q?L=E1=BB=97i=20truy=E1=BB=81n=20t=E1=BB=AB?=
 =?UTF-8?q?=20Fragment=20sang=20Activity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  2 +-
 .../java/com/sudo/androidd20/LoginFragment.kt | 22 +++++++++++++++++--
 .../com/sudo/androidd20/SecondActivity.kt     |  6 +++++
 app/src/main/res/layout/activity_second.xml   | 15 +++++++++++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ec9164f..7e780d6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/ic_login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/drawable/login_background.xml" value="0.1" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
-        <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_second.xml" value="0.1" />
+        <entry key="..\:/AndroidD20/app/src/main/res/layout/activity_second.xml" value="0.4154929577464789" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.34782608695652173" />
         <entry key="..\:/AndroidD20/app/src/main/res/layout/fragment_register.xml" value="0.1" />
       </map>
diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 73c45f9..0a73fe5 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -5,9 +5,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentResultListener
 import com.sudo.androidd20.databinding.FragmentLoginBinding
+import java.lang.Exception
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -24,6 +26,7 @@ class LoginFragment : Fragment() {
     private var param1: String? = null
     private var param2: String? = null
     private lateinit var binding: FragmentLoginBinding
+    private var user: User? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -43,6 +46,7 @@ class LoginFragment : Fragment() {
                 this@LoginFragment,
             FragmentResultListener{_,bundle->
                 val result = bundle.getSerializable("userName") as User
+                user = result
                 binding.username.setText(result.email)
             })
         }
@@ -51,8 +55,22 @@ class LoginFragment : Fragment() {
             changeFragment()
         }
         binding.login.setOnClickListener {
-            val intent = Intent(context,SecondActivity::class.java)
-            startActivity(intent)
+            if(binding.username.text.isNullOrEmpty()||binding.password.text.isNullOrEmpty()){
+                Toast.makeText(context,"Please complete all information", Toast.LENGTH_SHORT).show()
+            }
+            else{
+                try{
+                    val intent = Intent(context,SecondActivity::class.java)
+                    val bundle = Bundle()
+                    bundle.putSerializable("userData",user)
+                    intent.putExtras(bundle)
+                    startActivity(intent)
+                    activity?.finish()
+                }
+                catch (e:Exception){
+                    throw e
+                }
+            }
         }
         return binding.root
     }
diff --git a/app/src/main/java/com/sudo/androidd20/SecondActivity.kt b/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
index 338a6f0..49776ad 100644
--- a/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
@@ -2,10 +2,16 @@ package com.sudo.androidd20
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import com.sudo.androidd20.databinding.ActivitySecondBinding
 
 class SecondActivity : AppCompatActivity() {
+    private lateinit var binding: ActivitySecondBinding
+    private val user = intent?.extras?.get("userData") as User
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_second)
+        binding = ActivitySecondBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        binding.username.text = user.email
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
index 9569f77..eb97375 100644
--- a/app/src/main/res/layout/activity_second.xml
+++ b/app/src/main/res/layout/activity_second.xml
@@ -4,6 +4,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/login_background"
     tools:context=".SecondActivity">
+    <TextView
+        android:id="@+id/username"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="126dp"
+        android:layout_marginEnd="24dp"
+        android:selectAllOnFocus="true"
+        android:textSize="18dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:autofillHints="username" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 1f28ba4f5445890e34a5153372cb397738003372 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 10:23:42 +0700
Subject: [PATCH 19/22] =?UTF-8?q?L=E1=BB=97i=20truy=E1=BB=81n=20t=E1=BB=AB?=
 =?UTF-8?q?=20Fragment=20sang=20Activity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sudo/androidd20/LoginFragment.kt | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index 0a73fe5..cad91ef 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -9,7 +9,6 @@ import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentResultListener
 import com.sudo.androidd20.databinding.FragmentLoginBinding
-import java.lang.Exception
 
 // TODO: Rename parameter arguments, choose names that match
 // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -26,7 +25,6 @@ class LoginFragment : Fragment() {
     private var param1: String? = null
     private var param2: String? = null
     private lateinit var binding: FragmentLoginBinding
-    private var user: User? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -46,7 +44,6 @@ class LoginFragment : Fragment() {
                 this@LoginFragment,
             FragmentResultListener{_,bundle->
                 val result = bundle.getSerializable("userName") as User
-                user = result
                 binding.username.setText(result.email)
             })
         }
@@ -59,17 +56,16 @@ class LoginFragment : Fragment() {
                 Toast.makeText(context,"Please complete all information", Toast.LENGTH_SHORT).show()
             }
             else{
-                try{
-                    val intent = Intent(context,SecondActivity::class.java)
-                    val bundle = Bundle()
-                    bundle.putSerializable("userData",user)
-                    intent.putExtras(bundle)
-                    startActivity(intent)
-                    activity?.finish()
-                }
-                catch (e:Exception){
-                    throw e
-                }
+
+                val intent = Intent(context,SecondActivity::class.java)
+                val bundle = Bundle()
+                bundle.putSerializable("userData",User(binding.username.text.toString(),binding.password.text.toString()))
+                intent.putExtras(bundle)
+                activity?.finish()
+                startActivity(intent)
+                Toast.makeText(context,"Logged in successfully", Toast.LENGTH_SHORT).show()
+
+
             }
         }
         return binding.root

From 5e6e80aa376fa2d2852f1a547c2c3d4d49ca6018 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 10:30:51 +0700
Subject: [PATCH 20/22] =?UTF-8?q?Ch=C6=B0a=20x=E1=BB=AD=20l=C3=BD=20Data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sudo/androidd20/SecondActivity.kt   |  4 ++--
 app/src/main/res/layout/activity_second.xml           | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/sudo/androidd20/SecondActivity.kt b/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
index 49776ad..ab15d4b 100644
--- a/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/SecondActivity.kt
@@ -6,12 +6,12 @@ import com.sudo.androidd20.databinding.ActivitySecondBinding
 
 class SecondActivity : AppCompatActivity() {
     private lateinit var binding: ActivitySecondBinding
-    private val user = intent?.extras?.get("userData") as User
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_second)
         binding = ActivitySecondBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        binding.username.text = user.email
+        val user = intent?.extras?.get("userData") as User
+        binding.username.setText(user.email)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
index eb97375..892ecbf 100644
--- a/app/src/main/res/layout/activity_second.xml
+++ b/app/src/main/res/layout/activity_second.xml
@@ -6,19 +6,20 @@
     android:layout_height="match_parent"
     android:background="@drawable/login_background"
     tools:context=".SecondActivity">
-    <TextView
+
+    <EditText
         android:id="@+id/username"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
         android:layout_marginTop="126dp"
         android:layout_marginEnd="24dp"
-        android:selectAllOnFocus="true"
-        android:textSize="18dp"
+        android:hint="@string/invalid_username"
+        android:autofillHints="emailAddress"
+        android:inputType="textEmailAddress"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:autofillHints="username" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 060aae1dcd3d8a91e254bc36fc7feafc8af647b6 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Fri, 29 Jul 2022 23:07:26 +0700
Subject: [PATCH 21/22] =?UTF-8?q?Ch=C6=B0a=20x=E1=BB=AD=20l=C3=BD=20Data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sudo/androidd20/LoginFragment.kt    | 4 +++-
 app/src/main/java/com/sudo/androidd20/RegisterFragment.kt | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
index cad91ef..22b6b91 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginFragment.kt
@@ -47,7 +47,9 @@ class LoginFragment : Fragment() {
                 binding.username.setText(result.email)
             })
         }
-
+//        arguments?.let {
+//            val result = it.getSerializable("userName") as User
+//        }
         binding.tvSignUp.setOnClickListener{
             changeFragment()
         }
diff --git a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
index a4b4ff8..b8a50df 100644
--- a/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/RegisterFragment.kt
@@ -63,6 +63,10 @@ class RegisterFragment : Fragment() {
                 setFragmentResult("result_to_fragment_login", bundle)
                 popBackStack()
             }
+//            val fragmentLogin = LoginFragment()
+//            val bundle = Bundle()
+//            fragmentLogin.arguments = bundle
+//            bundle.putSerializable("userName",User(username,password))
         }
     }
 

From 5ce1e31bd0fef0e6d607d75551b5bfd21fe1b704 Mon Sep 17 00:00:00 2001
From: Tuan Vo <dungtuan095@gmail.com>
Date: Sat, 30 Jul 2022 20:09:35 +0700
Subject: [PATCH 22/22] =?UTF-8?q?Ch=C6=B0a=20x=E1=BB=AD=20l=C3=BD=20Data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/sudo/androidd20/MainActivity.kt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index f17716c..8d09fae 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -1,15 +1,13 @@
 package com.sudo.androidd20
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 
 class MainActivity : AppCompatActivity() {
     private var fragmentManager: FragmentManager? = null
     private var fragmentTransaction: FragmentTransaction? = null
-    private lateinit var listUser: MutableList<User>
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -26,12 +24,6 @@ class MainActivity : AppCompatActivity() {
         )
         fragmentTransaction?.commit()
     }
-    public fun getUsersList(): MutableList<User> {
-        return listUser
-    }
 
-    public fun updateUsersList(user: User) {
-        listUser.add(user)
-    }
 
 }
\ No newline at end of file