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

Properly formatted the price values in shopping list

Browse Source
This commit is contained in:
Aaron Sun 2020-10-25 23:27:25 -07:00
parent 049d95bb91
commit 2c73e8b224
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import com.example.listify.data.List;
import com.example.listify.data.ListEntry; import com.example.listify.data.ListEntry;
import java.io.IOException; import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -30,6 +31,7 @@ import static com.example.listify.MainActivity.am;
public class ListPage extends AppCompatActivity { public class ListPage extends AppCompatActivity {
ListView listView; ListView listView;
MyAdapter myAdapter; MyAdapter myAdapter;
Requestor requestor;
Button incrQuan; Button incrQuan;
Button decrQuan; Button decrQuan;
@ -46,7 +48,7 @@ public class ListPage extends AppCompatActivity {
Map<String, Double> totalPriceByStore = new HashMap<>(); Map<String, Double> totalPriceByStore = new HashMap<>();
Map<String, Integer> storeHeaderIndex = new HashMap<>(); Map<String, Integer> storeHeaderIndex = new HashMap<>();
Requestor requestor; DecimalFormat df = new DecimalFormat("0.00");
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
@ -101,14 +103,14 @@ public class ListPage extends AppCompatActivity {
pNames.add("Kroger"); pNames.add("Kroger");
pStores.add(""); pStores.add("");
pPrices.add(totalPriceByStore.get("Kroger").toString()); pPrices.add(df.format(totalPriceByStore.get("Kroger")));
pQuantity.add("-1"); pQuantity.add("-1");
pImages.add("-1"); pImages.add("-1");
pListItemPair.add(null); pListItemPair.add(null);
pNames.add(item.getDescription()); pNames.add(item.getDescription());
pStores.add("Kroger"); pStores.add("Kroger");
pPrices.add(item.getPrice().toString()); pPrices.add(df.format(item.getPrice()));
pQuantity.add(entry.getQuantity().toString()); pQuantity.add(entry.getQuantity().toString());
pImages.add(item.getImageURL()); pImages.add(item.getImageURL());
pListItemPair.add(entry); pListItemPair.add(entry);
@ -117,16 +119,16 @@ public class ListPage extends AppCompatActivity {
int index = storeHeaderIndex.get("Kroger"); int index = storeHeaderIndex.get("Kroger");
totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") + (item.getPrice().doubleValue() * entry.getQuantity())); 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()); 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++; index++;
pNames.add(index, item.getDescription()); pNames.add(index, item.getDescription());
pStores.add(index, "Kroger"); pStores.add(index, "Kroger");
pPrices.add(index, item.getPrice().toString()); pPrices.add(index, df.format(item.getPrice()));
pQuantity.add(index, entry.getQuantity().toString()); pQuantity.add(index, entry.getQuantity().toString());
pImages.add(index, item.getImageURL()); pImages.add(index, item.getImageURL());
pListItemPair.add(index, entry); pListItemPair.add(index, entry);
@ -184,9 +186,9 @@ public class ListPage extends AppCompatActivity {
int q = Integer.parseInt(pQuantity.get(position)) - 1; int q = Integer.parseInt(pQuantity.get(position)) - 1;
pQuantity.set(position, Integer.toString(q)); pQuantity.set(position, Integer.toString(q));
totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) - Double.parseDouble(pPrices.get(position))); 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)); 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); ListEntry le = pListItemPair.remove(position);
le.setQuantity(le.getQuantity() - 1); le.setQuantity(le.getQuantity() - 1);
pListItemPair.add(position, le); pListItemPair.add(position, le);
@ -217,9 +219,9 @@ public class ListPage extends AppCompatActivity {
int q = Integer.parseInt(pQuantity.get(position)) + 1; int q = Integer.parseInt(pQuantity.get(position)) + 1;
pQuantity.set(position, Integer.toString(q)); pQuantity.set(position, Integer.toString(q));
totalPriceByStore.put(pStores.get(position), totalPriceByStore.get(pStores.get(position)) + Double.parseDouble(pPrices.get(position))); 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)); 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); ListEntry le = pListItemPair.remove(position);
le.setQuantity(le.getQuantity() + 1); le.setQuantity(le.getQuantity() + 1);
pListItemPair.add(position, le); pListItemPair.add(position, le);
@ -269,10 +271,10 @@ public class ListPage extends AppCompatActivity {
} }
else { else {
totalPriceByStore.put("Kroger", totalPriceByStore.get("Kroger") - (Double.parseDouble(pPrices.get(position)) * 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()); 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))); 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); pNames.remove(position);
pStores.remove(position); pStores.remove(position);
@ -304,7 +306,7 @@ public class ListPage extends AppCompatActivity {
incrQuan.setVisibility(View.INVISIBLE); incrQuan.setVisibility(View.INVISIBLE);
if(position == 0) { if(position == 0) {
removeItem.setText("Clear all");
} }
else { else {
removeItem.setVisibility(View.INVISIBLE); removeItem.setVisibility(View.INVISIBLE);