diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index bd02285..97ff4fa 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AppInsightsSettings">
-    <option name="selectedTabId" value="Android Vitals" />
+    <option name="selectedTabId" value="Firebase Crashlytics" />
     <option name="tabSettings">
       <map>
         <entry key="Firebase Crashlytics">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6e07f12..e01684d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,7 +1,10 @@
+import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
+
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsKotlinAndroid)
     alias(libs.plugins.googleServices)
+    alias(libs.plugins.firebaseCrashlytics)
     id("androidx.navigation.safeargs.kotlin")
     id("kotlin-kapt")
     id("kotlin-parcelize")
@@ -9,12 +12,12 @@ plugins {
 
 android {
     namespace = "com.pixel.toctalk"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.pixel.toctalk"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
@@ -29,18 +32,31 @@ android {
                 "proguard-rules.pro",
             )
         }
+        getByName("release") {
+            // Add this extension
+            configure<CrashlyticsExtension> {
+                // Enable processing and uploading of native symbols to Firebase servers.
+                // By default, this is disabled to improve build speeds.
+                // This flag must be enabled to see properly-symbolicated native
+                // stack traces in the Crashlytics dashboard.
+                nativeSymbolUploadEnabled = true
+                unstrippedNativeLibsDir = "build/intermediates/merged_native_libs/release/out/lib"
+            }
+        }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
     buildFeatures {
         viewBinding = true
         dataBinding = true
     }
+    buildToolsVersion = "35.0.0"
+    ndkVersion = "28.0.12674087 rc2"
 }
 
 dependencies {
@@ -49,6 +65,7 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
     implementation(libs.androidx.activity)
+    implementation(libs.androidx.activity.ktx)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.lifecycle.livedata.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.ktx)
@@ -56,13 +73,12 @@ dependencies {
     implementation(libs.androidx.navigation.fragment.ktx)
     implementation(libs.androidx.navigation.ui.ktx)
     implementation(libs.androidx.legacy.support.v4)
-    implementation(project(":domain"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 
     // LeakCanary
-    debugImplementation(libs.leakcanary.android)
+    // debugImplementation(libs.leakcanary.android)
 
     // Firebase
     implementation(platform(libs.firebase.bom))
@@ -77,5 +93,13 @@ dependencies {
     implementation(libs.androidx.viewpager2)
 
     // imagePicker
-    implementation(libs.image.picker)
+    implementation(libs.imagepicker)
+
+    // touchImageView
+
+    implementation(libs.touch.imageview)
+
+    // koin
+
+    implementation(libs.bundles.koin)
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b92c365..49be6f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+
     <!-- internet permission -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- Media permission -->
@@ -10,43 +11,56 @@
         android:maxSdkVersion="32" /> <!-- Devices running Android 13 (API level 33) or higher -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <!-- To handle the reselection within the app on Android 14 (API level 34) -->
-    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" /> <!-- Camera permission -->
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
 
     <application
+        android:name=".app.TokTalkApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.TocTalk"
         tools:targetApi="31">
+        <service
+            android:name=".ui.services.NotificationService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
         <activity
-            android:name=".ui.home.MainActivity"
-            android:exported="false" />
-        <activity
-            android:name=".ui.auth.AuthHostActivity"
+            android:name=".app.MainActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.SplashActivity"
+            android:name=".auth.presentation.AuthHostActivity"
             android:exported="true">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+
             </intent-filter>
         </activity>
-        <!--TODO: Solve package unresolved-->
-        <!-- <service android:name="com.google.android.gms.metadata.ModuleDependencies"
-             android:enabled="false"
-             android:exported="false"
-             tools:ignore="MissingClass">
-             <intent-filter>
-                 <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
-             </intent-filter>
-             <meta-data android:name="photopicker_activity:0:required" android:value="" />
-         </service>-->
+        <!--<activity
+            android:name=".ui.SplashActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>-->
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/pixel/toctalk/app/TokTalkApp.kt b/app/src/main/java/com/pixel/toctalk/app/TokTalkApp.kt
new file mode 100644
index 0000000..ed77bad
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/app/TokTalkApp.kt
@@ -0,0 +1,18 @@
+package com.pixel.toctalk.app
+
+import android.app.Application
+import com.pixel.toctalk.di.appModule
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.core.context.startKoin
+
+class TokTalkApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        startKoin {
+            androidContext(this@TokTalkApp)
+            androidLogger()
+            modules(appModule)
+        }
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/data/AuthenticationFirebaseDataSource.kt b/app/src/main/java/com/pixel/toctalk/auth/data/AuthenticationFirebaseDataSource.kt
new file mode 100644
index 0000000..339c9ce
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/data/AuthenticationFirebaseDataSource.kt
@@ -0,0 +1,261 @@
+package com.pixel.toctalk.auth.data
+
+import android.net.Uri
+import android.util.Log
+import com.google.firebase.Firebase
+import com.google.firebase.FirebaseNetworkException
+import com.google.firebase.Timestamp
+import com.google.firebase.auth.FirebaseAuthEmailException
+import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException
+import com.google.firebase.auth.FirebaseAuthInvalidUserException
+import com.google.firebase.auth.FirebaseAuthUserCollisionException
+import com.google.firebase.auth.FirebaseAuthWeakPasswordException
+import com.google.firebase.auth.UserProfileChangeRequest
+import com.google.firebase.auth.auth
+import com.google.firebase.firestore.firestore
+import com.google.firebase.storage.storage
+import com.pixel.toctalk.auth.domain.AuthenticationRepository
+import com.pixel.toctalk.auth.domain.models.AuthUser
+import com.pixel.toctalk.core.Constants
+import com.pixel.toctalk.core.data.models.UserDto
+import com.pixel.toctalk.core.domain.util.AuthError
+import com.pixel.toctalk.core.domain.util.Result
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class AuthenticationFirebaseDataSource : AuthenticationRepository {
+    private val auth = Firebase.auth
+    private val firestore = Firebase.firestore
+    private val storageRef = Firebase.storage.reference
+
+    override suspend fun login(
+        email: String,
+        password: String,
+    ): Result<AuthUser, AuthError> =
+        suspendCoroutine { continuation ->
+            auth
+                .signInWithEmailAndPassword(
+                    email,
+                    password,
+                ).addOnCompleteListener { task ->
+                    val result =
+                        if (task.isSuccessful) {
+                            val firebaseUser = task.result.user
+                            Result.Success(
+                                AuthUser(
+                                    uid = firebaseUser?.uid,
+                                    profilePic = firebaseUser?.photoUrl,
+                                    displayName = firebaseUser?.displayName,
+                                    email = firebaseUser?.email,
+                                ),
+                            )
+                        } else {
+                            Log.e("login", "${task.exception}")
+                            val error =
+                                when (task.exception) {
+                                    is FirebaseAuthEmailException -> AuthError.INVALID_EMAIL
+                                    is FirebaseAuthInvalidUserException -> AuthError.USER_NOT_FOUND
+                                    is FirebaseAuthInvalidCredentialsException -> AuthError.WRONG_EMAIL_OR_PASSWORD
+                                    is FirebaseNetworkException -> AuthError.NETWORK_ERROR
+                                    else -> AuthError.UNKNOWN
+                                }
+                            Result.Error(error)
+                        }
+                    continuation.resume(result)
+                }
+        }
+
+    override suspend fun createAccount(
+        email: String,
+        password: String,
+    ): Result<AuthUser, AuthError> =
+        suspendCoroutine { continuation ->
+            auth
+                .createUserWithEmailAndPassword(
+                    email,
+                    password,
+                ).addOnCompleteListener { task ->
+                    val result =
+                        if (task.isSuccessful) {
+                            val firebaseUser = task.result.user
+                            Result.Success(
+                                AuthUser(
+                                    uid = firebaseUser?.uid,
+                                    profilePic = firebaseUser?.photoUrl,
+                                    displayName = firebaseUser?.displayName,
+                                    email = firebaseUser?.email,
+                                    isEmailVerified = firebaseUser?.isEmailVerified ?: false,
+                                ),
+                            )
+                        } else {
+                            val error =
+                                when (task.exception) {
+                                    is FirebaseAuthEmailException -> AuthError.INVALID_EMAIL
+                                    is FirebaseAuthWeakPasswordException -> AuthError.WEAK_PASSWORD
+                                    is FirebaseNetworkException -> AuthError.NETWORK_ERROR
+                                    is FirebaseAuthUserCollisionException -> AuthError.EMAIL_ALREADY_IN_USE
+                                    else -> AuthError.UNKNOWN
+                                }
+                            Result.Error(error)
+                        }
+                    continuation.resume(result)
+                }
+        }
+
+    override suspend fun updateProfile(
+        userName: String,
+        userImage: Uri?,
+    ): Result<AuthUser, AuthError> =
+        suspendCoroutine { continuation ->
+            val profileUpdates =
+                UserProfileChangeRequest
+                    .Builder()
+                    .setDisplayName(userName)
+                    .setPhotoUri(userImage)
+                    .build()
+            auth.currentUser
+                ?.updateProfile(profileUpdates)
+                ?.addOnCompleteListener { task ->
+                    val result =
+                        if (task.isSuccessful) {
+                            val firebaseUser = auth.currentUser
+                            Log.d("Auth: updateProfile", "$firebaseUser")
+//                            firebaseUser?.photoUrl?.let { image ->
+//                                uploadUserImage(firebaseUser.uid, image)
+//                            }
+                            Result.Success(
+                                AuthUser(
+                                    uid = firebaseUser?.uid,
+                                    profilePic = firebaseUser?.photoUrl,
+                                    displayName = firebaseUser?.displayName,
+                                    email = firebaseUser?.email,
+                                    isEmailVerified = firebaseUser?.isEmailVerified ?: false,
+                                ),
+                            )
+                        } else {
+                            val error =
+                                when (task.exception) {
+                                    is FirebaseAuthEmailException -> AuthError.INVALID_EMAIL
+                                    is FirebaseAuthWeakPasswordException -> AuthError.WEAK_PASSWORD
+                                    is FirebaseNetworkException -> AuthError.NETWORK_ERROR
+                                    else -> AuthError.UNKNOWN
+                                }
+                            Result.Error(error)
+                        }
+                    continuation.resume(result)
+                }
+        }
+
+    override suspend fun uploadUserImageToStorage(
+        uid: String,
+        image: Uri,
+    ): String =
+        suspendCoroutine { continuation ->
+            val imageRef = storageRef.child("${Constants.USER_IMAGE_PATH}/$uid")
+            val uploadedImage =
+                imageRef
+                    .putFile(image)
+                    .addOnSuccessListener {
+                        imageRef.downloadUrl.addOnSuccessListener {
+                            continuation.resume(it.toString())
+                        }
+                    }
+        }
+
+    override suspend fun createUserInFireStore(authUser: AuthUser): Result<Boolean, AuthError> =
+        suspendCoroutine { continuation ->
+            firestore
+                .collection(Constants.COLLECTION_USERS)
+                .document(authUser.uid.toString())
+                .set(
+                    UserDto(
+                        uid = authUser.uid.toString(),
+                        displayName = authUser.displayName.toString(),
+                        emailAddress = authUser.email.toString(),
+                        phoneNumber = null,
+                        profilePic = authUser.profilePic.toString(),
+                        bio = null,
+                        friendsList = emptyList(),
+                        friendsRequestList = emptyList(),
+                        isOnline = true,
+                        isEmailVerified = authUser.isEmailVerified,
+                        isPhoneNumberVerified = false,
+                        createdAt = Timestamp.now(),
+                    ),
+                ).addOnCompleteListener { task ->
+                    val result =
+                        if (task.isSuccessful) {
+                            Log.d("Auth: CreateUserInFireStore", "${task.isSuccessful}")
+                            Result.Success(true)
+                        } else {
+                            Log.e("Auth: CreateUserInFireStore", "${task.exception}")
+                            val error = AuthError.UNKNOWN
+                            Result.Error(error)
+                        }
+                    continuation.resume(result)
+                }
+        }
+
+    override suspend fun sendResetPasswordCodeWithEmail(email: String): Result<Boolean?, AuthError> =
+        suspendCoroutine { continuation ->
+            auth.sendPasswordResetEmail(email).addOnCompleteListener { task ->
+                val result =
+                    if (task.isSuccessful) {
+                        Result.Success(true)
+                    } else {
+                        Log.e("Auth: SendResetPasswordCode", "${task.exception}")
+                        val error =
+                            when (task.exception) {
+                                is FirebaseAuthInvalidCredentialsException -> AuthError.USER_NOT_FOUND
+                                is FirebaseNetworkException -> AuthError.NETWORK_ERROR
+                                else -> AuthError.UNKNOWN
+                            }
+                        Result.Error(error)
+                    }
+                continuation.resume(result)
+            }
+        }
+
+    override suspend fun confirmResetPasswordCode(code: String): Result<Boolean, AuthError> =
+        suspendCoroutine { continuation ->
+            auth.checkActionCode(code).addOnCompleteListener { task ->
+                val result =
+                    if (task.isSuccessful) {
+                        Result.Success(true)
+                    } else {
+                        val error =
+                            when (task.exception) {
+                                is FirebaseAuthInvalidCredentialsException -> AuthError.INVALID_CODE
+                                is FirebaseNetworkException -> AuthError.NETWORK_ERROR
+                                else -> AuthError.UNKNOWN
+                            }
+                        Result.Error(error)
+                    }
+                continuation.resume(result)
+            }
+        }
+
+    override suspend fun resetPassword(
+        resetCode: String,
+        newPassword: String,
+    ): Result<Boolean, AuthError> =
+        suspendCoroutine { continuation ->
+            auth
+                .confirmPasswordReset(
+                    resetCode,
+                    newPassword,
+                ).addOnCompleteListener { task ->
+                    val result =
+                        if (task.isSuccessful) {
+                            Result.Success(true)
+                        } else {
+                            val error =
+                                when (task.exception) {
+                                    else -> AuthError.UNKNOWN
+                                }
+                            Result.Error(error)
+                        }
+                    continuation.resume(result)
+                }
+        }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/domain/AuthenticationRepository.kt b/app/src/main/java/com/pixel/toctalk/auth/domain/AuthenticationRepository.kt
new file mode 100644
index 0000000..450f899
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/domain/AuthenticationRepository.kt
@@ -0,0 +1,39 @@
+package com.pixel.toctalk.auth.domain
+
+import android.net.Uri
+import com.pixel.toctalk.auth.domain.models.AuthUser
+import com.pixel.toctalk.core.domain.util.AuthError
+import com.pixel.toctalk.core.domain.util.Result
+
+interface AuthenticationRepository {
+    suspend fun login(
+        email: String,
+        password: String,
+    ): Result<AuthUser, AuthError>
+
+    suspend fun createAccount(
+        email: String,
+        password: String,
+    ): Result<AuthUser, AuthError>
+
+    suspend fun updateProfile(
+        userName: String,
+        userImage: Uri?,
+    ): Result<AuthUser, AuthError>
+
+    suspend fun createUserInFireStore(authUser: AuthUser): Result<Boolean, AuthError>
+
+    suspend fun sendResetPasswordCodeWithEmail(email: String): Result<Boolean?, AuthError>
+
+    suspend fun confirmResetPasswordCode(code: String): Result<Boolean, AuthError>
+
+    suspend fun resetPassword(
+        resetCode: String,
+        newPassword: String,
+    ): Result<Boolean, AuthError>
+
+    suspend fun uploadUserImageToStorage(
+        uid: String,
+        image: Uri,
+    ): String
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/domain/models/AuthUser.kt b/app/src/main/java/com/pixel/toctalk/auth/domain/models/AuthUser.kt
new file mode 100644
index 0000000..ba06448
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/domain/models/AuthUser.kt
@@ -0,0 +1,11 @@
+package com.pixel.toctalk.auth.domain.models
+
+import android.net.Uri
+
+data class AuthUser(
+    val uid: String? = null,
+    val profilePic: Uri? = null,
+    val displayName: String? = null,
+    val email: String? = null,
+    val isEmailVerified: Boolean = false,
+)
diff --git a/app/src/main/java/com/pixel/toctalk/auth/domain/usecase/ValidationUseCase.kt b/app/src/main/java/com/pixel/toctalk/auth/domain/usecase/ValidationUseCase.kt
new file mode 100644
index 0000000..50509ae
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/domain/usecase/ValidationUseCase.kt
@@ -0,0 +1,56 @@
+package com.pixel.toctalk.auth.domain.usecase
+
+import com.pixel.toctalk.auth.domain.util.ValidationError
+
+class ValidationUseCase {
+    fun isValidUserName(userName: String?): ValidationError =
+        if (userName.isNullOrEmpty() || userName.length < 3) {
+            ValidationError.USERNAME_OUT_OF_RANGE
+        } else {
+            ValidationError.NONE
+        }
+
+    fun isValidEmail(email: String): ValidationError {
+        val emailRegex = Regex("[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}")
+        return if (emailRegex.matches(email)) {
+            ValidationError.NONE
+        } else {
+            ValidationError.INVALID_EMAIL
+        }
+    }
+
+//    fun isValidPhoneNumber(phoneNumber: String): ValidationError {
+//        return if (phoneNumber.length == 10) {
+//            phoneNumber[0] == '1' &&
+//                    arrayOf(
+//                        '0',
+//                        '1',
+//                        '2',
+//                        '5',
+//                    ).contains(phoneNumber[1])
+//        } else {
+//            ValidationError.NONE
+//        }
+//    }
+
+    fun isValidPassword(password: String): ValidationError {
+        val passwordRegex =
+            Regex("^(?=.*[A-Za-z])(?=.*\\d)(?=.*[@\$!%*#?&])[A-Za-z\\d@\$!%*#?&]{8,}$")
+        return if (passwordRegex.matches(password)) {
+            ValidationError.NONE
+        } else {
+            ValidationError.INVALID_PASSWORD
+        }
+    }
+
+//    fun isValidConfirmPassword(
+//        password: String?,
+//        confirmPassword: String?,
+//    ): Boolean {
+//        return if (password.isNullOrEmpty() && confirmPassword.isNullOrEmpty()) {
+//            false
+//        } else {
+//            password == confirmPassword
+//        }
+//    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/domain/util/ValidationError.kt b/app/src/main/java/com/pixel/toctalk/auth/domain/util/ValidationError.kt
new file mode 100644
index 0000000..fa5dd40
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/domain/util/ValidationError.kt
@@ -0,0 +1,12 @@
+package com.pixel.toctalk.auth.domain.util
+
+enum class ValidationError {
+    EMPTY_EMAIL,
+    EMPTY_PASSWORD,
+    EMPTY_USERNAME,
+    INVALID_EMAIL,
+    INVALID_PASSWORD,
+    UNMATCHED_PASSWORD,
+    USERNAME_OUT_OF_RANGE,
+    NONE,
+}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/AuthHostActivity.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/AuthHostActivity.kt
similarity index 77%
rename from app/src/main/java/com/pixel/toctalk/ui/auth/AuthHostActivity.kt
rename to app/src/main/java/com/pixel/toctalk/auth/presentation/AuthHostActivity.kt
index b9cac76..123a9c7 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/AuthHostActivity.kt
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/AuthHostActivity.kt
@@ -1,4 +1,4 @@
-package com.pixel.toctalk.ui.auth
+package com.pixel.toctalk.auth.presentation
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -9,7 +9,6 @@ import com.pixel.toctalk.R
 import com.pixel.toctalk.databinding.ActivityAuthHostBinding
 
 class AuthHostActivity : AppCompatActivity() {
-
     private lateinit var binding: ActivityAuthHostBinding
     private lateinit var navController: NavController
 
@@ -26,9 +25,10 @@ class AuthHostActivity : AppCompatActivity() {
             supportFragmentManager.findFragmentById(R.id.auth_fragment_container) as NavHostFragment
         navController = navHostFragment.navController
         setupActionBarWithNavController(navController)
+        navController.addOnDestinationChangedListener { _, _, _ ->
+            supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_left_chevron)
+        }
     }
 
-    override fun onSupportNavigateUp(): Boolean {
-        return navController.navigateUp() || super.onSupportNavigateUp()
-    }
+    override fun onSupportNavigateUp(): Boolean = navController.navigateUp() || super.onSupportNavigateUp()
 }
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/InputState.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/InputState.kt
similarity index 80%
rename from app/src/main/java/com/pixel/toctalk/ui/auth/fragment/InputState.kt
rename to app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/InputState.kt
index 9f49c69..311127d 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/InputState.kt
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/InputState.kt
@@ -1,4 +1,4 @@
-package com.pixel.toctalk.ui.auth.fragment
+package com.pixel.toctalk.auth.presentation.fragment
 
 sealed class InputState {
     data object UsernameInput : InputState()
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/CreateAccountContract.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/CreateAccountContract.kt
new file mode 100644
index 0000000..7276c9d
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/CreateAccountContract.kt
@@ -0,0 +1,19 @@
+package com.pixel.toctalk.auth.presentation.fragment.createAccount
+
+import android.net.Uri
+
+data class CreateAccountState(
+    val isLoading: Boolean = false,
+)
+
+sealed interface CreateAccountAction {
+    data class Register(
+        val email: String,
+        val password: String,
+    ) : CreateAccountAction
+
+    data class UpdateUserData(
+        val username: String,
+        val userImage: Uri?,
+    ) : CreateAccountAction
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/RegisterViewEvent.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/RegisterViewEvent.kt
new file mode 100644
index 0000000..749ffdb
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/RegisterViewEvent.kt
@@ -0,0 +1,17 @@
+package com.pixel.toctalk.auth.presentation.fragment.createAccount
+
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.core.domain.util.AuthError
+
+sealed class RegisterViewEvent {
+    data class Navigate(
+        val uid: String? = null,
+    ) : RegisterViewEvent()
+
+    data class Error(
+        val authError: AuthError? = null,
+        val emailValidationError: ValidationError = ValidationError.NONE,
+        val passwordValidationError: ValidationError = ValidationError.NONE,
+        val nameValidationError: ValidationError = ValidationError.NONE,
+    ) : RegisterViewEvent()
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/RegisterViewModel.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/RegisterViewModel.kt
new file mode 100644
index 0000000..378eda1
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/RegisterViewModel.kt
@@ -0,0 +1,330 @@
+package com.pixel.toctalk.auth.presentation.fragment.createAccount
+
+import android.net.Uri
+import android.util.Log
+import androidx.core.net.toUri
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.pixel.toctalk.auth.domain.AuthenticationRepository
+import com.pixel.toctalk.auth.domain.usecase.ValidationUseCase
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.core.domain.util.SingleLiveEvent
+import com.pixel.toctalk.core.domain.util.onError
+import com.pixel.toctalk.core.domain.util.onSuccess
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class RegisterViewModel(
+    private val authRepository: AuthenticationRepository,
+    private val validationUseCase: ValidationUseCase,
+) : ViewModel() {
+//    private val _currentUser: MutableStateFlow<User> =
+//        MutableStateFlow(
+//            User(),
+//        )
+//    val currentUser: StateFlow<User> = _currentUser.asStateFlow()
+
+    private val _stateFlow: MutableStateFlow<CreateAccountState> =
+        MutableStateFlow(CreateAccountState())
+
+    val stateFlow: StateFlow<CreateAccountState> = _stateFlow.asStateFlow()
+
+    private val _event = SingleLiveEvent<RegisterViewEvent>()
+    val event: LiveData<RegisterViewEvent> = _event
+
+    fun handleAction(action: CreateAccountAction) {
+        when (action) {
+            is CreateAccountAction.Register -> {
+                createAccount(
+                    email = action.email,
+                    password = action.password,
+                )
+            }
+
+            is CreateAccountAction.UpdateUserData -> {
+                updateProfile(
+                    username = action.username,
+                    profilePic = action.userImage,
+                )
+            }
+        }
+    }
+
+    private fun createAccount(
+        email: String,
+        password: String,
+    ) {
+        val emailError = validationUseCase.isValidEmail(email)
+        val passwordError = validationUseCase.isValidPassword(password)
+
+        if (emailError != ValidationError.NONE || passwordError != ValidationError.NONE) {
+            _event.postValue(
+                RegisterViewEvent.Error(
+                    emailValidationError = emailError,
+                    passwordValidationError = passwordError,
+                ),
+            )
+            return
+        }
+
+        _stateFlow.update {
+            it.copy(
+                isLoading = true,
+            )
+        }
+
+        viewModelScope.launch {
+            authRepository
+                .createAccount(
+                    email = email,
+                    password = password,
+                ).onSuccess { user ->
+                    // _currentUser.value = user
+//                    _currentUser.update {
+//                        it.copy(
+//                            uid = user.uid,
+//                            email = user.email,
+//                            isEmailVerified = user.isEmailVerified,
+//                        )
+//                    }
+                    _event.postValue(RegisterViewEvent.Navigate(user.uid))
+                }.onError { error ->
+                    _event.postValue(
+                        RegisterViewEvent.Error(
+                            authError = error,
+                        ),
+                    )
+                }.also {
+                    _stateFlow.update {
+                        it.copy(
+                            isLoading = false,
+                        )
+                    }
+                }
+        }
+    }
+
+    private fun updateProfile(
+        username: String,
+        profilePic: Uri?,
+    ) {
+        val usernameError = validationUseCase.isValidUserName(username)
+
+        if (usernameError != ValidationError.NONE) {
+            _event.postValue(
+                RegisterViewEvent.Error(
+                    nameValidationError = usernameError,
+                ),
+            )
+            return
+        }
+
+        _stateFlow.update {
+            it.copy(
+                isLoading = true,
+            )
+        }
+
+        viewModelScope.launch {
+            authRepository
+                .updateProfile(username, profilePic)
+                .onSuccess { user ->
+//                    _currentUser.update {
+//                        it.copy(
+//                            displayName = user.displayName,
+//                            profilePic = user.profilePic,
+//                        )
+//                    }
+                    val profilePicUrl =
+                        profilePic?.let {
+                            authRepository.uploadUserImageToStorage(user.uid.toString(), it)
+                        }
+                    authRepository
+                        .createUserInFireStore(user.copy(profilePic = profilePicUrl?.toUri()))
+                        .onSuccess { isCreated ->
+                            if (isCreated) {
+                                _event.postValue(RegisterViewEvent.Navigate(user.uid))
+                            } else {
+                                Log.d("TAG", "createUserInFireStore: Error")
+                            }
+                        }.onError { error ->
+                            // TODO: Handle error
+                            Log.d("TAG", "createUserInFireStore: $error")
+                        }.also {
+                            _stateFlow.update {
+                                it.copy(
+                                    isLoading = false,
+                                )
+                            }
+                        }
+                }.onError { error ->
+                    _event.postValue(
+                        RegisterViewEvent.Error(
+                            authError = error,
+                        ),
+                    )
+                }.also {
+                    _stateFlow.update {
+                        it.copy(
+                            isLoading = false,
+                        )
+                    }
+                }
+        }
+    }
+
+    /*fun onRegisterClick() {
+        if (isLoading.value == true) return
+        // if (!isValid()) return
+        isLoading.value = true
+        auth
+            .createUserWithEmailAndPassword(
+                emailLiveData.value!!,
+                passwordLiveData.value!!,
+            ).addOnCompleteListener { task ->
+                if (task.isSuccessful) {
+                    val user = task.result.user
+                    createUserInDB(user!!.uid)
+                } else {
+                    isLoading.value = false
+                    _messageDialogModelDialog.value =
+                        MessageDialogModel(
+                            message =
+                                task.exception?.localizedMessage
+                                    ?: "Unable to create new account",
+                        )
+                }
+            }
+    }*/
+
+    /*private fun createUserInDB(uid: String) {
+        if (userProfilePicLiveData.value != null) {
+            UserMdb.uploadUserPic(uid, userProfilePicLiveData.value) {
+                if (it.isSuccessful) {
+                    val user =
+                        User(
+                            uid = uid,
+                            username = usernameLiveData.value!!,
+                            email = emailLiveData.value!!,
+                            profilePic = it.result.toString(),
+                        )
+                    UserMdb
+                        .createUser(user) { task ->
+                            isLoading.value = false
+                            if (task.isSuccessful) {
+                                _event.value = RegisterViewEvent.NavigateToLogin
+                            } else {
+                                _messageDialogModelDialog.value =
+                                    MessageDialogModel(
+                                        message =
+                                            task.exception?.localizedMessage
+                                                ?: "Unable to create new account\nPlease try again",
+                                    )
+                            }
+                        }
+                } else {
+                    _messageDialogModelDialog.value =
+                        MessageDialogModel(
+                            message =
+                                it.exception?.localizedMessage
+                                    ?: "Unable to upload this photo",
+                            posActionName = "Ok",
+                        )
+                }
+            }
+        } else {
+            val user =
+                User(
+                    uid = uid,
+                    username = usernameLiveData.value!!,
+                    email = emailLiveData.value!!,
+                )
+            UserMdb
+                .createUser(user) { task ->
+                    isLoading.value = false
+                    if (task.isSuccessful) {
+                        _event.value = RegisterViewEvent.NavigateToLogin
+                    } else {
+                        _messageDialogModelDialog.value =
+                            MessageDialogModel(
+                                message =
+                                    task.exception?.localizedMessage
+                                        ?: "Unable to create new account\nPlease try again",
+                            )
+                    }
+                }
+        }
+    }*/
+
+//    private fun isValid(): Boolean {
+//        var isValid = true
+//        if (!(isValidInput(usernameLiveData.value, InputState.UsernameInput))) isValid = false
+//        if (!(isValidInput(emailLiveData.value, InputState.EmailInput))) isValid = false
+//        if (!(isValidInput(passwordLiveData.value, InputState.PasswordInput))) isValid = false
+//        if (!(
+//                isValidInput(
+//                    passwordConfirmationLiveData.value,
+//                    InputState.PasswordConfirmationInput,
+//                )
+//            )
+//        ) {
+//            isValid = false
+//        }
+//        return isValid
+//    }
+//
+//    fun isValidInput(
+//        input: CharSequence?,
+//        inputType: InputState,
+//    ): Boolean {
+//        var isValid = true
+//        when (inputType) {
+//            is InputState.UsernameInput -> {
+//                if (input.isNullOrEmpty()) {
+//                    usernameError.value = "Username required"
+//                    isValid = false
+//                } else {
+//                    usernameError.value = null
+//                }
+//            }
+//
+//            is InputState.EmailInput -> {
+//                if (input.isNullOrEmpty()) {
+//                    emailError.value = "Email required"
+//                    isValid = false
+//                } else {
+//                    emailError.value = null
+//                }
+//            }
+//
+//            is InputState.PasswordInput -> {
+//                if (input.isNullOrEmpty()) {
+//                    passwordError.value = "Password required"
+//                    isValid = false
+//                } else if (input.length < 6) {
+//                    passwordError.value = "Password length over 6"
+//                    isValid = false
+//                } else {
+//                    passwordError.value = null
+//                }
+//            }
+//
+//            is InputState.PasswordConfirmationInput -> {
+//                if (input.isNullOrEmpty()) {
+//                    passwordConfirmationError.value = "Confirm password required"
+//                    isValid = false
+//                } else if (input != passwordLiveData.value) {
+//                    passwordConfirmationError.value = "Password doesn't match"
+//                    isValid = false
+//                } else {
+//                    passwordConfirmationError.value = null
+//                }
+//            }
+//        }
+//        return isValid
+//    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/completeProfile/CompleteProfileFragment.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/completeProfile/CompleteProfileFragment.kt
new file mode 100644
index 0000000..810e24a
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/completeProfile/CompleteProfileFragment.kt
@@ -0,0 +1,141 @@
+package com.pixel.toctalk.auth.presentation.fragment.createAccount.completeProfile
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.github.dhaval2404.imagepicker.ImagePicker
+import com.pixel.toctalk.R
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.auth.presentation.fragment.createAccount.CreateAccountAction
+import com.pixel.toctalk.auth.presentation.fragment.createAccount.RegisterViewEvent
+import com.pixel.toctalk.auth.presentation.fragment.createAccount.RegisterViewModel
+import com.pixel.toctalk.core.permission.RequestMediaPermission
+import com.pixel.toctalk.core.presentation.BaseAuthFragment
+import com.pixel.toctalk.databinding.FragmentCompleteOfEditAccountBinding
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class CompleteProfileFragment : BaseAuthFragment<FragmentCompleteOfEditAccountBinding, RegisterViewModel>() {
+    private var _startForProfileImageResult: ActivityResultLauncher<Intent>? = null
+    private val startActivityForResult get() = _startForProfileImageResult!!
+
+    private var imageUri: Uri? = null
+
+    override fun initViewModel(): RegisterViewModel = viewModel<RegisterViewModel>().value
+
+    override fun getLayoutId(): Int = R.layout.fragment_complete_of_edit_account
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        initStartActivityForResult()
+        initViews()
+        observeData()
+    }
+
+    private fun initStartActivityForResult() {
+        _startForProfileImageResult =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+                val resultCode = result.resultCode
+                val data = result.data
+
+                when (resultCode) {
+                    Activity.RESULT_OK -> {
+                        imageUri = data?.data!!
+                        binding.openPic.setImageURI(imageUri)
+                        // viewModel.setProfilePic(imageUri)
+                    }
+
+                    ImagePicker.RESULT_ERROR -> {
+                        Toast
+                            .makeText(
+                                requireContext(),
+                                ImagePicker.getError(data),
+                                Toast.LENGTH_SHORT,
+                            ).show()
+                    }
+
+                    else -> {
+                        Toast
+                            .makeText(requireContext(), "Task Cancelled", Toast.LENGTH_SHORT)
+                            .show()
+                    }
+                }
+            }
+    }
+
+    private fun observeData() {
+        viewModel.event.observe(viewLifecycleOwner) { event ->
+            when (event) {
+                is RegisterViewEvent.Navigate -> navigateToHome(event.uid)
+                is RegisterViewEvent.Error -> {
+                    event.authError?.let {
+                        handleAuthError(event.authError)
+                    }
+                    handleUsernameError(event.nameValidationError)
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.stateFlow.collectLatest { state ->
+                    binding.isLoading = state.isLoading
+                }
+            }
+        }
+    }
+
+    private fun initViews() {
+        binding.changePic.setOnClickListener {
+            RequestMediaPermission.requestGalleryPermission(
+                requireActivity(),
+                this,
+                startActivityForResult,
+            )
+        }
+        binding.btnSaveChanges.setOnClickListener {
+            val username =
+                binding.username.text
+                    ?.toString()
+                    .orEmpty()
+
+            if (username.isEmpty()) {
+                handleUsernameError(ValidationError.EMPTY_USERNAME)
+                binding.username.requestFocus()
+                return@setOnClickListener
+            }
+            viewModel.handleAction(
+                CreateAccountAction.UpdateUserData(
+                    username = username,
+                    userImage = imageUri,
+                ),
+            )
+        }
+    }
+
+    private fun handleUsernameError(usernameError: ValidationError) {
+        binding.usernameField.error =
+            when (usernameError) {
+                ValidationError.EMPTY_USERNAME -> getString(R.string.field_is_required)
+                ValidationError.USERNAME_OUT_OF_RANGE -> getString(R.string.username_out_of_range)
+                else -> null
+            }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _startForProfileImageResult = null
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/register/RegisterFragment.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/register/RegisterFragment.kt
new file mode 100644
index 0000000..b58a547
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/createAccount/register/RegisterFragment.kt
@@ -0,0 +1,133 @@
+package com.pixel.toctalk.auth.presentation.fragment.createAccount.register
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.widget.doOnTextChanged
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import com.pixel.toctalk.R
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.auth.presentation.fragment.createAccount.CreateAccountAction
+import com.pixel.toctalk.auth.presentation.fragment.createAccount.RegisterViewEvent
+import com.pixel.toctalk.auth.presentation.fragment.createAccount.RegisterViewModel
+import com.pixel.toctalk.core.presentation.BaseAuthFragment
+import com.pixel.toctalk.databinding.FragmentRegisterBinding
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class RegisterFragment : BaseAuthFragment<FragmentRegisterBinding, RegisterViewModel>() {
+    override fun initViewModel(): RegisterViewModel = viewModel<RegisterViewModel>().value
+
+    override fun getLayoutId(): Int = R.layout.fragment_register
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews()
+        observeLiveData()
+    }
+
+    private fun observeLiveData() {
+        viewModel.event.observe(viewLifecycleOwner, ::onEventChange)
+        lifecycleScope.launch {
+            viewModel.stateFlow.collect { state ->
+                binding.isLoading = state.isLoading
+            }
+        }
+    }
+
+    private fun onEventChange(event: RegisterViewEvent) {
+        when (event) {
+            is RegisterViewEvent.Navigate -> {
+                findNavController()
+                    .navigate(R.id.action_registerFragment_to_completeProfileFragment)
+            }
+
+            is RegisterViewEvent.Error -> {
+                event.authError?.let { error ->
+                    handleAuthError(error)
+                }
+                handleEmailError(event.emailValidationError)
+                handlePasswordError(event.passwordValidationError)
+            }
+        }
+    }
+
+    private fun initViews() {
+        binding.regEmail.doOnTextChanged { email, _, _, _ ->
+            if (!email.isNullOrEmpty()) {
+                binding.regEmailField.error = null
+            }
+        }
+        binding.regPassword.doOnTextChanged { password, _, _, _ ->
+            if (!password.isNullOrEmpty()) {
+                binding.regPasswordField.error = null
+            }
+        }
+        binding.regPasswordConfirm.doOnTextChanged { confirmPassword, _, _, _ ->
+            if (!confirmPassword.isNullOrEmpty()) {
+                binding.regPasswordConfirmField.error = null
+            }
+        }
+
+        binding.btnRegister.setOnClickListener {
+            val email =
+                binding.regEmail.text
+                    ?.toString()
+                    .orEmpty()
+            val password =
+                binding.regPassword.text
+                    ?.toString()
+                    .orEmpty()
+            val confirmPassword =
+                binding.regPasswordConfirm.text
+                    ?.toString()
+                    .orEmpty()
+
+            val errors = mutableListOf<Pair<(ValidationError) -> Unit, ValidationError>>()
+
+            if (email.isEmpty()) errors.add(::handleEmailError to ValidationError.EMPTY_EMAIL)
+            if (password.isEmpty()) errors.add(::handlePasswordError to ValidationError.EMPTY_PASSWORD)
+            if (confirmPassword.isEmpty()) errors.add(::handlePasswordConfirmError to ValidationError.EMPTY_PASSWORD)
+            if (password.isNotEmpty() && confirmPassword.isNotEmpty() && password != confirmPassword) {
+                errors.add(::handlePasswordConfirmError to ValidationError.UNMATCHED_PASSWORD)
+            }
+
+            if (errors.isNotEmpty()) {
+                errors.forEach { (handler, error) -> handler(error) }
+                return@setOnClickListener
+            }
+
+            viewModel.handleAction(CreateAccountAction.Register(email, password))
+        }
+    }
+
+    private fun handlePasswordConfirmError(confirmPassword: ValidationError) {
+        binding.regPasswordConfirmField.error =
+            when (confirmPassword) {
+                ValidationError.EMPTY_PASSWORD -> getString(R.string.field_is_required)
+                ValidationError.UNMATCHED_PASSWORD -> getString(R.string.unmatched_password)
+                else -> null
+            }
+    }
+
+    private fun handlePasswordError(passwordError: ValidationError) {
+        binding.regPasswordField.error =
+            when (passwordError) {
+                ValidationError.EMPTY_PASSWORD -> getString(R.string.field_is_required)
+                ValidationError.INVALID_PASSWORD -> getString(R.string.invalid_password)
+                else -> null
+            }
+    }
+
+    private fun handleEmailError(emailError: ValidationError) {
+        binding.regEmailField.error =
+            when (emailError) {
+                ValidationError.EMPTY_EMAIL -> getString(R.string.field_is_required)
+                ValidationError.INVALID_EMAIL -> getString(R.string.invalid_email)
+                else -> null
+            }
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginContract.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginContract.kt
new file mode 100644
index 0000000..c715852
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginContract.kt
@@ -0,0 +1,12 @@
+package com.pixel.toctalk.auth.presentation.fragment.login
+
+data class LoginState(
+    val isLoading: Boolean = false,
+)
+
+sealed interface LoginAction {
+    data class Login(
+        val email: String,
+        val password: String,
+    ) : LoginAction
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginFragment.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginFragment.kt
new file mode 100644
index 0000000..9560301
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginFragment.kt
@@ -0,0 +1,120 @@
+package com.pixel.toctalk.auth.presentation.fragment.login
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.widget.doOnTextChanged
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import com.pixel.toctalk.R
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.core.presentation.BaseAuthFragment
+import com.pixel.toctalk.databinding.FragmentLoginBinding
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class LoginFragment : BaseAuthFragment<FragmentLoginBinding, LoginViewModel>() {
+    override fun initViewModel(): LoginViewModel = viewModel<LoginViewModel>().value
+
+    override fun getLayoutId(): Int = R.layout.fragment_login
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews()
+        observeLiveData()
+    }
+
+    private fun observeLiveData() {
+        viewModel.event.observe(viewLifecycleOwner) { event ->
+            when (event) {
+                is LoginViewEvent.NavigateToHome -> {
+                    val user = event.authUser
+                    navigateToHome(user.uid)
+                }
+
+                is LoginViewEvent.Error -> {
+                    event.authError?.let { error ->
+                        handleAuthError(error)
+                    }
+                    handleEmailError(event.emailValidationError)
+                    handlePasswordError(event.passwordValidationError)
+                }
+            }
+        }
+        lifecycleScope.launch {
+            viewModel.stateFlow.collect { state ->
+                binding.isLoading = state.isLoading
+            }
+        }
+    }
+
+    private fun handlePasswordError(passwordError: ValidationError) {
+        binding.logPasswordField.error =
+            when (passwordError) {
+                ValidationError.EMPTY_PASSWORD -> getString(R.string.field_is_required)
+                else -> null
+            }
+    }
+
+    private fun handleEmailError(emailError: ValidationError) {
+        binding.logEmailField.error =
+            when (emailError) {
+                ValidationError.EMPTY_EMAIL -> getString(R.string.field_is_required)
+                ValidationError.INVALID_EMAIL -> getString(R.string.invalid_email)
+                else -> null
+            }
+    }
+
+    private fun initViews() {
+        binding.logEmail.doOnTextChanged { email, _, _, _ ->
+            if (!email.isNullOrEmpty()) {
+                binding.logEmailField.error = null
+            }
+        }
+        binding.logPassword.doOnTextChanged { password, _, _, _ ->
+            if (!password.isNullOrEmpty()) {
+                binding.logPasswordField.error = null
+            }
+        }
+        binding.btnLogin.setOnClickListener {
+            val email =
+                binding.logEmail.text
+                    ?.toString()
+                    .orEmpty()
+            val password =
+                binding.logPassword.text
+                    ?.toString()
+                    .orEmpty()
+
+            val errors = mutableListOf<Pair<(ValidationError) -> Unit, ValidationError>>()
+
+            if (email.isEmpty()) errors.add(::handleEmailError to ValidationError.EMPTY_EMAIL)
+            if (password.isEmpty()) errors.add(::handlePasswordError to ValidationError.EMPTY_PASSWORD)
+
+            if (errors.isNotEmpty()) {
+                errors.forEach { (handler, error) -> handler(error) }
+                return@setOnClickListener
+            }
+
+            viewModel.handleAction(LoginAction.Login(email, password))
+        }
+        binding.forgetPassword.setOnClickListener {
+            navigateToForgetPassword()
+        }
+        binding.createAccount.setOnClickListener {
+            navigateToRegister()
+        }
+    }
+
+    private fun navigateToForgetPassword() {
+        findNavController()
+            .navigate(R.id.action_loginFragment_to_sendResetPasswordCodeFragment)
+    }
+
+    private fun navigateToRegister() {
+        findNavController()
+            .navigate(R.id.action_loginFragment_to_registerFragment)
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginViewEvent.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginViewEvent.kt
new file mode 100644
index 0000000..082ba6d
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginViewEvent.kt
@@ -0,0 +1,17 @@
+package com.pixel.toctalk.auth.presentation.fragment.login
+
+import com.pixel.toctalk.auth.domain.models.AuthUser
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.core.domain.util.AuthError
+
+sealed class LoginViewEvent {
+    data class NavigateToHome(
+        val authUser: AuthUser,
+    ) : LoginViewEvent()
+
+    data class Error(
+        val authError: AuthError? = null,
+        val emailValidationError: ValidationError = ValidationError.NONE,
+        val passwordValidationError: ValidationError = ValidationError.NONE,
+    ) : LoginViewEvent()
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginViewModel.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginViewModel.kt
new file mode 100644
index 0000000..c22fa2f
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/login/LoginViewModel.kt
@@ -0,0 +1,89 @@
+package com.pixel.toctalk.auth.presentation.fragment.login
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.pixel.toctalk.auth.domain.AuthenticationRepository
+import com.pixel.toctalk.auth.domain.usecase.ValidationUseCase
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.core.domain.util.SingleLiveEvent
+import com.pixel.toctalk.core.domain.util.onError
+import com.pixel.toctalk.core.domain.util.onSuccess
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class LoginViewModel(
+    private val authRepository: AuthenticationRepository,
+    private val validationUseCase: ValidationUseCase,
+) : ViewModel() {
+    private val _stateFlow: MutableStateFlow<LoginState> = MutableStateFlow(LoginState())
+
+    val stateFlow: StateFlow<LoginState> = _stateFlow.asStateFlow()
+
+    private val _event = SingleLiveEvent<LoginViewEvent>()
+    val event: LiveData<LoginViewEvent> = _event
+
+    fun handleAction(action: LoginAction) {
+        when (action) {
+            is LoginAction.Login -> {
+                _stateFlow.update {
+                    it.copy(
+                        isLoading = true,
+                    )
+                }
+                login(action.email, action.password)
+            }
+        }
+    }
+
+    private fun login(
+        email: String,
+        password: String,
+    ) {
+        val emailError = validationUseCase.isValidEmail(email)
+        if (
+            emailError == ValidationError.NONE
+        ) {
+            viewModelScope.launch {
+                authRepository
+                    .login(
+                        email = email,
+                        password = password,
+                    ).onSuccess { user ->
+                        _stateFlow.update {
+                            it.copy(
+                                isLoading = false,
+                            )
+                        }
+                        _event.postValue(LoginViewEvent.NavigateToHome(user))
+                    }.onError { error ->
+                        _stateFlow.update {
+                            it.copy(
+                                isLoading = false,
+                            )
+                        }
+                        _event.postValue(
+                            LoginViewEvent.Error(
+                                authError = error,
+                            ),
+                        )
+                    }
+            }
+        } else {
+            _stateFlow.update {
+                it.copy(
+                    isLoading = false,
+                )
+            }
+
+            _event.postValue(
+                LoginViewEvent.Error(
+                    emailValidationError = emailError,
+                ),
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/ResetPasswordEvent.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/ResetPasswordEvent.kt
new file mode 100644
index 0000000..6cd1d8c
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/ResetPasswordEvent.kt
@@ -0,0 +1,13 @@
+package com.pixel.toctalk.auth.presentation.fragment.resetPassword
+
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.core.domain.util.AuthError
+
+sealed class ResetPasswordEvent {
+    data object NavigateToConfirmResetPasswordCode : ResetPasswordEvent()
+
+    data class Error(
+        val authError: AuthError? = null,
+        val emailValidationError: ValidationError = ValidationError.NONE,
+    ) : ResetPasswordEvent()
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/ResetPasswordViewModel.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/ResetPasswordViewModel.kt
new file mode 100644
index 0000000..9b54f40
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/ResetPasswordViewModel.kt
@@ -0,0 +1,57 @@
+package com.pixel.toctalk.auth.presentation.fragment.resetPassword
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.pixel.toctalk.auth.domain.AuthenticationRepository
+import com.pixel.toctalk.auth.domain.usecase.ValidationUseCase
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.core.domain.util.AuthError
+import com.pixel.toctalk.core.domain.util.SingleLiveEvent
+import com.pixel.toctalk.core.domain.util.onError
+import com.pixel.toctalk.core.domain.util.onSuccess
+import kotlinx.coroutines.launch
+
+class ResetPasswordViewModel(
+    private val authenticationRepository: AuthenticationRepository,
+    private val validationUseCase: ValidationUseCase,
+) : ViewModel() {
+    private val userEmail = MutableLiveData<String>()
+    private val resetPasswordCode = MutableLiveData<String>()
+
+    private val _event = SingleLiveEvent<ResetPasswordEvent>()
+    val event: LiveData<ResetPasswordEvent> = _event
+
+    fun sendResetPasswordCodeWithEmail() {
+        val emailValidationError = validationUseCase.isValidEmail(userEmail.value!!)
+        if (emailValidationError == ValidationError.NONE) {
+            viewModelScope.launch {
+                authenticationRepository
+                    .sendResetPasswordCodeWithEmail(userEmail.value!!)
+                    .onSuccess { isSent ->
+                        if (isSent == true) {
+                            _event.postValue(ResetPasswordEvent.NavigateToConfirmResetPasswordCode)
+                        } else {
+                            _event.postValue(ResetPasswordEvent.Error(AuthError.UNKNOWN))
+                        }
+                    }.onError { error ->
+                        _event.postValue(
+                            ResetPasswordEvent.Error(
+                                authError = error,
+                            ),
+                        )
+                    }
+            }
+        } else {
+            _event.value =
+                ResetPasswordEvent.Error(
+                    emailValidationError = emailValidationError,
+                )
+        }
+    }
+
+    fun updateEmail(email: CharSequence) {
+        userEmail.value = email.toString()
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/confirmCode/ConfirmPasswordResetCodeFragment.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/confirmCode/ConfirmPasswordResetCodeFragment.kt
new file mode 100644
index 0000000..1ed81b4
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/confirmCode/ConfirmPasswordResetCodeFragment.kt
@@ -0,0 +1,13 @@
+package com.pixel.toctalk.auth.presentation.fragment.resetPassword.confirmCode
+
+import com.pixel.toctalk.R
+import com.pixel.toctalk.auth.presentation.fragment.resetPassword.ResetPasswordViewModel
+import com.pixel.toctalk.core.presentation.BaseFragment
+import com.pixel.toctalk.databinding.FragmentConfirmPasswordResetCodeBinding
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class ConfirmPasswordResetCodeFragment : BaseFragment<FragmentConfirmPasswordResetCodeBinding, ResetPasswordViewModel>() {
+    override fun initViewModel(): ResetPasswordViewModel = viewModel<ResetPasswordViewModel>().value
+
+    override fun getLayoutId(): Int = R.layout.fragment_confirm_password_reset_code
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/sendCode/SendResetPasswordCodeFragment.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/sendCode/SendResetPasswordCodeFragment.kt
new file mode 100644
index 0000000..5b4b161
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/sendCode/SendResetPasswordCodeFragment.kt
@@ -0,0 +1,87 @@
+package com.pixel.toctalk.auth.presentation.fragment.resetPassword.sendCode
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.core.widget.doOnTextChanged
+import androidx.navigation.fragment.findNavController
+import com.pixel.toctalk.R
+import com.pixel.toctalk.auth.domain.util.ValidationError
+import com.pixel.toctalk.auth.presentation.fragment.resetPassword.ResetPasswordEvent
+import com.pixel.toctalk.auth.presentation.fragment.resetPassword.ResetPasswordViewModel
+import com.pixel.toctalk.core.domain.util.AuthError
+import com.pixel.toctalk.core.presentation.BaseFragment
+import com.pixel.toctalk.databinding.FragmentSendResetPasswordCodeBinding
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class SendResetPasswordCodeFragment : BaseFragment<FragmentSendResetPasswordCodeBinding, ResetPasswordViewModel>() {
+    override fun initViewModel(): ResetPasswordViewModel = viewModel<ResetPasswordViewModel>().value
+
+    override fun getLayoutId(): Int = R.layout.fragment_send_reset_password_code
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        observeData()
+        binding.email.doOnTextChanged { email, _, _, _ ->
+            if (!email.isNullOrEmpty()) {
+                binding.emailField.error = null
+                viewModel.updateEmail(email)
+            }
+        }
+
+        binding.btnSendCode.setOnClickListener {
+            if (binding.email.text.isNullOrEmpty()) {
+                handleEmailError(ValidationError.EMPTY_EMAIL)
+                return@setOnClickListener
+            } else {
+                viewModel.sendResetPasswordCodeWithEmail()
+            }
+        }
+    }
+
+    private fun observeData() {
+        viewModel.event.observe(viewLifecycleOwner) { event ->
+            when (event) {
+                is ResetPasswordEvent.Error -> {
+                    event.authError?.let { error ->
+                        val errorMsg =
+                            when (error) {
+                                AuthError.INVALID_EMAIL -> getString(R.string.error_invalid_email)
+                                AuthError.USER_NOT_FOUND -> getString(R.string.error_user_not_found)
+                                AuthError.OPERATION_NOT_ALLOWED -> getString(R.string.error_operation_not_allowed)
+                                AuthError.USER_DISABLED -> getString(R.string.error_user_disabled)
+                                AuthError.NETWORK_ERROR -> getString(R.string.error_network)
+                                else -> getString(R.string.error_unexpected)
+                            }
+
+                        Toast
+                            .makeText(
+                                requireContext(),
+                                errorMsg,
+                                Toast.LENGTH_LONG,
+                            ).show()
+                    }
+
+                    handleEmailError(event.emailValidationError)
+                }
+
+                ResetPasswordEvent.NavigateToConfirmResetPasswordCode -> {
+                    findNavController()
+                        .navigate(R.id.action_sendResetPasswordCodeFragment_to_confirmPasswordResetCodeFragment)
+                }
+            }
+        }
+    }
+
+    private fun handleEmailError(emailError: ValidationError) {
+        binding.emailField.error =
+            when (emailError) {
+                ValidationError.EMPTY_EMAIL -> getString(R.string.field_is_required)
+                ValidationError.INVALID_EMAIL -> getString(R.string.invalid_email)
+                else -> null
+            }
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/updatePassword/UpdatePasswordFragment.kt b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/updatePassword/UpdatePasswordFragment.kt
new file mode 100644
index 0000000..b5c7b8d
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/auth/presentation/fragment/resetPassword/updatePassword/UpdatePasswordFragment.kt
@@ -0,0 +1,24 @@
+package com.pixel.toctalk.auth.presentation.fragment.resetPassword.updatePassword
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import com.pixel.toctalk.R
+import com.pixel.toctalk.auth.presentation.fragment.resetPassword.ResetPasswordViewModel
+
+class UpdatePasswordFragment : Fragment() {
+    companion object {
+        fun newInstance() = UpdatePasswordFragment()
+    }
+
+    private val viewModel: ResetPasswordViewModel by viewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View = inflater.inflate(R.layout.fragment_update_password, container, false)
+}
diff --git a/app/src/main/java/com/pixel/toctalk/core/data/models/UserDto.kt b/app/src/main/java/com/pixel/toctalk/core/data/models/UserDto.kt
new file mode 100644
index 0000000..ab4248e
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/core/data/models/UserDto.kt
@@ -0,0 +1,18 @@
+package com.pixel.toctalk.core.data.models
+
+import com.google.firebase.Timestamp
+
+data class UserDto(
+    val uid: String,
+    val displayName: String,
+    val emailAddress: String,
+    val phoneNumber: String?,
+    val profilePic: String?,
+    val bio: String?,
+    val friendsList: List<String>?,
+    val friendsRequestList: List<String>?,
+    val isOnline: Boolean,
+    val isEmailVerified: Boolean,
+    val isPhoneNumberVerified: Boolean,
+    val createdAt: Timestamp,
+)
diff --git a/app/src/main/java/com/pixel/toctalk/core/domain/util/SingleLiveEvent.kt b/app/src/main/java/com/pixel/toctalk/core/domain/util/SingleLiveEvent.kt
new file mode 100644
index 0000000..9ec59b4
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/core/domain/util/SingleLiveEvent.kt
@@ -0,0 +1,48 @@
+package com.pixel.toctalk.core.domain.util
+
+import android.util.Log
+import androidx.annotation.MainThread
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import java.util.concurrent.atomic.AtomicBoolean
+
+class SingleLiveEvent<T> : MutableLiveData<T>() {
+    private val mPending = AtomicBoolean(false)
+
+    @MainThread
+    override fun observe(
+        owner: LifecycleOwner,
+        observer: Observer<in T>,
+    ) {
+        if (hasActiveObservers()) {
+            Log.w(TAG, "Multiple observers registered but only one will be notified of changes.")
+        }
+        // Observe the internal MutableLiveData
+        super.observe(
+            owner,
+        ) { t: T ->
+            if (mPending.compareAndSet(true, false)) {
+                observer.onChanged(t)
+            }
+        }
+    }
+
+    @MainThread
+    override fun setValue(t: T?) {
+        mPending.set(true)
+        super.setValue(t)
+    }
+
+    /**
+     * Used for cases where T is Void, to make calls cleaner.
+     */
+    @MainThread
+    fun call() {
+        value = null
+    }
+
+    companion object {
+        private const val TAG = "SingleLiveEvent"
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/core/presentation/BaseAuthFragment.kt b/app/src/main/java/com/pixel/toctalk/core/presentation/BaseAuthFragment.kt
new file mode 100644
index 0000000..0887678
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/core/presentation/BaseAuthFragment.kt
@@ -0,0 +1,43 @@
+package com.pixel.toctalk.core.presentation
+
+import android.content.Intent
+import android.widget.Toast
+import androidx.lifecycle.ViewModel
+import androidx.viewbinding.ViewBinding
+import com.pixel.toctalk.R
+import com.pixel.toctalk.app.MainActivity
+import com.pixel.toctalk.core.Constants
+import com.pixel.toctalk.core.domain.util.AuthError
+
+abstract class BaseAuthFragment<VB : ViewBinding, VM : ViewModel> : BaseFragment<VB, VM>() {
+    fun navigateToHome(userId: String?) {
+        startActivity(
+            Intent(
+                requireContext(),
+                MainActivity::class.java,
+            ).putExtra(Constants.PARSE_USER, userId),
+        )
+        requireActivity().finish()
+    }
+
+    fun handleAuthError(error: AuthError) {
+        val errorMsg =
+            when (error) {
+                AuthError.INVALID_EMAIL -> getString(R.string.error_invalid_email)
+                AuthError.EMAIL_ALREADY_IN_USE -> getString(R.string.error_email_already_in_use)
+                AuthError.WRONG_EMAIL_OR_PASSWORD -> getString(R.string.error_wrong_email_or_password)
+                AuthError.USER_NOT_FOUND -> getString(R.string.error_user_not_found)
+                AuthError.OPERATION_NOT_ALLOWED -> getString(R.string.error_operation_not_allowed)
+                AuthError.USER_DISABLED -> getString(R.string.error_user_disabled)
+                AuthError.NETWORK_ERROR -> getString(R.string.error_network)
+                else -> getString(R.string.error_unexpected)
+            }
+
+        Toast
+            .makeText(
+                requireContext(),
+                errorMsg,
+                Toast.LENGTH_LONG,
+            ).show()
+    }
+}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/base/BaseFragment.kt b/app/src/main/java/com/pixel/toctalk/core/presentation/BaseFragment.kt
similarity index 95%
rename from app/src/main/java/com/pixel/toctalk/ui/base/BaseFragment.kt
rename to app/src/main/java/com/pixel/toctalk/core/presentation/BaseFragment.kt
index 9f04bc0..5e339d0 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/base/BaseFragment.kt
+++ b/app/src/main/java/com/pixel/toctalk/core/presentation/BaseFragment.kt
@@ -1,4 +1,4 @@
-package com.pixel.toctalk.ui.base
+package com.pixel.toctalk.core.presentation
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/pixel/toctalk/ui/base/BaseViewModel.kt b/app/src/main/java/com/pixel/toctalk/core/presentation/BaseViewModel.kt
similarity index 75%
rename from app/src/main/java/com/pixel/toctalk/ui/base/BaseViewModel.kt
rename to app/src/main/java/com/pixel/toctalk/core/presentation/BaseViewModel.kt
index 023c492..17655b8 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/base/BaseViewModel.kt
+++ b/app/src/main/java/com/pixel/toctalk/core/presentation/BaseViewModel.kt
@@ -1,9 +1,9 @@
-package com.pixel.toctalk.ui.base
+package com.pixel.toctalk.core.presentation
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.pixel.toctalk.ui.extensions.model.MessageDialogModel
+import com.pixel.toctalk.core.extensions.model.MessageDialogModel
 
 open class BaseViewModel : ViewModel() {
     protected val _messageDialogModelDialog = MutableLiveData<MessageDialogModel>()
diff --git a/app/src/main/java/com/pixel/toctalk/data/database/PrivateChatMdb.kt b/app/src/main/java/com/pixel/toctalk/data/database/PrivateChatMdb.kt
index 8e2b4f5..c9d5af6 100644
--- a/app/src/main/java/com/pixel/toctalk/data/database/PrivateChatMdb.kt
+++ b/app/src/main/java/com/pixel/toctalk/data/database/PrivateChatMdb.kt
@@ -2,13 +2,14 @@ package com.pixel.toctalk.data.database
 
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.firebase.Firebase
+import com.google.firebase.firestore.DocumentSnapshot
 import com.google.firebase.firestore.firestore
 import com.pixel.toctalk.Constants
 import com.pixel.toctalk.data.model.ChatMessage
 import com.pixel.toctalk.data.model.Contact
 
 object PrivateChatMdb {
-    fun createChat(contact: Contact, onComplete: OnCompleteListener<Void>) {
+    fun createChat(contact: Contact, onComplete: OnCompleteListener<DocumentSnapshot>) {
         Firebase
             .firestore
             .collection(Constants.COLLECTION_PRIVATE_CHAT)
@@ -18,13 +19,22 @@ object PrivateChatMdb {
             }
     }
 
-    private fun updateChatID(id: String, onComplete: OnCompleteListener<Void>) {
+    private fun updateChatID(id: String, onComplete: OnCompleteListener<DocumentSnapshot>) {
         Firebase
             .firestore
             .collection(Constants.COLLECTION_PRIVATE_CHAT)
             .document(id)
             .update(Contact.CHAT_ID_FIELD, id)
-            .addOnCompleteListener(onComplete)
+            .addOnCompleteListener {
+                if (it.isSuccessful) {
+                    Firebase
+                        .firestore
+                        .collection(Constants.COLLECTION_PRIVATE_CHAT)
+                        .document(id)
+                        .get()
+                        .addOnCompleteListener(onComplete)
+                }
+            }
     }
 
     fun updateLastMessage(id: String, docID: String, collection: String) {
@@ -37,15 +47,57 @@ object PrivateChatMdb {
                 .document(id)
                 .get()
                 .addOnCompleteListener {
+                    val chatMessage = it.result.toObject(ChatMessage::class.java)
                     Firebase
                         .firestore
                         .collection(collection)
                         .document(docID)
                         .update(
                             Contact.LAST_MESSAGE_FIELD,
-                            it.result.toObject(ChatMessage::class.java),
+                            chatMessage,
                         )
+                        .addOnCompleteListener { task ->
+                            if (task.isSuccessful) {
+                                Firebase
+                                    .firestore
+                                    .collection(collection)
+                                    .document(docID)
+                                    .update(
+                                        Contact.LAST_TIMESTAMP_FIELD,
+                                        chatMessage?.timestamp,
+                                    )
+                            }
+                        }
                 }
         }
     }
+
+    private fun deleteChat(chatID: String) {
+        Firebase
+            .firestore
+            .collection(Constants.COLLECTION_PRIVATE_CHAT)
+            .document(chatID)
+            .delete()
+            .addOnCompleteListener { if (it.isSuccessful) return@addOnCompleteListener }
+    }
+
+    fun checkIfChatEmpty(id: String?) {
+        getChat(id) { chatTask ->
+            if (chatTask.isSuccessful) {
+                val chat = chatTask.result.toObject(Contact::class.java)
+                if (chat?.lastMessage == null) {
+                    deleteChat(id!!)
+                }
+            }
+        }
+    }
+
+    private fun getChat(id: String?, onComplete: OnCompleteListener<DocumentSnapshot>) {
+        Firebase
+            .firestore
+            .collection(Constants.COLLECTION_PRIVATE_CHAT)
+            .document(id!!)
+            .get()
+            .addOnCompleteListener(onComplete)
+    }
 }
diff --git a/app/src/main/java/com/pixel/toctalk/data/model/Contact.kt b/app/src/main/java/com/pixel/toctalk/data/model/Contact.kt
index 7fb7899..528b876 100644
--- a/app/src/main/java/com/pixel/toctalk/data/model/Contact.kt
+++ b/app/src/main/java/com/pixel/toctalk/data/model/Contact.kt
@@ -1,17 +1,20 @@
 package com.pixel.toctalk.data.model
 
 import android.os.Parcelable
+import com.google.firebase.Timestamp
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class Contact(
     val id: String? = null,
     val lastMessage: ChatMessage? = null,
+    val lastTimestamp: Timestamp? = null,
     val usersID: List<String>? = null,
 ) : Parcelable {
     companion object {
         const val USERS_ID_FIELD = "usersID"
         const val CHAT_ID_FIELD = "id"
         const val LAST_MESSAGE_FIELD = "lastMessage"
+        const val LAST_TIMESTAMP_FIELD = "lastTimestamp"
     }
 }
diff --git a/app/src/main/java/com/pixel/toctalk/di/AppModule.kt b/app/src/main/java/com/pixel/toctalk/di/AppModule.kt
new file mode 100644
index 0000000..a4b0cf9
--- /dev/null
+++ b/app/src/main/java/com/pixel/toctalk/di/AppModule.kt
@@ -0,0 +1,23 @@
+package com.pixel.toctalk.di
+
+import com.pixel.toctalk.auth.data.AuthenticationFirebaseDataSource
+import com.pixel.toctalk.auth.domain.AuthenticationRepository
+import com.pixel.toctalk.auth.domain.usecase.ValidationUseCase
+import com.pixel.toctalk.auth.presentation.fragment.createAccount.RegisterViewModel
+import com.pixel.toctalk.auth.presentation.fragment.login.LoginViewModel
+import com.pixel.toctalk.auth.presentation.fragment.resetPassword.ResetPasswordViewModel
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.factoryOf
+import org.koin.core.module.dsl.singleOf
+import org.koin.core.module.dsl.viewModelOf
+import org.koin.dsl.module
+
+val appModule =
+    module {
+        singleOf(::AuthenticationFirebaseDataSource) { bind<AuthenticationRepository>() }
+        factoryOf(::ValidationUseCase)
+
+        viewModelOf(::LoginViewModel)
+        viewModelOf(::ResetPasswordViewModel)
+        viewModelOf(::RegisterViewModel)
+    }
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginFragment.kt b/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginFragment.kt
deleted file mode 100644
index 819aa86..0000000
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginFragment.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.pixel.toctalk.ui.auth.fragment.login
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import androidx.core.widget.doOnTextChanged
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import com.pixel.toctalk.Constants
-import com.pixel.toctalk.R
-import com.pixel.toctalk.data.model.User
-import com.pixel.toctalk.databinding.FragmentLoginBinding
-import com.pixel.toctalk.ui.auth.fragment.InputState
-import com.pixel.toctalk.ui.base.BaseFragment
-import com.pixel.toctalk.ui.extensions.showDialog
-import com.pixel.toctalk.ui.home.MainActivity
-
-class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>() {
-    override fun initViewModel(): LoginViewModel =
-        ViewModelProvider(this)[LoginViewModel::class.java]
-
-    override fun getLayoutId(): Int = R.layout.fragment_login
-
-    override fun onViewCreated(
-        view: View,
-        savedInstanceState: Bundle?,
-    ) {
-        super.onViewCreated(view, savedInstanceState)
-        initViews()
-        observeLiveData()
-    }
-
-    private fun observeLiveData() {
-        viewModel.messageDialogModelDialog.observe(viewLifecycleOwner) {
-            showDialog(it)
-        }
-        viewModel.event.observe(viewLifecycleOwner) { event ->
-            when (event) {
-                is LoginViewEvent.NavigateToHome -> {
-                    val user = event.user
-                    navigateToHome(user)
-                }
-            }
-        }
-    }
-
-    private fun navigateToHome(user: User) {
-        startActivity(
-            Intent(
-                requireContext(),
-                MainActivity::class.java,
-            ).putExtra(Constants.PARSE_USER, user),
-        )
-        requireActivity().finish()
-    }
-
-    private fun initViews() {
-        binding.vm = viewModel
-        binding.lifecycleOwner = this
-        binding.logEmail.doOnTextChanged { email, _, _, _ ->
-            viewModel.isValidInput(email, InputState.EmailInput)
-        }
-        binding.logPassword.doOnTextChanged { password, _, _, _ ->
-            viewModel.isValidInput(password, InputState.PasswordInput)
-        }
-        binding.createAccount.setOnClickListener {
-            navigateToRegister()
-        }
-    }
-
-    private fun navigateToRegister() {
-        findNavController()
-            .navigate(R.id.action_loginFragment_to_registerFragment)
-    }
-}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginViewEvent.kt b/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginViewEvent.kt
deleted file mode 100644
index 0b4de0f..0000000
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginViewEvent.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.pixel.toctalk.ui.auth.fragment.login
-
-import com.pixel.toctalk.data.model.User
-
-sealed class LoginViewEvent {
-
-    // data object NavigateToReg : LoginViewEvent()
-    data class NavigateToHome(val user: User) : LoginViewEvent()
-}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginViewModel.kt b/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginViewModel.kt
deleted file mode 100644
index 3483174..0000000
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/login/LoginViewModel.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.pixel.toctalk.ui.auth.fragment.login
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.google.firebase.Firebase
-import com.google.firebase.auth.auth
-import com.pixel.toctalk.data.database.UserMdb
-import com.pixel.toctalk.data.model.User
-import com.pixel.toctalk.ui.auth.fragment.InputState
-import com.pixel.toctalk.ui.base.BaseViewModel
-import com.pixel.toctalk.ui.extensions.model.MessageDialogModel
-
-class LoginViewModel : BaseViewModel() {
-    val emailLiveData = MutableLiveData<String>()
-    val emailError = MutableLiveData<String?>()
-    val passwordLiveData = MutableLiveData<String>()
-    val passwordError = MutableLiveData<String?>()
-    val auth = Firebase.auth
-    val isLoading = MutableLiveData(false)
-
-    private val _event = MutableLiveData<LoginViewEvent>()
-    val event: LiveData<LoginViewEvent> = _event
-
-    fun login() {
-        if (isLoading.value == true) return
-        if (!isValidInputs()) return
-        isLoading.value = true
-        auth.signInWithEmailAndPassword(
-            emailLiveData.value!!,
-            passwordLiveData.value!!,
-        ).addOnCompleteListener { task ->
-            if (task.isSuccessful) {
-                val user = task.result.user
-                getUser(user!!.uid)
-            } else {
-                isLoading.value = false
-                _messageDialogModelDialog.value = MessageDialogModel(
-                    message = task.exception?.localizedMessage ?: "Unable to Login",
-                )
-            }
-        }
-    }
-
-    private fun getUser(uid: String?) {
-        UserMdb
-            .getUser(uid) { task ->
-                isLoading.value = false
-                if (task.isSuccessful) {
-                    val user = task.result.toObject(User::class.java)
-                    _event.value = LoginViewEvent.NavigateToHome(user!!)
-                } else {
-                    _messageDialogModelDialog.value = MessageDialogModel(
-                        message = task.exception?.localizedMessage
-                            ?: "Unable to login\nPlease try again",
-                    )
-                }
-            }
-    }
-
-    private fun isValidInputs(): Boolean {
-        var isValid = true
-        if (!(isValidInput(emailLiveData.value, InputState.EmailInput))) isValid = false
-        if (!(isValidInput(passwordLiveData.value, InputState.PasswordInput))) isValid = false
-        return isValid
-    }
-
-    fun isValidInput(input: CharSequence?, inputType: InputState): Boolean {
-        var isValid = true
-        when (inputType) {
-            is InputState.EmailInput -> {
-                if (input.isNullOrEmpty()) {
-                    emailError.value = "Email required"
-                    isValid = false
-                } else {
-                    emailError.value = null
-                }
-            }
-
-            is InputState.PasswordInput -> {
-                if (input.isNullOrEmpty()) {
-                    passwordError.value = "Password required"
-                    isValid = false
-                } else {
-                    passwordError.value = null
-                }
-            }
-
-            else -> {}
-        }
-        return isValid
-    }
-}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterFragment.kt b/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterFragment.kt
deleted file mode 100644
index f6d8ebe..0000000
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterFragment.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.pixel.toctalk.ui.auth.fragment.register
-
-import android.os.Bundle
-import android.view.View
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.PickVisualMediaRequest
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.widget.doOnTextChanged
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import com.pixel.toctalk.R
-import com.pixel.toctalk.databinding.FragmentRegisterBinding
-import com.pixel.toctalk.ui.auth.fragment.InputState
-import com.pixel.toctalk.ui.base.BaseFragment
-import com.pixel.toctalk.ui.extensions.showDialog
-import com.pixel.toctalk.ui.permission.RequestMediaPermission
-
-class RegisterFragment : BaseFragment<FragmentRegisterBinding, RegisterViewModel>() {
-    override fun initViewModel(): RegisterViewModel =
-        ViewModelProvider(this)[RegisterViewModel::class.java]
-
-    override fun getLayoutId(): Int = R.layout.fragment_register
-
-    private lateinit var imagePicker: ActivityResultLauncher<PickVisualMediaRequest>
-
-    override fun onViewCreated(
-        view: View,
-        savedInstanceState: Bundle?,
-    ) {
-        super.onViewCreated(view, savedInstanceState)
-        imagePicker = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) {
-            viewModel.setProfilePic(it!!)
-        }
-        initViews()
-        observeLiveData()
-    }
-
-    private fun observeLiveData() {
-        viewModel.messageDialogModelDialog.observe(viewLifecycleOwner) {
-            showDialog(it)
-        }
-        viewModel.event.observe(viewLifecycleOwner, ::onEventChange)
-    }
-
-    private fun onEventChange(event: RegisterViewEvent) {
-        when (event) {
-            is RegisterViewEvent.NavigateToLogin -> {
-                findNavController().popBackStack()
-            }
-        }
-    }
-
-    private fun initViews() {
-        binding.vm = viewModel
-        binding.lifecycleOwner = this
-        binding.regUsername.doOnTextChanged { username, _, _, _ ->
-            viewModel.isValidInput(username, InputState.UsernameInput)
-        }
-        binding.regEmail.doOnTextChanged { email, _, _, _ ->
-            viewModel.isValidInput(email, InputState.EmailInput)
-        }
-        binding.regPassword.doOnTextChanged { password, _, _, _ ->
-            viewModel.isValidInput(password, InputState.PasswordInput)
-        }
-        binding.userProfilePic.setOnClickListener {
-            RequestMediaPermission.requestGalleryPermission(requireActivity(), this, imagePicker)
-        }
-    }
-}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterViewEvent.kt b/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterViewEvent.kt
deleted file mode 100644
index 56a613f..0000000
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterViewEvent.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pixel.toctalk.ui.auth.fragment.register
-
-sealed class RegisterViewEvent {
-    data object NavigateToLogin : RegisterViewEvent()
-}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterViewModel.kt b/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterViewModel.kt
deleted file mode 100644
index e22e9e5..0000000
--- a/app/src/main/java/com/pixel/toctalk/ui/auth/fragment/register/RegisterViewModel.kt
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.pixel.toctalk.ui.auth.fragment.register
-
-import android.net.Uri
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import com.google.firebase.Firebase
-import com.google.firebase.auth.auth
-import com.pixel.toctalk.data.database.UserMdb
-import com.pixel.toctalk.data.model.User
-import com.pixel.toctalk.ui.auth.fragment.InputState
-import com.pixel.toctalk.ui.base.BaseViewModel
-import com.pixel.toctalk.ui.extensions.model.MessageDialogModel
-
-class RegisterViewModel : BaseViewModel() {
-    val auth = Firebase.auth
-    val userProfilePicLiveData = MutableLiveData<Uri>()
-    val usernameLiveData = MutableLiveData<String>()
-    val usernameError = MutableLiveData<String?>()
-    val emailLiveData = MutableLiveData<String>()
-    val emailError = MutableLiveData<String?>()
-    val passwordLiveData = MutableLiveData<String>()
-    val passwordError = MutableLiveData<String?>()
-    val passwordConfirmationLiveData = MutableLiveData<String>()
-    val passwordConfirmationError = MutableLiveData<String?>()
-    val isLoading = MutableLiveData(false)
-
-    private val _event = MutableLiveData<RegisterViewEvent>()
-    val event: LiveData<RegisterViewEvent> = _event
-
-    fun onRegisterClick() {
-        if (isLoading.value == true) return
-        if (!isValid()) return
-        isLoading.value = true
-        auth.createUserWithEmailAndPassword(
-            emailLiveData.value!!,
-            passwordLiveData.value!!,
-        ).addOnCompleteListener { task ->
-            if (task.isSuccessful) {
-                val user = task.result.user
-                createUserInDB(user!!.uid)
-            } else {
-                isLoading.value = false
-                _messageDialogModelDialog.value = MessageDialogModel(
-                    message = task.exception?.localizedMessage ?: "Unable to create new account",
-                )
-            }
-        }
-    }
-
-    fun setProfilePic(imageUri: Uri) {
-        userProfilePicLiveData.value = imageUri
-    }
-
-    private fun createUserInDB(uid: String) {
-        if (userProfilePicLiveData.value != null) {
-            UserMdb.uploadUserPic(uid, userProfilePicLiveData.value) {
-                if (it.isSuccessful) {
-                    val user = User(
-                        uid = uid,
-                        username = usernameLiveData.value!!,
-                        email = emailLiveData.value!!,
-                        profilePic = it.result.toString(),
-                    )
-                    UserMdb
-                        .createUser(user) { task ->
-                            isLoading.value = false
-                            if (task.isSuccessful) {
-                                _event.value = RegisterViewEvent.NavigateToLogin
-                            } else {
-                                _messageDialogModelDialog.value = MessageDialogModel(
-                                    message = task.exception?.localizedMessage
-                                        ?: "Unable to create new account\nPlease try again",
-                                )
-                            }
-                        }
-                } else {
-                    _messageDialogModelDialog.value = MessageDialogModel(
-                        message = it.exception?.localizedMessage ?: "Unable to upload this photo",
-                        posActionName = "Ok",
-                    )
-                }
-            }
-        } else {
-            val user = User(
-                uid = uid,
-                username = usernameLiveData.value!!,
-                email = emailLiveData.value!!,
-            )
-            UserMdb
-                .createUser(user) { task ->
-                    isLoading.value = false
-                    if (task.isSuccessful) {
-                        _event.value = RegisterViewEvent.NavigateToLogin
-                    } else {
-                        _messageDialogModelDialog.value = MessageDialogModel(
-                            message = task.exception?.localizedMessage
-                                ?: "Unable to create new account\nPlease try again",
-                        )
-                    }
-                }
-        }
-    }
-
-    private fun isValid(): Boolean {
-        var isValid = true
-        if (!(isValidInput(usernameLiveData.value, InputState.UsernameInput))) isValid = false
-        if (!(isValidInput(emailLiveData.value, InputState.EmailInput))) isValid = false
-        if (!(isValidInput(passwordLiveData.value, InputState.PasswordInput))) isValid = false
-        if (!(
-                isValidInput(
-                    passwordConfirmationLiveData.value,
-                    InputState.PasswordConfirmationInput,
-                )
-                )
-        ) {
-            isValid = false
-        }
-        return isValid
-    }
-
-    fun isValidInput(input: CharSequence?, inputType: InputState): Boolean {
-        var isValid = true
-        when (inputType) {
-            is InputState.UsernameInput -> {
-                if (input.isNullOrEmpty()) {
-                    usernameError.value = "Username required"
-                    isValid = false
-                } else {
-                    usernameError.value = null
-                }
-            }
-
-            is InputState.EmailInput -> {
-                if (input.isNullOrEmpty()) {
-                    emailError.value = "Email required"
-                    isValid = false
-                } else {
-                    emailError.value = null
-                }
-            }
-
-            is InputState.PasswordInput -> {
-                if (input.isNullOrEmpty()) {
-                    passwordError.value = "Password required"
-                    isValid = false
-                } else if (input.length < 6) {
-                    passwordError.value = "Password length over 6"
-                    isValid = false
-                } else {
-                    passwordError.value = null
-                }
-            }
-
-            is InputState.PasswordConfirmationInput -> {
-                if (input.isNullOrEmpty()) {
-                    passwordConfirmationError.value = "Confirm password required"
-                    isValid = false
-                } else if (input != passwordLiveData.value) {
-                    passwordConfirmationError.value = "Password doesn't match"
-                    isValid = false
-                } else {
-                    passwordConfirmationError.value = null
-                }
-            }
-        }
-        return isValid
-    }
-}
diff --git a/app/src/main/java/com/pixel/toctalk/ui/home/MainActivity.kt b/app/src/main/java/com/pixel/toctalk/ui/home/MainActivity.kt
index 4abfbf9..01665e4 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/home/MainActivity.kt
+++ b/app/src/main/java/com/pixel/toctalk/ui/home/MainActivity.kt
@@ -39,6 +39,9 @@ class MainActivity : AppCompatActivity() {
         setUpNav()
     }
 
+    fun setActionbarTitle(title: String) {
+        supportActionBar?.title = title
+    }
     private fun setUpNav() {
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.homeFragmentContainer) as NavHostFragment
@@ -98,4 +101,9 @@ class MainActivity : AppCompatActivity() {
             .setCancelable(message.isCancelable)
         alertDialog.show()
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        setSupportActionBar(null)
+    }
 }
diff --git a/app/src/main/java/com/pixel/toctalk/ui/home/fragment/chat/ChatFragment.kt b/app/src/main/java/com/pixel/toctalk/ui/home/fragment/chat/ChatFragment.kt
index bad24f9..7b7c28b 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/home/fragment/chat/ChatFragment.kt
+++ b/app/src/main/java/com/pixel/toctalk/ui/home/fragment/chat/ChatFragment.kt
@@ -8,6 +8,7 @@ import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.pixel.toctalk.R
+import com.pixel.toctalk.data.database.PrivateChatMdb
 import com.pixel.toctalk.data.model.Contact
 import com.pixel.toctalk.data.model.Group
 import com.pixel.toctalk.databinding.FragmentChatBinding
@@ -43,7 +44,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding, ChatViewModel>() {
             }
 
             MessageState.GROUP.value -> {
-                (activity as MainActivity).supportActionBar?.title = args.groupChat?.name
+                (activity as MainActivity).setActionbarTitle(args.groupChat?.name!!)
                 initGroupView()
                 viewModel.messageState.value = MessageState.GROUP
                 viewModel.initGroupChatFireStoreOption()
@@ -112,6 +113,15 @@ class ChatFragment : BaseFragment<FragmentChatBinding, ChatViewModel>() {
         findNavController().navigate(action)
     }
 
+    override fun onStop() {
+        super.onStop()
+        when (args.state) {
+            MessageState.CONTACT.value -> {
+                PrivateChatMdb.checkIfChatEmpty(args.contentChat?.id)
+            }
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _chatAdapter = null
diff --git a/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactFragment.kt b/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactFragment.kt
index 59e03de..3d7f4c0 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactFragment.kt
+++ b/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactFragment.kt
@@ -48,9 +48,8 @@ class SearchContactFragment : BaseFragment<FragmentSearchContactBinding, SearchC
         binding.contactsRv.adapter = adapter
         if (adapter.snapshots.isEmpty()) {
             binding.messageNoUserFound.visibility = View.VISIBLE
-        } else {
-            binding.messageNoUserFound.visibility = View.GONE
         }
+        binding.messageNoUserFound.visibility = View.GONE
         adapter.setOnContactClickListener { user ->
             viewModel.createChatInDB(user)
         }
diff --git a/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactViewModel.kt b/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactViewModel.kt
index c325be7..29b4c06 100644
--- a/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactViewModel.kt
+++ b/app/src/main/java/com/pixel/toctalk/ui/home/fragment/home/searchContact/SearchContactViewModel.kt
@@ -47,8 +47,8 @@ class SearchContactViewModel : BaseViewModel() {
         PrivateChatMdb
             .createChat(newContact) {
                 if (it.isSuccessful) {
-                    // TODO: Send the new contact with id
-                    state.value = SearchContactState.NavToChat(newContact)
+                    state.value = it.result.toObject(Contact::class.java)
+                        ?.let { it1 -> SearchContactState.NavToChat(it1) }
                 }
             }
     }
diff --git a/app/src/main/res/drawable/avatar_group.png b/app/src/main/res/drawable/avatar_group.png
new file mode 100644
index 0000000..c2b8095
Binary files /dev/null and b/app/src/main/res/drawable/avatar_group.png differ
diff --git a/app/src/main/res/drawable/avatar_user.png b/app/src/main/res/drawable/avatar_user.png
new file mode 100644
index 0000000..1399772
Binary files /dev/null and b/app/src/main/res/drawable/avatar_user.png differ
diff --git a/app/src/main/res/layout/activity_auth_host.xml b/app/src/main/res/layout/activity_auth_host.xml
index 12f062f..d5a0342 100644
--- a/app/src/main/res/layout/activity_auth_host.xml
+++ b/app/src/main/res/layout/activity_auth_host.xml
@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/blue_wave"
-    tools:context=".ui.auth.AuthHostActivity">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:theme="@style/Theme.TocTalk.AppBarOverlay">
+        android:layout_height="match_parent"
+        tools:context=".auth.presentation.AuthHostActivity">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/auth_toolbar"
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            app:popupTheme="@style/Theme.TocTalk.PopupOverlay"
-            app:titleCentered="true"
-            app:titleTextColor="@color/clock_gray" />
-    </com.google.android.material.appbar.AppBarLayout>
+            android:background="@color/white"
+            android:theme="@style/Theme.TocTalk.AppBarOverlay">
 
-    <include layout="@layout/content_auth" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/auth_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:navigationIcon="@drawable/ic_left_chevron"
+                app:navigationIconTint="@color/black"
+                app:popupTheme="@style/Theme.TocTalk.PopupOverlay"
+                app:titleCentered="true"
+                app:titleTextColor="@color/clock_gray" />
+        </com.google.android.material.appbar.AppBarLayout>
+
+
+        <include layout="@layout/content_auth" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_auth.xml b/app/src/main/res/layout/content_auth.xml
index bfe16ed..cebc1ec 100644
--- a/app/src/main/res/layout/content_auth.xml
+++ b/app/src/main/res/layout/content_auth.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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="@color/white_snow"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:showIn="@layout/activity_auth_host">
 
@@ -13,9 +14,5 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/nav_auth_graph" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_edit_account.xml b/app/src/main/res/layout/fragment_complete_of_edit_account.xml
similarity index 66%
rename from app/src/main/res/layout/fragment_edit_account.xml
rename to app/src/main/res/layout/fragment_complete_of_edit_account.xml
index 01a1e62..259c20c 100644
--- a/app/src/main/res/layout/fragment_edit_account.xml
+++ b/app/src/main/res/layout/fragment_complete_of_edit_account.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout 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">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -9,15 +8,18 @@
             name="vm"
             type="com.pixel.toctalk.ui.home.fragment.account.EditAccountViewModel" />
 
+
+        <variable
+            name="isLoading"
+            type="Boolean" />
+
         <import type="android.view.View" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/blue_wave"
-        android:paddingHorizontal="32dp"
-        tools:context=".ui.auth.fragment.register.RegisterFragment">
+        android:paddingHorizontal="32dp">
 
         <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/open_pic"
@@ -28,21 +30,21 @@
             android:contentDescription="@string/click_to_select_a_photo"
             android:padding="8dp"
             android:scaleType="fitCenter"
-            android:src="@{vm.userNewPic}"
+            android:src="@drawable/avatar_user"
             app:imageUrl="@{vm.userCurrentPic}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:shapeAppearanceOverlay="@style/CircularPhoto"
             app:strokeColor="@color/very_light_blue"
-            app:strokeWidth="8dp"
-            tools:src="@tools:sample/avatars" />
+            app:strokeWidth="8dp" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/change_pic"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:backgroundTint="@color/white"
+            android:clickable="@{!isLoading}"
             android:elevation="8dp"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_edit_photo"
@@ -50,46 +52,47 @@
             app:layout_constraintEnd_toEndOf="@id/open_pic"
             app:shapeAppearanceOverlay="@style/CircularPhoto" />
 
-        <LinearLayout
-            android:id="@+id/user_info"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/username_field"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginVertical="8dp"
             android:layout_marginTop="64dp"
-            android:orientation="vertical"
+            android:clickable="@{!isLoading}"
+            android:hint="@string/username"
+            android:maxLength="32"
+            android:padding="4dp"
+            app:boxBackgroundColor="@color/white_smoke"
+            app:boxCornerRadiusBottomEnd="8dp"
+            app:boxCornerRadiusBottomStart="8dp"
+            app:boxCornerRadiusTopEnd="8dp"
+            app:boxCornerRadiusTopStart="8dp"
+            app:boxStrokeWidth="0dp"
+            app:boxStrokeWidthFocused="1dp"
+            app:counterEnabled="true"
+            app:counterMaxLength="32"
+            app:counterOverflowTextColor="@color/gray"
+            app:errorMessage="@{vm.usernameError}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/open_pic">
+            app:layout_constraintTop_toBottomOf="@id/open_pic"
+            app:startIconDrawable="@drawable/ic_user">
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/username_field"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginVertical="8dp"
-                android:hint="@string/username"
-                android:maxLength="32"
-                app:counterEnabled="true"
-                app:counterMaxLength="32"
-                app:counterOverflowTextColor="@color/gray"
-                app:errorMessage="@{vm.usernameError}"
-                app:startIconDrawable="@drawable/ic_user">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/username"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:inputType="text"
-                    android:text="@={vm.usernameLiveData}" />
-            </com.google.android.material.textfield.TextInputLayout>
-        </LinearLayout>
+                android:inputType="text"
+                android:text="@={vm.usernameLiveData}" />
+        </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/btn_save_changes"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="64dp"
-            android:onClick="@{() -> vm.onSaveClick()}"
+            android:clickable="@{!isLoading}"
             app:cardBackgroundColor="@color/white"
             app:contentPaddingBottom="8dp"
             app:contentPaddingLeft="32dp"
@@ -107,7 +110,7 @@
                 android:text="@string/save"
                 android:textColor="#BDBDBD"
                 android:textSize="18sp"
-                android:visibility="@{vm.isLoading == true ? View.GONE : View.VISIBLE}" />
+                android:visibility="@{isLoading == true ? View.GONE : View.VISIBLE}" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -115,7 +118,7 @@
                 android:layout_gravity="end|center"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_arrow"
-                android:visibility="@{vm.isLoading == true ? View.GONE : View.VISIBLE}"
+                android:visibility="@{isLoading == true ? View.GONE : View.VISIBLE}"
                 app:tint="#BDBDBD" />
 
             <com.google.android.material.progressindicator.CircularProgressIndicator
@@ -123,7 +126,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:indeterminate="true"
-                android:visibility="@{vm.isLoading == true ? View.VISIBLE : View.GONE}"
+                android:visibility="@{isLoading == true ? View.VISIBLE : View.INVISIBLE}"
                 app:indicatorColor="@color/light_blue" />
         </com.google.android.material.card.MaterialCardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 57635fa..2f2fd44 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -32,12 +32,12 @@
             <androidx.viewpager2.widget.ViewPager2
                 android:id="@+id/home_view_pager"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="@color/white" />
         </LinearLayout>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/open_fab_menu"
-            style="@style/Widget.MaterialComponents.FloatingActionButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
@@ -48,6 +48,7 @@
             android:importantForAccessibility="no"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:shapeAppearanceOverlay="@style/CircularPhoto"
             app:srcCompat="@drawable/ic_add"
             app:tint="@color/white" />
 
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 2c3deb9..6921a0d 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -6,141 +6,187 @@
     <data>
 
         <variable
-            name="vm"
-            type="com.pixel.toctalk.ui.auth.fragment.login.LoginViewModel" />
+            name="isLoading"
+            type="Boolean" />
 
         <import type="android.view.View" />
     </data>
 
-    <LinearLayout
+    <ScrollView
         android:id="@+id/login"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:paddingHorizontal="32dp"
-        android:paddingTop="32dp"
-        tools:background="@drawable/blue_wave"
-        tools:context=".ui.auth.fragment.login.LoginFragment">
-
-        <TextView
-            android:id="@+id/welcome_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="64dp"
-            android:fontFamily="@font/poppins_bold"
-            android:text="@string/app_name"
-            android:textColor="@color/text_gray"
-            android:textSize="32sp" />
-
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/log_email_field"
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+        android:layout_height="wrap_content"
+        tools:context=".auth.presentation.fragment.login.LoginFragment">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:hint="@string/email"
-            app:errorMessage="@{vm.emailError}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:startIconDrawable="@drawable/ic_email">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/log_email"
-                android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/welcome_message"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                android:inputType="textEmailAddress"
-                android:text="@={vm.emailLiveData}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/log_password_field"
-            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="4dp"
-            android:hint="@string/password"
-            app:endIconMode="password_toggle"
-            app:errorMessage="@{vm.passwordError}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:startIconDrawable="@drawable/ic_password">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/log_password"
-                android:layout_width="match_parent"
+                android:layout_marginTop="122dp"
+                android:fontFamily="@font/roboto_extra_bold"
+                android:text="@string/app_name"
+                android:textColor="@color/text_gray"
+                android:textSize="32sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+            <LinearLayout
+                android:id="@+id/input_field"
+                android:layout_width="350dp"
                 android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                android:inputType="textPassword"
-                android:text="@={vm.passwordLiveData}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/forget_password"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_marginVertical="16dp"
-            android:fontFamily="@font/poppins"
-            android:text="@string/forget_password"
-            android:textColor="@color/text_gray" />
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_login"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="32dp"
-            android:onClick="@{() -> vm.login()}"
-            app:cardBackgroundColor="@{vm.isLoading == false ? @color/light_blue : @color/white}"
-            app:contentPaddingBottom="8dp"
-            app:contentPaddingLeft="32dp"
-            app:contentPaddingRight="32dp"
-            app:contentPaddingTop="8dp">
-
+                android:layout_marginTop="128dp"
+                android:clickable="@{!isLoading}"
+                android:orientation="vertical"
+                android:paddingHorizontal="12dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/welcome_message">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/log_email_field"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:hint="@string/email"
+                    android:padding="4dp"
+                    app:boxBackgroundColor="@color/white_smoke"
+                    app:boxCornerRadiusBottomEnd="8dp"
+                    app:boxCornerRadiusBottomStart="8dp"
+                    app:boxCornerRadiusTopEnd="8dp"
+                    app:boxCornerRadiusTopStart="8dp"
+                    app:boxStrokeWidth="0dp"
+                    app:boxStrokeWidthFocused="1dp"
+                    app:hintTextColor="@color/gray"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/welcome_message"
+                    app:startIconDrawable="@drawable/ic_email">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/log_email"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textEmailAddress"
+                        android:textAppearance="@style/Body"
+                        android:textColor="@color/black" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/log_password_field"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginVertical="4dp"
+                    android:hint="@string/password"
+                    android:padding="4dp"
+                    app:boxBackgroundColor="@color/white_smoke"
+                    app:boxCornerRadiusBottomEnd="8dp"
+                    app:boxCornerRadiusBottomStart="8dp"
+                    app:boxCornerRadiusTopEnd="8dp"
+                    app:boxCornerRadiusTopStart="8dp"
+                    app:boxStrokeWidth="0dp"
+                    app:boxStrokeWidthFocused="1dp"
+                    app:endIconMode="password_toggle"
+                    app:hintTextColor="@color/gray"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/log_email_field"
+                    app:startIconDrawable="@drawable/ic_password">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/log_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textPassword"
+                        android:textAppearance="@style/Body"
+                        android:textColor="@color/black" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <!-- android:clickable="@{isLoading}" ->  -->
             <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/login_tv"
+                android:id="@+id/forget_password"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="start|center"
+                android:layout_gravity="start"
+                android:layout_marginTop="16dp"
+                android:clickable="@{!isLoading}"
                 android:fontFamily="@font/poppins"
-                android:text="@string/login"
-                android:textColor="#F9F9F9"
-                android:textSize="18sp"
-                android:visibility="@{vm.isLoading == true ? View.GONE : View.VISIBLE}" />
-
-            <ImageView
-                android:id="@+id/log_arrow_iv"
-                android:layout_width="wrap_content"
+                android:paddingHorizontal="12dp"
+                android:text="@string/forget_password"
+                android:textColor="@color/pretty_gray"
+                app:layout_constraintStart_toStartOf="@id/input_field"
+                app:layout_constraintTop_toBottomOf="@id/input_field" />
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_login"
+                android:layout_width="330dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_arrow"
-                android:visibility="@{vm.isLoading == true ? View.GONE : View.VISIBLE}" />
+                android:layout_marginHorizontal="32dp"
+                android:layout_marginTop="124dp"
+                android:clickable="@{!isLoading}"
+                app:cardBackgroundColor="@{isLoading == false ? @color/light_blue : @color/white}"
+                app:contentPaddingBottom="8dp"
+                app:contentPaddingLeft="32dp"
+                app:contentPaddingRight="32dp"
+                app:contentPaddingTop="8dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/input_field">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/login_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center"
+                    android:fontFamily="@font/poppins"
+                    android:text="@string/login"
+                    android:textColor="#F9F9F9"
+                    android:textSize="18sp"
+                    android:visibility="@{isLoading == true ? View.GONE : View.VISIBLE}" />
+
+                <ImageView
+                    android:id="@+id/log_arrow_iv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center"
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/ic_arrow"
+                    android:visibility="@{isLoading == true ? View.GONE : View.VISIBLE}" />
+
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/log_progressIndicator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:indeterminate="true"
+                    android:visibility="@{isLoading == false ? View.INVISIBLE : View.VISIBLE}"
+                    app:indicatorColor="@color/light_blue" />
+            </com.google.android.material.card.MaterialCardView>
 
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/log_progressIndicator"
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/create_account"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                android:visibility="@{vm.isLoading == false ? View.GONE : View.VISIBLE}"
-                app:indicatorColor="@color/light_blue" />
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/create_account"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:fontFamily="@font/poppins_medium1"
-            android:text="@string/or_create_my_account"
-            android:shadowColor="@color/black"
-            android:shadowRadius="4"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
-    </LinearLayout>
+                android:layout_gravity="start"
+                android:layout_marginTop="16dp"
+                android:clickable="@{!isLoading}"
+                android:fontFamily="@font/poppins_medium1"
+                android:text="@string/or_create_my_account"
+                android:textColor="@color/pretty_gray"
+                android:textSize="14sp"
+                app:layout_constraintStart_toStartOf="@id/btn_login"
+                app:layout_constraintTop_toBottomOf="@id/btn_login" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register.xml b/app/src/main/res/layout/fragment_register.xml
index 6282e42..5e01b16 100644
--- a/app/src/main/res/layout/fragment_register.xml
+++ b/app/src/main/res/layout/fragment_register.xml
@@ -6,169 +6,163 @@
     <data>
 
         <variable
-            name="vm"
-            type="com.pixel.toctalk.ui.auth.fragment.register.RegisterViewModel" />
+            name="isLoading"
+            type="Boolean" />
 
         <import type="android.view.View" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/register"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingHorizontal="32dp"
-        tools:background="@drawable/blue_wave"
-        tools:context=".ui.auth.fragment.register.RegisterFragment">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/user_profile_pic"
-            android:layout_width="182dp"
-            android:layout_height="182dp"
-            android:layout_marginTop="64dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/pick_image"
-            android:contentDescription="@string/click_to_select_a_photo"
-            android:scaleType="fitCenter"
-            android:src="@{vm.userProfilePicLiveData}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/CircularPhoto" />
-
-        <LinearLayout
-            android:id="@+id/user_info"
+        android:layout_height="wrap_content">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/register"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toTopOf="@+id/btn_register"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/user_profile_pic">
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/reg_username_field"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginVertical="8dp"
-                android:hint="@string/username"
-                app:errorMessage="@{vm.usernameError}"
-                app:startIconDrawable="@drawable/ic_user">
+            tools:context=".auth.presentation.fragment.createAccount.register.RegisterFragment">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/reg_username"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:inputType="text"
-                    android:text="@={vm.usernameLiveData}" />
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/reg_email_field"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:id="@+id/user_info"
+                android:layout_width="330dp"
                 android:layout_height="wrap_content"
-                android:layout_marginVertical="16dp"
-                android:hint="@string/email"
-                app:errorMessage="@{vm.emailError}"
-                app:startIconDrawable="@drawable/ic_email">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/reg_email"
+                android:layout_marginTop="16dp"
+                android:clickable="@{!isLoading}"
+                android:orientation="vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/reg_email_field"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:inputType="textEmailAddress"
-                    android:text="@={vm.emailLiveData}" />
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/reg_password_field"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginVertical="8dp"
-                android:hint="@string/password"
-                app:endIconMode="password_toggle"
-                app:errorMessage="@{vm.passwordError}"
-                app:startIconDrawable="@drawable/ic_password">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/reg_password"
+                    android:layout_marginVertical="16dp"
+                    android:hint="@string/email"
+                    android:padding="4dp"
+                    app:boxBackgroundColor="@color/white_smoke"
+                    app:boxCornerRadiusBottomEnd="8dp"
+                    app:boxCornerRadiusBottomStart="8dp"
+                    app:boxCornerRadiusTopEnd="8dp"
+                    app:boxCornerRadiusTopStart="8dp"
+                    app:boxStrokeWidth="0dp"
+                    app:boxStrokeWidthFocused="1dp"
+                    app:hintTextColor="@color/gray"
+                    app:startIconDrawable="@drawable/ic_email">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/reg_email"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textEmailAddress"
+                        android:textAppearance="@style/Body"
+                        android:textColor="@color/black" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/reg_password_field"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:inputType="textPassword"
-                    android:text="@={vm.passwordLiveData}" />
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/reg_password_confirm_field"
-                style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginVertical="8dp"
-                android:hint="@string/password_confirm"
-                app:endIconMode="password_toggle"
-                app:errorMessage="@{vm.passwordConfirmationError}"
-                app:startIconDrawable="@drawable/ic_password">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/reg_password_confirm"
+                    android:layout_marginVertical="8dp"
+                    android:hint="@string/password"
+                    android:padding="4dp"
+                    app:boxBackgroundColor="@color/white_smoke"
+                    app:boxCornerRadiusBottomEnd="8dp"
+                    app:boxCornerRadiusBottomStart="8dp"
+                    app:boxCornerRadiusTopEnd="8dp"
+                    app:boxCornerRadiusTopStart="8dp"
+                    app:boxStrokeWidth="0dp"
+                    app:boxStrokeWidthFocused="1dp"
+                    app:endIconMode="password_toggle"
+                    app:hintTextColor="@color/gray"
+                    app:startIconDrawable="@drawable/ic_password">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/reg_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textPassword"
+                        android:textAppearance="@style/Body"
+                        android:textColor="@color/black" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/reg_password_confirm_field"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
-                    android:inputType="textPassword"
-                    android:text="@={vm.passwordConfirmationLiveData}" />
-            </com.google.android.material.textfield.TextInputLayout>
-        </LinearLayout>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/btn_register"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="64dp"
-            android:onClick="@{() -> vm.onRegisterClick()}"
-            app:cardBackgroundColor="@color/white"
-            app:contentPaddingBottom="8dp"
-            app:contentPaddingLeft="32dp"
-            app:contentPaddingRight="32dp"
-            app:contentPaddingTop="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/create_account_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start|center"
-                android:fontFamily="@font/poppins"
-                android:text="@string/create_account"
-                android:textColor="#BDBDBD"
-                android:textSize="18sp"
-                android:visibility="@{vm.isLoading == true ? View.GONE : View.VISIBLE}" />
-
-            <ImageView
-                android:id="@+id/reg_arrow_iv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                android:importantForAccessibility="no"
-                android:src="@drawable/ic_arrow"
-                android:visibility="@{vm.isLoading == true ? View.GONE : View.VISIBLE}"
-                app:tint="#BDBDBD" />
-
-            <com.google.android.material.progressindicator.CircularProgressIndicator
-                android:id="@+id/reg_progressIndicator"
-                android:layout_width="wrap_content"
+                    android:layout_marginVertical="8dp"
+                    android:hint="@string/password_confirm"
+                    android:padding="4dp"
+                    app:boxBackgroundColor="@color/white_smoke"
+                    app:boxCornerRadiusBottomEnd="8dp"
+                    app:boxCornerRadiusBottomStart="8dp"
+                    app:boxCornerRadiusTopEnd="8dp"
+                    app:boxCornerRadiusTopStart="8dp"
+                    app:boxStrokeWidth="0dp"
+                    app:boxStrokeWidthFocused="1dp"
+                    app:endIconMode="password_toggle"
+                    app:hintTextColor="@color/gray"
+                    app:startIconDrawable="@drawable/ic_password">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/reg_password_confirm"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textPassword"
+                        android:textAppearance="@style/Body"
+                        android:textColor="@color/black" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </LinearLayout>
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/btn_register"
+                android:layout_width="330dp"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:indeterminate="true"
-                android:visibility="@{vm.isLoading == true ? View.VISIBLE : View.GONE}"
-                app:indicatorColor="@color/light_blue" />
-        </com.google.android.material.card.MaterialCardView>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="64dp"
+                android:clickable="@{!isLoading}"
+                app:cardBackgroundColor="@color/white"
+                app:contentPaddingBottom="8dp"
+                app:contentPaddingLeft="32dp"
+                app:contentPaddingRight="32dp"
+                app:contentPaddingTop="8dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/user_info">
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/create_account_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start|center"
+                    android:fontFamily="@font/poppins"
+                    android:text="@string/create_account"
+                    android:textColor="#BDBDBD"
+                    android:textSize="18sp"
+                    android:visibility="@{isLoading == true ? View.GONE : View.VISIBLE}" />
+
+                <ImageView
+                    android:id="@+id/reg_arrow_iv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center"
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/ic_arrow"
+                    android:visibility="@{isLoading == true ? View.GONE : View.VISIBLE}"
+                    app:tint="#BDBDBD" />
+
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/reg_progressIndicator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:indeterminate="true"
+                    android:visibility="@{isLoading == true ? View.VISIBLE : View.INVISIBLE}"
+                    app:indicatorColor="@color/light_blue" />
+            </com.google.android.material.card.MaterialCardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_send_reset_password_code.xml b/app/src/main/res/layout/fragment_send_reset_password_code.xml
new file mode 100644
index 0000000..bf50fef
--- /dev/null
+++ b/app/src/main/res/layout/fragment_send_reset_password_code.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingTop="54dp"
+        tools:context=".auth.presentation.fragment.resetPassword.sendCode.SendResetPasswordCodeFragment">
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="54dp"
+            android:text="@string/enter_your_email" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/email_field"
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="32dp"
+            android:layout_marginTop="12dp"
+            android:hint="@string/email">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/email"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/transparent"
+                android:inputType="textEmailAddress" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/btn_send_code"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="12dp"
+            android:layout_marginTop="22dp"
+            android:paddingVertical="18dp"
+            android:paddingStart="42dp"
+            android:paddingEnd="32dp"
+            android:text="@string/continue_prosses"
+            android:textAlignment="textStart"
+            app:icon="@drawable/ic_arrow"
+            app:iconGravity="end" />
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_update_password.xml b/app/src/main/res/layout/fragment_update_password.xml
new file mode 100644
index 0000000..63fd161
--- /dev/null
+++ b/app/src/main/res/layout/fragment_update_password.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    tools:context=".auth.presentation.fragment.resetPassword.updatePassword.UpdatePasswordFragment">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="Hello" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000..a00aeb9
--- /dev/null
+++ b/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">TocTalk</string>
+    <string name="email">البريد الالكتروني</string>
+    <string name="password">كلمة المرور</string>
+    <string name="invalid_password">
+        يجب أن تتكون كلمة المرور من 8 أحرف على الأقل وتشمل:
+        &#8226; حرف واحد على الأقل (A-Z أو a-z)
+        &#8226; رقم واحد على الأقل (0-9)
+        &#8226; رمز خاص واحد على الأقل (@, $, !, %, *, #, ?, &amp;)
+    </string>
+    <string name="forget_password">نسيت كلمة المرور؟</string>
+    <string name="login">تسجيل دخول</string>
+    <string name="or_create_my_account">انشاء حساب جديد</string>
+    <string name="username">اسم المسخدم</string>
+    <string name="join">انضمام</string>
+    <string name="create_account">انشاء حساب</string>
+    <string name="password_confirm">تاكيد كلمة المرور</string>
+    <string name="create_group">انشاء مجموعه</string>
+    <string name="no_rooms_joined_yet">لم يتم الإنضمام الي أي غرف بعد</string>
+    <string name="no_rooms_here_yet">لا يوجد مجموعات هنا بعد
+    انقر الزر العائم لانشاء مجموعه جديده</string>
+    <string name="no_chat_here_yet">لا توجد دردشه هنا بعد</string>
+    <string name="type_message">اكتب رسالة…</string>
+    <string name="send">إرسال</string>
+    <string name="create_new_group">انشاء مجموعة جديده</string>
+    <string name="group_name">اسم المجموعه</string>
+    <string name="group_description">وصف المجموعه</string>
+    <string name="click_to_select_a_photo">انقر لإختيار الصوره</string>
+    <string name="menu_home">الرئيسية</string>
+    <string name="menu_account">الحساب</string>
+    <string name="leave_group">مغادرة المجموعه</string>
+    <string name="description">الوصف…</string>
+    <string name="members">الاعضاء…</string>
+    <string name="contact_username">اسم المستخدم</string>
+    <string name="search_chat">بحث</string>
+    <string name="you">انت: %s</string>
+    <string name="no_user_found">لا يوجد مستخدم</string>
+    <string name="login_again">سجدل دخول مجددا</string>
+    <string name="login_failed">غير قادر علي تسجيد الدخول
+    الرجاء المحاوله مره اخري</string>
+    <string name="unable_to_login">غير قادر علي تسجيد الدخول</string>
+    <string name="save">حفظ</string>
+    <string name="logout">تسجيل الخروج</string>
+    <string name="settings">الإعدادات</string>
+    <string name="account">الحساب</string>
+    <string name="search">البحث</string>
+    <string name="update_account_failed">حدث خطأ ما
+    لم نتمكن من تحديث حسابك, الرجاء المحاوله لاحقا</string>
+    <string name="back">الرجوع</string>
+    <string name="contact_details">تفاصيل المستخدم</string>
+    <string name="delete_chat">خذف المحادثه</string>
+    <string name="block_user">حذر المستخدم</string>
+    <string name="block_group">حذر المجموعه</string>
+    <string name="group_details">تفاصيل المجموعه</string>
+    <string name="ok">تم</string>
+    <string name="permission_message">هذا التطبيق يستعمل اذن الوصول للمخزن</string>
+    <string name="edit_group">تعديل المجموعه</string>
+    <string name="change_group_name">تغيير اسم المجموعه</string>
+    <string name="name_successfully_updated">تم تغيير الاسم بنجاح</string>
+    <string name="name_updated_failed">فشل التحديث</string>
+    <string name="edit_group_pic">تغيير الصوره</string>
+    <string name="remove_pic">حذف الصوره</string>
+    <string name="done_remove_group_pic">تم حذف الصوره بنجاح</string>
+    <string name="change_group_des">تغيير وصف المجموعه</string>
+    <string name="you_have_leaved_the_group">لقد غادرت المجموعه</string>
+    <string name="are_you_sure_you_want_to_leave_this_group">هل انت متاكد من انك تريد مغادرة المجموعه</string>
+    <string name="leave">مغادره</string>
+    <string name="cancel">الغاء</string>
+    <string name="invalid_email">يرجى إدخال عنوان بريد إلكتروني صحيح</string>
+
+    <string-array name="home_tabs_title">
+        <item>محادثاتي</item>
+        <item>مجموعاتي</item>
+        <item>تصفح المجموعات</item>
+    </string-array>
+
+    <plurals name="members_count">
+        <item quantity="zero">لا يوجد اعضاء %d</item>
+        <item quantity="one">عضو %d</item>
+        <item quantity="two">عضوان %d</item>
+        <item quantity="few">اعضاء %d</item>
+        <item quantity="many">اعضاء %d</item>
+    </plurals>
+    <string name="field_is_required">الحقل مطلوب</string>
+</resources>
\ 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
new file mode 100644
index 0000000..b4c1b30
--- /dev/null
+++ b/app/src/main/res/values-night/themes.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Base.Theme.TocTalk" parent="Theme.Material3.Dark.NoActionBar">
+        <!-- Customize your light theme here. -->
+        <!-- <item name="colorPrimary">@color/dark_blue</item> -->
+        <item name="colorPrimary">@color/accent_blue</item>
+        <item name="android:statusBarColor">@color/white_smoke</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="colorControlActivated">@color/black</item>
+        <item name="android:textColorHighlight">@color/overlay</item>
+    </style>
+
+    <style name="Theme.TocTalk" parent="Base.Theme.TocTalk" />
+</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 4b97751..264ce24 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,12 @@
     <string name="app_name">TocTalk</string>
     <string name="email">Email</string>
     <string name="password">Password</string>
+    <string name="invalid_password">
+        Your password must be at least 8 characters long and include:
+        &#8226; At least one letter (A-Z or a-z)
+        &#8226; At least one digit (0-9)
+        &#8226; At least one special character (@, $, !, %, *, #, ?, &amp;)
+    </string>
     <string name="forget_password">Forget Password?</string>
     <string name="login">Login</string>
     <string name="or_create_my_account">Or Create My Account</string>
@@ -11,8 +17,8 @@
     <string name="password_confirm">Confirm Password</string>
     <string name="create_group">Create Group</string>
     <string name="no_rooms_joined_yet">No rooms joined yet</string>
-    <string name="no_rooms_here_yet">No rooms here yet
-        click the FAB to create your room</string>
+    <string name="no_rooms_here_yet">No groups here yet
+        click the FAB to create your group</string>
     <string name="no_chat_here_yet">No chat here yet</string>
 
     <string-array name="home_tabs_title">
@@ -20,11 +26,10 @@
         <item>My Groups</item>
         <item>Browse Groups</item>
     </string-array>
-    <plurals name="members_count">
+    <plurals name="members_count" translatable="false">
         <item quantity="one">%d Member</item>
         <item quantity="other">%d Members</item>
     </plurals>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="type_message">Type message</string>
     <string name="send">Send</string>
     <string name="create_new_group">Create new group</string>
@@ -52,4 +57,40 @@
     <string name="update_account_failed">Something went wrong
         Unable to update your account, try again later</string>
     <string name="back">Back</string>
+    <string name="contact_details">Contact Details</string>
+    <string name="delete_chat">Delete Chat</string>
+    <string name="block_user">Block User</string>
+    <string name="block_group">Block Group</string>
+    <string name="group_details">Group Details</string>
+    <string name="ok">OK</string>
+    <string name="permission_message">This app requires Storage permission for particular feature to work as expected.</string>
+    <string name="edit_group">Edit Group</string>
+    <string name="change_group_name">Change group name</string>
+    <string name="name_successfully_updated">Name successfully updated</string>
+    <string name="name_updated_failed">Update failed</string>
+    <string name="edit_group_pic">Change picture</string>
+    <string name="remove_pic">Remove picture</string>
+    <string name="done_remove_group_pic">Picture removed successfully</string>
+    <string name="change_group_des">Change group description</string>
+    <string name="you_have_leaved_the_group">You have leaved the group</string>
+    <string name="are_you_sure_you_want_to_leave_this_group">Are you sure you want to leave this group?</string>
+    <string name="leave">Leave</string>
+    <string name="cancel">Cancel</string>
+    <string name="invalid_email">Please enter a valid email address</string>
+    <string name="field_is_required">Field is required</string>
+    <string name="enter_your_email">Enter your Email</string>
+    <string name="continue_prosses">Continue</string>
+    <string name="error_invalid_email">Invalid email format.</string>
+    <string name="error_wrong_email_or_password">Incorrect email or password.</string>
+    <string name="error_user_not_found">User not found.</string>
+    <string name="error_operation_not_allowed">This operation is not allowed.</string>
+    <string name="error_user_disabled">This user account is disabled.</string>
+    <string name="error_network">Network error. Please check your connection.</string>
+    <string name="error_unexpected">An unexpected error occurred.</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="unmatched_password">Password dosen\'t match</string>
+    <string name="complete_profile_info">Complete Profile info</string>
+    <string name="username_out_of_range">Username should be atleast 3 character or above</string>
+    <string name="error_email_already_in_use">The email you entered is already in use</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 3acd807..10ff480 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,12 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Base.Theme.TocTalk" parent="Theme.Material3.Light.NoActionBar">
+    <style name="Base.Theme.TocTalk" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your light theme here. -->
-        <item name="colorPrimary">@color/dark_blue</item>
+        <item name="colorPrimary">@color/accent_blue</item>
+        <item name="android:statusBarColor">@color/white_smoke</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorControlActivated">@color/black</item>
+        <item name="android:textColorHighlight">@color/overlay</item>
     </style>
 
     <style name="Theme.TocTalk" parent="Base.Theme.TocTalk" />
@@ -19,4 +23,52 @@
     <style name="CircularPhoto">
         <item name="cornerSize">50%</item>
     </style>
+
+    <style name="Caption_Bold">
+        <item name="android:textSize">10sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="fontFamily">@font/roboto_bold</item>
+    </style>
+
+    <style name="Footnote">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/roboto_regular</item>
+    </style>
+
+    <style name="Footnote_Bold">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/roboto_medium</item>
+    </style>
+
+    <style name="Body">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/roboto_medium</item>
+    </style>
+
+    <style name="Body_Bold">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/roboto_bold</item>
+    </style>
+
+    <style name="Headline">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/roboto_medium</item>
+    </style>
+
+    <style name="Headline_Bold">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/roboto_bold</item>
+    </style>
+
+    <style name="Title">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="fontFamily">@font/roboto_bold</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 3d2fc68..7153966 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,7 @@ buildscript {
     }
     dependencies {
         classpath(libs.androidx.navigation.safe.args.gradle.plugin)
+        // classpath(libs.google.services)
     }
 }
 plugins {
@@ -12,4 +13,5 @@ plugins {
     alias(libs.plugins.jetbrainsKotlinAndroid) apply false
     alias(libs.plugins.googleServices) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.firebaseCrashlytics) apply false
 }
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
deleted file mode 100644
index be22af0..0000000
--- a/data/build.gradle.kts
+++ /dev/null
@@ -1,44 +0,0 @@
-plugins {
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
-}
-
-android {
-    namespace = "com.pixel.data"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 24
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-dependencies {
-
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
-    implementation(project(":domain"))
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-}
diff --git a/data/consumer-rules.pro b/data/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/data/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/data/src/androidTest/java/com/pixel/data/ExampleInstrumentedTest.kt b/data/src/androidTest/java/com/pixel/data/ExampleInstrumentedTest.kt
deleted file mode 100644
index ad715a9..0000000
--- a/data/src/androidTest/java/com/pixel/data/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.pixel.data
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.pixel.data.test", appContext.packageName)
-    }
-}
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/data/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/data/src/test/java/com/pixel/data/ExampleUnitTest.kt b/data/src/test/java/com/pixel/data/ExampleUnitTest.kt
deleted file mode 100644
index 2fc7fac..0000000
--- a/data/src/test/java/com/pixel/data/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.pixel.data
-
-import org.junit.Assert.*
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/domain/.gitignore b/domain/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/domain/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
deleted file mode 100644
index 2354321..0000000
--- a/domain/build.gradle.kts
+++ /dev/null
@@ -1,44 +0,0 @@
-plugins {
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
-    id("kotlin-parcelize")
-}
-
-android {
-    namespace = "com.pixel.domain"
-    compileSdk = 34
-
-    defaultConfig {
-        minSdk = 24
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
-            )
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-dependencies {
-
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-}
diff --git a/domain/consumer-rules.pro b/domain/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/domain/proguard-rules.pro b/domain/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/domain/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/domain/src/androidTest/java/com/pixel/domain/ExampleInstrumentedTest.kt b/domain/src/androidTest/java/com/pixel/domain/ExampleInstrumentedTest.kt
deleted file mode 100644
index 15bc514..0000000
--- a/domain/src/androidTest/java/com/pixel/domain/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.pixel.domain
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.pixel.domain.test", appContext.packageName)
-    }
-}
diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/domain/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/domain/src/test/java/com/pixel/domain/ExampleUnitTest.kt b/domain/src/test/java/com/pixel/domain/ExampleUnitTest.kt
deleted file mode 100644
index 4fdde0a..0000000
--- a/domain/src/test/java/com/pixel/domain/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.pixel.domain
-
-import org.junit.Assert.*
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3cbfa56..5ff3bb0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ espressoCore = "3.5.1"
 appcompat = "1.6.1"
 material = "1.11.0"
 activity = "1.8.2"
-constraintlayout = "2.1.4"
+constraintlayout = "1.0.0-alpha3"
 lifecycleLivedataKtx = "2.7.0"
 lifecycleViewmodelKtx = "2.7.0"
 fragmentKtx = "1.6.2"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bb1986c..16a6031 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,5 +22,3 @@ dependencyResolutionManagement {
 
 rootProject.name = "TocTalk"
 include(":app")
-include(":domain")
-include(":data")