From 85f78e3333a2e07044a708e5333396a14b93ef97 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Fri, 9 Oct 2020 12:14:44 -0700
Subject: [PATCH 1/6] Can now display splashscreen when first entering the app
 v.3

---
 Listify/app/src/main/AndroidManifest.xml      |  1 +
 .../com/example/listify/MainActivity.java     | 18 +++++++++++-
 .../com/example/listify/SplashActivity.java   | 28 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 Listify/app/src/main/java/com/example/listify/SplashActivity.java

diff --git a/Listify/app/src/main/AndroidManifest.xml b/Listify/app/src/main/AndroidManifest.xml
index 73d5a0d..980c079 100644
--- a/Listify/app/src/main/AndroidManifest.xml
+++ b/Listify/app/src/main/AndroidManifest.xml
@@ -40,6 +40,7 @@
         <activity android:name="com.example.listify.ui.LoginPage" />
         <activity android:name="com.example.listify.ui.ForgotPasswordPage" />
         <activity android:name="com.example.listify.ListPage" />
+        <activity android:name="com.example.listify.SplashActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java
index 0dfb9cc..d56bbee 100644
--- a/Listify/app/src/main/java/com/example/listify/MainActivity.java
+++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java
@@ -2,6 +2,7 @@ package com.example.listify;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -14,12 +15,15 @@ import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
+
 import com.amplifyframework.auth.AuthException;
 import com.example.listify.data.Item;
 import com.example.listify.data.ItemSearch;
 import com.example.listify.data.List;
 import com.example.listify.data.ListEntry;
 import com.google.android.material.navigation.NavigationView;
+import static com.example.listify.SplashActivity.showSplash;
+
 import org.json.JSONException;
 import java.io.IOException;
 import java.time.Instant;
@@ -29,13 +33,25 @@ import java.util.Random;
 
 public class MainActivity extends AppCompatActivity implements CreateListDialogFragment.OnNewListListener {
     private AppBarConfiguration mAppBarConfiguration;
-
     public static AuthManager am = new AuthManager();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if(showSplash) {
+            showSplash = false;
+
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    Intent intent = new Intent(MainActivity.this, SplashActivity.class);
+                    startActivity(intent);
+                    finish();
+                }
+            }, 1);
+        }
+
 
         //------------------------------Auth Testing---------------------------------------------//
 
diff --git a/Listify/app/src/main/java/com/example/listify/SplashActivity.java b/Listify/app/src/main/java/com/example/listify/SplashActivity.java
new file mode 100644
index 0000000..a5d9c2a
--- /dev/null
+++ b/Listify/app/src/main/java/com/example/listify/SplashActivity.java
@@ -0,0 +1,28 @@
+package com.example.listify;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class SplashActivity extends AppCompatActivity {
+    public static boolean showSplash = true;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splashscreen);
+
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                showSplash = false;
+                Intent intent = new Intent(SplashActivity.this, MainActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        }, 3000);
+    }
+}
\ No newline at end of file

From 8acf63038256288717bd8fbbe36e0f3420636640 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 20 Oct 2020 20:07:31 -0700
Subject: [PATCH 2/6] Removed everything except Login and Delete Account
 buttons in Home/Profile page

---
 .../java/com/example/listify/AuthManager.java |  1 -
 .../example/listify/ui/home/HomeFragment.java |  9 ++----
 .../app/src/main/res/layout/fragment_home.xml | 31 ++++---------------
 Listify/app/src/main/res/values/strings.xml   |  2 +-
 4 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/AuthManager.java b/Listify/app/src/main/java/com/example/listify/AuthManager.java
index 7e38e72..c00c8eb 100644
--- a/Listify/app/src/main/java/com/example/listify/AuthManager.java
+++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java
@@ -117,7 +117,6 @@ public class AuthManager {
             error -> setAuthError(error)
         );
         throwIfAuthError();
-
     }
 
     public void confirmSignUp(String confirmationCode) throws AuthException {
diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
index 6e7b513..68ec5e2 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
@@ -26,7 +26,7 @@ import java.util.Properties;
 
 public class HomeFragment extends Fragment {
     private Button toLoginPage;
-    private Button toListPage;
+    private Button toDeleteAccountPage;
 
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_home, container, false);
@@ -40,13 +40,10 @@ public class HomeFragment extends Fragment {
             }
         });
 
-        toListPage = (Button) root.findViewById(R.id.button2);
-        toListPage.setOnClickListener(new View.OnClickListener() {
+        toDeleteAccountPage = (Button) root.findViewById(R.id.button2);
+        toDeleteAccountPage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                //Intent intent = new Intent(HomeFragment.this.getActivity(), com.example.listify.ListPage.class);
-                //startActivity(intent);
-
                 try {
                     Properties configs = new Properties();
                     try {
diff --git a/Listify/app/src/main/res/layout/fragment_home.xml b/Listify/app/src/main/res/layout/fragment_home.xml
index f43f76a..ecc63ce 100644
--- a/Listify/app/src/main/res/layout/fragment_home.xml
+++ b/Listify/app/src/main/res/layout/fragment_home.xml
@@ -10,39 +10,20 @@
         android:id="@+id/button1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="25dp"
-        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="40dp"
         android:text="Log in"
-        app:layout_constraintBottom_toTopOf="@+id/button2"
-        app:layout_constraintEnd_toEndOf="@+id/button2" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/button2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="148dp"
         android:text="Delete Account"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Switch
-        android:id="@+id/switch1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="29dp"
-        android:text="Kroger"
-        app:layout_constraintBottom_toTopOf="@+id/button1"
-        app:layout_constraintStart_toStartOf="@+id/button1" />
-
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="31dp"
-        android:text="Search these stores:"
-        app:layout_constraintBottom_toTopOf="@+id/switch1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Listify/app/src/main/res/values/strings.xml b/Listify/app/src/main/res/values/strings.xml
index d2e0149..ef47675 100644
--- a/Listify/app/src/main/res/values/strings.xml
+++ b/Listify/app/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>
 
-    <string name="menu_home">Home</string>
+    <string name="menu_home">Profile</string>
     <string name="menu_gallery">Gallery</string>
     <string name="menu_slideshow">Slideshow</string>
 

From 6337422f52eb3c6f12e5ed216f64dca46907f68d Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 20 Oct 2020 20:36:42 -0700
Subject: [PATCH 3/6] Added Confirm Password to Forgot Password

---
 .../listify/ui/ForgotPasswordPage.java        | 17 +++++--
 .../main/res/layout/activity_forgotpswd.xml   | 47 ++++++++++++-------
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java
index a06d23a..565db9b 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java
@@ -18,6 +18,7 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
 
     String email;
     String newPassword;
+    String confirmNewPassword;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -28,19 +29,25 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
         button1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                EditText emailText = (EditText) findViewById(R.id.editTextTextEmailAddress2);
-                EditText newPasswordText = (EditText) findViewById(R.id.editTextTextPassword2);
+                EditText emailText = (EditText) findViewById(R.id.editTextTextEmailAddress);
+                EditText newPasswordText = (EditText) findViewById(R.id.editTextTextPassword);
+                EditText confirmNewPasswordText = (EditText) findViewById(R.id.editTextTextPassword2);
 
                 email = emailText.getText().toString();
                 newPassword = newPasswordText.getText().toString();
+                confirmNewPassword = confirmNewPasswordText.getText().toString();
+
+                if(!newPassword.equals(confirmNewPassword)) {
+                    TextView invalidCred = findViewById(R.id.textView6);
+                    invalidCred.setText("\"Confirm New Password\" does not match \"New Password\".");
+                    return;
+                }
 
                 try {
                     am.changePassword(email);
                 }
                 catch (Exception e) {
                     Log.i("Authentication", e.toString());
-                    TextView invalidCred = findViewById(R.id.textView6);
-                    invalidCred.setText("Password criteria not met. Please try again.");
                 }
                 openDialog();
             }
@@ -60,6 +67,8 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
             }
             catch (Exception e) {
                 Log.i("Authentication", e.toString());
+                TextView invalidCred = findViewById(R.id.textView6);
+                invalidCred.setText("Password criteria not met. Please try again.");
             }
         }
 
diff --git a/Listify/app/src/main/res/layout/activity_forgotpswd.xml b/Listify/app/src/main/res/layout/activity_forgotpswd.xml
index 8e4055c..7080bbd 100644
--- a/Listify/app/src/main/res/layout/activity_forgotpswd.xml
+++ b/Listify/app/src/main/res/layout/activity_forgotpswd.xml
@@ -9,51 +9,64 @@
         android:id="@+id/button1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="52dp"
+        android:layout_marginTop="51dp"
         android:text="Submit"
         app:layout_constraintEnd_toStartOf="@+id/textView6"
         app:layout_constraintStart_toStartOf="@+id/textView6"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword2" />
 
     <EditText
-        android:id="@+id/editTextTextEmailAddress2"
+        android:id="@+id/editTextTextEmailAddress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="295dp"
+        android:layout_marginTop="263dp"
         android:ems="10"
         android:hint="Email"
         android:inputType="textEmailAddress"
-        app:layout_constraintStart_toStartOf="@+id/editTextTextPassword2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <EditText
+        android:id="@+id/editTextTextPassword"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="35dp"
+        android:ems="10"
+        android:hint="New Password"
+        android:inputType="textPassword"
+        app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress"
+        app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />
+
     <EditText
         android:id="@+id/editTextTextPassword2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="31dp"
+        android:layout_marginTop="35dp"
         android:ems="10"
-        android:hint="New Password"
+        android:hint="Confirm New Password"
         android:inputType="textPassword"
         app:layout_constraintEnd_toStartOf="@+id/textView6"
         app:layout_constraintStart_toStartOf="@+id/textView6"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress2" />
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="34dp"
-        android:layout_marginEnd="2dp"
-        android:text="Please enter your email address."
-        app:layout_constraintBottom_toTopOf="@+id/editTextTextEmailAddress2"
-        app:layout_constraintEnd_toEndOf="@+id/editTextTextEmailAddress2" />
+        app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" />
 
     <TextView
         android:id="@+id/textView6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
         android:text=""
         app:layout_constraintBottom_toTopOf="@+id/button1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="46dp"
+        android:layout_marginEnd="2dp"
+        android:text="Please enter your email address."
+        app:layout_constraintBottom_toTopOf="@+id/editTextTextEmailAddress"
+        app:layout_constraintEnd_toEndOf="@+id/editTextTextEmailAddress" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4623718e3a9ab50498bded3fe7bace25a685acf6 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 20 Oct 2020 20:55:02 -0700
Subject: [PATCH 4/6] Restructured Forgot Password code similar to that of Sign
 Up

---
 .../main/java/com/example/listify/AuthManager.java    |  2 --
 .../com/example/listify/ui/ForgotPasswordPage.java    | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/AuthManager.java b/Listify/app/src/main/java/com/example/listify/AuthManager.java
index c00c8eb..87ab897 100644
--- a/Listify/app/src/main/java/com/example/listify/AuthManager.java
+++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java
@@ -28,7 +28,6 @@ public class AuthManager {
     String password = null;
     volatile boolean waiting = false;
 
-
     void fetchAuthSession() throws AuthException {
         waiting = true;
         Amplify.Auth.fetchAuthSession(
@@ -61,7 +60,6 @@ public class AuthManager {
         return authSession.getUserPoolTokens().getValue().getIdToken();
     }
 
-
     public void setAuthSession(AuthSession toSet) {
         authSession = (AWSCognitoAuthSession) toSet;
         waiting = false;
diff --git a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java
index 565db9b..f30833b 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java
@@ -48,7 +48,11 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
                 }
                 catch (Exception e) {
                     Log.i("Authentication", e.toString());
+                    TextView invalidCred = findViewById(R.id.textView6);
+                    invalidCred.setText("Password criteria not met. Please try again.");
+                    return;
                 }
+
                 openDialog();
             }
         });
@@ -64,15 +68,12 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
         if(!cancel) {
             try {
                 am.confirmPasswordReset(newPassword, code);
+                Intent intent = new Intent(ForgotPasswordPage.this, LoginPage.class);
+                startActivity(intent);
             }
             catch (Exception e) {
                 Log.i("Authentication", e.toString());
-                TextView invalidCred = findViewById(R.id.textView6);
-                invalidCred.setText("Password criteria not met. Please try again.");
             }
         }
-
-        Intent intent = new Intent(ForgotPasswordPage.this, LoginPage.class);
-        startActivity(intent);
     }
 }
\ No newline at end of file

From e1c670fed00022186f00da0969de00ce405c4fd6 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 20 Oct 2020 22:55:43 -0700
Subject: [PATCH 5/6] Renamed xml file for list entry

---
 Listify/app/src/main/AndroidManifest.xml                     | 5 ++---
 Listify/app/src/main/java/com/example/listify/ListPage.java  | 4 ++--
 .../{listproduct.xml => activity_listproductentry.xml}       | 0
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename Listify/app/src/main/res/layout/{listproduct.xml => activity_listproductentry.xml} (100%)

diff --git a/Listify/app/src/main/AndroidManifest.xml b/Listify/app/src/main/AndroidManifest.xml
index 980c079..7389dd5 100644
--- a/Listify/app/src/main/AndroidManifest.xml
+++ b/Listify/app/src/main/AndroidManifest.xml
@@ -33,14 +33,13 @@
             android:name=".SearchResults"
             android:label=""
             android:theme="@style/AppTheme.NoActionBar">
-
         </activity>
-  
+
+        <activity android:name="com.example.listify.SplashActivity" />
         <activity android:name="com.example.listify.ui.SignupPage" />
         <activity android:name="com.example.listify.ui.LoginPage" />
         <activity android:name="com.example.listify.ui.ForgotPasswordPage" />
         <activity android:name="com.example.listify.ListPage" />
-        <activity android:name="com.example.listify.SplashActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/Listify/app/src/main/java/com/example/listify/ListPage.java b/Listify/app/src/main/java/com/example/listify/ListPage.java
index f81c481..fa449d2 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -123,7 +123,7 @@ public class ListPage extends AppCompatActivity {
         ArrayList<Integer> pImages;
 
         MyAdapter (Context c, ArrayList<String> names, ArrayList<String> stores, ArrayList<String> prices, ArrayList<String> quantity, ArrayList<Integer> images) {
-            super(c, R.layout.listproduct, R.id.productView, names);
+            super(c, R.layout.activity_listproductentry, R.id.productView, names);
             context = c;
             pNames = names;
             pStores = stores;
@@ -136,7 +136,7 @@ public class ListPage extends AppCompatActivity {
         @Override
         public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
             LayoutInflater layoutInflater = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            View listproduct = layoutInflater.inflate(R.layout.listproduct, parent,false);
+            View listproduct = layoutInflater.inflate(R.layout.activity_listproductentry, parent,false);
 
             decrQuan = (Button) listproduct.findViewById(R.id.buttonDecr);
             incrQuan = (Button) listproduct.findViewById(R.id.buttonIncr);
diff --git a/Listify/app/src/main/res/layout/listproduct.xml b/Listify/app/src/main/res/layout/activity_listproductentry.xml
similarity index 100%
rename from Listify/app/src/main/res/layout/listproduct.xml
rename to Listify/app/src/main/res/layout/activity_listproductentry.xml

From a3ed7ba8d970e5458ad5bd4061aa288b5d118f65 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 20 Oct 2020 23:37:27 -0700
Subject: [PATCH 6/6] Finished with adding an extra security step to the delete
 account process

---
 .../java/com/example/listify/AuthManager.java |  4 ++
 .../example/listify/ui/home/HomeFragment.java | 51 ++++++++++++++-----
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/AuthManager.java b/Listify/app/src/main/java/com/example/listify/AuthManager.java
index 87ab897..74096fe 100644
--- a/Listify/app/src/main/java/com/example/listify/AuthManager.java
+++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java
@@ -60,6 +60,10 @@ public class AuthManager {
         return authSession.getUserPoolTokens().getValue().getIdToken();
     }
 
+    public String getPassword() {
+        return password;
+    }
+
     public void setAuthSession(AuthSession toSet) {
         authSession = (AWSCognitoAuthSession) toSet;
         waiting = false;
diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
index 68ec5e2..5565af8 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
@@ -1,5 +1,7 @@
 package com.example.listify.ui.home;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -8,6 +10,8 @@ import android.widget.Button;
 
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
+import android.widget.EditText;
+
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
@@ -44,19 +48,42 @@ public class HomeFragment extends Fragment {
         toDeleteAccountPage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                try {
-                    Properties configs = new Properties();
-                    try {
-                        configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json");
-                    } catch (IOException | JSONException e) {
-                        e.printStackTrace();
+                View passwordView = getLayoutInflater().inflate(R.layout.activity_code, null);
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                builder.setView(passwordView);
+                builder.setTitle("Account deletion verification");
+                builder.setMessage("Are you sure you want to delete your account? If so, enter your password below and hit \"Yes\".");
+                builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        EditText passwordText = (EditText) passwordView.findViewById(R.id.editTextCode);
+                        String password = passwordText.getText().toString();
+                        if(password.equals(am.getPassword())) {
+                            try {
+                                Properties configs = new Properties();
+                                try {
+                                    configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json");
+                                } catch (IOException | JSONException e) {
+                                    e.printStackTrace();
+                                }
+                                Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
+                                am.deleteUser(requestor);
+                            }
+                            catch (Exception e) {
+                                Log.i("Authentication", e.toString());
+                            }
+                        }
                     }
-                    Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
-                    am.deleteUser(requestor);
-                }
-                catch (Exception e) {
-                    Log.i("Authentication", e.toString());
-                }
+                });
+                builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        return;
+                    }
+                });
+
+                AlertDialog dialog = builder.create();
+                dialog.show();
             }
         });