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 01/36] 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 4e7b180fe086af6f34a8735b4f9aa0ff7cfd73d3 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Tue, 20 Oct 2020 05:45:33 -0400
Subject: [PATCH 02/36] Async load search results

---
 .../com/example/listify/SearchResults.java    | 77 ++++++++++++-------
 1 file changed, 49 insertions(+), 28 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/SearchResults.java b/Listify/app/src/main/java/com/example/listify/SearchResults.java
index 0b312c6..3841f4a 100644
--- a/Listify/app/src/main/java/com/example/listify/SearchResults.java
+++ b/Listify/app/src/main/java/com/example/listify/SearchResults.java
@@ -22,7 +22,7 @@ import java.util.Properties;
 
 import static com.example.listify.MainActivity.am;
 
-public class SearchResults extends AppCompatActivity implements SortDialogFragment.OnSortingListener {
+public class SearchResults extends AppCompatActivity implements SortDialogFragment.OnSortingListener, Requestor.Receiver {
     private ListView listView;
     private SearchResultsListAdapter searchResultsListAdapter;
     private List<Product> resultsProductList = new ArrayList<>();
@@ -148,32 +148,7 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
         }
 
         Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
-
-        SynchronousReceiver<ItemSearch> itemReceiver = new SynchronousReceiver<>();
-        requestor.getObject(query, ItemSearch.class, itemReceiver, itemReceiver);
-        ItemSearch results;
-        try {
-            results = itemReceiver.await();
-            for (int i = 0; i < results.getResults().size(); i++) {
-                // TODO: Change to dynamically grab chain name by id
-                resultsProductList.add(new Product(results.getResults().get(i).getDescription(), results.getResults().get(i).getProductID(), "Kroger", results.getResults().get(i).getChainID(), results.getResults().get(i).getUpc(), results.getResults().get(i).getDescription(), results.getResults().get(i).getPrice(), results.getResults().get(i).getImageURL(), results.getResults().get(i).getDepartment()));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        // Create a list of all stores in the results so the user can filter by store name
-        for (int i = 0; i < resultsProductList.size(); i++) {
-            if (!stores.contains(resultsProductList.get(i).getChainName())) {
-                stores.add(resultsProductList.get(i).getChainName());
-            }
-        }
-
-        // Add all results to the sorted list
-        resultsProductListSorted.addAll(resultsProductList);
-
-        // Apply selected sorting to the list
-        sortResults();
+        requestor.getObject(query, ItemSearch.class, this);
     }
 
     // Sorts the search results
@@ -258,6 +233,52 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
             resultsProductListSorted.addAll(temp);
         }
 
-        searchResultsListAdapter.notifyDataSetChanged();
+        // Updates the list of search results. Runs on the main UI thread since other threads are
+        // not allowed to change UI elements
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                searchResultsListAdapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    // This is called after the search results come back from the server
+    // TODO: Display a "no results" message if nothing is found when searching
+    @Override
+    public void acceptDelivery(Object delivered) {
+        ItemSearch results = (ItemSearch) delivered;
+
+        try {
+            for (int i = 0; i < results.getResults().size(); i++) {
+                // TODO: Change to dynamically grab chain name by id
+                resultsProductList.add(new Product(
+                        results.getResults().get(i).getDescription(),
+                        results.getResults().get(i).getProductID(),
+                        "Kroger",
+                        results.getResults().get(i).getChainID(),
+                        results.getResults().get(i).getUpc(),
+                        results.getResults().get(i).getDescription(),
+                        results.getResults().get(i).getPrice(),
+                        results.getResults().get(i).getImageURL(),
+                        results.getResults().get(i).getDepartment()
+                ));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        // Create a list of all stores in the results so the user can filter by store name
+        for (int i = 0; i < resultsProductList.size(); i++) {
+            if (!stores.contains(resultsProductList.get(i).getChainName())) {
+                stores.add(resultsProductList.get(i).getChainName());
+            }
+        }
+
+        // Add all results to the sorted list
+        resultsProductListSorted.addAll(resultsProductList);
+
+        // Apply selected sorting to the list
+        sortResults();
     }
 }
\ No newline at end of file

From 4757ba2ddf15041af7d48c32f8d07067444e4924 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Tue, 20 Oct 2020 07:28:58 -0400
Subject: [PATCH 03/36] Create new thread on search and show progress bar

---
 .../com/example/listify/SearchResults.java    | 38 ++++++++++++++-----
 .../res/layout/content_search_results.xml     | 10 +++++
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/SearchResults.java b/Listify/app/src/main/java/com/example/listify/SearchResults.java
index 3841f4a..37f78cb 100644
--- a/Listify/app/src/main/java/com/example/listify/SearchResults.java
+++ b/Listify/app/src/main/java/com/example/listify/SearchResults.java
@@ -9,6 +9,7 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.SearchView;
 import com.example.listify.adapter.SearchResultsListAdapter;
 import com.example.listify.data.ItemSearch;
@@ -23,7 +24,7 @@ import java.util.Properties;
 import static com.example.listify.MainActivity.am;
 
 public class SearchResults extends AppCompatActivity implements SortDialogFragment.OnSortingListener, Requestor.Receiver {
-    private ListView listView;
+    private ProgressBar loadingSearch;
     private SearchResultsListAdapter searchResultsListAdapter;
     private List<Product> resultsProductList = new ArrayList<>();
     private List<Product> resultsProductListSorted = new ArrayList<>();
@@ -31,6 +32,7 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
     private int storeSelection;
     private int sortMode;
     private boolean descending;
+    boolean doneLoading = false;
 
     @Override
     public void sendSort(int storeSelection, int sortMode, boolean descending) {
@@ -47,6 +49,8 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        loadingSearch = (ProgressBar) findViewById(R.id.progress_loading_search);
+
         // Back button closes this activity and returns to previous activity (MainActivity)
         ImageButton backButton = (ImageButton) findViewById(R.id.backToHomeButton);
         backButton.setOnClickListener(new View.OnClickListener() {
@@ -77,7 +81,7 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
             }
         });
 
-        listView = (ListView) findViewById(R.id.search_results_list);
+        ListView listView = (ListView) findViewById(R.id.search_results_list);
         searchResultsListAdapter = new SearchResultsListAdapter(this, resultsProductListSorted);
         listView.setAdapter(searchResultsListAdapter);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -96,7 +100,15 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
-                doSearch(query);
+                // Show progress bar
+                loadingSearch.setVisibility(View.VISIBLE);
+                Thread t = new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        doSearch(query);
+                    }
+                });
+                t.start();
                 return false;
             }
 
@@ -122,12 +134,8 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
                 sortDialog.show(getSupportFragmentManager(), "Sort");
             }
         });
-
     }
 
-
-
-
     // Override default phone back button to add animation
     @Override
     public void onBackPressed() {
@@ -136,10 +144,13 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
     }
 
     private void doSearch(String query) {
-
         // Clear the old search results
         resultsProductList.clear();
 
+        // Clear old search results from the view
+        resultsProductListSorted.clear();
+        searchResultsListAdapter.notifyDataSetChanged();
+
         Properties configs = new Properties();
         try {
             configs = AuthManager.loadProperties(this, "android.resource://" + getPackageName() + "/raw/auths.json");
@@ -178,7 +189,6 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
                 });
                 break;
 
-            // TODO: May need to change this depending on if price is stored as a string or a double
             case 2:
                 resultsProductListSorted.sort(new Comparator<Product>() {
                     @Override
@@ -238,7 +248,13 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                searchResultsListAdapter.notifyDataSetChanged();
+                if (doneLoading) {
+                    doneLoading = false;
+                    searchResultsListAdapter.notifyDataSetChanged();
+
+                    // Hide progress bar
+                    loadingSearch.setVisibility(View.GONE);
+                }
             }
         });
     }
@@ -280,5 +296,7 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
 
         // Apply selected sorting to the list
         sortResults();
+
+        doneLoading = true;
     }
 }
\ No newline at end of file
diff --git a/Listify/app/src/main/res/layout/content_search_results.xml b/Listify/app/src/main/res/layout/content_search_results.xml
index cd08592..51ff208 100644
--- a/Listify/app/src/main/res/layout/content_search_results.xml
+++ b/Listify/app/src/main/res/layout/content_search_results.xml
@@ -12,6 +12,16 @@
     tools:context=".SearchResults"
     tools:showIn="@layout/activity_search_results">
 
+    <ProgressBar
+        android:id="@+id/progress_loading_search"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:indeterminate="true"
+        android:visibility="gone"/>
+
     <ListView
         android:id="@+id/search_results_list"
         android:layout_width="fill_parent"

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 04/36] 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 05/36] 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 06/36] 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 07/36] 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 08/36] 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();
             }
         });
 

From 8dd2f33b422e12f4a50dfd9158e580eb0e1dee99 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 21 Oct 2020 11:52:20 -0700
Subject: [PATCH 09/36] App directs user to Login page if not logged in

---
 .../app/src/main/java/com/example/listify/AuthManager.java  | 4 ++++
 .../app/src/main/java/com/example/listify/MainActivity.java | 6 ++++++
 .../src/main/java/com/example/listify/ui/SignupPage.java    | 2 +-
 .../main/java/com/example/listify/ui/home/HomeFragment.java | 3 +++
 Listify/app/src/main/res/layout/activity_code.xml           | 4 ++--
 Listify/app/src/main/res/layout/activity_signup.xml         | 2 +-
 6 files changed, 17 insertions(+), 4 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 74096fe..bc3164c 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 getEmail() {
+        return email;
+    }
+
     public String getPassword() {
         return password;
     }
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 d56bbee..d18c4f1 100644
--- a/Listify/app/src/main/java/com/example/listify/MainActivity.java
+++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java
@@ -21,6 +21,7 @@ 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.example.listify.ui.LoginPage;
 import com.google.android.material.navigation.NavigationView;
 import static com.example.listify.SplashActivity.showSplash;
 
@@ -52,6 +53,11 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
             }, 1);
         }
 
+        if(am.getEmail() == null) {
+            Intent intent = new Intent(MainActivity.this, LoginPage.class);
+            startActivity(intent);
+        }
+
 
         //------------------------------Auth Testing---------------------------------------------//
 
diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
index c3a691a..a35e678 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
@@ -76,7 +76,7 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
         if(!cancel) {
             try {
                 am.confirmSignUp(code);
-                Intent intent = new Intent(SignupPage.this, MainActivity.class);
+                Intent intent = new Intent(SignupPage.this, LoginPage.class);
                 startActivity(intent);
             }
             catch (Exception e) {
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 5565af8..fcca309 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
@@ -68,6 +68,9 @@ public class HomeFragment extends Fragment {
                                 }
                                 Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
                                 am.deleteUser(requestor);
+
+                                Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
+                                startActivity(intent);
                             }
                             catch (Exception e) {
                                 Log.i("Authentication", e.toString());
diff --git a/Listify/app/src/main/res/layout/activity_code.xml b/Listify/app/src/main/res/layout/activity_code.xml
index 2c06f6a..7b8bd91 100644
--- a/Listify/app/src/main/res/layout/activity_code.xml
+++ b/Listify/app/src/main/res/layout/activity_code.xml
@@ -11,8 +11,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:ems="10"
-        android:hint="Code"
-        android:inputType="textPersonName"
+        android:hint=""
+        android:inputType="textPassword"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/Listify/app/src/main/res/layout/activity_signup.xml b/Listify/app/src/main/res/layout/activity_signup.xml
index 6af1bfd..1671732 100644
--- a/Listify/app/src/main/res/layout/activity_signup.xml
+++ b/Listify/app/src/main/res/layout/activity_signup.xml
@@ -33,7 +33,7 @@
         android:layout_marginTop="23dp"
         android:ems="10"
         android:hint="Password"
-        android:inputType="textPersonName"
+        android:inputType="textPassword"
         app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />
 

From fdf27b9e6222282e97d7ce2c00fde1cd9e194a99 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 21 Oct 2020 12:22:42 -0700
Subject: [PATCH 10/36] User can now log out and also automatically gets logged
 in after signing up

---
 .../java/com/example/listify/ui/SignupPage.java     | 13 +++++++++----
 .../com/example/listify/ui/home/HomeFragment.java   |  7 ++++++-
 Listify/app/src/main/res/layout/fragment_home.xml   |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
index a35e678..a5400c7 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
@@ -19,6 +19,10 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
     private Button button1; //Log in page button
     private Button button2; //Sign up button
 
+    String email;
+    String password;
+    String confirmPassword;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -41,9 +45,9 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
                 EditText passwordText = (EditText) findViewById(R.id.editTextTextPassword);
                 EditText confirmPasswordText = (EditText) findViewById(R.id.editTextTextPassword2);
 
-                String email = emailText.getText().toString();
-                String password = passwordText.getText().toString();
-                String confirmPassword = confirmPasswordText.getText().toString();
+                email = emailText.getText().toString();
+                password = passwordText.getText().toString();
+                confirmPassword = confirmPasswordText.getText().toString();
 
                 if(!password.equals(confirmPassword)) {
                     TextView invalidCred = findViewById(R.id.textView3);
@@ -76,7 +80,8 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
         if(!cancel) {
             try {
                 am.confirmSignUp(code);
-                Intent intent = new Intent(SignupPage.this, LoginPage.class);
+                am.signIn(email, password);
+                Intent intent = new Intent(SignupPage.this, MainActivity.class);
                 startActivity(intent);
             }
             catch (Exception e) {
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 fcca309..985d430 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
@@ -39,6 +39,12 @@ public class HomeFragment extends Fragment {
         toLoginPage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                try {
+                    am.signOutUser();
+                }
+                catch (Exception e) {
+                    Log.i("Authentication", e.toString());
+                }
                 Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
                 startActivity(intent);
             }
@@ -68,7 +74,6 @@ public class HomeFragment extends Fragment {
                                 }
                                 Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
                                 am.deleteUser(requestor);
-
                                 Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
                                 startActivity(intent);
                             }
diff --git a/Listify/app/src/main/res/layout/fragment_home.xml b/Listify/app/src/main/res/layout/fragment_home.xml
index ecc63ce..2726aad 100644
--- a/Listify/app/src/main/res/layout/fragment_home.xml
+++ b/Listify/app/src/main/res/layout/fragment_home.xml
@@ -11,7 +11,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="40dp"
-        android:text="Log in"
+        android:text="Log out"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

From 465318eb84f8856aa643bb4dec2578f0ae36387f Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 21 Oct 2020 14:31:00 -0700
Subject: [PATCH 11/36] Sign out button is now in the hamburger menu

---
 .../com/example/listify/MainActivity.java     | 17 +++++++++++
 .../example/listify/ui/home/HomeFragment.java | 18 +-----------
 .../app/src/main/res/layout/fragment_home.xml | 12 +-------
 .../main/res/menu/activity_main_drawer.xml    | 28 +++++++++++--------
 4 files changed, 35 insertions(+), 40 deletions(-)

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 d18c4f1..ea01bac 100644
--- a/Listify/app/src/main/java/com/example/listify/MainActivity.java
+++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java
@@ -202,6 +202,23 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
         });
     }
 
+    public void onClickSignout(MenuItem m) {
+        m.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                try {
+                    am.signOutUser();
+                    Intent intent = new Intent(MainActivity.this, com.example.listify.ui.LoginPage.class);
+                    startActivity(intent);
+                }
+                catch (Exception e) {
+                    Log.i("Authentication", e.toString());
+                }
+                return false;
+            }
+        });
+    }
+
     @Override
     public void sendNewListName(String name) {
         Properties configs = new Properties();
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 985d430..28178c9 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
@@ -29,28 +29,12 @@ import java.io.IOException;
 import java.util.Properties;
 
 public class HomeFragment extends Fragment {
-    private Button toLoginPage;
     private Button toDeleteAccountPage;
 
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_home, container, false);
 
-        toLoginPage = (Button) root.findViewById(R.id.button1);
-        toLoginPage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    am.signOutUser();
-                }
-                catch (Exception e) {
-                    Log.i("Authentication", e.toString());
-                }
-                Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
-                startActivity(intent);
-            }
-        });
-
-        toDeleteAccountPage = (Button) root.findViewById(R.id.button2);
+        toDeleteAccountPage = (Button) root.findViewById(R.id.button);
         toDeleteAccountPage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/Listify/app/src/main/res/layout/fragment_home.xml b/Listify/app/src/main/res/layout/fragment_home.xml
index 2726aad..a938244 100644
--- a/Listify/app/src/main/res/layout/fragment_home.xml
+++ b/Listify/app/src/main/res/layout/fragment_home.xml
@@ -7,17 +7,7 @@
     tools:context=".ui.home.HomeFragment">
 
     <Button
-        android:id="@+id/button1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="40dp"
-        android:text="Log out"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/button2"
+        android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Delete Account"
diff --git a/Listify/app/src/main/res/menu/activity_main_drawer.xml b/Listify/app/src/main/res/menu/activity_main_drawer.xml
index 93efe47..26a2072 100644
--- a/Listify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml
@@ -8,22 +8,26 @@
             android:id="@+id/nav_home"
             android:icon="@drawable/ic_menu_camera"
             android:title="@string/menu_home" />
-<!--        <item-->
-<!--            android:id="@+id/nav_gallery"-->
-<!--            android:icon="@drawable/ic_menu_gallery"-->
-<!--            android:title="@string/menu_gallery" />-->
-<!--        <item-->
-<!--            android:id="@+id/nav_slideshow"-->
-<!--            android:icon="@drawable/ic_menu_slideshow"-->
-<!--            android:title="@string/menu_slideshow" />-->
+<!--    <item-->
+<!--        android:id="@+id/nav_gallery"-->
+<!--        android:icon="@drawable/ic_menu_gallery"-->
+<!--        android:title="@string/menu_gallery" />-->
+<!--    <item-->
+<!--        android:id="@+id/nav_slideshow"-->
+<!--        android:icon="@drawable/ic_menu_slideshow"-->
+<!--        android:title="@string/menu_slideshow" />-->
         <item
             android:id="@+id/nav_lists"
             android:icon="@drawable/ic_baseline_list_alt_28"
             android:title="@string/menu_lists" />
+<!--    <item-->
+<!--        android:id="@+id/nav_create_list"-->
+<!--        android:icon="@drawable/ic_baseline_add_28"-->
+<!--        android:title="Create New List"-->
+<!--        android:onClick="onClickCreateList" />-->
         <item
-            android:id="@+id/nav_create_list"
-            android:icon="@drawable/ic_baseline_add_28"
-            android:title="Create New List"
-            android:onClick="onClickCreateList"/>
+            android:id="@+id/nav_logout"
+            android:title="Sign out"
+            android:onClick="onClickSignout" />
     </group>
 </menu>
\ No newline at end of file

From f62e666652ce286183f244449818eb9f692c8bb7 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 21 Oct 2020 19:31:24 -0700
Subject: [PATCH 12/36] User can no longer reaccess login-required pages
 through the back button

---
 .../app/src/main/java/com/example/listify/AuthManager.java | 2 ++
 .../src/main/java/com/example/listify/MainActivity.java    | 1 +
 .../java/com/example/listify/ui/ForgotPasswordPage.java    | 7 +++++++
 .../src/main/java/com/example/listify/ui/LoginPage.java    | 6 ++++++
 .../src/main/java/com/example/listify/ui/SignupPage.java   | 6 ++++++
 .../java/com/example/listify/ui/home/HomeFragment.java     | 1 +
 6 files changed, 23 insertions(+)

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 bc3164c..5a02019 100644
--- a/Listify/app/src/main/java/com/example/listify/AuthManager.java
+++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java
@@ -156,6 +156,8 @@ public class AuthManager {
 
     public void signOutUser() throws AuthException {
         authSession = null;
+        email = null;
+        password = null;
         waiting = true;
         Amplify.Auth.signOut(this::signOutSuccess, error -> setAuthError(error));
         throwIfAuthError();
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 ea01bac..dd6d2bc 100644
--- a/Listify/app/src/main/java/com/example/listify/MainActivity.java
+++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java
@@ -210,6 +210,7 @@ public class MainActivity extends AppCompatActivity implements CreateListDialogF
                     am.signOutUser();
                     Intent intent = new Intent(MainActivity.this, com.example.listify.ui.LoginPage.class);
                     startActivity(intent);
+                    finish();
                 }
                 catch (Exception e) {
                     Log.i("Authentication", e.toString());
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 f30833b..7f2e129 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
@@ -8,6 +8,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.example.listify.MainActivity;
 import com.example.listify.R;
 import static com.example.listify.MainActivity.am;
 
@@ -25,6 +26,11 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_forgotpswd);
 
+        if(am.getEmail() != null) {
+            Intent intent = new Intent(ForgotPasswordPage.this, MainActivity.class);
+            startActivity(intent);
+        }
+
         button1 = (Button) findViewById(R.id.button1);
         button1.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -70,6 +76,7 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
                 am.confirmPasswordReset(newPassword, code);
                 Intent intent = new Intent(ForgotPasswordPage.this, LoginPage.class);
                 startActivity(intent);
+                finish();
             }
             catch (Exception e) {
                 Log.i("Authentication", e.toString());
diff --git a/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java
index 65e3ce0..3754b52 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java
@@ -25,6 +25,11 @@ public class LoginPage extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
 
+        if(am.getEmail() != null) {
+            Intent intent = new Intent(LoginPage.this, MainActivity.class);
+            startActivity(intent);
+        }
+
         button1 = (Button) findViewById(R.id.button1);
         button1.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -57,6 +62,7 @@ public class LoginPage extends AppCompatActivity {
                     am.signIn(email, password);
                     Intent intent = new Intent(LoginPage.this, MainActivity.class);
                     startActivity(intent);
+                    finish();
                 }
                 catch(Exception e) {
                     Log.i("Authentication", e.toString());
diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
index a5400c7..29e8df3 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
@@ -28,6 +28,11 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_signup);
 
+        if(am.getEmail() != null) {
+            Intent intent = new Intent(SignupPage.this, MainActivity.class);
+            startActivity(intent);
+        }
+
         button1 = (Button) findViewById(R.id.button1);
         button1.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -83,6 +88,7 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
                 am.signIn(email, password);
                 Intent intent = new Intent(SignupPage.this, MainActivity.class);
                 startActivity(intent);
+                finish();
             }
             catch (Exception e) {
                 Log.i("Authentication", e.toString());
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 28178c9..fbd75d6 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
@@ -60,6 +60,7 @@ public class HomeFragment extends Fragment {
                                 am.deleteUser(requestor);
                                 Intent intent = new Intent(getActivity(), com.example.listify.ui.LoginPage.class);
                                 startActivity(intent);
+                                getActivity().finish();
                             }
                             catch (Exception e) {
                                 Log.i("Authentication", e.toString());

From 22f8cabc6739ecc2858d146515ce361894c47b03 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 21 Oct 2020 20:09:40 -0700
Subject: [PATCH 13/36] Simplified code for verification code pop-up

---
 .../java/com/example/listify/AuthManager.java |  2 +-
 .../java/com/example/listify/ui/CodePage.java | 70 -------------------
 .../listify/ui/ForgotPasswordPage.java        | 54 ++++++++------
 .../com/example/listify/ui/SignupPage.java    | 63 +++++++++++------
 .../example/listify/ui/home/HomeFragment.java |  1 -
 5 files changed, 73 insertions(+), 117 deletions(-)
 delete mode 100644 Listify/app/src/main/java/com/example/listify/ui/CodePage.java

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 5a02019..4ece51a 100644
--- a/Listify/app/src/main/java/com/example/listify/AuthManager.java
+++ b/Listify/app/src/main/java/com/example/listify/AuthManager.java
@@ -164,7 +164,7 @@ public class AuthManager {
     }
 
     public void changePassword(String email) throws AuthException {
-        this.email = email;
+        //this.email = email;
         //waiting = true;
         Amplify.Auth.resetPassword(email, result -> setAuthResetPasswordResult(result), error -> setAuthError(error));
         throwIfAuthError();
diff --git a/Listify/app/src/main/java/com/example/listify/ui/CodePage.java b/Listify/app/src/main/java/com/example/listify/ui/CodePage.java
deleted file mode 100644
index d2f9e81..0000000
--- a/Listify/app/src/main/java/com/example/listify/ui/CodePage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.example.listify.ui;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-import com.example.listify.AuthManager;
-import com.example.listify.R;
-import com.example.listify.MainActivity;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDialog;
-import androidx.appcompat.app.AppCompatDialogFragment;
-
-public class CodePage extends AppCompatDialogFragment {
-    private EditText ediTextCode;
-
-    private CodeDialogListener listener;
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        LayoutInflater inflater =  getActivity().getLayoutInflater();
-        View view = inflater.inflate(R.layout.activity_code, null);
-
-        builder.setView(view)
-                .setTitle("Verification code")
-                .setPositiveButton("Submit", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        String code = ediTextCode.getText().toString();
-                        listener.sendCode("" + code + "", false);
-                    }
-                })
-                .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        String code = ediTextCode.getText().toString();
-                        listener.sendCode("" + code + "", true);
-                    }
-                });
-
-        ediTextCode = view.findViewById(R.id.editTextCode);
-
-        return builder.create();
-    }
-
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-
-        try {
-            listener = (CodeDialogListener) context;
-        } catch (ClassCastException e) {
-            throw new ClassCastException("CodeDialogListener not implemented.");
-        }
-    }
-
-    public interface CodeDialogListener {
-        void sendCode(String code, boolean cancel);
-    }
-}
\ No newline at end of file
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 7f2e129..7b58531 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
@@ -1,5 +1,7 @@
 package com.example.listify.ui;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -14,7 +16,7 @@ import static com.example.listify.MainActivity.am;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-public class ForgotPasswordPage extends AppCompatActivity implements CodePage.CodeDialogListener {
+public class ForgotPasswordPage extends AppCompatActivity {
     private Button button1; //Code page button
 
     String email;
@@ -59,28 +61,36 @@ public class ForgotPasswordPage extends AppCompatActivity implements CodePage.Co
                     return;
                 }
 
-                openDialog();
+                View codeView = getLayoutInflater().inflate(R.layout.activity_code, null);
+                AlertDialog.Builder builder = new AlertDialog.Builder(ForgotPasswordPage.this);
+                builder.setView(codeView);
+                builder.setTitle("Verification code");
+                builder.setMessage("Please enter the 6-digit verification code sent to your email.");
+                builder.setPositiveButton("Submit", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        EditText codeText = (EditText) codeView.findViewById(R.id.editTextCode);
+                        String code = codeText.getText().toString();
+                        try {
+                            am.confirmPasswordReset(newPassword, code);
+                            Intent intent = new Intent(ForgotPasswordPage.this, LoginPage.class);
+                            startActivity(intent);
+                            finish();
+                        }
+                        catch (Exception e) {
+                            Log.i("Authentication", e.toString());
+                        }
+                    }
+                });
+                builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        return;
+                    }
+                });
+                AlertDialog dialog = builder.create();
+                dialog.show();
             }
         });
     }
-
-    public void openDialog() {
-        CodePage codePage = new CodePage();
-        codePage.show(getSupportFragmentManager(), "Verification code");
-    }
-
-    @Override
-    public void sendCode(String code, boolean cancel) {
-        if(!cancel) {
-            try {
-                am.confirmPasswordReset(newPassword, code);
-                Intent intent = new Intent(ForgotPasswordPage.this, LoginPage.class);
-                startActivity(intent);
-                finish();
-            }
-            catch (Exception e) {
-                Log.i("Authentication", e.toString());
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
index 29e8df3..e438f7a 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
@@ -1,5 +1,7 @@
 package com.example.listify.ui;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -11,11 +13,18 @@ import android.widget.TextView;
 import com.example.listify.R;
 import com.example.listify.AuthManager;
 import com.example.listify.MainActivity;
+import com.example.listify.Requestor;
+
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.util.Properties;
+
 import static com.example.listify.MainActivity.am;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-public class SignupPage extends AppCompatActivity implements CodePage.CodeDialogListener {
+public class SignupPage extends AppCompatActivity {
     private Button button1; //Log in page button
     private Button button2; //Sign up button
 
@@ -70,29 +79,37 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
                     return;
                 }
 
-                openDialog();
+                View codeView = getLayoutInflater().inflate(R.layout.activity_code, null);
+                AlertDialog.Builder builder = new AlertDialog.Builder(SignupPage.this);
+                builder.setView(codeView);
+                builder.setTitle("Verification code");
+                builder.setMessage("Please enter the 6-digit verification code sent to your email.");
+                builder.setPositiveButton("Submit", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        EditText codeText = (EditText) codeView.findViewById(R.id.editTextCode);
+                        String code = codeText.getText().toString();
+                        try {
+                            am.confirmSignUp(code);
+                            am.signIn(email, password);
+                            Intent intent = new Intent(SignupPage.this, MainActivity.class);
+                            startActivity(intent);
+                            finish();
+                        }
+                        catch (Exception e) {
+                            Log.i("Authentication", e.toString());
+                        }
+                    }
+                });
+                builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        return;
+                    }
+                });
+                AlertDialog dialog = builder.create();
+                dialog.show();
             }
         });
     }
-
-    public void openDialog() {
-        CodePage codePage = new CodePage();
-        codePage.show(getSupportFragmentManager(), "Verification code");
-    }
-
-    @Override
-    public void sendCode(String code, boolean cancel) {
-        if(!cancel) {
-            try {
-                am.confirmSignUp(code);
-                am.signIn(email, password);
-                Intent intent = new Intent(SignupPage.this, MainActivity.class);
-                startActivity(intent);
-                finish();
-            }
-            catch (Exception e) {
-                Log.i("Authentication", e.toString());
-            }
-        }
-    }
 }
\ No newline at end of file
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 fbd75d6..8eb6840 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
@@ -74,7 +74,6 @@ public class HomeFragment extends Fragment {
                         return;
                     }
                 });
-
                 AlertDialog dialog = builder.create();
                 dialog.show();
             }

From 20408ea42bd2c3ff4707764f24e439905da5a087 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Thu, 22 Oct 2020 16:28:00 -0400
Subject: [PATCH 14/36] async search bug fixes

---
 .../com/example/listify/SearchResults.java    | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/SearchResults.java b/Listify/app/src/main/java/com/example/listify/SearchResults.java
index 37f78cb..6b62c74 100644
--- a/Listify/app/src/main/java/com/example/listify/SearchResults.java
+++ b/Listify/app/src/main/java/com/example/listify/SearchResults.java
@@ -32,7 +32,6 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
     private int storeSelection;
     private int sortMode;
     private boolean descending;
-    boolean doneLoading = false;
 
     @Override
     public void sendSort(int storeSelection, int sortMode, boolean descending) {
@@ -102,6 +101,14 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
             public boolean onQueryTextSubmit(String query) {
                 // Show progress bar
                 loadingSearch.setVisibility(View.VISIBLE);
+
+                // Clear the old search results
+                resultsProductList.clear();
+
+                // Clear old search results from the view
+                resultsProductListSorted.clear();
+                searchResultsListAdapter.notifyDataSetChanged();
+
                 Thread t = new Thread(new Runnable() {
                     @Override
                     public void run() {
@@ -144,13 +151,6 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
     }
 
     private void doSearch(String query) {
-        // Clear the old search results
-        resultsProductList.clear();
-
-        // Clear old search results from the view
-        resultsProductListSorted.clear();
-        searchResultsListAdapter.notifyDataSetChanged();
-
         Properties configs = new Properties();
         try {
             configs = AuthManager.loadProperties(this, "android.resource://" + getPackageName() + "/raw/auths.json");
@@ -242,21 +242,6 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
             resultsProductListSorted.clear();
             resultsProductListSorted.addAll(temp);
         }
-
-        // Updates the list of search results. Runs on the main UI thread since other threads are
-        // not allowed to change UI elements
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (doneLoading) {
-                    doneLoading = false;
-                    searchResultsListAdapter.notifyDataSetChanged();
-
-                    // Hide progress bar
-                    loadingSearch.setVisibility(View.GONE);
-                }
-            }
-        });
     }
 
     // This is called after the search results come back from the server
@@ -297,6 +282,17 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
         // Apply selected sorting to the list
         sortResults();
 
-        doneLoading = true;
+        // Updates the list of search results. Runs on the main UI thread since other threads are
+        // not allowed to change UI elements
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                searchResultsListAdapter.notifyDataSetChanged();
+
+                // Hide progress bar
+                loadingSearch.setVisibility(View.GONE);
+
+            }
+        });
     }
 }
\ No newline at end of file

From ec28e8babca7f2aca1f4009a7812bb72e0af3032 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Thu, 22 Oct 2020 18:06:10 -0400
Subject: [PATCH 15/36] Async loading lists page

---
 .../listify/ui/lists/ListsFragment.java       | 77 ++++++++++++-------
 .../src/main/res/layout/fragment_lists.xml    | 10 +++
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
index c7029ba..e542c0a 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
@@ -7,9 +7,11 @@ import android.view.ViewGroup;
 import android.view.LayoutInflater;
 import android.widget.AdapterView;
 import android.widget.ListView;
+import android.widget.ProgressBar;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.ListFragment;
 
 import com.amplifyframework.auth.AuthException;
 import com.example.listify.AuthManager;
@@ -34,16 +36,19 @@ import java.util.Properties;
 
 import static com.example.listify.MainActivity.am;
 
-public class ListsFragment extends Fragment implements CreateListDialogFragment.OnNewListListener {
+public class ListsFragment extends Fragment implements CreateListDialogFragment.OnNewListListener, Requestor.Receiver {
     ArrayList<List> shoppingLists = new ArrayList<>();
     DisplayShoppingListsAdapter displayShoppingListsAdapter;
+    Requestor requestor;
     ListView shoppingListsView;
+    ProgressBar loadingLists;
 
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_lists, container, false);
         shoppingListsView = root.findViewById(R.id.shopping_lists);
+        loadingLists = (ProgressBar) root.findViewById(R.id.progress_loading_lists);
+        loadingLists.setVisibility(View.VISIBLE);
 
-        // TODO: Switch this to async
         Properties configs = new Properties();
         try {
             configs = AuthManager.loadProperties(getContext(), "android.resource://" + getActivity().getPackageName() + "/raw/auths.json");
@@ -51,35 +56,18 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
             e.printStackTrace();
         }
 
-        Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
+        requestor = new Requestor(am, configs.getProperty("apiKey"));
         SynchronousReceiver<Integer[]> listIdsReceiver = new SynchronousReceiver<>();
-        SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
 
-        requestor.getListOfIds(List.class, listIdsReceiver, listIdsReceiver);
-        try {
-            Integer[] listIds = listIdsReceiver.await();
-            for (int i = 0; i < listIds.length; i++) {
-                requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
-                shoppingLists.add(listReceiver.await());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-        // Set adapter and display this users lists
-        displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), shoppingLists);
-        shoppingListsView.setAdapter(displayShoppingListsAdapter);
-        shoppingListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        final Requestor.Receiver<Integer[]> recv = this;
+        Thread t = new Thread(new Runnable() {
             @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                Intent listPage = new Intent(getContext(), ListPage.class);
-
-                // Send the list ID
-                listPage.putExtra("listID", shoppingLists.get(position).getItemID());
-                startActivity(listPage);
+            public void run() {
+                requestor.getListOfIds(List.class, recv, null);
             }
         });
+        t.start();
+
 
         FloatingActionButton fab = (FloatingActionButton) root.findViewById(R.id.new_list_fab);
         Fragment thisFragment = this;
@@ -120,4 +108,41 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
             e.printStackTrace();
         }
     }
+
+    @Override
+    public void acceptDelivery(Object delivered) {
+        SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
+        Integer[] listIds = (Integer[]) delivered;
+        try {
+//            Integer[] listIds = listIdsReceiver.await();
+            for (int i = 0; i < listIds.length; i++) {
+                requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
+                shoppingLists.add(listReceiver.await());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        // Set adapter and display this users lists
+        displayShoppingListsAdapter = new DisplayShoppingListsAdapter(getActivity(), shoppingLists);
+
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                shoppingListsView.setAdapter(displayShoppingListsAdapter);
+                shoppingListsView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                        Intent listPage = new Intent(getContext(), ListPage.class);
+
+                        // Send the list ID
+                        listPage.putExtra("listID", shoppingLists.get(position).getItemID());
+                        startActivity(listPage);
+                    }
+                });
+                loadingLists.setVisibility(View.GONE);
+            }
+        });
+
+    }
 }
\ No newline at end of file
diff --git a/Listify/app/src/main/res/layout/fragment_lists.xml b/Listify/app/src/main/res/layout/fragment_lists.xml
index 0793341..e595fb9 100644
--- a/Listify/app/src/main/res/layout/fragment_lists.xml
+++ b/Listify/app/src/main/res/layout/fragment_lists.xml
@@ -12,6 +12,16 @@
     tools:context=".ui.lists.ListsFragment"
     tools:showIn="@layout/fragment_lists">
 
+    <ProgressBar
+        android:id="@+id/progress_loading_lists"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:indeterminate="true"
+        android:visibility="gone"/>
+
     <ListView
         android:id="@+id/shopping_lists"
         android:layout_width="fill_parent"

From 07d0cd44cbc6e395cb53e31b7fba33cf2d15251f Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Thu, 22 Oct 2020 18:36:00 -0400
Subject: [PATCH 16/36] Async loading list products

---
 .../java/com/example/listify/ListPage.java    | 78 ++++++++++---------
 .../app/src/main/res/layout/activity_list.xml | 14 +++-
 2 files changed, 55 insertions(+), 37 deletions(-)

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..e05d1f6 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -21,13 +21,14 @@ import java.util.Properties;
 
 import static com.example.listify.MainActivity.am;
 
-public class ListPage extends AppCompatActivity {
+public class ListPage extends AppCompatActivity implements Requestor.Receiver {
     ListView listView;
     MyAdapter myAdapter;
 
     Button incrQuan;
     Button decrQuan;
     Button removeItem;
+    ProgressBar loadingListItems;
 
     ArrayList<String> pNames = new ArrayList<>();
     ArrayList<String> pStores = new ArrayList<>();
@@ -39,11 +40,23 @@ public class ListPage extends AppCompatActivity {
 
     Requestor requestor;
 
+    // TODO: Display a message if their list is empty
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         // Read list ID from caller
         final int listID = (int) getIntent().getSerializableExtra("listID");
 
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_list);
+
+        listView = findViewById(R.id.listView);
+        myAdapter = new MyAdapter(this, pNames, pStores, pPrices, pQuantity, pImages);
+
+        listView.setAdapter(myAdapter);
+
+        loadingListItems = findViewById(R.id.progress_loading_list_items);
+        loadingListItems.setVisibility(View.VISIBLE);
+
         Properties configs = new Properties();
         try {
             configs = AuthManager.loadProperties(this, "android.resource://" + getPackageName() + "/raw/auths.json");
@@ -51,18 +64,31 @@ public class ListPage extends AppCompatActivity {
             e.printStackTrace();
         }
         requestor = new Requestor(am, configs.getProperty("apiKey"));
-        SynchronousReceiver<List> lr = new SynchronousReceiver<>();
         //ListReceiver<List> lr = new ListReceiver<>();
-        requestor.getObject(Integer.toString(listID), List.class, lr);
+        requestor.getObject(Integer.toString(listID), List.class, this);
 
-        List list;
+        /*pNames.add("Half-gallon organic whole milk");
+        pStores.add("Kroger");
+        pPrices.add("$5.00");
+        pQuantity.add("1");
+        pImages.add(R.drawable.milk);
 
-        try {
-            list = lr.await();
-        }
-        catch (Exception e) {
-            list = null;
-        }
+        pNames.add("5-bunch medium bananas");
+        pStores.add("Kroger");
+        pPrices.add("$3.00");
+        pQuantity.add("1");
+        pImages.add(R.drawable.bananas);
+
+        pNames.add("JIF 40-oz creamy peanut butter");
+        pStores.add("Kroger");
+        pPrices.add("$7.00");
+        pQuantity.add("1");
+        pImages.add(R.drawable.peanutbutter);*/
+    }
+
+    @Override
+    public void acceptDelivery(Object delivered) {
+        List list = (List) delivered;
 
         if(list != null) {
             for (ListEntry entry : list.getEntries()) {
@@ -87,31 +113,13 @@ public class ListPage extends AppCompatActivity {
             }
         }
 
-        /*pNames.add("Half-gallon organic whole milk");
-        pStores.add("Kroger");
-        pPrices.add("$5.00");
-        pQuantity.add("1");
-        pImages.add(R.drawable.milk);
-
-        pNames.add("5-bunch medium bananas");
-        pStores.add("Kroger");
-        pPrices.add("$3.00");
-        pQuantity.add("1");
-        pImages.add(R.drawable.bananas);
-
-        pNames.add("JIF 40-oz creamy peanut butter");
-        pStores.add("Kroger");
-        pPrices.add("$7.00");
-        pQuantity.add("1");
-        pImages.add(R.drawable.peanutbutter);*/
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_list);
-
-        listView = findViewById(R.id.listView);
-        myAdapter = new MyAdapter(this, pNames, pStores, pPrices, pQuantity, pImages);
-
-        listView.setAdapter(myAdapter);
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                loadingListItems.setVisibility(View.GONE);
+                myAdapter.notifyDataSetChanged();
+            }
+        });
     }
 
     class MyAdapter extends ArrayAdapter<String> {
diff --git a/Listify/app/src/main/res/layout/activity_list.xml b/Listify/app/src/main/res/layout/activity_list.xml
index 65c12f4..97ce5b1 100644
--- a/Listify/app/src/main/res/layout/activity_list.xml
+++ b/Listify/app/src/main/res/layout/activity_list.xml
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ProgressBar
+        android:id="@+id/progress_loading_list_items"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:indeterminate="true"
+        android:visibility="gone"/>
+
     <ListView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -11,4 +21,4 @@
 
     </ListView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file

From 8604d98e6348da8eb45fe92976291642c76dafeb Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Thu, 22 Oct 2020 23:09:57 -0400
Subject: [PATCH 17/36] Async creating lists and adding items

---
 .../java/com/example/listify/ItemDetails.java | 96 ++++++++++++++-----
 .../listify/ui/lists/ListsFragment.java       | 49 +++++++++-
 .../src/main/res/layout/dialog_loading.xml    | 16 ++++
 .../main/res/menu/activity_main_drawer.xml    | 10 +-
 4 files changed, 140 insertions(+), 31 deletions(-)
 create mode 100644 Listify/app/src/main/res/layout/dialog_loading.xml

diff --git a/Listify/app/src/main/java/com/example/listify/ItemDetails.java b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
index 415d1a4..15f0767 100644
--- a/Listify/app/src/main/java/com/example/listify/ItemDetails.java
+++ b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
@@ -1,5 +1,8 @@
 package com.example.listify;
 
+import android.app.Dialog;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 
 import com.amplifyframework.auth.AuthException;
@@ -11,6 +14,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -71,6 +76,17 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
             @Override
             public void onClick(View v) {
                 closeFABMenu();
+                // Create and show a loading dialog
+                Dialog loadingDialog = new Dialog(ItemDetails.this);
+                loadingDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+                loadingDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                // layout to display
+                loadingDialog.setContentView(R.layout.dialog_loading);
+                // set color transpartent
+                loadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+                loadingDialog.setCancelable(false);
+                loadingDialog.setCanceledOnTouchOutside(false);
+                loadingDialog.show();
 
                 Properties configs = new Properties();
                 try {
@@ -82,20 +98,27 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
                 Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
                 SynchronousReceiver<Integer[]> listIdsReceiver = new SynchronousReceiver<>();
                 SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
-
                 requestor.getListOfIds(List.class, listIdsReceiver, listIdsReceiver);
-                try {
-                    Integer[] listIds = listIdsReceiver.await();
-                    for (int i = 0; i < listIds.length; i++) {
-                        requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
-                        shoppingLists.add(listReceiver.await());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
 
-                ListPickerDialogFragment listPickerDialog = new ListPickerDialogFragment(shoppingLists);
-                listPickerDialog.show(getSupportFragmentManager(), "User Lists");
+                Thread t = new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            Integer[] listIds = listIdsReceiver.await();
+                            for (int i = 0; i < listIds.length; i++) {
+                                requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
+                                shoppingLists.add(listReceiver.await());
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+
+                        loadingDialog.cancel();
+                        ListPickerDialogFragment listPickerDialog = new ListPickerDialogFragment(shoppingLists);
+                        listPickerDialog.show(getSupportFragmentManager(), "User Lists");
+                    }
+                });
+                t.start();
             }
         });
 
@@ -184,6 +207,17 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
     // Create a new list and add the item to it
     @Override
     public void sendNewListName(String name, int quantity) {
+        // Create and show a loading dialog
+        Dialog loadingDialog = new Dialog(this);
+        loadingDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        loadingDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        // layout to display
+        loadingDialog.setContentView(R.layout.dialog_loading);
+        // set color transpartent
+        loadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        loadingDialog.setCancelable(false);
+        loadingDialog.setCanceledOnTouchOutside(false);
+        loadingDialog.show();
 
         Properties configs = new Properties();
         try {
@@ -196,16 +230,34 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
 
         com.example.listify.data.List newList = new List(-1, name, "user filled by lambda", Instant.now().toEpochMilli());
 
-        try {
-            requestor.postObject(newList, idReceiver, idReceiver);
-            int newListId = idReceiver.await();
-            ListEntry entry = new ListEntry(newListId, curProduct.getItemId(), quantity, Instant.now().toEpochMilli(),false);
-            requestor.postObject(entry);
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    requestor.postObject(newList, idReceiver, idReceiver);
+                    int newListId = idReceiver.await();
+                    ListEntry entry = new ListEntry(newListId, curProduct.getItemId(), quantity, Instant.now().toEpochMilli(),false);
+                    requestor.postObject(entry);
 
-            Toast.makeText(this, String.format("%s created and item added", name), Toast.LENGTH_LONG).show();
-        } catch (Exception e) {
-            Toast.makeText(this, "An error occurred", Toast.LENGTH_LONG).show();
-            e.printStackTrace();
-        }
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(ItemDetails.this, String.format("%s created and item added", name), Toast.LENGTH_LONG).show();
+                            loadingDialog.cancel();
+                        }
+                    });
+                } catch (Exception e) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(ItemDetails.this, "An error occurred", Toast.LENGTH_LONG).show();
+                            loadingDialog.cancel();
+                            e.printStackTrace();
+                        }
+                    });
+                }
+            }
+        });
+        t.start();
     }
 }
\ No newline at end of file
diff --git a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
index e542c0a..6c1c2c1 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
@@ -1,10 +1,15 @@
 package com.example.listify.ui.lists;
 
+import android.app.Dialog;
 import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
@@ -85,6 +90,17 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
 
     @Override
     public void sendNewListName(String name) {
+        // Create and show a loading dialog
+        Dialog loadingDialog = new Dialog(getActivity());
+        loadingDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        loadingDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        // layout to display
+        loadingDialog.setContentView(R.layout.dialog_loading);
+        // set color transpartent
+        loadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        loadingDialog.setCancelable(false);
+        loadingDialog.setCanceledOnTouchOutside(false);
+        loadingDialog.show();
 
         Properties configs = new Properties();
         try {
@@ -99,14 +115,39 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
 
         try {
             requestor.postObject(newList, idReceiver, idReceiver);
-            newList.setItemID(idReceiver.await());
-            shoppingLists.add(newList);
-            displayShoppingListsAdapter.notifyDataSetChanged();
-            Toast.makeText(getContext(), String.format("%s created", name), Toast.LENGTH_LONG).show();
         } catch (Exception e) {
             Toast.makeText(getContext(), "An error occurred", Toast.LENGTH_LONG).show();
             e.printStackTrace();
         }
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    newList.setItemID(idReceiver.await());
+                } catch (Exception e) {
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(getContext(), "An error occurred", Toast.LENGTH_LONG).show();
+                            loadingDialog.cancel();
+                        }
+                    });
+                    e.printStackTrace();
+
+                }
+                shoppingLists.add(newList);
+
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        displayShoppingListsAdapter.notifyDataSetChanged();
+                        loadingDialog.cancel();
+                        Toast.makeText(getContext(), String.format("%s created", name), Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
+        });
+        t.start();
     }
 
     @Override
diff --git a/Listify/app/src/main/res/layout/dialog_loading.xml b/Listify/app/src/main/res/layout/dialog_loading.xml
new file mode 100644
index 0000000..a51c2a1
--- /dev/null
+++ b/Listify/app/src/main/res/layout/dialog_loading.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@null">
+
+    <ProgressBar
+        android:id="@+id/progress_loading_lists"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:indeterminate="true"
+        android:visibility="visible"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/Listify/app/src/main/res/menu/activity_main_drawer.xml b/Listify/app/src/main/res/menu/activity_main_drawer.xml
index 93efe47..f2e00a0 100644
--- a/Listify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml
@@ -20,10 +20,10 @@
             android:id="@+id/nav_lists"
             android:icon="@drawable/ic_baseline_list_alt_28"
             android:title="@string/menu_lists" />
-        <item
-            android:id="@+id/nav_create_list"
-            android:icon="@drawable/ic_baseline_add_28"
-            android:title="Create New List"
-            android:onClick="onClickCreateList"/>
+<!--        <item-->
+<!--            android:id="@+id/nav_create_list"-->
+<!--            android:icon="@drawable/ic_baseline_add_28"-->
+<!--            android:title="Create New List"-->
+<!--            android:onClick="onClickCreateList"/>-->
     </group>
 </menu>
\ No newline at end of file

From 6b30476ccd68581040ec58689fb26e05d8e1c8bf Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwilson@protonmail.com>
Date: Fri, 23 Oct 2020 22:27:01 -0400
Subject: [PATCH 18/36] Move loading circle into its own object

---
 .../java/com/example/listify/ItemDetails.java | 24 ++-----------
 .../example/listify/LoadingCircleDialog.java  | 36 +++++++++++++++++++
 .../listify/ui/lists/ListsFragment.java       | 12 ++-----
 3 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 Listify/app/src/main/java/com/example/listify/LoadingCircleDialog.java

diff --git a/Listify/app/src/main/java/com/example/listify/ItemDetails.java b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
index 15f0767..e76f699 100644
--- a/Listify/app/src/main/java/com/example/listify/ItemDetails.java
+++ b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
@@ -76,16 +76,7 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
             @Override
             public void onClick(View v) {
                 closeFABMenu();
-                // Create and show a loading dialog
-                Dialog loadingDialog = new Dialog(ItemDetails.this);
-                loadingDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-                loadingDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                // layout to display
-                loadingDialog.setContentView(R.layout.dialog_loading);
-                // set color transpartent
-                loadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-                loadingDialog.setCancelable(false);
-                loadingDialog.setCanceledOnTouchOutside(false);
+                LoadingCircleDialog loadingDialog = new LoadingCircleDialog(ItemDetails.this);
                 loadingDialog.show();
 
                 Properties configs = new Properties();
@@ -180,7 +171,7 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
     }
 
 
-    // Add the viewed item to the selected list
+    // Add the selected item to the selected list
     @Override
     public void sendListSelection(int selectedListIndex, int quantity) {
 
@@ -207,16 +198,7 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
     // Create a new list and add the item to it
     @Override
     public void sendNewListName(String name, int quantity) {
-        // Create and show a loading dialog
-        Dialog loadingDialog = new Dialog(this);
-        loadingDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        loadingDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        // layout to display
-        loadingDialog.setContentView(R.layout.dialog_loading);
-        // set color transpartent
-        loadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        loadingDialog.setCancelable(false);
-        loadingDialog.setCanceledOnTouchOutside(false);
+        LoadingCircleDialog loadingDialog = new LoadingCircleDialog(this);
         loadingDialog.show();
 
         Properties configs = new Properties();
diff --git a/Listify/app/src/main/java/com/example/listify/LoadingCircleDialog.java b/Listify/app/src/main/java/com/example/listify/LoadingCircleDialog.java
new file mode 100644
index 0000000..d4f6d82
--- /dev/null
+++ b/Listify/app/src/main/java/com/example/listify/LoadingCircleDialog.java
@@ -0,0 +1,36 @@
+package com.example.listify;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Window;
+import android.view.WindowManager;
+
+public class LoadingCircleDialog {
+    Dialog loadingDialog;
+
+    public LoadingCircleDialog(Context context) {
+        loadingDialog = new Dialog(context);
+
+        // Create and show a loading dialog
+        loadingDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+        loadingDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+        // layout to display
+        loadingDialog.setContentView(R.layout.dialog_loading);
+
+        // set color transpartent
+        loadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        loadingDialog.setCancelable(false);
+        loadingDialog.setCanceledOnTouchOutside(false);
+    }
+
+    public void show() {
+        loadingDialog.show();
+    }
+
+    public void cancel() {
+        loadingDialog.cancel();
+    }
+}
diff --git a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
index 6c1c2c1..0e1ccbf 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
@@ -24,6 +24,7 @@ import com.example.listify.CreateListAddDialogFragment;
 import com.example.listify.CreateListDialogFragment;
 import com.example.listify.ItemDetails;
 import com.example.listify.ListPage;
+import com.example.listify.LoadingCircleDialog;
 import com.example.listify.R;
 import com.example.listify.Requestor;
 import com.example.listify.SearchResults;
@@ -90,16 +91,7 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
 
     @Override
     public void sendNewListName(String name) {
-        // Create and show a loading dialog
-        Dialog loadingDialog = new Dialog(getActivity());
-        loadingDialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-        loadingDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        // layout to display
-        loadingDialog.setContentView(R.layout.dialog_loading);
-        // set color transpartent
-        loadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        loadingDialog.setCancelable(false);
-        loadingDialog.setCanceledOnTouchOutside(false);
+        LoadingCircleDialog loadingDialog = new LoadingCircleDialog(getActivity());
         loadingDialog.show();
 
         Properties configs = new Properties();

From 8f6ecdbab1dbba9cb2f5a3751d45d14be166e717 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Fri, 23 Oct 2020 20:20:31 -0700
Subject: [PATCH 19/36] Removed unnecessary code for Cancel button in pop-up
 window

---
 .../main/java/com/example/listify/ui/ForgotPasswordPage.java  | 4 +---
 .../app/src/main/java/com/example/listify/ui/SignupPage.java  | 4 +---
 .../main/java/com/example/listify/ui/home/HomeFragment.java   | 4 +---
 3 files changed, 3 insertions(+), 9 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 7b58531..fe59b9c 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
@@ -84,9 +84,7 @@ public class ForgotPasswordPage extends AppCompatActivity {
                 });
                 builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        return;
-                    }
+                    public void onClick(DialogInterface dialog, int which) {}
                 });
                 AlertDialog dialog = builder.create();
                 dialog.show();
diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
index e438f7a..6e1eaeb 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
@@ -103,9 +103,7 @@ public class SignupPage extends AppCompatActivity {
                 });
                 builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        return;
-                    }
+                    public void onClick(DialogInterface dialog, int which) {}
                 });
                 AlertDialog dialog = builder.create();
                 dialog.show();
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 8eb6840..13ddebe 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
@@ -70,9 +70,7 @@ public class HomeFragment extends Fragment {
                 });
                 builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
                     @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        return;
-                    }
+                    public void onClick(DialogInterface dialog, int which) {}
                 });
                 AlertDialog dialog = builder.create();
                 dialog.show();

From 4eddf3ce2dccc9d29a5e8d901a1f56e783505881 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Fri, 23 Oct 2020 22:06:21 -0700
Subject: [PATCH 20/36] Can now divde the items in shopping list by store

---
 .../java/com/example/listify/ListPage.java    | 88 ++++++++-----------
 1 file changed, 39 insertions(+), 49 deletions(-)

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 fa449d2..99cb518 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -17,6 +17,8 @@ import org.json.JSONException;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 import static com.example.listify.MainActivity.am;
@@ -37,6 +39,8 @@ public class ListPage extends AppCompatActivity {
 
     ArrayList<ListEntry> pListItemPair = new ArrayList<>();
 
+    Map<String, Integer> numItemsFromStore = new HashMap<>();
+
     Requestor requestor;
 
     @Override
@@ -52,7 +56,6 @@ public class ListPage extends AppCompatActivity {
         }
         requestor = new Requestor(am, configs.getProperty("apiKey"));
         SynchronousReceiver<List> lr = new SynchronousReceiver<>();
-        //ListReceiver<List> lr = new ListReceiver<>();
         requestor.getObject(Integer.toString(listID), List.class, lr);
 
         List list;
@@ -77,34 +80,45 @@ public class ListPage extends AppCompatActivity {
                     item = null;
                 }
                 if(item != null) {
-                    pNames.add(item.getDescription());
-                    pStores.add("Kroger");
-                    pPrices.add(item.getPrice().toString());
-                    pQuantity.add(entry.getQuantity().toString());
-                    pImages.add(R.drawable.placeholder);
-                    pListItemPair.add(entry);
+                    if(!numItemsFromStore.containsKey("Kroger") || numItemsFromStore.get("Kroger") == 0) {
+                        pNames.add("Kroger");
+                        pStores.add("");
+                        pPrices.add("$?.??");
+                        pQuantity.add("0");
+                        pImages.add(-1);
+                        pListItemPair.add(null);
+
+                        numItemsFromStore.put("Kroger", 1);
+
+                        pNames.add(item.getDescription());
+                        pStores.add("Kroger");
+                        pPrices.add(item.getPrice().toString());
+                        pQuantity.add(entry.getQuantity().toString());
+                        pImages.add(R.drawable.placeholder);
+                        pListItemPair.add(entry);
+                    }
+                    else {
+                        int index = 0;
+
+                        while(index < pNames.size() && pNames.get(index).equals("Kroger")) {
+                            index++;
+                        }
+
+                        index++;
+
+                        pNames.add(index, item.getDescription());
+                        pStores.add(index, "Kroger");
+                        pPrices.add(index, item.getPrice().toString());
+                        pQuantity.add(index, entry.getQuantity().toString());
+                        pImages.add(index, R.drawable.placeholder);
+                        pListItemPair.add(index, entry);
+
+                        numItemsFromStore.put("Kroger", numItemsFromStore.get("Kroger") + 1);
+                    }
                 }
             }
         }
 
-        /*pNames.add("Half-gallon organic whole milk");
-        pStores.add("Kroger");
-        pPrices.add("$5.00");
-        pQuantity.add("1");
-        pImages.add(R.drawable.milk);
-
-        pNames.add("5-bunch medium bananas");
-        pStores.add("Kroger");
-        pPrices.add("$3.00");
-        pQuantity.add("1");
-        pImages.add(R.drawable.bananas);
-
-        pNames.add("JIF 40-oz creamy peanut butter");
-        pStores.add("Kroger");
-        pPrices.add("$7.00");
-        pQuantity.add("1");
-        pImages.add(R.drawable.peanutbutter);*/
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_list);
 
@@ -232,28 +246,4 @@ public class ListPage extends AppCompatActivity {
             return listproduct;
         }
     }
-
-    class ListReceiver<T> implements Requestor.Receiver<T> {
-        @Override
-        public void acceptDelivery(T delivered) {
-            for(ListEntry entry : ((List) delivered).getEntries()) {
-                int product = entry.getProductID();
-                ProductReceiver<Item> pr = new ProductReceiver<>();
-                requestor.getObject(Integer.toString(product), Item.class, pr);
-                pQuantity.add(entry.getQuantity().toString());
-                pListItemPair.add(entry);
-            }
-        }
-    }
-
-    class ProductReceiver<T> implements Requestor.Receiver<T> {
-        @Override
-        public void acceptDelivery(T delivered) {
-            Item i = (Item) delivered;
-            pNames.add(i.getDescription());
-            pStores.add("Kroger");
-            pPrices.add(i.getPrice().toString());
-            pImages.add(R.drawable.placeholder);
-        }
-    }
 }

From 45c7ac15bdbca51bbe8ce5e521a25731b30d8c9d Mon Sep 17 00:00:00 2001
From: NMerz <nmerz@icloud.com>
Date: Sat, 24 Oct 2020 11:53:12 -0400
Subject: [PATCH 21/36] Limit item search results

Add a limit on item search results so the user is not overwhelmed.
---
 .../Lists/ItemSearch/src/ItemSearcher.java    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Lambdas/Lists/ItemSearch/src/ItemSearcher.java b/Lambdas/Lists/ItemSearch/src/ItemSearcher.java
index 29bc78c..a3a7381 100644
--- a/Lambdas/Lists/ItemSearch/src/ItemSearcher.java
+++ b/Lambdas/Lists/ItemSearch/src/ItemSearcher.java
@@ -7,26 +7,24 @@ import java.util.Map;
 
 public class ItemSearcher implements CallHandler {
 
-    DBConnector connector;
+    Connection connection;
     String cognitoID;
 
-    private final String GET_ITEM_MATCHES = "SELECT * FROM Product WHERE description LIKE ?";
+    private final String GET_ITEM_MATCHES = "SELECT * FROM Product WHERE description LIKE ? LIMIT 100;";
 
-    public ItemSearcher(DBConnector connector, String cognitoID) {
-        this.connector = connector;
+    public ItemSearcher(Connection connection, String cognitoID) {
+        this.connection = connection;
         this.cognitoID = cognitoID;
     }
 
     @Override
     public Object conductAction(Map<String, Object> body, HashMap<String, String> queryParams, String s) throws SQLException {
-        try (Connection connection = connector.getConnection()) {
-            PreparedStatement getItemMatches = connection.prepareStatement(GET_ITEM_MATCHES);
-            getItemMatches.setString(1, "%" + queryParams.get("id") + "%");
-            System.out.println(getItemMatches);
-            ResultSet searchResults = getItemMatches.executeQuery();
-            ItemSearch searchResultsObject = new ItemSearch(searchResults);
-            System.out.println(searchResultsObject);
-            return searchResultsObject;
-        }
+        PreparedStatement getItemMatches = connection.prepareStatement(GET_ITEM_MATCHES);
+        getItemMatches.setString(1, "%" + queryParams.get("id") + "%");
+        System.out.println(getItemMatches);
+        ResultSet searchResults = getItemMatches.executeQuery();
+        ItemSearch searchResultsObject = new ItemSearch(searchResults);
+        System.out.println(searchResultsObject);
+        return searchResultsObject;
     }
 }

From 6fe3110c294f2db628231c71f2c6e79f194f4412 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sat, 24 Oct 2020 12:40:28 -0700
Subject: [PATCH 22/36] Can now display the total price of the items from each
 store in shopping list

---
 .../java/com/example/listify/ListPage.java    | 42 ++++++++++++++-----
 .../main/res/menu/activity_main_drawer.xml    |  5 ---
 2 files changed, 31 insertions(+), 16 deletions(-)

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 99cb518..a5b9204 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -39,7 +39,7 @@ public class ListPage extends AppCompatActivity {
 
     ArrayList<ListEntry> pListItemPair = new ArrayList<>();
 
-    Map<String, Integer> numItemsFromStore = new HashMap<>();
+    Map<String, Double> totalPriceByStore = new HashMap<>();
 
     Requestor requestor;
 
@@ -80,16 +80,16 @@ public class ListPage extends AppCompatActivity {
                     item = null;
                 }
                 if(item != null) {
-                    if(!numItemsFromStore.containsKey("Kroger") || numItemsFromStore.get("Kroger") == 0) {
+                    if(!totalPriceByStore.containsKey("Kroger")) {
+                        totalPriceByStore.put("Kroger", item.getPrice().doubleValue() * entry.getQuantity());
+
                         pNames.add("Kroger");
                         pStores.add("");
-                        pPrices.add("$?.??");
-                        pQuantity.add("0");
+                        pPrices.add("$" + totalPriceByStore.get("Kroger"));
+                        pQuantity.add("-1");
                         pImages.add(-1);
                         pListItemPair.add(null);
 
-                        numItemsFromStore.put("Kroger", 1);
-
                         pNames.add(item.getDescription());
                         pStores.add("Kroger");
                         pPrices.add(item.getPrice().toString());
@@ -100,10 +100,13 @@ public class ListPage extends AppCompatActivity {
                     else {
                         int index = 0;
 
-                        while(index < pNames.size() && pNames.get(index).equals("Kroger")) {
+                        while(index < pNames.size() && !pNames.get(index).equals("Kroger")) {
                             index++;
                         }
 
+                        totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") + (item.getPrice().doubleValue() * entry.getQuantity()));
+                        pPrices.set(index, "$" + totalPriceByStore.get("Kroger"));
+
                         index++;
 
                         pNames.add(index, item.getDescription());
@@ -112,8 +115,6 @@ public class ListPage extends AppCompatActivity {
                         pQuantity.add(index, entry.getQuantity().toString());
                         pImages.add(index, R.drawable.placeholder);
                         pListItemPair.add(index, entry);
-
-                        numItemsFromStore.put("Kroger", numItemsFromStore.get("Kroger") + 1);
                     }
                 }
             }
@@ -161,6 +162,7 @@ public class ListPage extends AppCompatActivity {
                 public void onClick(View v) {
                     int q = Integer.parseInt(pQuantity.get(position)) - 1;
                     pQuantity.set(position, Integer.toString(q));
+                    totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) - 1.0);
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() - 1);
                     pListItemPair.add(position, le);
@@ -190,6 +192,7 @@ public class ListPage extends AppCompatActivity {
                 public void onClick(View v) {
                     int q = Integer.parseInt(pQuantity.get(position)) + 1;
                     pQuantity.set(position, Integer.toString(q));
+                    totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) + 1.0);
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() + 1);
                     pListItemPair.add(position, le);
@@ -217,6 +220,8 @@ public class ListPage extends AppCompatActivity {
             removeItem.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (1.0 * Integer.parseInt(pQuantity.get(position))));
+
                     pNames.remove(position);
                     pStores.remove(position);
                     pPrices.remove(position);
@@ -239,8 +244,23 @@ public class ListPage extends AppCompatActivity {
                 name.setText(pNames.get(position));
                 store.setText(pStores.get(position));
                 price.setText(pPrices.get(position));
-                quantity.setText(pQuantity.get(position));
-                image.setImageResource(pImages.get(position));
+
+                if(pQuantity.get(position).equals("-1")) {
+                    quantity.setVisibility(View.INVISIBLE);
+                    decrQuan.setVisibility(View.INVISIBLE);
+                    incrQuan.setVisibility(View.INVISIBLE);
+                    removeItem.setVisibility(View.INVISIBLE);
+                }
+                else {
+                    quantity.setText(pQuantity.get(position));
+                }
+
+                if(pImages.get(position) == -1) {
+                    image.setVisibility(View.INVISIBLE);
+                }
+                else {
+                    image.setImageResource(pImages.get(position));
+                }
             }
 
             return listproduct;
diff --git a/Listify/app/src/main/res/menu/activity_main_drawer.xml b/Listify/app/src/main/res/menu/activity_main_drawer.xml
index 26a2072..b4aec58 100644
--- a/Listify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml
@@ -20,11 +20,6 @@
             android:id="@+id/nav_lists"
             android:icon="@drawable/ic_baseline_list_alt_28"
             android:title="@string/menu_lists" />
-<!--    <item-->
-<!--        android:id="@+id/nav_create_list"-->
-<!--        android:icon="@drawable/ic_baseline_add_28"-->
-<!--        android:title="Create New List"-->
-<!--        android:onClick="onClickCreateList" />-->
         <item
             android:id="@+id/nav_logout"
             android:title="Sign out"

From 8afa81db596ca9de3bd787775a0074f9cf290ef0 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sat, 24 Oct 2020 16:14:17 -0700
Subject: [PATCH 23/36] Total prices change on the spot after changing quantity
 and removing items

---
 .../java/com/example/listify/ListPage.java    | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

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 a5b9204..a45e323 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -40,6 +40,7 @@ public class ListPage extends AppCompatActivity {
     ArrayList<ListEntry> pListItemPair = new ArrayList<>();
 
     Map<String, Double> totalPriceByStore = new HashMap<>();
+    Map<String, Integer> storeHeaderIndex = new HashMap<>();
 
     Requestor requestor;
 
@@ -82,10 +83,11 @@ public class ListPage extends AppCompatActivity {
                 if(item != null) {
                     if(!totalPriceByStore.containsKey("Kroger")) {
                         totalPriceByStore.put("Kroger", item.getPrice().doubleValue() * entry.getQuantity());
+                        storeHeaderIndex.put("Kroger", pNames.size());
 
                         pNames.add("Kroger");
                         pStores.add("");
-                        pPrices.add("$" + totalPriceByStore.get("Kroger"));
+                        pPrices.add(totalPriceByStore.get("Kroger").toString());
                         pQuantity.add("-1");
                         pImages.add(-1);
                         pListItemPair.add(null);
@@ -105,7 +107,7 @@ public class ListPage extends AppCompatActivity {
                         }
 
                         totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") + (item.getPrice().doubleValue() * entry.getQuantity()));
-                        pPrices.set(index, "$" + totalPriceByStore.get("Kroger"));
+                        pPrices.set(index, totalPriceByStore.get("Kroger").toString());
 
                         index++;
 
@@ -115,6 +117,12 @@ public class ListPage extends AppCompatActivity {
                         pQuantity.add(index, entry.getQuantity().toString());
                         pImages.add(index, R.drawable.placeholder);
                         pListItemPair.add(index, entry);
+
+                        for(String store : storeHeaderIndex.keySet()) {
+                            if(storeHeaderIndex.get(store) > index) {
+                                storeHeaderIndex.put(store, storeHeaderIndex.get(store) + 1);
+                            }
+                        }
                     }
                 }
             }
@@ -162,7 +170,8 @@ public class ListPage extends AppCompatActivity {
                 public void onClick(View v) {
                     int q = Integer.parseInt(pQuantity.get(position)) - 1;
                     pQuantity.set(position, Integer.toString(q));
-                    totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) - 1.0);
+                    totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) - Double.parseDouble(pPrices.get(position)));
+                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() - 1);
                     pListItemPair.add(position, le);
@@ -192,7 +201,8 @@ public class ListPage extends AppCompatActivity {
                 public void onClick(View v) {
                     int q = Integer.parseInt(pQuantity.get(position)) + 1;
                     pQuantity.set(position, Integer.toString(q));
-                    totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) + 1.0);
+                    totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) + Double.parseDouble(pPrices.get(position)));
+                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() + 1);
                     pListItemPair.add(position, le);
@@ -220,7 +230,8 @@ public class ListPage extends AppCompatActivity {
             removeItem.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (1.0 * Integer.parseInt(pQuantity.get(position))));
+                    totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position))));
+                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
 
                     pNames.remove(position);
                     pStores.remove(position);
@@ -243,7 +254,7 @@ public class ListPage extends AppCompatActivity {
             if(!pNames.isEmpty()) {
                 name.setText(pNames.get(position));
                 store.setText(pStores.get(position));
-                price.setText(pPrices.get(position));
+                price.setText("$" + pPrices.get(position));
 
                 if(pQuantity.get(position).equals("-1")) {
                     quantity.setVisibility(View.INVISIBLE);

From c07599ecc6b2417a4ed3480ea21c52204ba84f4f Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwilson@protonmail.com>
Date: Sun, 25 Oct 2020 16:53:51 -0400
Subject: [PATCH 24/36] Add threads in awaited for loops. Remove new threads
 from Requestor.getObject calls

---
 .../java/com/example/listify/ItemDetails.java | 40 ++++++++++++++---
 .../com/example/listify/SearchResults.java    |  9 +---
 .../listify/ui/lists/ListsFragment.java       | 44 ++++++++++++-------
 3 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/ItemDetails.java b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
index e76f699..89fe980 100644
--- a/Listify/app/src/main/java/com/example/listify/ItemDetails.java
+++ b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
@@ -88,22 +88,50 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
 
                 Requestor requestor = new Requestor(am, configs.getProperty("apiKey"));
                 SynchronousReceiver<Integer[]> listIdsReceiver = new SynchronousReceiver<>();
-                SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
                 requestor.getListOfIds(List.class, listIdsReceiver, listIdsReceiver);
 
                 Thread t = new Thread(new Runnable() {
                     @Override
                     public void run() {
+                        Integer[] listIds = null;
                         try {
-                            Integer[] listIds = listIdsReceiver.await();
-                            for (int i = 0; i < listIds.length; i++) {
-                                requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
-                                shoppingLists.add(listReceiver.await());
-                            }
+                            listIds = listIdsReceiver.await();
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
 
+                        // Create threads and add them to a list
+                        Thread[] threads = new Thread[listIds.length];
+                        List[] results = new List[listIds.length];
+                        for (int i = 0; i < listIds.length; i++) {
+                            SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
+                            requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
+                            int finalI = i;
+                            Thread l = new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    try {
+                                        results[finalI] = listReceiver.await();
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            });
+                            threads[i] = l;
+                            l.start();
+                        }
+
+                        // Wait for each thread to finish and add results to shoppingLists
+                        for (int i = 0; i < threads.length; i++) {
+                            try {
+                                threads[i].join();
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+                            shoppingLists.add(results[i]);
+                        }
+
+
                         loadingDialog.cancel();
                         ListPickerDialogFragment listPickerDialog = new ListPickerDialogFragment(shoppingLists);
                         listPickerDialog.show(getSupportFragmentManager(), "User Lists");
diff --git a/Listify/app/src/main/java/com/example/listify/SearchResults.java b/Listify/app/src/main/java/com/example/listify/SearchResults.java
index 6b62c74..18e4671 100644
--- a/Listify/app/src/main/java/com/example/listify/SearchResults.java
+++ b/Listify/app/src/main/java/com/example/listify/SearchResults.java
@@ -108,14 +108,7 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
                 // Clear old search results from the view
                 resultsProductListSorted.clear();
                 searchResultsListAdapter.notifyDataSetChanged();
-
-                Thread t = new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        doSearch(query);
-                    }
-                });
-                t.start();
+                doSearch(query);
                 return false;
             }
 
diff --git a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
index 0e1ccbf..cec4674 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
@@ -66,13 +66,7 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
         SynchronousReceiver<Integer[]> listIdsReceiver = new SynchronousReceiver<>();
 
         final Requestor.Receiver<Integer[]> recv = this;
-        Thread t = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                requestor.getListOfIds(List.class, recv, null);
-            }
-        });
-        t.start();
+        requestor.getListOfIds(List.class, recv, null);
 
 
         FloatingActionButton fab = (FloatingActionButton) root.findViewById(R.id.new_list_fab);
@@ -144,16 +138,36 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
 
     @Override
     public void acceptDelivery(Object delivered) {
-        SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
         Integer[] listIds = (Integer[]) delivered;
-        try {
-//            Integer[] listIds = listIdsReceiver.await();
-            for (int i = 0; i < listIds.length; i++) {
-                requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
-                shoppingLists.add(listReceiver.await());
+        // Create threads and add them to a list
+        Thread[] threads = new Thread[listIds.length];
+        List[] results = new List[listIds.length];
+        for (int i = 0; i < listIds.length; i++) {
+            SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
+            requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
+            int finalI = i;
+            Thread t = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        results[finalI] = listReceiver.await();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+            threads[i] = t;
+            t.start();
+        }
+
+        // Wait for each thread to finish and add results to shoppingLists
+        for (int i = 0; i < threads.length; i++) {
+            try {
+                threads[i].join();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+            shoppingLists.add(results[i]);
         }
 
         // Set adapter and display this users lists

From 7bc43d82499f2e92619e62942bc75c225e90e40a Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sun, 25 Oct 2020 16:15:42 -0700
Subject: [PATCH 25/36] Simplified a section of code for total price by store
 (used HashMap to access header section)

---
 Listify/app/src/main/java/com/example/listify/ListPage.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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 a45e323..a7a3e89 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -100,11 +100,7 @@ public class ListPage extends AppCompatActivity {
                         pListItemPair.add(entry);
                     }
                     else {
-                        int index = 0;
-
-                        while(index < pNames.size() && !pNames.get(index).equals("Kroger")) {
-                            index++;
-                        }
+                        int index = storeHeaderIndex.get("Kroger");
 
                         totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") + (item.getPrice().doubleValue() * entry.getQuantity()));
                         pPrices.set(index, totalPriceByStore.get("Kroger").toString());

From 07db1c833ad446fa1babb580581fd0fa53b92736 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwilson@protonmail.com>
Date: Sun, 25 Oct 2020 21:57:57 -0400
Subject: [PATCH 26/36] Fix duplicate lists displaying

---
 Listify/app/src/main/java/com/example/listify/ItemDetails.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Listify/app/src/main/java/com/example/listify/ItemDetails.java b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
index 89fe980..f2fb43c 100644
--- a/Listify/app/src/main/java/com/example/listify/ItemDetails.java
+++ b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
@@ -121,6 +121,7 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
                             l.start();
                         }
 
+                        shoppingLists.clear();
                         // Wait for each thread to finish and add results to shoppingLists
                         for (int i = 0; i < threads.length; i++) {
                             try {

From caf929a71e2569e267be5d5603a96bdec29b0c44 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwilson@protonmail.com>
Date: Sun, 25 Oct 2020 22:52:35 -0400
Subject: [PATCH 27/36] Floating total price bar

---
 .../java/com/example/listify/ListPage.java    |  8 +++++
 .../com/example/listify/SearchResults.java    |  1 +
 .../app/src/main/res/layout/activity_list.xml | 32 ++++++++++++++++---
 3 files changed, 37 insertions(+), 4 deletions(-)

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 fa449d2..8558e28 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -16,6 +16,7 @@ import com.example.listify.data.ListEntry;
 import org.json.JSONException;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Properties;
 
@@ -64,6 +65,7 @@ public class ListPage extends AppCompatActivity {
             list = null;
         }
 
+        double totalPrice = 0;
         if(list != null) {
             for (ListEntry entry : list.getEntries()) {
                 int product = entry.getProductID();
@@ -83,6 +85,9 @@ public class ListPage extends AppCompatActivity {
                     pQuantity.add(entry.getQuantity().toString());
                     pImages.add(R.drawable.placeholder);
                     pListItemPair.add(entry);
+
+                    // Increment total price
+                    totalPrice += (item.getPrice().doubleValue() * entry.getQuantity());
                 }
             }
         }
@@ -112,6 +117,9 @@ public class ListPage extends AppCompatActivity {
         myAdapter = new MyAdapter(this, pNames, pStores, pPrices, pQuantity, pImages);
 
         listView.setAdapter(myAdapter);
+
+        TextView tvTotalPrice = (TextView) findViewById(R.id.total_price);
+        tvTotalPrice.setText(String.format("$%.2f", totalPrice));
     }
 
     class MyAdapter extends ArrayAdapter<String> {
diff --git a/Listify/app/src/main/java/com/example/listify/SearchResults.java b/Listify/app/src/main/java/com/example/listify/SearchResults.java
index 0b312c6..d799cca 100644
--- a/Listify/app/src/main/java/com/example/listify/SearchResults.java
+++ b/Listify/app/src/main/java/com/example/listify/SearchResults.java
@@ -176,6 +176,7 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme
         sortResults();
     }
 
+    // TODO: Scroll the list back to the top when a search, sort, or filter is performed
     // Sorts the search results
     private void sortResults() {
         // Reset the filtered list
diff --git a/Listify/app/src/main/res/layout/activity_list.xml b/Listify/app/src/main/res/layout/activity_list.xml
index 65c12f4..12e134b 100644
--- a/Listify/app/src/main/res/layout/activity_list.xml
+++ b/Listify/app/src/main/res/layout/activity_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -7,8 +7,32 @@
     <ListView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/listView">
-
+        android:id="@+id/listView"
+        android:paddingBottom="20dp">
     </ListView>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:background="@color/colorPrimaryDark">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:text="Total: "/>
+
+        <TextView
+            android:id="@+id/total_price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:text="@string/default__00_00"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file

From 04a944f2d5a4dbcfcd6125a3004995f79d29f27d Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwilson@protonmail.com>
Date: Sun, 25 Oct 2020 23:06:56 -0400
Subject: [PATCH 28/36] Update total price when quantities change and items are
 removed

---
 .../java/com/example/listify/ListPage.java     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

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 8558e28..580bb65 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -16,7 +16,6 @@ import com.example.listify.data.ListEntry;
 import org.json.JSONException;
 
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Properties;
 
@@ -29,6 +28,7 @@ public class ListPage extends AppCompatActivity {
     Button incrQuan;
     Button decrQuan;
     Button removeItem;
+    TextView tvTotalPrice;
 
     ArrayList<String> pNames = new ArrayList<>();
     ArrayList<String> pStores = new ArrayList<>();
@@ -39,6 +39,7 @@ public class ListPage extends AppCompatActivity {
     ArrayList<ListEntry> pListItemPair = new ArrayList<>();
 
     Requestor requestor;
+    double totalPrice = 0;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -65,7 +66,6 @@ public class ListPage extends AppCompatActivity {
             list = null;
         }
 
-        double totalPrice = 0;
         if(list != null) {
             for (ListEntry entry : list.getEntries()) {
                 int product = entry.getProductID();
@@ -118,7 +118,7 @@ public class ListPage extends AppCompatActivity {
 
         listView.setAdapter(myAdapter);
 
-        TextView tvTotalPrice = (TextView) findViewById(R.id.total_price);
+        tvTotalPrice = (TextView) findViewById(R.id.total_price);
         tvTotalPrice.setText(String.format("$%.2f", totalPrice));
     }
 
@@ -158,6 +158,10 @@ public class ListPage extends AppCompatActivity {
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() - 1);
                     pListItemPair.add(position, le);
+
+                    totalPrice -= Double.parseDouble(pPrices.get(position));
+                    tvTotalPrice.setText(String.format("$%.2f", totalPrice));
+
                     SynchronousReceiver<Integer> synchronousenforcer = new SynchronousReceiver<>();
                     requestor.deleteObject(le, synchronousenforcer, synchronousenforcer);
                     try {
@@ -187,6 +191,10 @@ public class ListPage extends AppCompatActivity {
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() + 1);
                     pListItemPair.add(position, le);
+
+                    totalPrice += Double.parseDouble(pPrices.get(position));
+                    tvTotalPrice.setText(String.format("$%.2f", totalPrice));
+
                     SynchronousReceiver<Integer> synchronousenforcer = new SynchronousReceiver<>();
                     requestor.deleteObject(le, synchronousenforcer, synchronousenforcer);
                     try {
@@ -211,6 +219,10 @@ public class ListPage extends AppCompatActivity {
             removeItem.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
+                    totalPrice -= (Double.parseDouble(pPrices.get(position)) *
+                            Double.parseDouble(pQuantity.get(position)));
+                    tvTotalPrice.setText(String.format("$%.2f", totalPrice));
+
                     pNames.remove(position);
                     pStores.remove(position);
                     pPrices.remove(position);

From a3e72d3699baeb26b538f50b4af5f0a34029ae5a Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sun, 25 Oct 2020 21:47:48 -0700
Subject: [PATCH 29/36] Shopping list can now display actual image of item

---
 .../java/com/example/listify/ListPage.java    | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

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 a7a3e89..2a1fbd6 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -10,10 +10,12 @@ import android.widget.*;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+
+import com.bumptech.glide.Glide;
+
 import com.example.listify.data.Item;
 import com.example.listify.data.List;
 import com.example.listify.data.ListEntry;
-import org.json.JSONException;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -21,6 +23,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.json.JSONException;
+
 import static com.example.listify.MainActivity.am;
 
 public class ListPage extends AppCompatActivity {
@@ -35,7 +39,7 @@ public class ListPage extends AppCompatActivity {
     ArrayList<String> pStores = new ArrayList<>();
     ArrayList<String> pPrices = new ArrayList<>();
     ArrayList<String> pQuantity = new ArrayList<>();
-    ArrayList<Integer> pImages = new ArrayList<>();
+    ArrayList<String> pImages = new ArrayList<>();
 
     ArrayList<ListEntry> pListItemPair = new ArrayList<>();
 
@@ -89,14 +93,14 @@ public class ListPage extends AppCompatActivity {
                         pStores.add("");
                         pPrices.add(totalPriceByStore.get("Kroger").toString());
                         pQuantity.add("-1");
-                        pImages.add(-1);
+                        pImages.add("-1");
                         pListItemPair.add(null);
 
                         pNames.add(item.getDescription());
                         pStores.add("Kroger");
                         pPrices.add(item.getPrice().toString());
                         pQuantity.add(entry.getQuantity().toString());
-                        pImages.add(R.drawable.placeholder);
+                        pImages.add(item.getImageURL());
                         pListItemPair.add(entry);
                     }
                     else {
@@ -111,7 +115,7 @@ public class ListPage extends AppCompatActivity {
                         pStores.add(index, "Kroger");
                         pPrices.add(index, item.getPrice().toString());
                         pQuantity.add(index, entry.getQuantity().toString());
-                        pImages.add(index, R.drawable.placeholder);
+                        pImages.add(index, item.getImageURL());
                         pListItemPair.add(index, entry);
 
                         for(String store : storeHeaderIndex.keySet()) {
@@ -139,9 +143,9 @@ public class ListPage extends AppCompatActivity {
         ArrayList<String> pStores;
         ArrayList<String> pPrices;
         ArrayList<String> pQuantity;
-        ArrayList<Integer> pImages;
+        ArrayList<String> pImages;
 
-        MyAdapter (Context c, ArrayList<String> names, ArrayList<String> stores, ArrayList<String> prices, ArrayList<String> quantity, ArrayList<Integer> images) {
+        MyAdapter (Context c, ArrayList<String> names, ArrayList<String> stores, ArrayList<String> prices, ArrayList<String> quantity, ArrayList<String> images) {
             super(c, R.layout.activity_listproductentry, R.id.productView, names);
             context = c;
             pNames = names;
@@ -262,11 +266,11 @@ public class ListPage extends AppCompatActivity {
                     quantity.setText(pQuantity.get(position));
                 }
 
-                if(pImages.get(position) == -1) {
+                if(pImages.get(position).equals("-1")) {
                     image.setVisibility(View.INVISIBLE);
                 }
                 else {
-                    image.setImageResource(pImages.get(position));
+                    Glide.with(getContext()).load(pImages.get(position)).into(image);
                 }
             }
 

From 0562c66dbb90cab9f3d63b5ee5c7a6217d35afa6 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sun, 25 Oct 2020 22:15:27 -0700
Subject: [PATCH 30/36] Can now display the grand total of items in shopping
 list

---
 .../java/com/example/listify/ListPage.java    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

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 2a1fbd6..e4c057b 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -53,6 +53,13 @@ public class ListPage extends AppCompatActivity {
         // Read list ID from caller
         final int listID = (int) getIntent().getSerializableExtra("listID");
 
+        pNames.add("Total Price");
+        pStores.add("");
+        pPrices.add("0.00");
+        pQuantity.add("-1");
+        pImages.add("-1");
+        pListItemPair.add(null);
+
         Properties configs = new Properties();
         try {
             configs = AuthManager.loadProperties(this, "android.resource://" + getPackageName() + "/raw/auths.json");
@@ -89,6 +96,9 @@ public class ListPage extends AppCompatActivity {
                         totalPriceByStore.put("Kroger", item.getPrice().doubleValue() * entry.getQuantity());
                         storeHeaderIndex.put("Kroger", pNames.size());
 
+                        double newTotal = Double.parseDouble(pPrices.get(0)) + (item.getPrice().doubleValue() * entry.getQuantity());
+                        pPrices.set(0, String.valueOf(newTotal));
+
                         pNames.add("Kroger");
                         pStores.add("");
                         pPrices.add(totalPriceByStore.get("Kroger").toString());
@@ -109,6 +119,9 @@ public class ListPage extends AppCompatActivity {
                         totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") + (item.getPrice().doubleValue() * entry.getQuantity()));
                         pPrices.set(index, totalPriceByStore.get("Kroger").toString());
 
+                        double newTotal = Double.parseDouble(pPrices.get(0)) + (item.getPrice().doubleValue() * entry.getQuantity());
+                        pPrices.set(0, String.valueOf(newTotal));
+
                         index++;
 
                         pNames.add(index, item.getDescription());
@@ -172,6 +185,8 @@ public class ListPage extends AppCompatActivity {
                     pQuantity.set(position, Integer.toString(q));
                     totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) - Double.parseDouble(pPrices.get(position)));
                     pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
+                    double newTotal = Double.parseDouble(pPrices.get(0)) - Double.parseDouble(pPrices.get(position));
+                    pPrices.set(0, String.valueOf(newTotal));
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() - 1);
                     pListItemPair.add(position, le);
@@ -203,6 +218,8 @@ public class ListPage extends AppCompatActivity {
                     pQuantity.set(position, Integer.toString(q));
                     totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) + Double.parseDouble(pPrices.get(position)));
                     pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
+                    double newTotal = Double.parseDouble(pPrices.get(0)) + Double.parseDouble(pPrices.get(position));
+                    pPrices.set(0, String.valueOf(newTotal));
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() + 1);
                     pListItemPair.add(position, le);
@@ -233,6 +250,9 @@ public class ListPage extends AppCompatActivity {
                     totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position))));
                     pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
 
+                    double newTotal = Double.parseDouble(pPrices.get(0)) - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position)));
+                    pPrices.set(0, String.valueOf(newTotal));
+
                     pNames.remove(position);
                     pStores.remove(position);
                     pPrices.remove(position);

From 049d95bb914c02aa31ba0ae48330e895618c5d5c Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sun, 25 Oct 2020 22:39:56 -0700
Subject: [PATCH 31/36] Can now clear shopping list (i.e. remove all items)

---
 .../java/com/example/listify/ListPage.java    | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

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 e4c057b..2e9dffa 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -247,19 +247,41 @@ public class ListPage extends AppCompatActivity {
             removeItem.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position))));
-                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
+                    if(position == 0) {
+                        pNames.clear();
+                        pStores.clear();
+                        pPrices.clear();
+                        pQuantity.clear();
+                        pImages.clear();
 
-                    double newTotal = Double.parseDouble(pPrices.get(0)) - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position)));
-                    pPrices.set(0, String.valueOf(newTotal));
+                        pNames.add("Total Price");
+                        pStores.add("");
+                        pPrices.add("0.00");
+                        pQuantity.add("-1");
+                        pImages.add("-1");
 
-                    pNames.remove(position);
-                    pStores.remove(position);
-                    pPrices.remove(position);
-                    pQuantity.remove(position);
-                    pImages.remove(position);
+                        while(pListItemPair.size() > 1) {
+                            try {
+                                requestor.deleteObject(pListItemPair.remove(1));
+                            }
+                            catch(Exception e) {}
+                        }
+                    }
+                    else {
+                        totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position))));
+                        pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
 
-                    requestor.deleteObject(pListItemPair.remove(position));
+                        double newTotal = Double.parseDouble(pPrices.get(0)) - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position)));
+                        pPrices.set(0, String.valueOf(newTotal));
+
+                        pNames.remove(position);
+                        pStores.remove(position);
+                        pPrices.remove(position);
+                        pQuantity.remove(position);
+                        pImages.remove(position);
+
+                        requestor.deleteObject(pListItemPair.remove(position));
+                    }
 
                     listView.setAdapter(myAdapter);
                 }
@@ -280,7 +302,13 @@ public class ListPage extends AppCompatActivity {
                     quantity.setVisibility(View.INVISIBLE);
                     decrQuan.setVisibility(View.INVISIBLE);
                     incrQuan.setVisibility(View.INVISIBLE);
-                    removeItem.setVisibility(View.INVISIBLE);
+
+                    if(position == 0) {
+
+                    }
+                    else {
+                        removeItem.setVisibility(View.INVISIBLE);
+                    }
                 }
                 else {
                     quantity.setText(pQuantity.get(position));

From 2c73e8b224ece6d2a659cc4e28109307b86ddc2d Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Sun, 25 Oct 2020 23:27:25 -0700
Subject: [PATCH 32/36] Properly formatted the price values in shopping list

---
 .../java/com/example/listify/ListPage.java    | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

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 2e9dffa..6f3044f 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -18,6 +18,7 @@ import com.example.listify.data.List;
 import com.example.listify.data.ListEntry;
 
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,6 +31,7 @@ import static com.example.listify.MainActivity.am;
 public class ListPage extends AppCompatActivity {
     ListView listView;
     MyAdapter myAdapter;
+    Requestor requestor;
 
     Button incrQuan;
     Button decrQuan;
@@ -46,7 +48,7 @@ public class ListPage extends AppCompatActivity {
     Map<String, Double> totalPriceByStore = new HashMap<>();
     Map<String, Integer> storeHeaderIndex = new HashMap<>();
 
-    Requestor requestor;
+    DecimalFormat df = new DecimalFormat("0.00");
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -101,14 +103,14 @@ public class ListPage extends AppCompatActivity {
 
                         pNames.add("Kroger");
                         pStores.add("");
-                        pPrices.add(totalPriceByStore.get("Kroger").toString());
+                        pPrices.add(df.format(totalPriceByStore.get("Kroger")));
                         pQuantity.add("-1");
                         pImages.add("-1");
                         pListItemPair.add(null);
 
                         pNames.add(item.getDescription());
                         pStores.add("Kroger");
-                        pPrices.add(item.getPrice().toString());
+                        pPrices.add(df.format(item.getPrice()));
                         pQuantity.add(entry.getQuantity().toString());
                         pImages.add(item.getImageURL());
                         pListItemPair.add(entry);
@@ -117,16 +119,16 @@ public class ListPage extends AppCompatActivity {
                         int index = storeHeaderIndex.get("Kroger");
 
                         totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") + (item.getPrice().doubleValue() * entry.getQuantity()));
-                        pPrices.set(index, totalPriceByStore.get("Kroger").toString());
+                        pPrices.set(index, df.format(totalPriceByStore.get("Kroger")));
 
                         double newTotal = Double.parseDouble(pPrices.get(0)) + (item.getPrice().doubleValue() * entry.getQuantity());
-                        pPrices.set(0, String.valueOf(newTotal));
+                        pPrices.set(0, df.format(newTotal));
 
                         index++;
 
                         pNames.add(index, item.getDescription());
                         pStores.add(index, "Kroger");
-                        pPrices.add(index, item.getPrice().toString());
+                        pPrices.add(index, df.format(item.getPrice()));
                         pQuantity.add(index, entry.getQuantity().toString());
                         pImages.add(index, item.getImageURL());
                         pListItemPair.add(index, entry);
@@ -184,9 +186,9 @@ public class ListPage extends AppCompatActivity {
                     int q = Integer.parseInt(pQuantity.get(position)) - 1;
                     pQuantity.set(position, Integer.toString(q));
                     totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) - Double.parseDouble(pPrices.get(position)));
-                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
+                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), df.format(totalPriceByStore.get(pStores.get(position))));
                     double newTotal = Double.parseDouble(pPrices.get(0)) - Double.parseDouble(pPrices.get(position));
-                    pPrices.set(0, String.valueOf(newTotal));
+                    pPrices.set(0, df.format(newTotal));
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() - 1);
                     pListItemPair.add(position, le);
@@ -217,9 +219,9 @@ public class ListPage extends AppCompatActivity {
                     int q = Integer.parseInt(pQuantity.get(position)) + 1;
                     pQuantity.set(position, Integer.toString(q));
                     totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) + Double.parseDouble(pPrices.get(position)));
-                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
+                    pPrices.set(storeHeaderIndex.get(pStores.get(position)), df.format(totalPriceByStore.get(pStores.get(position))));
                     double newTotal = Double.parseDouble(pPrices.get(0)) + Double.parseDouble(pPrices.get(position));
-                    pPrices.set(0, String.valueOf(newTotal));
+                    pPrices.set(0, df.format(newTotal));
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() + 1);
                     pListItemPair.add(position, le);
@@ -269,10 +271,10 @@ public class ListPage extends AppCompatActivity {
                     }
                     else {
                         totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position))));
-                        pPrices.set(storeHeaderIndex.get(pStores.get(position)), totalPriceByStore.get(pStores.get(position)).toString());
+                        pPrices.set(storeHeaderIndex.get(pStores.get(position)), df.format(totalPriceByStore.get(pStores.get(position))));
 
                         double newTotal = Double.parseDouble(pPrices.get(0)) - (Double.parseDouble(pPrices.get(position)) * Integer.parseInt(pQuantity.get(position)));
-                        pPrices.set(0, String.valueOf(newTotal));
+                        pPrices.set(0, df.format(newTotal));
 
                         pNames.remove(position);
                         pStores.remove(position);
@@ -304,7 +306,7 @@ public class ListPage extends AppCompatActivity {
                     incrQuan.setVisibility(View.INVISIBLE);
 
                     if(position == 0) {
-
+                        removeItem.setText("Clear all");
                     }
                     else {
                         removeItem.setVisibility(View.INVISIBLE);

From 739699d7a525ea3128e98b927a86953049e187ff Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Sat, 31 Oct 2020 19:54:11 -0400
Subject: [PATCH 33/36] Explicitly declared inner loop variables to final

---
 Listify/app/src/main/java/com/example/listify/ItemDetails.java | 2 +-
 .../main/java/com/example/listify/ui/lists/ListsFragment.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Listify/app/src/main/java/com/example/listify/ItemDetails.java b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
index f2fb43c..46dd926 100644
--- a/Listify/app/src/main/java/com/example/listify/ItemDetails.java
+++ b/Listify/app/src/main/java/com/example/listify/ItemDetails.java
@@ -106,7 +106,7 @@ public class ItemDetails extends AppCompatActivity implements ListPickerDialogFr
                         for (int i = 0; i < listIds.length; i++) {
                             SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
                             requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
-                            int finalI = i;
+                            final int finalI = i;
                             Thread l = new Thread(new Runnable() {
                                 @Override
                                 public void run() {
diff --git a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
index cec4674..fdcc4d4 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/lists/ListsFragment.java
@@ -48,6 +48,7 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
     Requestor requestor;
     ListView shoppingListsView;
     ProgressBar loadingLists;
+    int resultsIndex;
 
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_lists, container, false);
@@ -145,7 +146,7 @@ public class ListsFragment extends Fragment implements CreateListDialogFragment.
         for (int i = 0; i < listIds.length; i++) {
             SynchronousReceiver<List> listReceiver = new SynchronousReceiver<>();
             requestor.getObject(Integer.toString(listIds[i]), List.class, listReceiver, listReceiver);
-            int finalI = i;
+            final int finalI = i;
             Thread t = new Thread(new Runnable() {
                 @Override
                 public void run() {

From 8364ed049b4eaa27596656beb4e2c5b54104bce8 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Sat, 31 Oct 2020 20:10:09 -0400
Subject: [PATCH 34/36] Fixed formatting from merge

---
 .../main/java/com/example/listify/ListPage.java   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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 2a551b5..4f2a794 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -168,13 +168,14 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
                     }
                 }
             }
-          runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                loadingListItems.setVisibility(View.GONE);
-                myAdapter.notifyDataSetChanged();
-            }
-        });
+
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    loadingListItems.setVisibility(View.GONE);
+                    myAdapter.notifyDataSetChanged();
+                }
+            });
         }
     }
 

From d9ea934021c5a471e8ec97ccc0c336c258450075 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Sat, 31 Oct 2020 20:34:54 -0400
Subject: [PATCH 35/36] Fix total price being incorrect

---
 .../main/java/com/example/listify/ListPage.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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 dd6a28b..b821dcf 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -47,7 +47,6 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
 
     ArrayList<ListEntry> pListItemPair = new ArrayList<>();
 
-    Requestor requestor;
     double totalPrice = 0;
   
     Map<String, Double> totalPriceByStore = new HashMap<>();
@@ -163,9 +162,6 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
                         pQuantity.add(index, entry.getQuantity().toString());
                         pImages.add(index, item.getImageURL());
                         pListItemPair.add(index, entry);
-                      
-                      // Increment total price
-                      totalPrice += (item.getPrice().doubleValue() * entry.getQuantity());
 
                         for(String store : storeHeaderIndex.keySet()) {
                             if(storeHeaderIndex.get(store) > index) {
@@ -173,14 +169,21 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
                             }
                         }
                     }
+
+                    // Increment total price
+                    System.out.println(totalPrice);
+                    System.out.println(item.getPrice().doubleValue());
+                    System.out.println(entry.getQuantity());
+                    totalPrice += (item.getPrice().doubleValue() * entry.getQuantity());
+                    System.out.println(totalPrice);
                 }
             }
 
-        tvTotalPrice = (TextView) findViewById(R.id.total_price);
-        tvTotalPrice.setText(String.format("$%.2f", totalPrice));
+            tvTotalPrice = (TextView) findViewById(R.id.total_price);
             runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
+                    tvTotalPrice.setText(String.format("$%.2f", totalPrice));
                     loadingListItems.setVisibility(View.GONE);
                     myAdapter.notifyDataSetChanged();
                 }

From 1f7a1b10db8d8dd123619428d2aca889d11a4d55 Mon Sep 17 00:00:00 2001
From: Clayton Wilson <claytonwwilson97@gmail.com>
Date: Sat, 31 Oct 2020 20:35:31 -0400
Subject: [PATCH 36/36] Remove print statements

---
 Listify/app/src/main/java/com/example/listify/ListPage.java | 4 ----
 1 file changed, 4 deletions(-)

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 b821dcf..a914890 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -171,11 +171,7 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
                     }
 
                     // Increment total price
-                    System.out.println(totalPrice);
-                    System.out.println(item.getPrice().doubleValue());
-                    System.out.println(entry.getQuantity());
                     totalPrice += (item.getPrice().doubleValue() * entry.getQuantity());
-                    System.out.println(totalPrice);
                 }
             }