From f1307e58a4399dce1651866e614205e55bca315c Mon Sep 17 00:00:00 2001
From: S4ltF1sh <sankatana100@gmail.com>
Date: Wed, 27 Jul 2022 18:19:04 +0700
Subject: [PATCH 1/9] first commit

---
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |  16 +++
 .idea/vcs.xml                                 |   6 +
 app/build.gradle                              |   8 +-
 app/src/main/AndroidManifest.xml              |   9 ++
 .../java/com/sudo/androidd20/LoginActivity.kt |  39 +++++++
 .../java/com/sudo/androidd20/MainActivity.kt  |  20 +++-
 .../sudo/androidd20/fragment/LogInFragment.kt |  73 ++++++++++++
 .../androidd20/fragment/SignUpFragment.kt     |  72 ++++++++++++
 app/src/main/res/layout/activity_login.xml    |  10 ++
 app/src/main/res/layout/activity_main.xml     |  66 +++++++++--
 app/src/main/res/layout/fragment_login.xml    | 101 ++++++++++++++++
 app/src/main/res/layout/fragment_sign_up.xml  | 109 ++++++++++++++++++
 app/src/main/res/values-night/themes.xml      |   2 +-
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings.xml           |  15 +++
 app/src/main/res/values/themes.xml            |   2 +-
 17 files changed, 538 insertions(+), 13 deletions(-)
 create mode 100644 .idea/vcs.xml
 create mode 100644 app/src/main/java/com/sudo/androidd20/LoginActivity.kt
 create mode 100644 app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
 create mode 100644 app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
 create mode 100644 app/src/main/res/layout/activity_login.xml
 create mode 100644 app/src/main/res/layout/fragment_login.xml
 create mode 100644 app/src/main/res/layout/fragment_sign_up.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/misc.xml b/.idea/misc.xml
index 2a4d5b5..2e5d349 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_background.xml" value="0.3535" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_background2.xml" value="0.3535" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_button.xml" value="0.3535" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_button2.xml" value="0.3535" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/activity_login.xml" value="0.17885973763874874" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.3020833333333333" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/activity_sign_in.xml" value="0.3020833333333333" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/fragment_login.xml" value="0.264" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/fragment_sign_in.xml" value="0.3020833333333333" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/fragment_sign_up.xml" value="0.3020833333333333" />
+      </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>
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
diff --git a/app/build.gradle b/app/build.gradle
index bd2a8f5..e50c283 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,15 +29,21 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    buildFeatures {
+        viewBinding = true
+    }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation "androidx.fragment:fragment-ktx:1.5.0"
+    implementation("androidx.room:room-ktx:2.4.2")
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6b425a5..09da46e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,15 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidD20"
         tools:targetApi="31">
+        <activity
+            android:name=".LoginActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".MainActivity"
             android:exported="true">
diff --git a/app/src/main/java/com/sudo/androidd20/LoginActivity.kt b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
new file mode 100644
index 0000000..7a2f8ca
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
@@ -0,0 +1,39 @@
+package com.sudo.androidd20
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import androidx.fragment.app.add
+import androidx.fragment.app.commit
+import androidx.room.Room
+import com.sudo.androidd20.data.User
+import com.sudo.androidd20.data.UserDataBase
+import com.sudo.androidd20.databinding.ActivityLoginBinding
+import com.sudo.androidd20.fragment.LogInFragment
+
+class LoginActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityLoginBinding
+
+    companion object {
+        lateinit var listUser: MutableList<User>
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        //setContentView(R.layout.activity_login)
+
+        binding = ActivityLoginBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        supportFragmentManager.commit {
+            add<LogInFragment>(R.id.fragment_container)
+        }
+
+        listUser = mutableListOf(
+            User(
+                email = "sankatana02@gmail.com",
+                userName = "S4ltF1sh",
+                password = "123456"
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index 4249a08..2b2243e 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -2,10 +2,28 @@ package com.sudo.androidd20
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatDelegate
+import com.sudo.androidd20.data.User
+import com.sudo.androidd20.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+
+        val userReceived = intent?.extras?.get("userData") as User
+
+        binding.tvUserName.text = userReceived.userName
+        binding.tvName.text = userReceived.name
+        binding.tvAge.text = userReceived.age.toString()
+
+        binding.tvBtnLogOut.setOnClickListener {
+            finish()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
new file mode 100644
index 0000000..014ff51
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
@@ -0,0 +1,73 @@
+package com.sudo.androidd20.fragment
+
+import android.app.Activity
+import android.app.Activity.RESULT_OK
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.AppCompatButton
+import androidx.fragment.app.commit
+import androidx.fragment.app.setFragmentResultListener
+import com.sudo.androidd20.LoginActivity
+import com.sudo.androidd20.MainActivity
+import com.sudo.androidd20.R
+import com.sudo.androidd20.databinding.FragmentLoginBinding
+
+class LogInFragment : Fragment() {
+    private lateinit var binding: FragmentLoginBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        binding = FragmentLoginBinding.inflate(inflater, container, false)
+
+        setFragmentResultListener("result_to_fragment_login") { _, bundle ->
+            // We use a String here, but any type that can be put in a Bundle is supported
+            val result = bundle.get("userName")
+            binding.edtEnterEmail.setText(result.toString())
+            // Do something with the result
+        }
+
+        binding.tvBtnSignUp.setOnClickListener {
+            parentFragmentManager.apply {
+                beginTransaction()
+                    .replace(R.id.fragment_container, SignUpFragment())
+                    .addToBackStack(null)
+                    .commit()
+            }
+        }
+
+        binding.tvBntLogIn.setOnClickListener {
+            val enteredEmail = binding.edtEnterEmail.text.toString()
+            val enteredPassword = binding.edtEnterPassword.text.toString()
+
+            if (enteredEmail != "" && enteredPassword != "") {
+                for (it in LoginActivity.listUser) {
+                    try {
+                        if ((it.userName == enteredEmail || it.email == enteredEmail) && it.password == enteredPassword) {
+                            val intent = Intent(context, MainActivity::class.java)
+
+                            val bundle = Bundle()
+                            bundle.putSerializable("userData", it)
+                            intent.putExtras(bundle)
+                            startActivity(intent)
+
+                            activity?.finish()
+                        }
+                    } catch (e: Exception) {
+                        throw e
+                    }
+                }
+            }
+
+
+        }
+
+        return binding.root
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
new file mode 100644
index 0000000..d2f5230
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
@@ -0,0 +1,72 @@
+package com.sudo.androidd20.fragment
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.commit
+import com.sudo.androidd20.LoginActivity
+import com.sudo.androidd20.R
+import com.sudo.androidd20.data.User
+import com.sudo.androidd20.databinding.FragmentSignUpBinding
+
+class SignUpFragment : Fragment() {
+    private lateinit var binding: FragmentSignUpBinding
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        binding = FragmentSignUpBinding.inflate(inflater, container, false)
+
+        binding.tvBtnLogin.setOnClickListener {
+            parentFragmentManager.apply {
+                popBackStack()
+            }
+        }
+
+        binding.tvBtnSingUp.setOnClickListener {
+            val enteredUserName = binding.edtEmailOrUsername.text.toString().trim()
+            val enteredPassword = binding.edtEnterPassword.text.toString()
+            if (binding.edtEnterPassword.text.toString() != binding.edtConfirmPassword.text.toString()) {
+                Toast.makeText(context, "Mật khẩu không trùng khớp", Toast.LENGTH_SHORT).show()
+                binding.edtEnterPassword.setText("")
+                binding.edtConfirmPassword.setText("")
+                binding.edtEnterPassword.requestFocus()
+            } else {
+                if (enteredUserName.contains("@gmail.com"))
+                    LoginActivity.listUser.add(
+                        User(
+                            email = enteredUserName,
+                            userName = "None",
+                            password = enteredPassword
+                        )
+                    )
+                else {
+                    LoginActivity.listUser.add(
+                        User(
+                            email = "None",
+                            userName = enteredUserName,
+                            password = enteredPassword
+                        )
+                    )
+                }
+
+                parentFragmentManager.apply {
+
+                    val bundle = Bundle()
+                    bundle.putString("userName", enteredUserName)
+                    setFragmentResult("result_to_fragment_login", bundle)
+                    popBackStack()
+                }
+
+                Toast.makeText(context, "Đăng ký thành công, mời đăng nhập!", Toast.LENGTH_LONG)
+                    .show()
+            }
+        }
+
+        return binding.root
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..3245b74
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.fragment.app.FragmentContainerView 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/fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".LoginActivity">
+
+</androidx.fragment.app.FragmentContainerView>
\ 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 17eab17..1ee0c1d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,66 @@
 <?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"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/custom_background2"
+    android:orientation="vertical"
+    android:weightSum="1"
     tools:context=".MainActivity">
 
-    <TextView
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.5"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tv_userName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:textSize="24sp"
+            android:hint="User name"/>
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:textSize="24sp"
+            android:hint="Real name"/>
+
+        <TextView
+            android:id="@+id/tv_age"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:textSize="24sp"
+            android:hint="Age"/>
+    </LinearLayout>
+
+    <View
         android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="0.4" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/tv_btn_logOut"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_gravity="center"
+        android:layout_marginStart="45dp"
+        android:layout_marginEnd="45dp"
+        android:background="@drawable/custom_button2"
+        android:text="@string/btn_log_out"/>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
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..beb4a5a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:background="@drawable/custom_background"
+    android:orientation="vertical"
+    android:weightSum="1"
+    tools:context=".fragment.LogInFragment">
+
+    <TextView
+        android:id="@+id/tv_login"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.25"
+        android:gravity="center"
+        android:text="@string/tv_login"
+        android:textColor="@color/white"
+        android:textSize="36sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.3"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/edt_enterEmail"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:hint="@string/enter_your_email"
+            android:inputType="textEmailAddress" />
+
+        <EditText
+            android:id="@+id/edt_enterPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:hint="@string/password"
+            android:inputType="textPassword" />
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.45">
+
+        <TextView
+            android:id="@+id/tv_bnt_logIn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="80dp"
+            android:background="@drawable/custom_button"
+            android:clickable="true"
+            android:focusable="true"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:shadowColor="@color/black"
+            android:text="@string/btn_login"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="36dp"
+            android:text="@string/dont_have_account"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toTopOf="@+id/tv_btn_signUp"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_btn_signUp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="36dp"
+            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>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml
new file mode 100644
index 0000000..06ce573
--- /dev/null
+++ b/app/src/main/res/layout/fragment_sign_up.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:background="@drawable/custom_background"
+    android:orientation="vertical"
+    android:weightSum="1"
+    tools:context=".fragment.LogInFragment">
+
+    <TextView
+        android:id="@+id/tv_signUp"
+        style="@style/TextAppearance.MaterialComponents.Headline6"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.25"
+        android:gravity="center"
+        android:text="@string/tv_sign_up"
+        android:textColor="@color/white"
+        android:textSize="36sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.3"
+        android:orientation="vertical">
+
+        <EditText
+            android:id="@+id/edt_emailOrUsername"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:hint="@string/email_or_username"
+            android:inputType="textEmailAddress" />
+
+        <EditText
+            android:id="@+id/edt_enterPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:hint="@string/password"
+            android:inputType="textPassword" />
+
+        <EditText
+            android:id="@+id/edt_confirmPassword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="45dp"
+            android:autofillHints="true"
+            android:hint="@string/confirm_password"
+            android:inputType="textPassword" />
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.45">
+
+        <TextView
+            android:id="@+id/tv_btn_singUp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="80dp"
+            android:background="@drawable/custom_button"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:text="@string/btn_sign_up"
+            android:textSize="24sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="36dp"
+            android:text="@string/already_have_an_account"
+            android:textColor="@color/black"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toTopOf="@+id/tv_btn_login"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_btn_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="36dp"
+            android:layout_marginBottom="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/tv_btn_log_in"
+            android:textColor="@color/black"
+            android:textSize="26sp"
+            android:textStyle="italic"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
\ No newline at end of file
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/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..b838865 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="teal_bg">#3cdcf3</color>
+    <color name="teal_btn">#40d4e7</color>
 </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..28c6a98 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,18 @@
 <resources>
     <string name="app_name">AndroidD20</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="enter_your_email">Enter Your Email</string>
+    <string name="password">Password</string>
+    <string name="tv_login">LOGIN</string>
+    <string name="btn_login">Login</string>
+    <string name="dont_have_account">Don\'t have account?</string>
+    <string name="tv_btn_sign_up"><u>Sign up</u></string>
+    <string name="tv_sign_up">SIGN UP</string>
+    <string name="tv_btn_log_in"><u>Log in</u></string>
+    <string name="already_have_an_account">Already, have an account?</string>
+    <string name="btn_sign_up">Sign Up</string>
+    <string name="email_or_username">Email Or Username</string>
+    <string name="confirm_password">Confirm Password</string>
+    <string name="btn_log_out">Log out</string>
 </resources>
\ No newline at end of file
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 41b35ac31079af7e52ce768cf6da084b7c3dc6c4 Mon Sep 17 00:00:00 2001
From: S4ltF1sh <84552830+S4ltF1sh@users.noreply.github.com>
Date: Wed, 27 Jul 2022 18:25:46 +0700
Subject: [PATCH 2/9] Create README.md

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..507744e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,17 @@
+# AndroidD20
+##Màn hình khi mở App - LoginFragment (thuộc LoginActivity)
+
+![image](https://user-images.githubusercontent.com/84552830/181234862-6ae26fbb-f0ee-46ac-a343-9da2a4b99728.png)
+
+
+##Màn hình SignUp - SignUpFragment (Thuộc LoginActivity)
+![image](https://user-images.githubusercontent.com/84552830/181235112-d327bcbc-9ead-4662-8173-8cf78de20fbf.png)
+
+##Màn hình sau khi đăng ký thành công - LoginFragment (thuộc LoginActivity)
+![image](https://user-images.githubusercontent.com/84552830/181235411-06fb8497-6789-4907-b10f-2b6c94521677.png)
+
+##Màn hình sau khi đăng nhập thành công - MainActivity:
+![image](https://user-images.githubusercontent.com/84552830/181235466-a57b2a58-3af2-4a73-81e9-fd22222aa33d.png)
+
+//Sau khi đăng nhập thành công sẽ gọi finish() của LoginActivity để khi nhấn back không quay trở lại màn hình Login.
+//Bấm [Logout] sẽ gọi finish() đóng App.

From 58f2a3a445bcc732f8eb945ca087ae11231d42ef Mon Sep 17 00:00:00 2001
From: S4ltF1sh <84552830+S4ltF1sh@users.noreply.github.com>
Date: Wed, 27 Jul 2022 18:32:00 +0700
Subject: [PATCH 3/9] Update README.md

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 507744e..237a81a 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
 # AndroidD20
-##Màn hình khi mở App - LoginFragment (thuộc LoginActivity)
+## Màn hình khi mở App - LoginFragment (thuộc LoginActivity)
 
 ![image](https://user-images.githubusercontent.com/84552830/181234862-6ae26fbb-f0ee-46ac-a343-9da2a4b99728.png)
 
 
-##Màn hình SignUp - SignUpFragment (Thuộc LoginActivity)
+## Màn hình SignUp - SignUpFragment (Thuộc LoginActivity)
 ![image](https://user-images.githubusercontent.com/84552830/181235112-d327bcbc-9ead-4662-8173-8cf78de20fbf.png)
 
-##Màn hình sau khi đăng ký thành công - LoginFragment (thuộc LoginActivity)
+## Màn hình sau khi đăng ký thành công - LoginFragment (thuộc LoginActivity)
 ![image](https://user-images.githubusercontent.com/84552830/181235411-06fb8497-6789-4907-b10f-2b6c94521677.png)
 
-##Màn hình sau khi đăng nhập thành công - MainActivity:
+## Màn hình sau khi đăng nhập thành công - MainActivity:
 ![image](https://user-images.githubusercontent.com/84552830/181235466-a57b2a58-3af2-4a73-81e9-fd22222aa33d.png)
 
-//Sau khi đăng nhập thành công sẽ gọi finish() của LoginActivity để khi nhấn back không quay trở lại màn hình Login.
-//Bấm [Logout] sẽ gọi finish() đóng App.
+//Sau khi đăng nhập thành công sẽ gọi `finish()` của `LoginActivity` để khi nhấn back không quay trở lại màn hình Login.
+//Bấm `Logout` sẽ gọi `finish()` đóng App.

From facfe8dffe32ec1e01b8fe008e39f482ff3b8c50 Mon Sep 17 00:00:00 2001
From: S4ltF1sh <84552830+S4ltF1sh@users.noreply.github.com>
Date: Wed, 27 Jul 2022 18:32:30 +0700
Subject: [PATCH 4/9] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 237a81a..acb594c 100644
--- a/README.md
+++ b/README.md
@@ -14,4 +14,5 @@
 ![image](https://user-images.githubusercontent.com/84552830/181235466-a57b2a58-3af2-4a73-81e9-fd22222aa33d.png)
 
 //Sau khi đăng nhập thành công sẽ gọi `finish()` của `LoginActivity` để khi nhấn back không quay trở lại màn hình Login.
+
 //Bấm `Logout` sẽ gọi `finish()` đóng App.

From a441833307fa0b07f9960a74810ab4229d90f923 Mon Sep 17 00:00:00 2001
From: S4ltF1sh <sankatana100@gmail.com>
Date: Wed, 27 Jul 2022 18:43:01 +0700
Subject: [PATCH 5/9] =?UTF-8?q?th=C3=AAm=20ripple=20v=C3=A0=20b=C3=B3ng=20?=
 =?UTF-8?q?cho=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                               | 1 +
 app/src/main/res/layout/fragment_login.xml   | 5 +++--
 app/src/main/res/layout/fragment_sign_up.xml | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2e5d349..62659fe 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,6 +7,7 @@
         <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_background2.xml" value="0.3535" />
         <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_button.xml" value="0.3535" />
         <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_button2.xml" value="0.3535" />
+        <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/drawable/custom_ripple.xml" value="0.3535" />
         <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/activity_login.xml" value="0.17885973763874874" />
         <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/activity_main.xml" value="0.3020833333333333" />
         <entry key="..\:/Users/sanka/AndroidStudioProjects/AndroidD20/app/src/main/res/layout/activity_sign_in.xml" value="0.3020833333333333" />
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index beb4a5a..30c2e61 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="80dp"
-            android:background="@drawable/custom_button"
+            android:background="@drawable/custom_ripple"
             android:clickable="true"
             android:focusable="true"
             android:paddingStart="16dp"
@@ -69,7 +69,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:elevation="2dp"/>
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml
index 06ce573..c1b280c 100644
--- a/app/src/main/res/layout/fragment_sign_up.xml
+++ b/app/src/main/res/layout/fragment_sign_up.xml
@@ -69,7 +69,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="80dp"
-            android:background="@drawable/custom_button"
+            android:background="@drawable/custom_ripple"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/btn_sign_up"
@@ -77,7 +77,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            android:elevation="2dp"/>
 
         <TextView
             android:layout_width="wrap_content"

From e46cf3661892703dc75e15c4d4d8f666edcdf7af Mon Sep 17 00:00:00 2001
From: S4ltF1sh <sankatana100@gmail.com>
Date: Wed, 27 Jul 2022 22:20:48 +0700
Subject: [PATCH 6/9] commit

---
 .../java/com/sudo/androidd20/data/User.kt     | 16 +++++++++
 .../java/com/sudo/androidd20/data/UserDao.kt  | 14 ++++++++
 .../com/sudo/androidd20/data/UserDataBase.kt  | 33 +++++++++++++++++++
 .../main/res/drawable/custom_background.xml   | 10 ++++++
 .../main/res/drawable/custom_background2.xml  |  9 +++++
 app/src/main/res/drawable/custom_button.xml   | 12 +++++++
 app/src/main/res/drawable/custom_button2.xml  |  9 +++++
 app/src/main/res/drawable/custom_ripple.xml   | 11 +++++++
 8 files changed, 114 insertions(+)
 create mode 100644 app/src/main/java/com/sudo/androidd20/data/User.kt
 create mode 100644 app/src/main/java/com/sudo/androidd20/data/UserDao.kt
 create mode 100644 app/src/main/java/com/sudo/androidd20/data/UserDataBase.kt
 create mode 100644 app/src/main/res/drawable/custom_background.xml
 create mode 100644 app/src/main/res/drawable/custom_background2.xml
 create mode 100644 app/src/main/res/drawable/custom_button.xml
 create mode 100644 app/src/main/res/drawable/custom_button2.xml
 create mode 100644 app/src/main/res/drawable/custom_ripple.xml

diff --git a/app/src/main/java/com/sudo/androidd20/data/User.kt b/app/src/main/java/com/sudo/androidd20/data/User.kt
new file mode 100644
index 0000000..26a152d
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/data/User.kt
@@ -0,0 +1,16 @@
+package com.sudo.androidd20.data
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity
+data class User(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo var email: String,
+    @ColumnInfo var userName: String,
+    @ColumnInfo var password: String,
+    @ColumnInfo val name: String = "Lê Quang Dũng",
+    @ColumnInfo var age: Int = 19,
+) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/data/UserDao.kt b/app/src/main/java/com/sudo/androidd20/data/UserDao.kt
new file mode 100644
index 0000000..842cfbe
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/data/UserDao.kt
@@ -0,0 +1,14 @@
+package com.sudo.androidd20.data
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+
+@Dao
+interface UserDao {
+    @Insert
+    fun insertUser(vararg user: User)
+
+    @Query("SELECT * FROM User ")
+    fun getAllUsers(): List<User>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/data/UserDataBase.kt b/app/src/main/java/com/sudo/androidd20/data/UserDataBase.kt
new file mode 100644
index 0000000..ae45458
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/data/UserDataBase.kt
@@ -0,0 +1,33 @@
+package com.sudo.androidd20.data
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+@Database(entities = [User::class], version = 1)
+abstract class UserDataBase : RoomDatabase() {
+    abstract fun userDao(): UserDao
+
+    companion object {
+        // Singleton prevents multiple instances of database opening at the
+        // same time.
+        @Volatile
+        private var INSTANCE: UserDataBase? = null
+
+        fun getDatabase(context: Context): UserDataBase {
+            // if the INSTANCE is not null, then return it,
+            // if it is, then create the database
+            return INSTANCE ?: synchronized(this) {
+                val instance = Room.databaseBuilder(
+                    context.applicationContext,
+                    UserDataBase::class.java,
+                    "word_database"
+                ).build()
+                INSTANCE = instance
+                // return instance
+                instance
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_background.xml b/app/src/main/res/drawable/custom_background.xml
new file mode 100644
index 0000000..926825b
--- /dev/null
+++ b/app/src/main/res/drawable/custom_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="@color/white"
+        android:startColor="@color/teal_bg"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_background2.xml b/app/src/main/res/drawable/custom_background2.xml
new file mode 100644
index 0000000..eaad21c
--- /dev/null
+++ b/app/src/main/res/drawable/custom_background2.xml
@@ -0,0 +1,9 @@
+<?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="#97dfe9"
+        android:startColor="#97dfe9" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_button.xml b/app/src/main/res/drawable/custom_button.xml
new file mode 100644
index 0000000..39be1ec
--- /dev/null
+++ b/app/src/main/res/drawable/custom_button.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/teal_btn" />
+    <corners android:radius="20dp" />
+    <padding
+        android:left="6dp"
+        android:right="6dp"
+        android:top="3dp"
+        android:bottom="3dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_button2.xml b/app/src/main/res/drawable/custom_button2.xml
new file mode 100644
index 0000000..23948e5
--- /dev/null
+++ b/app/src/main/res/drawable/custom_button2.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/white"/>
+
+    <corners
+        android:radius="20dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/custom_ripple.xml b/app/src/main/res/drawable/custom_ripple.xml
new file mode 100644
index 0000000..5ded1ce
--- /dev/null
+++ b/app/src/main/res/drawable/custom_ripple.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/black">
+    <item android:id="@+id/back_ground">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/teal_btn" />
+
+            <corners android:radius="20dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file

From 46a206b9c28c128f6484ede7938eb7590fccd89c Mon Sep 17 00:00:00 2001
From: S4ltF1sh <sankatana100@gmail.com>
Date: Thu, 28 Jul 2022 04:21:39 +0700
Subject: [PATCH 7/9] =?UTF-8?q?s=E1=BB=ADa=20l=E1=BA=A1i=20b=C3=A0i?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

chia sẻ dữ liệu các user giữa 2 Fragment và LoginActivity bằng ViewModel
---
 .../java/com/sudo/androidd20/LoginActivity.kt |  32 ++--
 .../java/com/sudo/androidd20/MainActivity.kt  |  21 ++-
 .../java/com/sudo/androidd20/data/User.kt     |  15 +-
 .../sudo/androidd20/fragment/LogInFragment.kt |  87 ++++++----
 .../androidd20/fragment/SignUpFragment.kt     | 106 ++++++++----
 .../com/sudo/androidd20/model/LoginModel.kt   |  22 +++
 app/src/main/res/layout/activity_login.xml    |   1 -
 app/src/main/res/layout/activity_main.xml     |  75 ++++----
 app/src/main/res/layout/fragment_login.xml    | 142 +++++++--------
 app/src/main/res/layout/fragment_sign_up.xml  | 163 ++++++++----------
 10 files changed, 359 insertions(+), 305 deletions(-)
 create mode 100644 app/src/main/java/com/sudo/androidd20/model/LoginModel.kt

diff --git a/app/src/main/java/com/sudo/androidd20/LoginActivity.kt b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
index 7a2f8ca..4d8c179 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
@@ -2,38 +2,42 @@ package com.sudo.androidd20
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import androidx.activity.viewModels
 import androidx.fragment.app.add
 import androidx.fragment.app.commit
-import androidx.room.Room
 import com.sudo.androidd20.data.User
-import com.sudo.androidd20.data.UserDataBase
 import com.sudo.androidd20.databinding.ActivityLoginBinding
 import com.sudo.androidd20.fragment.LogInFragment
+import com.sudo.androidd20.model.LoginModel
 
 class LoginActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityLoginBinding
-
-    companion object {
-        lateinit var listUser: MutableList<User>
-    }
+    private val loginModel: LoginModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        //setContentView(R.layout.activity_login)
+        setContentView(R.layout.activity_login)
 
-        binding = ActivityLoginBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        linkToLoginFragment()
+        loadUsersData()
+    }
 
+    private fun linkToLoginFragment() {
         supportFragmentManager.commit {
             add<LogInFragment>(R.id.fragment_container)
         }
+    }
 
-        listUser = mutableListOf(
+    //mục đích chính là load dữ liệu người dùng từ database nên em đặt tên thế này
+    private fun loadUsersData() {
+        loginModel.add(
             User(
-                email = "sankatana02@gmail.com",
-                userName = "S4ltF1sh",
-                password = "123456"
+                email = "admin",
+                userName = "admin",
+                password = "admin"
             )
         )
+
+        Log.i("LoginModel", "add S4ltF1sh!")
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index 2b2243e..b9dad40 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -2,9 +2,13 @@ package com.sudo.androidd20
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModel
 import com.sudo.androidd20.data.User
 import com.sudo.androidd20.databinding.ActivityMainBinding
+import com.sudo.androidd20.model.LoginModel
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -16,13 +20,22 @@ class MainActivity : AppCompatActivity() {
 
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
 
+        setDataDisplayed()
+        setOnClick()
+    }
+
+    private fun setDataDisplayed() {
         val userReceived = intent?.extras?.get("userData") as User
 
-        binding.tvUserName.text = userReceived.userName
-        binding.tvName.text = userReceived.name
-        binding.tvAge.text = userReceived.age.toString()
+        binding.apply {
+            tvUsername.text = userReceived.userName
+            tvName.text = userReceived.name
+            tvAge.text = userReceived.age.toString()
+        }
+    }
 
-        binding.tvBtnLogOut.setOnClickListener {
+    private fun setOnClick() {
+        binding.btnLogOut.setOnClickListener {
             finish()
         }
     }
diff --git a/app/src/main/java/com/sudo/androidd20/data/User.kt b/app/src/main/java/com/sudo/androidd20/data/User.kt
index 26a152d..2c14720 100644
--- a/app/src/main/java/com/sudo/androidd20/data/User.kt
+++ b/app/src/main/java/com/sudo/androidd20/data/User.kt
@@ -1,16 +1,11 @@
 package com.sudo.androidd20.data
 
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
 import java.io.Serializable
 
-@Entity
 data class User(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo var email: String,
-    @ColumnInfo var userName: String,
-    @ColumnInfo var password: String,
-    @ColumnInfo val name: String = "Lê Quang Dũng",
-    @ColumnInfo var age: Int = 19,
+    var email: String,
+    var userName: String,
+    var password: String,
+    val name: String = "Lê Quang Dũng",
+    var age: Int = 19,
 ) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
index 014ff51..3028929 100644
--- a/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
@@ -1,73 +1,94 @@
 package com.sudo.androidd20.fragment
 
-import android.app.Activity
-import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.appcompat.widget.AppCompatButton
-import androidx.fragment.app.commit
+import androidx.activity.viewModels
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Observer
 import com.sudo.androidd20.LoginActivity
 import com.sudo.androidd20.MainActivity
 import com.sudo.androidd20.R
+import com.sudo.androidd20.data.User
 import com.sudo.androidd20.databinding.FragmentLoginBinding
+import com.sudo.androidd20.model.LoginModel
 
 class LogInFragment : Fragment() {
     private lateinit var binding: FragmentLoginBinding
+    private val loginModel: LoginModel by activityViewModels()
+    private lateinit var listUser: MutableList<User>
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        // Inflate the layout for this fragment
         binding = FragmentLoginBinding.inflate(inflater, container, false)
 
+        //tạo setFragmentResultListener để lắng nghe kết quả trả về (dưới dạng Bundle)
         setFragmentResultListener("result_to_fragment_login") { _, bundle ->
-            // We use a String here, but any type that can be put in a Bundle is supported
+            //Sau khi lấy được dữ liệu trả về sẽ xử lý và gán username cho phần ô nhập
             val result = bundle.get("userName")
             binding.edtEnterEmail.setText(result.toString())
-            // Do something with the result
         }
 
-        binding.tvBtnSignUp.setOnClickListener {
-            parentFragmentManager.apply {
-                beginTransaction()
-                    .replace(R.id.fragment_container, SignUpFragment())
-                    .addToBackStack(null)
-                    .commit()
+        setOnClick()
+
+        return binding.root
+    }
+
+    private fun setOnClick() {
+        binding.apply {
+            tvSignUp.setOnClickListener {
+                changeToSignUpFragment()
+            }
+
+            btnLogin.setOnClickListener {
+                login()
             }
         }
+    }
 
-        binding.tvBntLogIn.setOnClickListener {
-            val enteredEmail = binding.edtEnterEmail.text.toString()
-            val enteredPassword = binding.edtEnterPassword.text.toString()
+    private fun changeToSignUpFragment() {
+        parentFragmentManager.apply {
+            beginTransaction()
+                .replace(R.id.fragment_container, SignUpFragment())
+                .addToBackStack(null)
+                .commit()
+        }
+    }
+
+    private fun login() {
+        loginModel.users.observe(viewLifecycleOwner, Observer<MutableList<User>> {
+            listUser = it
+            Log.i("LoginModel", "$it")
+        })
+        val enteredEmail = binding.edtEnterEmail.text.toString()
+        val enteredPassword = binding.edtEnterPassword.text.toString()
 
-            if (enteredEmail != "" && enteredPassword != "") {
-                for (it in LoginActivity.listUser) {
-                    try {
-                        if ((it.userName == enteredEmail || it.email == enteredEmail) && it.password == enteredPassword) {
-                            val intent = Intent(context, MainActivity::class.java)
+        if (enteredEmail != "" && enteredPassword != "") {
+            for (user in listUser) {
+                try {
+                    if ((user.userName == enteredEmail || user.email == enteredEmail) && user.password == enteredPassword) {
+                        val intent = Intent(context, MainActivity::class.java)
+                        val bundle = Bundle()
 
-                            val bundle = Bundle()
-                            bundle.putSerializable("userData", it)
-                            intent.putExtras(bundle)
-                            startActivity(intent)
+                        bundle.putSerializable("userData", user)
+                        intent.putExtras(bundle)
 
-                            activity?.finish()
-                        }
-                    } catch (e: Exception) {
-                        throw e
+                        startActivity(intent)
+
+                        activity?.finish()
                     }
+                } catch (e: Exception) {
+                    throw e
                 }
             }
-
-
         }
-
-        return binding.root
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
index d2f5230..a2d5324 100644
--- a/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
@@ -6,14 +6,18 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.commit
 import com.sudo.androidd20.LoginActivity
 import com.sudo.androidd20.R
 import com.sudo.androidd20.data.User
 import com.sudo.androidd20.databinding.FragmentSignUpBinding
+import com.sudo.androidd20.model.LoginModel
 
 class SignUpFragment : Fragment() {
     private lateinit var binding: FragmentSignUpBinding
+    private val loginModel: LoginModel by activityViewModels()
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -21,52 +25,78 @@ class SignUpFragment : Fragment() {
         // Inflate the layout for this fragment
         binding = FragmentSignUpBinding.inflate(inflater, container, false)
 
-        binding.tvBtnLogin.setOnClickListener {
-            parentFragmentManager.apply {
-                popBackStack()
+        setOnCLick()
+
+        return binding.root
+    }
+
+    private fun setOnCLick() {
+        binding.apply {
+            tvBtnLogin.setOnClickListener {
+                changeToLoginFragment()
+            }
+
+            btnSignup.setOnClickListener {
+                signup()
             }
         }
+    }
 
-        binding.tvBtnSingUp.setOnClickListener {
-            val enteredUserName = binding.edtEmailOrUsername.text.toString().trim()
-            val enteredPassword = binding.edtEnterPassword.text.toString()
-            if (binding.edtEnterPassword.text.toString() != binding.edtConfirmPassword.text.toString()) {
-                Toast.makeText(context, "Mật khẩu không trùng khớp", Toast.LENGTH_SHORT).show()
-                binding.edtEnterPassword.setText("")
-                binding.edtConfirmPassword.setText("")
-                binding.edtEnterPassword.requestFocus()
-            } else {
-                if (enteredUserName.contains("@gmail.com"))
-                    LoginActivity.listUser.add(
-                        User(
-                            email = enteredUserName,
-                            userName = "None",
-                            password = enteredPassword
-                        )
+    private fun changeToLoginFragment() {
+        parentFragmentManager.apply {
+            popBackStack()
+        }
+    }
+
+    private fun signup() {
+        val enteredUserName = binding.edtEmailOrUsername.text.toString().trim()
+        val enteredPassword = binding.edtEnteredPassword.text.toString()
+        if (enteredPassword == "") {
+            return
+        }
+        //Nếu dữ liệu đăng ký thỏa mãn:
+        if (enteredPassword != binding.edtConfirmedPassword.text.toString() && enteredPassword != "") {
+            Toast.makeText(context, "Mật khẩu không trùng khớp", Toast.LENGTH_SHORT).show()
+            resetPasswordEditText()
+        } else {
+            //thực hiện việc thêm người dùng mới vào database (tạm hiểu là thế)
+            if (enteredUserName.contains("@gmail.com"))
+                loginModel.add(
+                    User(
+                        email = enteredUserName,
+                        userName = "None",
+                        password = enteredPassword
                     )
-                else {
-                    LoginActivity.listUser.add(
-                        User(
-                            email = "None",
-                            userName = enteredUserName,
-                            password = enteredPassword
-                        )
+                )
+            else {
+                loginModel.add(
+                    User(
+                        email = "None",
+                        userName = enteredUserName,
+                        password = enteredPassword
                     )
-                }
-
-                parentFragmentManager.apply {
-
-                    val bundle = Bundle()
-                    bundle.putString("userName", enteredUserName)
-                    setFragmentResult("result_to_fragment_login", bundle)
-                    popBackStack()
-                }
+                )
+            }
 
-                Toast.makeText(context, "Đăng ký thành công, mời đăng nhập!", Toast.LENGTH_LONG)
-                    .show()
+            parentFragmentManager.apply {
+                val bundle = Bundle()
+                bundle.putString("userName", enteredUserName)
+                //set dữ liệu kèm theo requesKey để trả dữ liệu về cho LoginFragment - đang lắng nghe
+                setFragmentResult("result_to_fragment_login", bundle)
+                //set dữ liệu trả về xong thì mới popBackStack()
+                popBackStack()
             }
+
+            Toast.makeText(context, "Đăng ký thành công, mời đăng nhập!", Toast.LENGTH_LONG)
+                .show()
         }
+    }
 
-        return binding.root
+    private fun resetPasswordEditText() {
+        binding.apply {
+            edtEnteredPassword.setText("")
+            edtConfirmedPassword.setText("")
+            edtEnteredPassword.requestFocus()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/model/LoginModel.kt b/app/src/main/java/com/sudo/androidd20/model/LoginModel.kt
new file mode 100644
index 0000000..0e41fda
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/model/LoginModel.kt
@@ -0,0 +1,22 @@
+package com.sudo.androidd20.model
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.sudo.androidd20.data.User
+
+class LoginModel : ViewModel() {
+    private val _users = MutableLiveData<MutableList<User>>(
+        mutableListOf(
+            User(
+                email = "sankatana02@gmail.com",
+                userName = "S4ltF1sh",
+                password = "123456"
+            )
+        )
+    )
+    val users: LiveData<MutableList<User>> get() = _users
+    fun add(newUser: User) {
+        _users.value?.add(newUser)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3245b74..19db6bf 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView 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/fragment_container"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1ee0c1d..5c80ac4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,59 +8,54 @@
     android:weightSum="1"
     tools:context=".MainActivity">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.5"
-        android:gravity="center"
-        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/tv_userName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:textSize="24sp"
-            android:hint="User name"/>
+    <TextView
+        android:id="@+id/tv_username"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginTop="120dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="User name"
+        android:textSize="24sp"
+        android:text=""/>
 
-        <TextView
-            android:id="@+id/tv_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:textSize="24sp"
-            android:hint="Real name"/>
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="Real name"
+        android:textSize="24sp" />
 
-        <TextView
-            android:id="@+id/tv_age"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:textSize="24sp"
-            android:hint="Age"/>
-    </LinearLayout>
+    <TextView
+        android:id="@+id/tv_age"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="Age"
+        android:textSize="24sp" />
 
     <View
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        android:layout_weight="0.4" />
+        android:layout_weight="0.6" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/tv_btn_logOut"
+        android:id="@+id/btn_log_out"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginStart="45dp"
         android:layout_marginEnd="45dp"
         android:background="@drawable/custom_button2"
-        android:text="@string/btn_log_out"/>
+        android:gravity="center"
+        android:text="@string/btn_log_out" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 30c2e61..1080a7f 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
     android:background="@drawable/custom_background"
-    android:orientation="vertical"
-    android:weightSum="1"
     tools:context=".fragment.LogInFragment">
 
     <TextView
@@ -14,89 +12,77 @@
         style="@style/TextAppearance.MaterialComponents.Headline6"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="0.25"
         android:gravity="center"
         android:text="@string/tv_login"
         android:textColor="@color/white"
-        android:textSize="36sp" />
+        android:textSize="36sp"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="60dp"/>
 
-    <LinearLayout
+    <EditText
+        android:id="@+id/edt_enter_email"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.3"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/edt_enterEmail"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:hint="@string/enter_your_email"
-            android:inputType="textEmailAddress" />
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="@string/enter_your_email"
+        android:inputType="textEmailAddress"
+        app:layout_constraintTop_toBottomOf="@+id/tv_login"
+        android:layout_marginTop="60dp"/>
 
-        <EditText
-            android:id="@+id/edt_enterPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:hint="@string/password"
-            android:inputType="textPassword" />
-    </LinearLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <EditText
+        android:id="@+id/edt_enter_password"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.45">
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="@string/password"
+        android:inputType="textPassword"
+        app:layout_constraintTop_toBottomOf="@+id/edt_enter_email" />
 
-        <TextView
-            android:id="@+id/tv_bnt_logIn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="80dp"
-            android:background="@drawable/custom_ripple"
-            android:clickable="true"
-            android:focusable="true"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:shadowColor="@color/black"
-            android:text="@string/btn_login"
-            android:textSize="24sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:elevation="2dp"/>
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/btn_login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="80dp"
+        android:background="@drawable/custom_ripple"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:shadowColor="@color/black"
+        android:text="@string/btn_login"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="240dp"/>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="36dp"
-            android:text="@string/dont_have_account"
-            android:textColor="@color/black"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toTopOf="@+id/tv_btn_signUp"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_btn_signUp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="36dp"
-            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" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="36dp"
+        android:text="@string/dont_have_account"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_sign_up"
+        app:layout_constraintEnd_toEndOf="parent" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:id="@+id/tv_sign_up"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="36dp"
+        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" />
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml
index c1b280c..3dd4e58 100644
--- a/app/src/main/res/layout/fragment_sign_up.xml
+++ b/app/src/main/res/layout/fragment_sign_up.xml
@@ -1,110 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
     android:background="@drawable/custom_background"
-    android:orientation="vertical"
-    android:weightSum="1"
     tools:context=".fragment.LogInFragment">
 
     <TextView
-        android:id="@+id/tv_signUp"
+        android:id="@+id/tv_sign_up"
         style="@style/TextAppearance.MaterialComponents.Headline6"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="0.25"
+        android:layout_marginTop="60dp"
         android:gravity="center"
         android:text="@string/tv_sign_up"
         android:textColor="@color/white"
-        android:textSize="36sp" />
+        android:textSize="36sp"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <LinearLayout
+    <EditText
+        android:id="@+id/edt_email_or_username"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.3"
-        android:orientation="vertical">
-
-        <EditText
-            android:id="@+id/edt_emailOrUsername"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:hint="@string/email_or_username"
-            android:inputType="textEmailAddress" />
-
-        <EditText
-            android:id="@+id/edt_enterPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:hint="@string/password"
-            android:inputType="textPassword" />
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginTop="60dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="@string/email_or_username"
+        android:inputType="textEmailAddress"
+        app:layout_constraintTop_toBottomOf="@+id/tv_sign_up" />
 
-        <EditText
-            android:id="@+id/edt_confirmPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="45dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="45dp"
-            android:autofillHints="true"
-            android:hint="@string/confirm_password"
-            android:inputType="textPassword" />
-    </LinearLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <EditText
+        android:id="@+id/edt_entered_password"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="0.45">
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="@string/password"
+        android:inputType="textPassword"
+        app:layout_constraintTop_toBottomOf="@+id/edt_email_or_username" />
 
-        <TextView
-            android:id="@+id/tv_btn_singUp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="80dp"
-            android:background="@drawable/custom_ripple"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:text="@string/btn_sign_up"
-            android:textSize="24sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:elevation="2dp"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="36dp"
-            android:text="@string/already_have_an_account"
-            android:textColor="@color/black"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toTopOf="@+id/tv_btn_login"
-            app:layout_constraintEnd_toEndOf="parent" />
+    <EditText
+        android:id="@+id/edt_confirmed_password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="45dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="45dp"
+        android:autofillHints="true"
+        android:hint="@string/confirm_password"
+        android:inputType="textPassword"
+        app:layout_constraintTop_toBottomOf="@+id/edt_entered_password" />
 
-        <TextView
-            android:id="@+id/tv_btn_login"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="36dp"
-            android:layout_marginBottom="16dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:text="@string/tv_btn_log_in"
-            android:textColor="@color/black"
-            android:textSize="26sp"
-            android:textStyle="italic"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/btn_signup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="240dp"
+        android:layout_marginBottom="80dp"
+        android:background="@drawable/custom_ripple"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:shadowColor="@color/black"
+        android:text="@string/btn_sign_up"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="36dp"
+        android:text="@string/already_have_an_account"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_btn_login"
+        app:layout_constraintEnd_toEndOf="parent" />
 
-</LinearLayout>
\ No newline at end of file
+    <TextView
+        android:id="@+id/tv_btn_login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="36dp"
+        android:layout_marginBottom="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/tv_btn_log_in"
+        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

From fc59febb79e37ee326bb6fd86f8b987f33c26623 Mon Sep 17 00:00:00 2001
From: S4ltF1sh <sankatana100@gmail.com>
Date: Thu, 28 Jul 2022 19:18:22 +0700
Subject: [PATCH 8/9] =?UTF-8?q?giao=20ti=E1=BA=BFp=20gi=E1=BB=AFa=20Host?=
 =?UTF-8?q?=20Activity=20v=E1=BB=9Bi=20c=C3=A1c=20Fragment=20b=E1=BA=B1ng?=
 =?UTF-8?q?=20interface=20v=C3=A0=20callback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/vcs.xml                                 |  1 +
 app/build.gradle                              |  4 ++-
 .../java/com/sudo/androidd20/LoginActivity.kt | 26 ++++++++++++--
 .../sudo/androidd20/fragment/LogInFragment.kt | 28 ++++++++++++---
 .../androidd20/fragment/SignUpFragment.kt     | 34 +++++++++++++++++--
 app/src/main/res/layout/activity_login.xml    |  5 ++-
 app/src/main/res/navigation/nav_graph.xml     | 33 ++++++++++++++++++
 7 files changed, 121 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/navigation/nav_graph.xml

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..25f82e9 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/GitHub" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e50c283..8f39471 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,6 +44,8 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation "androidx.fragment:fragment-ktx:1.5.0"
+    implementation "androidx.fragment:fragment-ktx:1.5.1"
     implementation("androidx.room:room-ktx:2.4.2")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.5.1")
+    implementation("androidx.navigation:navigation-ui-ktx:2.5.1")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/LoginActivity.kt b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
index 4d8c179..901d61c 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
@@ -9,10 +9,16 @@ import androidx.fragment.app.commit
 import com.sudo.androidd20.data.User
 import com.sudo.androidd20.databinding.ActivityLoginBinding
 import com.sudo.androidd20.fragment.LogInFragment
+import com.sudo.androidd20.fragment.SignUpFragment
 import com.sudo.androidd20.model.LoginModel
 
-class LoginActivity : AppCompatActivity() {
+class LoginActivity : AppCompatActivity(), LogInFragment.GetUsersListListener,
+    SignUpFragment.UpdateUsersListListener {
     private val loginModel: LoginModel by viewModels()
+    private lateinit var listUser: MutableList<User>
+
+    val getUsersList = { -> listUser }
+    val addUser = { user: User -> listUser.add(user) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -30,7 +36,15 @@ class LoginActivity : AppCompatActivity() {
 
     //mục đích chính là load dữ liệu người dùng từ database nên em đặt tên thế này
     private fun loadUsersData() {
-        loginModel.add(
+//        loginModel.add(
+//            User(
+//                email = "admin",
+//                userName = "admin",
+//                password = "admin"
+//            )
+//        )
+
+        listUser = mutableListOf(
             User(
                 email = "admin",
                 userName = "admin",
@@ -40,4 +54,12 @@ class LoginActivity : AppCompatActivity() {
 
         Log.i("LoginModel", "add S4ltF1sh!")
     }
+
+    override fun getUsersList(): MutableList<User> {
+        return listUser
+    }
+
+    override fun addUser(user: User) {
+        listUser.add(user)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
index 3028929..a6dd958 100644
--- a/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
@@ -1,5 +1,6 @@
 package com.sudo.androidd20.fragment
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
@@ -12,6 +13,7 @@ import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
+import androidx.navigation.fragment.findNavController
 import com.sudo.androidd20.LoginActivity
 import com.sudo.androidd20.MainActivity
 import com.sudo.androidd20.R
@@ -24,6 +26,17 @@ class LogInFragment : Fragment() {
     private val loginModel: LoginModel by activityViewModels()
     private lateinit var listUser: MutableList<User>
 
+    interface GetUsersListListener {
+        fun getUsersList(): MutableList<User>
+    }
+
+    private lateinit var getUsersListListener: GetUsersListListener
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        getUsersListListener = context as GetUsersListListener
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -55,19 +68,26 @@ class LogInFragment : Fragment() {
     }
 
     private fun changeToSignUpFragment() {
+        //với transaction
         parentFragmentManager.apply {
             beginTransaction()
                 .replace(R.id.fragment_container, SignUpFragment())
                 .addToBackStack(null)
                 .commit()
         }
+
+        //Với nav graph
+        //findNavController().navigate(R.id.action_logInFragment_to_signUpFragment)
     }
 
     private fun login() {
-        loginModel.users.observe(viewLifecycleOwner, Observer<MutableList<User>> {
-            listUser = it
-            Log.i("LoginModel", "$it")
-        })
+//        loginModel.users.observe(viewLifecycleOwner, Observer<MutableList<User>> {
+//            listUser = it
+//            Log.i("LoginModel", "$it")
+//        })
+
+        listUser = getUsersListListener.getUsersList()
+
         val enteredEmail = binding.edtEnterEmail.text.toString()
         val enteredPassword = binding.edtEnterPassword.text.toString()
 
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
index a2d5324..3adc7f1 100644
--- a/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
@@ -1,5 +1,6 @@
 package com.sudo.androidd20.fragment
 
+import android.content.Context
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
@@ -18,6 +19,17 @@ class SignUpFragment : Fragment() {
     private lateinit var binding: FragmentSignUpBinding
     private val loginModel: LoginModel by activityViewModels()
 
+    interface UpdateUsersListListener {
+        fun addUser(user: User)
+    }
+
+    private lateinit var updateUsersListListener: UpdateUsersListListener
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        updateUsersListListener = context as UpdateUsersListListener
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -60,8 +72,26 @@ class SignUpFragment : Fragment() {
             resetPasswordEditText()
         } else {
             //thực hiện việc thêm người dùng mới vào database (tạm hiểu là thế)
+//            if (enteredUserName.contains("@gmail.com"))
+//                loginModel.add(
+//                    User(
+//                        email = enteredUserName,
+//                        userName = "None",
+//                        password = enteredPassword
+//                    )
+//                )
+//            else {
+//                loginModel.add(
+//                    User(
+//                        email = "None",
+//                        userName = enteredUserName,
+//                        password = enteredPassword
+//                    )
+//                )
+//            }
+
             if (enteredUserName.contains("@gmail.com"))
-                loginModel.add(
+                updateUsersListListener.addUser(
                     User(
                         email = enteredUserName,
                         userName = "None",
@@ -69,7 +99,7 @@ class SignUpFragment : Fragment() {
                     )
                 )
             else {
-                loginModel.add(
+                updateUsersListListener.addUser(
                     User(
                         email = "None",
                         userName = enteredUserName,
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 19db6bf..1c6f581 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.fragment.app.FragmentContainerView 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/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    app:defaultNavHost="true"
+    app:navGraph="@navigation/nav_graph"
     tools:context=".LoginActivity">
 
-</androidx.fragment.app.FragmentContainerView>
\ No newline at end of file
+</androidx.fragment.app.FragmentContainerView>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..250b809
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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/nav_graph"
+    app:startDestination="@id/logInFragment">
+
+    <fragment
+        android:id="@+id/logInFragment"
+        android:name="com.sudo.androidd20.fragment.LogInFragment"
+        android:label="fragment_login"
+        tools:layout="@layout/fragment_login" >
+        <action
+            android:id="@+id/action_logInFragment_to_signUpFragment"
+            app:destination="@id/signUpFragment" />
+        <action
+            android:id="@+id/action_logInFragment_to_mainActivity"
+            app:destination="@id/mainActivity" />
+    </fragment>
+    <fragment
+        android:id="@+id/signUpFragment"
+        android:name="com.sudo.androidd20.fragment.SignUpFragment"
+        android:label="SignUpFragment" >
+        <action
+            android:id="@+id/action_signUpFragment_to_logInFragment"
+            app:destination="@id/logInFragment" />
+    </fragment>
+    <activity
+        android:id="@+id/mainActivity"
+        android:name="com.sudo.androidd20.MainActivity"
+        android:label="activity_main"
+        tools:layout="@layout/activity_main" />
+</navigation>
\ No newline at end of file

From 86f2ab95eb4783b5ba93302a6103ebda9ac08cc1 Mon Sep 17 00:00:00 2001
From: S4ltF1sh <sankatana100@gmail.com>
Date: Thu, 28 Jul 2022 21:37:43 +0700
Subject: [PATCH 9/9] =?UTF-8?q?s=E1=BB=AD=20d=E1=BB=A5ng=20getActivity()?=
 =?UTF-8?q?=20=C4=91=E1=BB=83=20l=E1=BA=A5y=20d=E1=BB=AF=20li=E1=BB=87u=20?=
 =?UTF-8?q?t=E1=BB=AB=20Host=20Activity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sudo/androidd20/LoginActivity.kt | 25 ++++-----
 .../java/com/sudo/androidd20/MainActivity.kt  |  4 --
 .../sudo/androidd20/fragment/LogInFragment.kt | 34 +++++-------
 .../androidd20/fragment/SignUpFragment.kt     | 52 +++++++++++++------
 .../sudo/androidd20/viewmodel/LoginModel.kt   | 22 ++++++++
 5 files changed, 84 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/java/com/sudo/androidd20/viewmodel/LoginModel.kt

diff --git a/app/src/main/java/com/sudo/androidd20/LoginActivity.kt b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
index 901d61c..63a7020 100644
--- a/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/LoginActivity.kt
@@ -3,23 +3,16 @@ package com.sudo.androidd20
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
-import androidx.activity.viewModels
 import androidx.fragment.app.add
 import androidx.fragment.app.commit
 import com.sudo.androidd20.data.User
-import com.sudo.androidd20.databinding.ActivityLoginBinding
 import com.sudo.androidd20.fragment.LogInFragment
-import com.sudo.androidd20.fragment.SignUpFragment
-import com.sudo.androidd20.model.LoginModel
 
-class LoginActivity : AppCompatActivity(), LogInFragment.GetUsersListListener,
-    SignUpFragment.UpdateUsersListListener {
-    private val loginModel: LoginModel by viewModels()
+class LoginActivity : AppCompatActivity()/*, LogInFragment.GetUsersListListener,
+    SignUpFragment.UpdateUsersListListener*/ {
+    //private val loginModel: LoginModel by viewModels()
     private lateinit var listUser: MutableList<User>
 
-    val getUsersList = { -> listUser }
-    val addUser = { user: User -> listUser.add(user) }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
@@ -55,11 +48,19 @@ class LoginActivity : AppCompatActivity(), LogInFragment.GetUsersListListener,
         Log.i("LoginModel", "add S4ltF1sh!")
     }
 
-    override fun getUsersList(): MutableList<User> {
+//    override fun getUsersList(): MutableList<User> {
+//        return listUser
+//    }
+//
+//    override fun addUser(user: User) {
+//        listUser.add(user)
+//    }
+
+    public fun getUsersList(): MutableList<User> {
         return listUser
     }
 
-    override fun addUser(user: User) {
+    public fun updateUsersList(user: User) {
         listUser.add(user)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sudo/androidd20/MainActivity.kt b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
index b9dad40..ae00901 100644
--- a/app/src/main/java/com/sudo/androidd20/MainActivity.kt
+++ b/app/src/main/java/com/sudo/androidd20/MainActivity.kt
@@ -2,13 +2,9 @@ package com.sudo.androidd20
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModel
 import com.sudo.androidd20.data.User
 import com.sudo.androidd20.databinding.ActivityMainBinding
-import com.sudo.androidd20.model.LoginModel
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
index a6dd958..ede6d94 100644
--- a/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/fragment/LogInFragment.kt
@@ -1,41 +1,34 @@
 package com.sudo.androidd20.fragment
 
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.activity.viewModels
-import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
-import androidx.navigation.fragment.findNavController
 import com.sudo.androidd20.LoginActivity
 import com.sudo.androidd20.MainActivity
 import com.sudo.androidd20.R
 import com.sudo.androidd20.data.User
 import com.sudo.androidd20.databinding.FragmentLoginBinding
-import com.sudo.androidd20.model.LoginModel
 
 class LogInFragment : Fragment() {
     private lateinit var binding: FragmentLoginBinding
-    private val loginModel: LoginModel by activityViewModels()
-    private lateinit var listUser: MutableList<User>
-
-    interface GetUsersListListener {
-        fun getUsersList(): MutableList<User>
-    }
 
-    private lateinit var getUsersListListener: GetUsersListListener
+    //    private val loginModel: LoginModel by activityViewModels()
+    private lateinit var listUser: MutableList<User>
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        getUsersListListener = context as GetUsersListListener
-    }
+//    interface GetUsersListListener {
+//        fun getUsersList(): MutableList<User>
+//    }
+//
+//    private lateinit var getUsersListListener: GetUsersListListener
+//
+//    override fun onAttach(context: Context) {
+//        super.onAttach(context)
+//        getUsersListListener = context as GetUsersListListener
+//    }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -86,7 +79,8 @@ class LogInFragment : Fragment() {
 //            Log.i("LoginModel", "$it")
 //        })
 
-        listUser = getUsersListListener.getUsersList()
+//        listUser = getUsersListListener.getUsersList()
+        listUser = (activity as LoginActivity).getUsersList()
 
         val enteredEmail = binding.edtEnterEmail.text.toString()
         val enteredPassword = binding.edtEnterPassword.text.toString()
diff --git a/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
index 3adc7f1..5a5070a 100644
--- a/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
+++ b/app/src/main/java/com/sudo/androidd20/fragment/SignUpFragment.kt
@@ -8,27 +8,26 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.commit
 import com.sudo.androidd20.LoginActivity
-import com.sudo.androidd20.R
+import com.sudo.androidd20.MainActivity
 import com.sudo.androidd20.data.User
 import com.sudo.androidd20.databinding.FragmentSignUpBinding
-import com.sudo.androidd20.model.LoginModel
+import com.sudo.androidd20.viewmodel.LoginModel
 
 class SignUpFragment : Fragment() {
     private lateinit var binding: FragmentSignUpBinding
-    private val loginModel: LoginModel by activityViewModels()
-
-    interface UpdateUsersListListener {
-        fun addUser(user: User)
-    }
-
-    private lateinit var updateUsersListListener: UpdateUsersListListener
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        updateUsersListListener = context as UpdateUsersListListener
-    }
+//    private val loginModel: LoginModel by activityViewModels()
+//
+//    interface UpdateUsersListListener {
+//        fun addUser(user: User)
+//    }
+//
+//    private lateinit var updateUsersListListener: UpdateUsersListListener
+//
+//    override fun onAttach(context: Context) {
+//        super.onAttach(context)
+//        updateUsersListListener = context as UpdateUsersListListener
+//    }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -88,10 +87,28 @@ class SignUpFragment : Fragment() {
 //                        password = enteredPassword
 //                    )
 //                )
+//            }
+
+//            if (enteredUserName.contains("@gmail.com"))
+//                updateUsersListListener.addUser(
+//                    User(
+//                        email = enteredUserName,
+//                        userName = "None",
+//                        password = enteredPassword
+//                    )
+//                )
+//            else {
+//                updateUsersListListener.addUser(
+//                    User(
+//                        email = "None",
+//                        userName = enteredUserName,
+//                        password = enteredPassword
+//                    )
+//                )
 //            }
 
             if (enteredUserName.contains("@gmail.com"))
-                updateUsersListListener.addUser(
+                (activity as LoginActivity).updateUsersList(
                     User(
                         email = enteredUserName,
                         userName = "None",
@@ -99,7 +116,8 @@ class SignUpFragment : Fragment() {
                     )
                 )
             else {
-                updateUsersListListener.addUser(
+                (activity as LoginActivity).updateUsersList(
+
                     User(
                         email = "None",
                         userName = enteredUserName,
diff --git a/app/src/main/java/com/sudo/androidd20/viewmodel/LoginModel.kt b/app/src/main/java/com/sudo/androidd20/viewmodel/LoginModel.kt
new file mode 100644
index 0000000..bd8ba5b
--- /dev/null
+++ b/app/src/main/java/com/sudo/androidd20/viewmodel/LoginModel.kt
@@ -0,0 +1,22 @@
+package com.sudo.androidd20.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.sudo.androidd20.data.User
+
+class LoginModel : ViewModel() {
+    private val _users = MutableLiveData<MutableList<User>>(
+        mutableListOf(
+            User(
+                email = "sankatana02@gmail.com",
+                userName = "S4ltF1sh",
+                password = "123456"
+            )
+        )
+    )
+    val users: LiveData<MutableList<User>> get() = _users
+    fun add(newUser: User) {
+        _users.value?.add(newUser)
+    }
+}
\ No newline at end of file