From 9fa5f19b982a399e199b54acd2315d5c4dd1b10a Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 24 Nov 2020 12:19:39 -0800
Subject: [PATCH 1/7] Auth error message no longer shifts button or password
 field

---
 .../main/res/layout/activity_forgotpswd.xml   | 19 ++++++++++++++-----
 .../src/main/res/layout/activity_login.xml    | 17 +++++++++++++----
 .../src/main/res/layout/activity_signup.xml   | 13 +++++++++++--
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/Listify/app/src/main/res/layout/activity_forgotpswd.xml b/Listify/app/src/main/res/layout/activity_forgotpswd.xml
index 7080bbd..8002666 100644
--- a/Listify/app/src/main/res/layout/activity_forgotpswd.xml
+++ b/Listify/app/src/main/res/layout/activity_forgotpswd.xml
@@ -11,8 +11,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="51dp"
         android:text="Submit"
-        app:layout_constraintEnd_toStartOf="@+id/textView6"
-        app:layout_constraintStart_toStartOf="@+id/textView6"
+        app:layout_constraintEnd_toStartOf="@+id/textView7"
+        app:layout_constraintStart_toStartOf="@+id/textView7"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword2" />
 
     <EditText
@@ -46,8 +46,8 @@
         android:ems="10"
         android:hint="Confirm New Password"
         android:inputType="textPassword"
-        app:layout_constraintEnd_toStartOf="@+id/textView6"
-        app:layout_constraintStart_toStartOf="@+id/textView6"
+        app:layout_constraintEnd_toStartOf="@+id/textView7"
+        app:layout_constraintStart_toStartOf="@+id/textView7"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword" />
 
     <TextView
@@ -56,7 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="2dp"
         android:text=""
-        app:layout_constraintBottom_toTopOf="@+id/button1"
+        app:layout_constraintBottom_toTopOf="@+id/textView7"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -69,4 +69,13 @@
         android:text="Please enter your email address."
         app:layout_constraintBottom_toTopOf="@+id/editTextTextEmailAddress"
         app:layout_constraintEnd_toEndOf="@+id/editTextTextEmailAddress" />
+
+    <TextView
+        android:id="@+id/textView7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        app:layout_constraintBottom_toTopOf="@+id/button1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Listify/app/src/main/res/layout/activity_login.xml b/Listify/app/src/main/res/layout/activity_login.xml
index a81dbf6..3f5022c 100644
--- a/Listify/app/src/main/res/layout/activity_login.xml
+++ b/Listify/app/src/main/res/layout/activity_login.xml
@@ -12,8 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="53dp"
         android:text="Log in"
-        app:layout_constraintEnd_toStartOf="@+id/textView5"
-        app:layout_constraintStart_toStartOf="@+id/textView5"
+        app:layout_constraintEnd_toStartOf="@+id/textView8"
+        app:layout_constraintStart_toStartOf="@+id/textView8"
         app:layout_constraintTop_toBottomOf="@+id/button2" />
 
     <Button
@@ -32,8 +32,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="72dp"
         android:text="Forgot password? Click here."
-        app:layout_constraintEnd_toStartOf="@+id/textView5"
-        app:layout_constraintStart_toStartOf="@+id/textView5"
+        app:layout_constraintEnd_toStartOf="@+id/textView8"
+        app:layout_constraintStart_toStartOf="@+id/textView8"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" />
 
     <EditText
@@ -73,6 +73,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text=""
+        app:layout_constraintBottom_toTopOf="@+id/textView8"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
         app:layout_constraintBottom_toTopOf="@+id/button3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/Listify/app/src/main/res/layout/activity_signup.xml b/Listify/app/src/main/res/layout/activity_signup.xml
index 1671732..f0d40cc 100644
--- a/Listify/app/src/main/res/layout/activity_signup.xml
+++ b/Listify/app/src/main/res/layout/activity_signup.xml
@@ -12,8 +12,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="65dp"
         android:text="Sign up"
-        app:layout_constraintEnd_toStartOf="@+id/textView3"
-        app:layout_constraintStart_toStartOf="@+id/textView3"
+        app:layout_constraintEnd_toStartOf="@+id/textView4"
+        app:layout_constraintStart_toStartOf="@+id/textView4"
         app:layout_constraintTop_toBottomOf="@+id/editTextTextPassword2" />
 
     <Button
@@ -77,6 +77,15 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="2dp"
         android:text=""
+        app:layout_constraintBottom_toTopOf="@+id/textView4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/textView4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
         app:layout_constraintBottom_toTopOf="@+id/button2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

From b842dcb46e0700b30dc56709457b02ca31074f23 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 24 Nov 2020 16:38:47 -0800
Subject: [PATCH 2/7] Alert now shows upon unsuccessful account deletion

---
 .../listify/ui/profile/ProfileFragment.java    | 11 +++++++++++
 .../main/res/layout/activity_erroralert.xml    | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 Listify/app/src/main/res/layout/activity_erroralert.xml

diff --git a/Listify/app/src/main/java/com/example/listify/ui/profile/ProfileFragment.java b/Listify/app/src/main/java/com/example/listify/ui/profile/ProfileFragment.java
index 134cd18..546d78d 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/profile/ProfileFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/profile/ProfileFragment.java
@@ -67,6 +67,17 @@ public class ProfileFragment extends Fragment {
                                 Log.i("Authentication", e.toString());
                             }
                         }
+                        else {
+                            View errorView = getLayoutInflater().inflate(R.layout.activity_erroralert, null);
+                            AlertDialog.Builder builder2 = new AlertDialog.Builder(getActivity());
+                            builder2.setView(errorView);
+                            builder2.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {}
+                            });
+                            AlertDialog dialog2 = builder2.create();
+                            dialog2.show();
+                        }
                     }
                 });
                 builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
diff --git a/Listify/app/src/main/res/layout/activity_erroralert.xml b/Listify/app/src/main/res/layout/activity_erroralert.xml
new file mode 100644
index 0000000..aaa6225
--- /dev/null
+++ b/Listify/app/src/main/res/layout/activity_erroralert.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textView9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Incorrect password. Try again."
+        android:textSize="15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From dc964d5cbd8bd9c37ac1317042bd8989f546e72d Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 24 Nov 2020 17:56:48 -0800
Subject: [PATCH 3/7] Added Stores page

---
 .../listify/ui/store/StoreFragment.java        | 18 ++++++++++++++++++
 .../src/main/res/layout/fragment_stores.xml    |  6 ++++++
 .../src/main/res/menu/activity_main_drawer.xml |  5 +++++
 .../main/res/navigation/mobile_navigation.xml  |  6 ++++++
 Listify/app/src/main/res/values/strings.xml    |  1 +
 5 files changed, 36 insertions(+)
 create mode 100644 Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
 create mode 100644 Listify/app/src/main/res/layout/fragment_stores.xml

diff --git a/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java b/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
new file mode 100644
index 0000000..e89cd20
--- /dev/null
+++ b/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
@@ -0,0 +1,18 @@
+package com.example.listify.ui.store;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.example.listify.R;
+
+public class StoreFragment extends Fragment {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.fragment_stores, container, false);
+        return root;
+    }
+}
diff --git a/Listify/app/src/main/res/layout/fragment_stores.xml b/Listify/app/src/main/res/layout/fragment_stores.xml
new file mode 100644
index 0000000..61a4490
--- /dev/null
+++ b/Listify/app/src/main/res/layout/fragment_stores.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 044cb9d..34e8768 100644
--- a/Listify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml
@@ -14,6 +14,11 @@
             android:icon="@drawable/ic_baseline_person_24"
             android:title="@string/menu_profile" />
 
+        <item
+            android:id="@+id/nav_stores"
+            android:icon="@drawable/ic_baseline_person_24"
+            android:title="@string/menu_stores" />
+
         <item
             android:id="@+id/nav_logout"
             android:title="Sign out"
diff --git a/Listify/app/src/main/res/navigation/mobile_navigation.xml b/Listify/app/src/main/res/navigation/mobile_navigation.xml
index b1c5870..ad12b58 100644
--- a/Listify/app/src/main/res/navigation/mobile_navigation.xml
+++ b/Listify/app/src/main/res/navigation/mobile_navigation.xml
@@ -17,6 +17,12 @@
         android:label="@string/menu_profile"
         tools:layout="@layout/fragment_profile" />
 
+    <fragment
+        android:id="@+id/nav_stores"
+        android:name="com.example.listify.ui.store.StoreFragment"
+        android:label="@string/menu_stores"
+        tools:layout="@layout/fragment_stores" />
+
     <fragment
         android:id="@+id/nav_gallery"
         android:name="com.example.listify.ui.gallery.GalleryFragment"
diff --git a/Listify/app/src/main/res/values/strings.xml b/Listify/app/src/main/res/values/strings.xml
index d21efe1..4dd217e 100644
--- a/Listify/app/src/main/res/values/strings.xml
+++ b/Listify/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
 
     <string name="menu_home">My Lists</string>
     <string name="menu_profile">Profile</string>
+    <string name="menu_stores">Stores</string>
     <string name="menu_gallery">Gallery</string>
     <string name="menu_slideshow">Slideshow</string>
 

From efb0fe4cc339773963ebc99ee8e1315162087877 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 24 Nov 2020 19:25:47 -0800
Subject: [PATCH 4/7] Changed Store page icon

---
 .../app/src/main/res/drawable/ic_baseline_store_24.xml | 10 ++++++++++
 Listify/app/src/main/res/menu/activity_main_drawer.xml |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 Listify/app/src/main/res/drawable/ic_baseline_store_24.xml

diff --git a/Listify/app/src/main/res/drawable/ic_baseline_store_24.xml b/Listify/app/src/main/res/drawable/ic_baseline_store_24.xml
new file mode 100644
index 0000000..76ec4df
--- /dev/null
+++ b/Listify/app/src/main/res/drawable/ic_baseline_store_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,4L4,4v2h16L20,4zM21,14v-2l-1,-5L4,7l-1,5v2h1v6h10v-6h4v6h2v-6h1zM12,18L6,18v-4h6v4z"/>
+</vector>
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 34e8768..8e55845 100644
--- a/Listify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Listify/app/src/main/res/menu/activity_main_drawer.xml
@@ -16,7 +16,7 @@
 
         <item
             android:id="@+id/nav_stores"
-            android:icon="@drawable/ic_baseline_person_24"
+            android:icon="@drawable/ic_baseline_store_24"
             android:title="@string/menu_stores" />
 
         <item

From d7fb380b8a4b5b7270d39bd41b94608f487d7da7 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 25 Nov 2020 12:25:24 -0800
Subject: [PATCH 5/7] Populated Store page with package
 com.example.listify.ui.store;

---
 .../app/src/main/res/layout/activity_list.xml |  1 +
 .../src/main/res/layout/fragment_stores.xml   | 51 +++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/Listify/app/src/main/res/layout/activity_list.xml b/Listify/app/src/main/res/layout/activity_list.xml
index 7ecaabf..d286d14 100644
--- a/Listify/app/src/main/res/layout/activity_list.xml
+++ b/Listify/app/src/main/res/layout/activity_list.xml
@@ -48,6 +48,7 @@
             android:layout_height="600dp"
             android:layout_marginTop="50dp"
             android:paddingBottom="20dp"/>
+
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
   
diff --git a/Listify/app/src/main/res/layout/fragment_stores.xml b/Listify/app/src/main/res/layout/fragment_stores.xml
index 61a4490..500b979 100644
--- a/Listify/app/src/main/res/layout/fragment_stores.xml
+++ b/Listify/app/src/main/res/layout/fragment_stores.xml
@@ -1,6 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto" 
+    android:layout_width="match_parent" 
+    android:layout_height="match_parent"
+    >
+
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="22dp"
+        android:layout_marginTop="30dp"
+        android:text="Stores available:"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView11"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="Kroger"
+        android:textSize="20sp"
+        app:layout_constraintStart_toStartOf="@+id/textView10"
+        app:layout_constraintTop_toBottomOf="@+id/textView10" />
+
+    <TextView
+        android:id="@+id/textView12"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="Kohl's"
+        android:textSize="20sp"
+        app:layout_constraintStart_toStartOf="@+id/textView11"
+        app:layout_constraintTop_toBottomOf="@+id/textView11" />
+
+    <TextView
+        android:id="@+id/textView13"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="eBay"
+        android:textSize="20sp"
+        app:layout_constraintStart_toStartOf="@+id/textView12"
+        app:layout_constraintTop_toBottomOf="@+id/textView12" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 95251d71159d0595ca89fa725af2ed3547958bcf Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 25 Nov 2020 12:28:16 -0800
Subject: [PATCH 6/7] Populated Store page with names of available stores

---
 .../main/java/com/example/listify/ui/store/StoreFragment.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java b/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
index e89cd20..eb0fc32 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
@@ -13,6 +13,7 @@ import com.example.listify.R;
 public class StoreFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_stores, container, false);
+        
         return root;
     }
 }

From ef527aef4242d5324f9266a488642e2f597c585e Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Wed, 25 Nov 2020 12:37:24 -0800
Subject: [PATCH 7/7] Added URL links to stores' official sites

---
 .../listify/ui/store/StoreFragment.java       | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java b/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
index eb0fc32..5a98800 100644
--- a/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
+++ b/Listify/app/src/main/java/com/example/listify/ui/store/StoreFragment.java
@@ -1,5 +1,8 @@
 package com.example.listify.ui.store;
 
+import android.content.Intent;
+import android.net.Uri;
+import android.widget.TextView;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +16,36 @@ import com.example.listify.R;
 public class StoreFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_stores, container, false);
-        
+
+        TextView krogerText = (TextView) root.findViewById(R.id.textView11);
+        krogerText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                gotoUrl("https://www.kroger.com/");
+            }
+        });
+
+        TextView kohlsText = (TextView) root.findViewById(R.id.textView12);
+        krogerText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                gotoUrl("https://www.kohls.com/");
+            }
+        });
+
+        TextView ebayText = (TextView) root.findViewById(R.id.textView13);
+        krogerText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                gotoUrl("https://www.ebay.com/");
+            }
+        });
+
         return root;
     }
+
+    private void gotoUrl(String url) {
+        Uri u = Uri.parse(url);
+        startActivity(new Intent(Intent.ACTION_VIEW, u));
+    }
 }