ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2025-12-16 02:38:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into async-loading

Browse Source
This commit is contained in:
Clayton Wilson 2020-10-31 20:05:18 -04:00 committed by GitHub
commit 4a43b84aba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 151 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Lambdas/Lists/ItemSearch/src/ItemSearcher.java
View File

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

185
Listify/app/src/main/java/com/example/listify/ListPage.java
View File

@ -10,20 +10,28 @@ 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.text.DecimalFormat;
import java.util.ArrayList;
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 implements Requestor.Receiver {
ListView listView;
MyAdapter myAdapter;
Requestor requestor;
Button incrQuan;
Button decrQuan;
@ -34,11 +42,14 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
ArrayList<String> pStores = new ArrayList<>();
ArrayList<String> pPrices = new ArrayList<>();
ArrayList<String> pQuantity = new ArrayList<>();
ArrayList<Integer> pImages = new ArrayList<>();
ArrayList<String> pImages = new ArrayList<>();
ArrayList<ListEntry> pListItemPair = new ArrayList<>();
Requestor requestor;
Map<String, Double> totalPriceByStore = new HashMap<>();
Map<String, Integer> storeHeaderIndex = new HashMap<>();
DecimalFormat df = new DecimalFormat("0.00");
// TODO: Display a message if their list is empty
@Override
@ -57,6 +68,14 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
loadingListItems = findViewById(R.id.progress_loading_list_items);
loadingListItems.setVisibility(View.VISIBLE);
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");
@ -64,7 +83,7 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
e.printStackTrace();
}
requestor = new Requestor(am, configs.getProperty("apiKey"));
//ListReceiver<List> lr = new ListReceiver<>();
requestor.getObject(Integer.toString(listID), List.class, this);
/*pNames.add("Half-gallon organic whole milk");
@ -103,23 +122,60 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
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(!totalPriceByStore.containsKey("Kroger")) {
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(df.format(totalPriceByStore.get("Kroger")));
pQuantity.add("-1");
pImages.add("-1");
pListItemPair.add(null);
pNames.add(item.getDescription());
pStores.add("Kroger");
pPrices.add(df.format(item.getPrice()));
pQuantity.add(entry.getQuantity().toString());
pImages.add(item.getImageURL());
pListItemPair.add(entry);
}
else {
int index = storeHeaderIndex.get("Kroger");
totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") + (item.getPrice().doubleValue() * entry.getQuantity()));
pPrices.set(index, df.format(totalPriceByStore.get("Kroger")));
double newTotal = Double.parseDouble(pPrices.get(0)) + (item.getPrice().doubleValue() * entry.getQuantity());
pPrices.set(0, df.format(newTotal));
index++;
pNames.add(index, item.getDescription());
pStores.add(index, "Kroger");
pPrices.add(index, df.format(item.getPrice()));
pQuantity.add(index, entry.getQuantity().toString());
pImages.add(index, item.getImageURL());
pListItemPair.add(index, entry);
for(String store : storeHeaderIndex.keySet()) {
if(storeHeaderIndex.get(store) > index) {
storeHeaderIndex.put(store, storeHeaderIndex.get(store) + 1);
}
}
}
}
}
}
runOnUiThread(new Runnable() {
runOnUiThread(new Runnable() {
@Override
public void run() {
loadingListItems.setVisibility(View.GONE);
myAdapter.notifyDataSetChanged();
}
});
}
}
class MyAdapter extends ArrayAdapter<String> {
@ -128,9 +184,9 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
ArrayList<String> pStores;
ArrayList<String> pPrices;
ArrayList<String> pQuantity;
ArrayList<Integer> pImages;
ArrayList<String> pImages;
MyAdapter (Context c, ArrayList<String> names, ArrayList<String> stores, ArrayList<String> prices, ArrayList<String> quantity, ArrayList<Integer> images) {
MyAdapter (Context c, ArrayList<String> names, ArrayList<String> stores, ArrayList<String> prices, ArrayList<String> quantity, ArrayList<String> images) {
super(c, R.layout.activity_listproductentry, R.id.productView, names);
context = c;
pNames = names;
@ -155,6 +211,10 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
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)) - Double.parseDouble(pPrices.get(position)));
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, df.format(newTotal));
ListEntry le = pListItemPair.remove(position);
le.setQuantity(le.getQuantity() - 1);
pListItemPair.add(position, le);
@ -184,6 +244,10 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
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)) + Double.parseDouble(pPrices.get(position)));
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, df.format(newTotal));
ListEntry le = pListItemPair.remove(position);
le.setQuantity(le.getQuantity() + 1);
pListItemPair.add(position, le);
@ -211,13 +275,41 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
removeItem.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
pNames.remove(position);
pStores.remove(position);
pPrices.remove(position);
pQuantity.remove(position);
pImages.remove(position);
if(position == 0) {
pNames.clear();
pStores.clear();
pPrices.clear();
pQuantity.clear();
pImages.clear();
requestor.deleteObject(pListItemPair.remove(position));
pNames.add("Total Price");
pStores.add("");
pPrices.add("0.00");
pQuantity.add("-1");
pImages.add("-1");
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)), 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, df.format(newTotal));
pNames.remove(position);
pStores.remove(position);
pPrices.remove(position);
pQuantity.remove(position);
pImages.remove(position);
requestor.deleteObject(pListItemPair.remove(position));
}
listView.setAdapter(myAdapter);
}
@ -232,36 +324,33 @@ public class ListPage extends AppCompatActivity implements Requestor.Receiver {
if(!pNames.isEmpty()) {
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));
price.setText("$" + pPrices.get(position));
if(pQuantity.get(position).equals("-1")) {
quantity.setVisibility(View.INVISIBLE);
decrQuan.setVisibility(View.INVISIBLE);
incrQuan.setVisibility(View.INVISIBLE);
if(position == 0) {
removeItem.setText("Clear all");
}
else {
removeItem.setVisibility(View.INVISIBLE);
}
}
else {
quantity.setText(pQuantity.get(position));
}
if(pImages.get(position).equals("-1")) {
image.setVisibility(View.INVISIBLE);
}
else {
Glide.with(getContext()).load(pImages.get(position)).into(image);
}
}
return listproduct;
}
}
class ListReceiver<T> implements Requestor.Receiver<T> {
@Override
public void acceptDelivery(T delivered) {
for(ListEntry entry : ((List) delivered).getEntries()) {
int product = entry.getProductID();
ProductReceiver<Item> pr = new ProductReceiver<>();
requestor.getObject(Integer.toString(product), Item.class, pr);
pQuantity.add(entry.getQuantity().toString());
pListItemPair.add(entry);
}
}
}
class ProductReceiver<T> implements Requestor.Receiver<T> {
@Override
public void acceptDelivery(T delivered) {
Item i = (Item) delivered;
pNames.add(i.getDescription());
pStores.add("Kroger");
pPrices.add(i.getPrice().toString());
pImages.add(R.drawable.placeholder);
}
}
}

4
Listify/app/src/main/java/com/example/listify/ui/ForgotPasswordPage.java
View File

@ -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();

4
Listify/app/src/main/java/com/example/listify/ui/SignupPage.java
View File

@ -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();

4
Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java
View File

@ -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();

5
Listify/app/src/main/res/menu/activity_main_drawer.xml
View File

@ -20,11 +20,6 @@
android:id="@+id/nav_lists"
android:icon="@drawable/ic_baseline_list_alt_28"
android:title="@string/menu_lists" />
<!-- <item-->
<!-- android:id="@+id/nav_create_list"-->
<!-- android:icon="@drawable/ic_baseline_add_28"-->
<!-- android:title="Create New List"-->
<!-- android:onClick="onClickCreateList" />-->
<item
android:id="@+id/nav_logout"
android:title="Sign out"