diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/.idea/other.xml b/.idea/other.xml
index 4604c44..94c96f6 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -69,6 +69,28 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="id" value="comet" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="29" />
           <option name="brand" value="samsung" />
@@ -91,6 +113,17 @@
           <option name="screenX" value="1440" />
           <option name="screenY" value="3088" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -102,6 +135,17 @@
           <option name="screenX" value="2208" />
           <option name="screenY" value="1840" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -146,6 +190,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -235,6 +290,17 @@
           <option name="screenX" value="1600" />
           <option name="screenY" value="2560" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="29" />
           <option name="brand" value="samsung" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 140749e..56ac927 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -42,7 +42,13 @@ dependencies {
     implementation(libs.constraintlayout)
     implementation(libs.navigation.fragment)
     implementation(libs.navigation.ui)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
-}
\ No newline at end of file
+    implementation(libs.biometric)
+
+
+
+}
+
diff --git a/app/src/main/java/com/example/signup_signin/DatabaseHandler.java b/app/src/main/java/com/example/signup_signin/DatabaseHandler.java
index c9c5b1d..f2a57f0 100644
--- a/app/src/main/java/com/example/signup_signin/DatabaseHandler.java
+++ b/app/src/main/java/com/example/signup_signin/DatabaseHandler.java
@@ -13,7 +13,7 @@
 
     public class DatabaseHandler extends SQLiteOpenHelper {
         private static final int DATABASE_VERSION = 1;
-        private static final String DATABASE_NAME = "SignUp-Form";
+        private static final String DATABASE_NAME = "SignUp";
         private static final String TABLE_CONTACTS = "SIGNIN";
         private static final String KEY_EMAIL = "Email";
         private static final String KEY_USERNAME = "Username";
@@ -26,7 +26,7 @@ public DatabaseHandler(Context context) {
         @Override
         public void onCreate(SQLiteDatabase db) {
             String CREATE_CONTACTS_TABLE = "CREATE TABLE " + TABLE_CONTACTS + "("
-                    + KEY_EMAIL + " TEXT PRIMARY KEY," // Change INTEGER to TEXT
+                    + KEY_EMAIL + " TEXT PRIMARY KEY,"
                     + KEY_USERNAME + " TEXT,"
                     + KEY_PASSWORD + " TEXT" + ")";
             db.execSQL(CREATE_CONTACTS_TABLE);
diff --git a/app/src/main/java/com/example/signup_signin/SignIn.java b/app/src/main/java/com/example/signup_signin/SignIn.java
index dfc90cb..bb9981d 100644
--- a/app/src/main/java/com/example/signup_signin/SignIn.java
+++ b/app/src/main/java/com/example/signup_signin/SignIn.java
@@ -1,26 +1,25 @@
 package com.example.signup_signin;
 
 import android.content.Intent;
-import android.hardware.usb.UsbRequest;
+import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.util.Log;
+import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.activity.EdgeToEdge;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
+import androidx.biometric.BiometricManager;
+import androidx.biometric.BiometricPrompt;
+import androidx.core.content.ContextCompat;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import java.util.concurrent.Executor;
 
-import java.util.List;
 public class SignIn extends AppCompatActivity {
     Button signInBtn;
     EditText useremail;
@@ -28,60 +27,117 @@ public class SignIn extends AppCompatActivity {
     TextView forgotpass;
     TextView singUp;
     DatabaseHandler db;
+    CheckBox checkBox;
+    Button fingerprintBtn;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        EdgeToEdge.enable(this);
         setContentView(R.layout.activity_sign_in);
 
-
         useremail = findViewById(R.id.email);
         userpassword = findViewById(R.id.password);
         signInBtn = findViewById(R.id.signInBtn);
         forgotpass = findViewById(R.id.forgotPassword);
         singUp = findViewById(R.id.SignUp);
+        checkBox = findViewById(R.id.checkbox);
+        fingerprintBtn = findViewById(R.id.fingerprint);
 
-
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         db = new DatabaseHandler(this);
 
 
-        signInBtn.setOnClickListener(new View.OnClickListener() {
+        Executor executor = ContextCompat.getMainExecutor(this);
+        BiometricPrompt biometricPrompt = new BiometricPrompt(this, executor, new BiometricPrompt.AuthenticationCallback() {
             @Override
-            public void onClick(View view) {
-                String enteredEmail = useremail.getText().toString().trim();
-                String enteredPassword = userpassword.getText().toString().trim();
+            public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+                super.onAuthenticationError(errorCode, errString);
+                Toast.makeText(getApplicationContext(), "Authentication error: " + errString, Toast.LENGTH_SHORT).show();
+            }
 
-                if (enteredEmail.isEmpty() || enteredPassword.isEmpty()) {
-                    Toast.makeText(getApplicationContext(), "Please enter both email and password", Toast.LENGTH_SHORT).show();
-                    return;
-                }
+            @Override
+            public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
+                super.onAuthenticationSucceeded(result);
+                Toast.makeText(getApplicationContext(), "Authentication succeeded!", Toast.LENGTH_SHORT).show();
 
-                UserInfo user = db.getuser(enteredEmail);
 
-                if (user != null && user.getEmail().equals(enteredEmail)) {
-                    Toast.makeText(getApplicationContext(), "Successfully Signed In", Toast.LENGTH_SHORT).show();
+                String savedEmail = prefs.getString("username", null);
+                String savedPassword = prefs.getString("password", null);
 
-                } else {
-                    Toast.makeText(getApplicationContext(), "Incorrect email or password", Toast.LENGTH_SHORT).show();
+                if (savedEmail != null && savedPassword != null) {
+                    useremail.setText(savedEmail);
+                    userpassword.setText(savedPassword);
+                    signInBtn.performClick();
                 }
             }
-        });
-
 
-        forgotpass.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(getApplicationContext(), forgot_password.class);
-                startActivity(intent);
+            public void onAuthenticationFailed() {
+                super.onAuthenticationFailed();
+                Toast.makeText(getApplicationContext(), "Authentication failed", Toast.LENGTH_SHORT).show();
             }
         });
-        singUp.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-                startActivity(intent);
+
+        BiometricPrompt.PromptInfo promptInfo = new BiometricPrompt.PromptInfo.Builder()
+                .setTitle("Biometric login for My App")
+                .setSubtitle("Log in using your biometric credential")
+                .setNegativeButtonText("Use password instead")
+                .build();
+
+
+        BiometricManager biometricManager = BiometricManager.from(this);
+        //BiometricManager.BIOMETRIC_SUCCESS
+            fingerprintBtn.setVisibility(View.VISIBLE);
+            fingerprintBtn.setOnClickListener(view -> biometricPrompt.authenticate(promptInfo));
+
+
+        signInBtn.setOnClickListener(view -> {
+            String enteredEmail = useremail.getText().toString().trim();
+            String enteredPassword = userpassword.getText().toString().trim();
+
+            if (enteredEmail.isEmpty() || enteredPassword.isEmpty()) {
+                Toast.makeText(getApplicationContext(), "Please enter both email and password", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            UserInfo user = db.getuser(enteredEmail);
+            if (user != null && user.getEmail().equals(enteredEmail)) {
+                boolean isChecked = checkBox.isChecked();
+
+                SharedPreferences.Editor editor = prefs.edit();
+                editor.putString("username", enteredEmail);
+                editor.putString("password", enteredPassword);
+                editor.putBoolean("checkbox", isChecked);
+                editor.apply();
+
+                displaySharedPreferences(prefs);
+
+                Toast.makeText(getApplicationContext(), "Successfully Signed In", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(getApplicationContext(), "Incorrect email or password", Toast.LENGTH_SHORT).show();
             }
         });
+
+        forgotpass.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), forgot_password.class);
+            startActivity(intent);
+        });
+
+        singUp.setOnClickListener(view -> {
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            startActivity(intent);
+        });
+    }
+
+    public void displaySharedPreferences(SharedPreferences prefs) {
+        String savedEmail = prefs.getString("username", "No email found");
+        String savedPassword = prefs.getString("password", "No password foun");
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("Saved Credentials");
+        builder.setMessage("Email: " + savedEmail + "\nPassword: " + savedPassword);
+        builder.setPositiveButton("Ok", null);
+        AlertDialog dialog = builder.create();
+        dialog.show();
     }
 }
diff --git a/app/src/main/res/layout/activity_sign_in.xml b/app/src/main/res/layout/activity_sign_in.xml
index b509115..c9d53ec 100644
--- a/app/src/main/res/layout/activity_sign_in.xml
+++ b/app/src/main/res/layout/activity_sign_in.xml
@@ -44,6 +44,14 @@
                 android:textColor="#ffffff"
                 android:textSize="22sp"
                 android:textStyle="bold"/>
+
+            <Button
+                android:id="@+id/fingerprint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:text="fingerprint" />
+
         </LinearLayout>
         <LinearLayout
             android:id="@+id/container"
@@ -98,6 +106,11 @@
                 android:padding="10dp"
                 android:text=""
                 android:textSize="14sp" />
+            <CheckBox
+                android:id="@+id/checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Stay logged in"/>
             <TextView
                 android:id="@+id/forgotPassword"
                 android:layout_width="wrap_content"
@@ -108,6 +121,7 @@
                 android:layout_marginLeft="200dp"
                 android:padding="6sp"
                 />
+
         </LinearLayout>
 
         <RelativeLayout
@@ -128,6 +142,7 @@
                 android:minWidth="48dp"
                 android:minHeight="48dp"/>
 
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 94e1d18..32aa1be 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 agp = "8.5.0"
+biometric = "1.1.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
@@ -11,6 +12,7 @@ navigationFragment = "2.6.0"
 navigationUi = "2.6.0"
 
 [libraries]
+biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }