From 4e7b180fe086af6f34a8735b4f9aa0ff7cfd73d3 Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Tue, 20 Oct 2020 05:45:33 -0400 Subject: [PATCH 01/21] 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 resultsProductList = new ArrayList<>(); @@ -148,32 +148,7 @@ public class SearchResults extends AppCompatActivity implements SortDialogFragme } Requestor requestor = new Requestor(am, configs.getProperty("apiKey")); - - SynchronousReceiver 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 Date: Tue, 20 Oct 2020 07:28:58 -0400 Subject: [PATCH 02/21] 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 resultsProductList = new ArrayList<>(); private List 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() { @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"> + + Date: Thu, 22 Oct 2020 16:28:00 -0400 Subject: [PATCH 03/21] 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 Date: Thu, 22 Oct 2020 18:06:10 -0400 Subject: [PATCH 04/21] 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 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 listIdsReceiver = new SynchronousReceiver<>(); - SynchronousReceiver 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 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 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"> + + Date: Thu, 22 Oct 2020 18:36:00 -0400 Subject: [PATCH 05/21] 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 pNames = new ArrayList<>(); ArrayList 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 lr = new SynchronousReceiver<>(); //ListReceiver 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 { 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 @@ - + + - \ No newline at end of file + \ No newline at end of file From 8604d98e6348da8eb45fe92976291642c76dafeb Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Thu, 22 Oct 2020 23:09:57 -0400 Subject: [PATCH 06/21] 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 listIdsReceiver = new SynchronousReceiver<>(); SynchronousReceiver 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 @@ + + + + + \ 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" /> - + + + + + \ No newline at end of file From 6b30476ccd68581040ec58689fb26e05d8e1c8bf Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Fri, 23 Oct 2020 22:27:01 -0400 Subject: [PATCH 07/21] 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 Date: Fri, 23 Oct 2020 20:20:31 -0700 Subject: [PATCH 08/21] 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 Date: Fri, 23 Oct 2020 22:06:21 -0700 Subject: [PATCH 09/21] 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 pListItemPair = new ArrayList<>(); + Map numItemsFromStore = new HashMap<>(); + Requestor requestor; @Override @@ -52,7 +56,6 @@ public class ListPage extends AppCompatActivity { } requestor = new Requestor(am, configs.getProperty("apiKey")); SynchronousReceiver lr = new SynchronousReceiver<>(); - //ListReceiver 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 implements Requestor.Receiver { - @Override - public void acceptDelivery(T delivered) { - for(ListEntry entry : ((List) delivered).getEntries()) { - int product = entry.getProductID(); - ProductReceiver pr = new ProductReceiver<>(); - requestor.getObject(Integer.toString(product), Item.class, pr); - pQuantity.add(entry.getQuantity().toString()); - pListItemPair.add(entry); - } - } - } - - class ProductReceiver implements Requestor.Receiver { - @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 Date: Sat, 24 Oct 2020 11:53:12 -0400 Subject: [PATCH 10/21] 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 body, HashMap 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 Date: Sat, 24 Oct 2020 12:40:28 -0700 Subject: [PATCH 11/21] 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 pListItemPair = new ArrayList<>(); - Map numItemsFromStore = new HashMap<>(); + Map 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" /> - - - - - Date: Sat, 24 Oct 2020 16:14:17 -0700 Subject: [PATCH 12/21] 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 pListItemPair = new ArrayList<>(); Map totalPriceByStore = new HashMap<>(); + Map 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 Date: Sun, 25 Oct 2020 16:53:51 -0400 Subject: [PATCH 13/21] 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 listIdsReceiver = new SynchronousReceiver<>(); - SynchronousReceiver 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 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 listIdsReceiver = new SynchronousReceiver<>(); final Requestor.Receiver 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 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 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 Date: Sun, 25 Oct 2020 16:15:42 -0700 Subject: [PATCH 14/21] 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 Date: Sun, 25 Oct 2020 21:57:57 -0400 Subject: [PATCH 15/21] 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 a3e72d3699baeb26b538f50b4af5f0a34029ae5a Mon Sep 17 00:00:00 2001 From: Aaron Sun Date: Sun, 25 Oct 2020 21:47:48 -0700 Subject: [PATCH 16/21] 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 pStores = new ArrayList<>(); ArrayList pPrices = new ArrayList<>(); ArrayList pQuantity = new ArrayList<>(); - ArrayList pImages = new ArrayList<>(); + ArrayList pImages = new ArrayList<>(); ArrayList 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 pStores; ArrayList pPrices; ArrayList pQuantity; - ArrayList pImages; + ArrayList pImages; - MyAdapter (Context c, ArrayList names, ArrayList stores, ArrayList prices, ArrayList quantity, ArrayList images) { + MyAdapter (Context c, ArrayList names, ArrayList stores, ArrayList prices, ArrayList quantity, ArrayList 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 Date: Sun, 25 Oct 2020 22:15:27 -0700 Subject: [PATCH 17/21] 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 Date: Sun, 25 Oct 2020 22:39:56 -0700 Subject: [PATCH 18/21] 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 Date: Sun, 25 Oct 2020 23:27:25 -0700 Subject: [PATCH 19/21] 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 totalPriceByStore = new HashMap<>(); Map 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 Date: Sat, 31 Oct 2020 19:54:11 -0400 Subject: [PATCH 20/21] 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 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 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 Date: Sat, 31 Oct 2020 20:10:09 -0400 Subject: [PATCH 21/21] 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(); + } + }); } }