From e3a4fa9fcd920223bec3709447c8b96ac676d66c Mon Sep 17 00:00:00 2001 From: PawelZielinski Date: Tue, 9 Feb 2021 01:55:40 +0100 Subject: [PATCH] =?UTF-8?q?Poprawnie=20dzia=C5=82aj=C4=85ca=20klasa=20Cart?= =?UTF-8?q?,=20koniec=20pracy=20nad=20koszykiem.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/pizzujemyv3/Cart.java | 12 ++++++----- .../com/example/pizzujemyv3/CartActivity.java | 17 +++++++--------- .../java/com/example/pizzujemyv3/Menu.java | 10 +++++----- .../java/com/example/pizzujemyv3/Pizza.java | 20 ++++++++++++------- app/src/main/res/layout/activity_cart.xml | 9 ++++++--- app/src/main/res/layout/list_row.xml | 13 ++++++++---- 6 files changed, 47 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/example/pizzujemyv3/Cart.java b/app/src/main/java/com/example/pizzujemyv3/Cart.java index d7f3a1b..66431ab 100644 --- a/app/src/main/java/com/example/pizzujemyv3/Cart.java +++ b/app/src/main/java/com/example/pizzujemyv3/Cart.java @@ -3,20 +3,21 @@ package com.example.pizzujemyv3; import java.util.ArrayList; public class Cart { - public ArrayList cartLista; - private int totalPrice; + public ArrayList cartLista = new ArrayList<>(); + private int totalPrice = 0; public Cart(ArrayList menuList){ - setCartLista(menuList); + setTotalPrice(); } public void setCartLista(ArrayList menuList) { - menuList.forEach((pizza) -> addToCart(pizza)); + menuList.forEach(pizza -> addToCart(pizza)); } + public void addToCart(Pizza pizza){ if(pizza.getOnOrder()>0) { - cartLista.add(pizza); + cartLista.add(new Pizza(pizza)); } } @@ -27,5 +28,6 @@ public class Cart { } public int getTotalPrice(){return totalPrice;} + public String getStringTotalPrice(){return String.valueOf(totalPrice);} } diff --git a/app/src/main/java/com/example/pizzujemyv3/CartActivity.java b/app/src/main/java/com/example/pizzujemyv3/CartActivity.java index 6ba4af1..7e5dcb8 100644 --- a/app/src/main/java/com/example/pizzujemyv3/CartActivity.java +++ b/app/src/main/java/com/example/pizzujemyv3/CartActivity.java @@ -15,7 +15,7 @@ import java.util.ArrayList; public class CartActivity extends AppCompatActivity { ListView cLView; -ArrayList pizzaArrayList = new ArrayList<>(); +ArrayList menuArrayList = new ArrayList<>(); Switch oSwitch; Button oButton; @Override @@ -24,17 +24,14 @@ Button oButton; setContentView(R.layout.activity_cart); cLView = findViewById(R.id.cartListView); - pizzaArrayList.add(new Pizza(1, "Margarita", 24, R.drawable.img1 , "sos pomidorowy\nmozzarella fior di latte")); - pizzaArrayList.add(new Pizza(2, "Marinara", 22, R.drawable.img2, "sos pomidorowy\noregano\nczosnek\nbazylia")); - pizzaArrayList.add(new Pizza(3, "Napoli", 26, R.drawable.img3 , "sos pomidorowy\nmozzarella fior di latte\nsalami napoli")); - pizzaArrayList.add(new Pizza(4, "Parma", 26, R.drawable.img4 ,"sos pomidorowy\nmozzarella fior di latte\ncebula czerwona\nszynka parmenska")); - pizzaArrayList.add(new Pizza(5, "Diavola", 28, R.drawable.img5 ,"sos pomidorowy\nmozzarella fior di latte\ncebula czerwona\nsalami spianata piccante")); - pizzaArrayList.get(3).addOnOrder(); - pizzaArrayList.get(1).addOnOrder(); ArrayList cartArrayList = new ArrayList<>(); - Cart cart = new Cart(pizzaArrayList); + //cartArrayList.add(pizzaArrayList.get(1)); + //cartArrayList.add(pizzaArrayList.get(3)); + menuArrayList = getIntent().getParcelableArrayListExtra("pizzas"); + Cart cart= new Cart(menuArrayList); TextView totalPrice = (TextView)findViewById(R.id.totalPrice); - totalPrice.setText(cart.getTotalPrice()); + totalPrice.setText("Cena: " + cart.getStringTotalPrice()); + PizzaAdapter pizzaAdapter = new PizzaAdapter(this,R.layout.list_row,cart.cartLista); cLView.setAdapter(pizzaAdapter); /* diff --git a/app/src/main/java/com/example/pizzujemyv3/Menu.java b/app/src/main/java/com/example/pizzujemyv3/Menu.java index 7c83f89..73f96e3 100644 --- a/app/src/main/java/com/example/pizzujemyv3/Menu.java +++ b/app/src/main/java/com/example/pizzujemyv3/Menu.java @@ -23,11 +23,11 @@ public class Menu extends AppCompatActivity { menuListView = findViewById(R.id.listView); ArrayList arrayList = new ArrayList<>(); - arrayList.add(new Pizza(1, "Margarita", 24, R.drawable.img1 , "sos pomidorowy\nmozzarella fior di latte")); - arrayList.add(new Pizza(2, "Marinara", 22, R.drawable.img2, "sos pomidorowy\noregano\nczosnek\nbazylia")); - arrayList.add(new Pizza(3, "Napoli", 26, R.drawable.img3 , "sos pomidorowy\nmozzarella fior di latte\nsalami napoli")); - arrayList.add(new Pizza(4, "Parma", 26, R.drawable.img4 ,"sos pomidorowy\nmozzarella fior di latte\ncebula czerwona\nszynka parmenska")); - arrayList.add(new Pizza(5, "Diavola", 28, R.drawable.img5 ,"sos pomidorowy\nmozzarella fior di latte\ncebula czerwona\nsalami spianata piccante")); + arrayList.add(new Pizza(1, "Margarita", 24, R.drawable.img1 , "sos pomidorowy\nmozzarella fior di latte", 0)); + arrayList.add(new Pizza(2, "Marinara", 22, R.drawable.img2, "sos pomidorowy\noregano\nczosnek\nbazylia",0)); + arrayList.add(new Pizza(3, "Napoli", 26, R.drawable.img3 , "sos pomidorowy\nmozzarella fior di latte\nsalami napoli",0)); + arrayList.add(new Pizza(4, "Parma", 26, R.drawable.img4 ,"sos pomidorowy\nmozzarella fior di latte\ncebula czerwona\nszynka parmenska",0)); + arrayList.add(new Pizza(5, "Diavola", 28, R.drawable.img5 ,"sos pomidorowy\nmozzarella fior di latte\ncebula czerwona\nsalami spianata piccante",0)); PizzaAdapter pizzaAdapter = new PizzaAdapter(this,R.layout.list_row,arrayList); menuListView.setAdapter(pizzaAdapter); diff --git a/app/src/main/java/com/example/pizzujemyv3/Pizza.java b/app/src/main/java/com/example/pizzujemyv3/Pizza.java index 86ebb24..debcfb0 100644 --- a/app/src/main/java/com/example/pizzujemyv3/Pizza.java +++ b/app/src/main/java/com/example/pizzujemyv3/Pizza.java @@ -12,15 +12,23 @@ public class Pizza implements Parcelable { private int resID; private String des; private int onOrder = 0; - private int sumPrice = price*onOrder; - public Pizza(int id, String name, int price, int resID, String des) { + public Pizza(int id, String name, int price, int resID, String des, int onOrder) { this.id = id; this.name = name; this.price = price; this.resID = resID; this.des = des; - this.onOrder = 0; + this.onOrder = onOrder; + } + public Pizza(Pizza pizza) + { + this.id = pizza.id; + this.name = pizza.name; + this.price = pizza.price; + this.resID = pizza.resID; + this.des = pizza.des; + this.onOrder = pizza.onOrder; } @@ -31,7 +39,6 @@ public class Pizza implements Parcelable { resID = in.readInt(); des = in.readString(); onOrder = in.readInt(); - sumPrice = in.readInt(); } @SuppressWarnings("unused") @@ -104,8 +111,8 @@ public class Pizza implements Parcelable { public void addOnOrder(){this.onOrder += 1;} public void minOnOrder(){if(onOrder>0) this.onOrder -= 1;} public String getStringOnOrder(){return String.valueOf((onOrder));} - public int getSumPrice(){return sumPrice;} - public String getStringSumPrice(){return String.valueOf(sumPrice);} + public int getSumPrice(){return price*onOrder;} + public String getStringSumPrice(){return String.valueOf(getSumPrice());} @Override public int describeContents() { @@ -120,6 +127,5 @@ public class Pizza implements Parcelable { dest.writeInt(resID); dest.writeString(des); dest.writeInt(onOrder); - dest.writeInt(sumPrice); } } diff --git a/app/src/main/res/layout/activity_cart.xml b/app/src/main/res/layout/activity_cart.xml index e07afb2..a5d46fe 100644 --- a/app/src/main/res/layout/activity_cart.xml +++ b/app/src/main/res/layout/activity_cart.xml @@ -29,7 +29,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:layout_marginBottom="15sp" + android:layout_marginBottom="10sp" android:layout_weight="0.3" > diff --git a/app/src/main/res/layout/list_row.xml b/app/src/main/res/layout/list_row.xml index cabcc07..94de856 100644 --- a/app/src/main/res/layout/list_row.xml +++ b/app/src/main/res/layout/list_row.xml @@ -92,12 +92,17 @@ \ No newline at end of file