Commit Graph

219 Commits

Author SHA1 Message Date
d7a86aac7d
Merge pull request #74 from ClaytonWWilson/total-price-bar
Floating total price bar
2020-10-31 20:35:43 -04:00
Clayton Wilson
1f7a1b10db Remove print statements 2020-10-31 20:35:31 -04:00
Clayton Wilson
d9ea934021 Fix total price being incorrect 2020-10-31 20:34:54 -04:00
1f2ea26efe
Merge branch 'master' into total-price-bar 2020-10-31 20:21:00 -04:00
19fdd96b76
Merge pull request #69 from ClaytonWWilson/async-loading
Async loading
2020-10-31 20:11:36 -04:00
Clayton Wilson
8364ed049b Fixed formatting from merge 2020-10-31 20:10:09 -04:00
4a43b84aba
Merge branch 'master' into async-loading 2020-10-31 20:05:18 -04:00
Clayton Wilson
739699d7a5 Explicitly declared inner loop variables to final 2020-10-31 19:54:11 -04:00
Nathan Merz
3b8e13e84c
Merge pull request #70 from ClaytonWWilson/item-search-limit
Limit item search results
2020-10-31 19:16:18 -04:00
Aaron Sun
7c6045ba46
Merge pull request #72 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-10-27 11:06:42 -07:00
Aaron Sun
2c73e8b224 Properly formatted the price values in shopping list 2020-10-25 23:27:25 -07:00
Aaron Sun
049d95bb91 Can now clear shopping list (i.e. remove all items) 2020-10-25 22:39:56 -07:00
Aaron Sun
0562c66dbb Can now display the grand total of items in shopping list 2020-10-25 22:15:27 -07:00
Aaron Sun
a3e72d3699 Shopping list can now display actual image of item 2020-10-25 21:47:48 -07:00
04a944f2d5 Update total price when quantities change and items are removed 2020-10-25 23:06:56 -04:00
caf929a71e Floating total price bar 2020-10-25 22:52:35 -04:00
07db1c833a Fix duplicate lists displaying 2020-10-25 21:57:57 -04:00
Aaron Sun
7bc43d8249 Simplified a section of code for total price by store (used HashMap to access header section) 2020-10-25 16:15:42 -07:00
c07599ecc6 Add threads in awaited for loops. Remove new threads from Requestor.getObject calls 2020-10-25 16:53:51 -04:00
Aaron Sun
8afa81db59 Total prices change on the spot after changing quantity and removing items 2020-10-24 16:14:17 -07:00
Aaron Sun
6fe3110c29 Can now display the total price of the items from each store in shopping list 2020-10-24 12:40:28 -07:00
NMerz
45c7ac15bd Limit item search results
Add a limit on item search results so the user is not overwhelmed.
2020-10-24 11:53:12 -04:00
Aaron Sun
4eddf3ce2d Can now divde the items in shopping list by store 2020-10-23 22:06:21 -07:00
Aaron Sun
8f6ecdbab1 Removed unnecessary code for Cancel button in pop-up window 2020-10-23 20:20:31 -07:00
6b30476ccd Move loading circle into its own object 2020-10-23 22:27:01 -04:00
e21913882c
Merge branch 'master' into async-loading 2020-10-22 23:12:41 -04:00
Clayton Wilson
8604d98e63 Async creating lists and adding items 2020-10-22 23:09:57 -04:00
Clayton Wilson
07d0cd44cb Async loading list products 2020-10-22 18:36:00 -04:00
Clayton Wilson
ec28e8babc Async loading lists page 2020-10-22 18:06:10 -04:00
Clayton Wilson
20408ea42b async search bug fixes 2020-10-22 16:28:00 -04:00
DreamCoder23
378878d746
Merge pull request #68 from ClaytonWWilson/master
Merge pull request #67 from ClaytonWWilson/aaron-branch-2
2020-10-21 20:11:19 -07:00
DreamCoder23
c6b5e28755
Merge pull request #67 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-10-21 20:10:44 -07:00
Aaron Sun
22f8cabc67 Simplified code for verification code pop-up 2020-10-21 20:09:40 -07:00
DreamCoder23
4a35c5de92
Merge pull request #66 from ClaytonWWilson/master
Merge pull request #65 from ClaytonWWilson/aaron-branch-2
2020-10-21 19:33:14 -07:00
DreamCoder23
7e19a898ff
Merge pull request #65 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-10-21 19:32:39 -07:00
Aaron Sun
f62e666652 User can no longer reaccess login-required pages through the back button 2020-10-21 19:31:24 -07:00
Aaron Sun
465318eb84 Sign out button is now in the hamburger menu 2020-10-21 14:31:00 -07:00
Aaron Sun
fdf27b9e62 User can now log out and also automatically gets logged in after signing up 2020-10-21 12:22:42 -07:00
Aaron Sun
8dd2f33b42 App directs user to Login page if not logged in 2020-10-21 11:52:20 -07:00
DreamCoder23
ff14f59ddd
Merge pull request #64 from ClaytonWWilson/master
Merge pull request #62 from ClaytonWWilson/aaron-branch-2
2020-10-21 10:27:34 -07:00
DreamCoder23
dacd469a56
Merge pull request #62 from ClaytonWWilson/aaron-branch-2 2020-10-21 10:26:05 -07:00
Aaron Sun
a3ed7ba8d9 Finished with adding an extra security step to the delete account process 2020-10-20 23:37:27 -07:00
Aaron Sun
e1c670fed0 Renamed xml file for list entry 2020-10-20 22:55:43 -07:00
Aaron Sun
4623718e3a Restructured Forgot Password code similar to that of Sign Up 2020-10-20 20:55:02 -07:00
Aaron Sun
6337422f52 Added Confirm Password to Forgot Password 2020-10-20 20:36:42 -07:00
Aaron Sun
8acf630382 Removed everything except Login and Delete Account buttons in Home/Profile page 2020-10-20 20:07:31 -07:00
Clayton Wilson
4757ba2ddf Create new thread on search and show progress bar 2020-10-20 07:28:58 -04:00
Clayton Wilson
4e7b180fe0 Async load search results 2020-10-20 05:45:33 -04:00
Aaron Sun
85f78e3333 Can now display splashscreen when first entering the app v.3 2020-10-09 12:14:44 -07:00
Clayton Wilson
8fa081e4b7 Fix creating list from hamburger menu 2020-10-09 02:15:08 -04:00