From e7d2ec333af7956ed6d0fd9de15d1c13cc8e2eeb Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Thu, 8 Oct 2020 21:30:08 -0700
Subject: [PATCH 1/6] Implemented Confirm Password and quantity fetching from
 shopping list v.1

---
 .../main/java/com/example/listify/ListPage.java   |  2 +-
 .../java/com/example/listify/ui/SignupPage.java   |  8 ++++++++
 .../app/src/main/res/layout/activity_signup.xml   | 15 ++++++++-------
 3 files changed, 17 insertions(+), 8 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 baf1914..6f200d4 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -89,7 +89,7 @@ public class ListPage extends AppCompatActivity {
                     pNames.add(item.getDescription());
                     pStores.add("Kroger");
                     pPrices.add(item.getPrice().toString());
-                    pQuantity.add("1");
+                    pQuantity.add(entry.getQuantity().toString());
                     pImages.add(R.drawable.placeholder);
                     pListItemPair.add(entry);
                 }
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 fe90cfc..c3a691a 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
@@ -39,9 +39,17 @@ public class SignupPage extends AppCompatActivity implements CodePage.CodeDialog
             public void onClick(View v) {
                 EditText emailText = (EditText) findViewById(R.id.editTextTextEmailAddress);
                 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();
+
+                if(!password.equals(confirmPassword)) {
+                    TextView invalidCred = findViewById(R.id.textView3);
+                    invalidCred.setText("\"Confirm Password\" does not match \"Password\".");
+                    return;
+                }
 
                 try {
                     am.startSignUp(email, password);
diff --git a/Listify/app/src/main/res/layout/activity_signup.xml b/Listify/app/src/main/res/layout/activity_signup.xml
index 9b1bc15..6af1bfd 100644
--- a/Listify/app/src/main/res/layout/activity_signup.xml
+++ b/Listify/app/src/main/res/layout/activity_signup.xml
@@ -14,7 +14,7 @@
         android:text="Sign up"
         app:layout_constraintEnd_toStartOf="@+id/textView3"
         app:layout_constraintStart_toStartOf="@+id/textView3"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" />
+        app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword2" />
 
     <Button
         android:id="@+id/button1"
@@ -27,27 +27,27 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <EditText
-        android:id="@+id/editTextTextPersonName"
+        android:id="@+id/editTextTextPassword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="23dp"
         android:ems="10"
-        android:hint="Username"
+        android:hint="Password"
         android:inputType="textPersonName"
         app:layout_constraintStart_toStartOf="@+id/editTextTextEmailAddress"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextEmailAddress" />
 
     <EditText
-        android:id="@+id/editTextTextPassword"
+        android:id="@+id/editTextTextPassword2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="1dp"
         android:layout_marginTop="26dp"
         android:ems="10"
-        android:hint="Password"
+        android:hint="Confirm Password"
         android:inputType="textPassword"
-        app:layout_constraintEnd_toEndOf="@+id/editTextTextPersonName"
-        app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" />
+        app:layout_constraintEnd_toEndOf="@+id/editTextTextPassword"
+        app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" />
 
     <EditText
         android:id="@+id/editTextTextEmailAddress"
@@ -75,6 +75,7 @@
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
         android:text=""
         app:layout_constraintBottom_toTopOf="@+id/button2"
         app:layout_constraintEnd_toEndOf="parent"

From 23fc181fc00713e40f81021f25a965cb0b955bf0 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Thu, 8 Oct 2020 21:31:43 -0700
Subject: [PATCH 2/6] Removed upper limit for quantity -- not needed

---
 Listify/app/src/main/java/com/example/listify/ListPage.java | 6 ------
 1 file changed, 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 6f200d4..c7a39ad 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -162,9 +162,6 @@ public class ListPage extends AppCompatActivity {
             if(Integer.parseInt(pQuantity.get(position)) <= 1) {
                 decrQuan.setEnabled(false);
             }
-            if(Integer.parseInt(pQuantity.get(position)) < 10) {
-                incrQuan.setEnabled(true);
-            }
 
             incrQuan.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -177,9 +174,6 @@ public class ListPage extends AppCompatActivity {
             if(Integer.parseInt(pQuantity.get(position)) > 1) {
                 decrQuan.setEnabled(true);
             }
-            if(Integer.parseInt(pQuantity.get(position)) >= 10) {
-                incrQuan.setEnabled(false);
-            }
 
             removeItem.setOnClickListener(new View.OnClickListener() {
                 @Override

From 702a83ff85610d562ba2b3918c82e4b4b888f976 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Thu, 8 Oct 2020 22:03:45 -0700
Subject: [PATCH 3/6] Can now save quantity after changing it in List v.1

---
 .../java/com/example/listify/ListPage.java    | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 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 c7a39ad..1d0a1ec 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -3,6 +3,7 @@ package com.example.listify;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -154,8 +155,17 @@ public class ListPage extends AppCompatActivity {
             decrQuan.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    int q = Integer.parseInt(pQuantity.get(position)) - 1;
-                    pQuantity.set(position, Integer.toString(q));
+                    //int q = Integer.parseInt(pQuantity.get(position)) - 1;
+                    //pQuantity.set(position, Integer.toString(q));
+                    ListEntry le = pListItemPair.remove(position);
+                    le.setQuantity(le.getQuantity() - 1);
+                    requestor.deleteObject(le);
+                    try {
+                        requestor.postObject(le);
+                    }
+                    catch (Exception e) {
+                        Log.i("Authentication", e.toString());
+                    }
                     listView.setAdapter(myAdapter);
                 }
             });
@@ -166,8 +176,17 @@ public class ListPage extends AppCompatActivity {
             incrQuan.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    int q = Integer.parseInt(pQuantity.get(position)) + 1;
-                    pQuantity.set(position, Integer.toString(q));
+                    //int q = Integer.parseInt(pQuantity.get(position)) + 1;
+                    //pQuantity.set(position, Integer.toString(q));
+                    ListEntry le = pListItemPair.remove(position);
+                    le.setQuantity(le.getQuantity() + 1);
+                    requestor.deleteObject(le);
+                    try {
+                        requestor.postObject(le);
+                    }
+                    catch (Exception e) {
+                        Log.i("Authentication", e.toString());
+                    }
                     listView.setAdapter(myAdapter);
                 }
             });
@@ -215,7 +234,7 @@ public class ListPage extends AppCompatActivity {
                 int product = entry.getProductID();
                 ProductReceiver<Item> pr = new ProductReceiver<>();
                 requestor.getObject(Integer.toString(product), Item.class, pr);
-                pQuantity.add("1");
+                pQuantity.add(entry.getQuantity().toString());
                 pListItemPair.add(entry);
             }
         }

From a7ac3d6ec9b357a455f7d287d7d9447880af688c Mon Sep 17 00:00:00 2001
From: NMerz <nmerz@icloud.com>
Date: Fri, 9 Oct 2020 01:16:42 -0400
Subject: [PATCH 4/6] Enforce synchronous updates for quanitity

Also added a new delete method to requestor to allow for a receiver.
---
 .../java/com/example/listify/ListPage.java    | 52 +++++++++++--------
 .../java/com/example/listify/Requestor.java   |  6 ++-
 2 files changed, 34 insertions(+), 24 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 1d0a1ec..f81c481 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -1,35 +1,25 @@
 package com.example.listify;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
+import android.widget.*;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.example.listify.data.Item;
 import com.example.listify.data.List;
 import com.example.listify.data.ListEntry;
-import com.example.listify.model.Product;
-import static com.example.listify.MainActivity.am;
-
 import org.json.JSONException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Properties;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
+import static com.example.listify.MainActivity.am;
 
 public class ListPage extends AppCompatActivity {
     ListView listView;
@@ -155,13 +145,21 @@ public class ListPage extends AppCompatActivity {
             decrQuan.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    //int q = Integer.parseInt(pQuantity.get(position)) - 1;
-                    //pQuantity.set(position, Integer.toString(q));
+                    int q = Integer.parseInt(pQuantity.get(position)) - 1;
+                    pQuantity.set(position, Integer.toString(q));
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() - 1);
-                    requestor.deleteObject(le);
+                    pListItemPair.add(position, le);
+                    SynchronousReceiver<Integer> synchronousenforcer = new SynchronousReceiver<>();
+                    requestor.deleteObject(le, synchronousenforcer, synchronousenforcer);
                     try {
-                        requestor.postObject(le);
+                        synchronousenforcer.await();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    try {
+                        requestor.postObject(le, synchronousenforcer, synchronousenforcer);
+                        synchronousenforcer.await();
                     }
                     catch (Exception e) {
                         Log.i("Authentication", e.toString());
@@ -176,13 +174,21 @@ public class ListPage extends AppCompatActivity {
             incrQuan.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    //int q = Integer.parseInt(pQuantity.get(position)) + 1;
-                    //pQuantity.set(position, Integer.toString(q));
+                    int q = Integer.parseInt(pQuantity.get(position)) + 1;
+                    pQuantity.set(position, Integer.toString(q));
                     ListEntry le = pListItemPair.remove(position);
                     le.setQuantity(le.getQuantity() + 1);
-                    requestor.deleteObject(le);
+                    pListItemPair.add(position, le);
+                    SynchronousReceiver<Integer> synchronousenforcer = new SynchronousReceiver<>();
+                    requestor.deleteObject(le, synchronousenforcer, synchronousenforcer);
                     try {
-                        requestor.postObject(le);
+                        synchronousenforcer.await();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    try {
+                        requestor.postObject(le, synchronousenforcer, synchronousenforcer);
+                        synchronousenforcer.await();
                     }
                     catch (Exception e) {
                         Log.i("Authentication", e.toString());
diff --git a/Listify/app/src/main/java/com/example/listify/Requestor.java b/Listify/app/src/main/java/com/example/listify/Requestor.java
index 09e7dad..b2df019 100644
--- a/Listify/app/src/main/java/com/example/listify/Requestor.java
+++ b/Listify/app/src/main/java/com/example/listify/Requestor.java
@@ -45,9 +45,13 @@ public class Requestor {
     }
 
     public void deleteObject(Object toDelete) {
+        deleteObject(toDelete, null, null);
+    }
+
+    public void deleteObject(Object toDelete, Receiver receiver, RequestErrorHandler errorHandler) {
         String deleteURL = DEV_BASEURL + "/" + toDelete.getClass().getSimpleName();
         Request deleteRequest = buildBaseRequest(deleteURL, "DELETE", new Gson().toJson(toDelete));
-        launchCall(deleteRequest, null, toDelete.getClass(), null);
+        launchCall(deleteRequest, receiver, toDelete.getClass(), errorHandler);
     }
 
     public void deleteObject(String id, Class classType, RequestErrorHandler failureHandler) {

From 61d7c88e1a2014602b049c939c463357c8ed875c Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Thu, 8 Oct 2020 22:35:38 -0700
Subject: [PATCH 5/6] Can now display splashscreen when first entering the app
 v.1

---
 .../java/com/example/listify/MainActivity.java     | 12 ++++++++++++
 .../java/com/example/listify/SplashActivity.java   | 14 ++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 Listify/app/src/main/java/com/example/listify/SplashActivity.java

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 1a6180d..14e0a8c 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;
@@ -30,12 +31,23 @@ import java.util.Random;
 public class MainActivity extends AppCompatActivity implements CreateListDialogFragment.OnNewListListener {
     private AppBarConfiguration mAppBarConfiguration;
 
+    private static final int SPLASH_SCREEN_TIME = 3000; //in milliseconds
+
     public static AuthManager am = new AuthManager();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                Intent intent = new Intent(MainActivity.this, SplashActivity.class);
+                startActivity(intent);
+                finish();
+            }
+        }, SPLASH_SCREEN_TIME);
+
 
         //------------------------------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..793c9eb
--- /dev/null
+++ b/Listify/app/src/main/java/com/example/listify/SplashActivity.java
@@ -0,0 +1,14 @@
+package com.example.listify;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class SplashActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splashscreen);
+    }
+}

From 55d07f23e8de7938c691350c6335e6636cd5ba13 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Thu, 8 Oct 2020 22:37:14 -0700
Subject: [PATCH 6/6] Can now display splashscreen when first entering the app
 v.2

---
 Listify/app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

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