From b0970918475cd6df527bb4e1471669651ed93645 Mon Sep 17 00:00:00 2001 From: Nezumi2711 <73208452+Nezumi2711@users.noreply.github.com> Date: Sat, 25 Jun 2022 09:40:54 +0700 Subject: [PATCH] Add image in Cart --- .../app/src/main/assets/databases/EatItDB.db | Bin 24576 -> 32768 bytes .../waterbase/foodify/Database/Database.java | 12 +++++++----- .../com/waterbase/foodify/FoodDetail.java | 3 ++- .../java/com/waterbase/foodify/FoodList.java | 3 ++- .../com/waterbase/foodify/Model/Order.java | 15 +++++++++++++-- .../foodify/ViewHolder/CartAdapter.java | 12 ++++++++++-- .../app/src/main/res/layout/cart_layout.xml | 7 +++++++ 7 files changed, 41 insertions(+), 11 deletions(-) diff --git a/Foodify/app/src/main/assets/databases/EatItDB.db b/Foodify/app/src/main/assets/databases/EatItDB.db index 69bb69d505e516698dec746ed52d28b2f2fab899..a2fe5d797285c00644ac9efccc5da285f6425d09 100644 GIT binary patch delta 368 zcmZoTz}V2hG(lRBm4ShQ1BjV{mA&L$qJ&&ZIOmy%imv?jA8H9oPlBp=L=$FLWRQ$c~@4#W(m zOl;zw%8U%A?2`}kn=o=L5)haez|P7Dlw#T}DDa+tVgTzT0~R(${tpcNAAll{`Gv(e ciuo9sl{x&2Qc{atQcDsua~260EK(2v06yYs%m4rY delta 125 zcmZo@U}`wPI6+#Fg@J*A4TxcYWulI;I17WGe=RTn4+d7=PYisI_z&_;;QhoGyID}6 zhIjHO-Va=jF^ufu%F2vQ^^^H{r6;rV=TBbEqc!;nj|jiNr=N3>tFNnHh$fe&DbwWB U{3e{tK+`!uHY{>5Sd^du0031TivR!s diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Database/Database.java b/Foodify/app/src/main/java/com/waterbase/foodify/Database/Database.java index 0ce2ff6..4d4abc4 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Database/Database.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Database/Database.java @@ -14,7 +14,7 @@ import java.util.List; public class Database extends SQLiteAssetHelper { private static final String DB_NAME = "EatItDB.db"; - private static final int DB_VER = 1; + private static final int DB_VER = 2; public Database(Context context) { super(context, DB_NAME, null, DB_VER); @@ -24,7 +24,7 @@ public class Database extends SQLiteAssetHelper { SQLiteDatabase db = getReadableDatabase(); SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); - String[] sqlSelect = {"ID", "ProductName", "ProductId", "Quantity", "Price", "Discount"}; + String[] sqlSelect = {"ID", "ProductName", "ProductId", "Quantity", "Price", "Discount", "Image"}; String sqlTable = "OrderDetail"; qb.setTables(sqlTable); @@ -39,7 +39,8 @@ public class Database extends SQLiteAssetHelper { c.getString(c.getColumnIndexOrThrow("ProductName")), c.getString(c.getColumnIndexOrThrow("Quantity")), c.getString(c.getColumnIndexOrThrow("Price")), - c.getString(c.getColumnIndexOrThrow("Discount")) + c.getString(c.getColumnIndexOrThrow("Discount")), + c.getString(c.getColumnIndexOrThrow("Image")) )); } while (c.moveToNext()); } @@ -48,12 +49,13 @@ public class Database extends SQLiteAssetHelper { public void addToCart(Order order) { SQLiteDatabase db = getReadableDatabase(); - String query = String.format("INSERT INTO OrderDetail(ProductId, ProductName, Quantity, Price,Discount) VALUES ('%s', '%s','%s','%s','%s');", + String query = String.format("INSERT INTO OrderDetail(ProductId, ProductName, Quantity, Price,Discount,Image) VALUES ('%s', '%s','%s','%s','%s','%s');", order.getProductId(), order.getProductName(), order.getQuantity(), order.getPrice(), - order.getDiscount()); + order.getDiscount(), + order.getImage()); db.execSQL(query); } diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java b/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java index 5c7298f..2a83556 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodDetail.java @@ -104,7 +104,8 @@ public class FoodDetail extends AppCompatActivity implements RatingDialogListene currentFood.getName(), numberButton.getNumber(), currentFood.getPrice(), - currentFood.getDiscount() + currentFood.getDiscount(), + currentFood.getImage() )); Toast.makeText(FoodDetail.this, "Đã thêm vào giỏ hàng!", Toast.LENGTH_SHORT).show(); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java b/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java index 3d2e78d..4eae199 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java @@ -258,7 +258,8 @@ public class FoodList extends AppCompatActivity { model.getName(), "1", model.getPrice(), - model.getDiscount() + model.getDiscount(), + model.getImage() )); Toast.makeText(FoodList.this, "Đã thêm vào giỏ hàng!", Toast.LENGTH_SHORT).show(); diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Model/Order.java b/Foodify/app/src/main/java/com/waterbase/foodify/Model/Order.java index 2c9d747..1bcb6fa 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/Model/Order.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/Model/Order.java @@ -8,25 +8,28 @@ public class Order { private String Quantity; private String Price; private String Discount; + private String Image; public Order() { } - public Order(String productId, String productName, String quantity, String price, String discount) { + public Order(String productId, String productName, String quantity, String price, String discount, String image) { ProductId = productId; ProductName = productName; Quantity = quantity; Price = price; Discount = discount; + Image = image; } - public Order(int ID, String productId, String productName, String quantity, String price, String discount) { + public Order(int ID, String productId, String productName, String quantity, String price, String discount, String image) { this.ID = ID; ProductId = productId; ProductName = productName; Quantity = quantity; Price = price; Discount = discount; + Image = image; } public int getID() { @@ -76,4 +79,12 @@ public class Order { public void setDiscount(String discount) { Discount = discount; } + + public String getImage() { + return Image; + } + + public void setImage(String image) { + Image = image; + } } diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/CartAdapter.java b/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/CartAdapter.java index 90cc64c..a31c804 100644 --- a/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/CartAdapter.java +++ b/Foodify/app/src/main/java/com/waterbase/foodify/ViewHolder/CartAdapter.java @@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.amulyakhare.textdrawable.TextDrawable; import com.cepheuen.elegantnumberbutton.view.ElegantNumberButton; +import com.squareup.picasso.Picasso; import com.waterbase.foodify.Cart; import com.waterbase.foodify.Common.Common; import com.waterbase.foodify.Database.Database; @@ -32,6 +33,7 @@ class CartViewHolder extends RecyclerView.ViewHolder implements View.OnClickList public TextView txt_card_item, txt_price; public ElegantNumberButton btn_quantity; + public ImageView cart_image; private ItemClickListener itemClickListener; @@ -44,6 +46,8 @@ class CartViewHolder extends RecyclerView.ViewHolder implements View.OnClickList txt_card_item = (TextView) itemView.findViewById(R.id.cart_item_name); txt_price = (TextView) itemView.findViewById(R.id.cart_item_Price); btn_quantity = (ElegantNumberButton) itemView.findViewById(R.id.btn_quantity); + cart_image = (ImageView) itemView.findViewById(R.id.cart_image); + itemView.setOnCreateContextMenuListener(this); } @@ -79,8 +83,12 @@ public class CartAdapter extends RecyclerView.Adapter{ @Override public void onBindViewHolder(@NonNull CartViewHolder holder, final int position) { -// TextDrawable drawable = TextDrawable.builder().buildRound("" + listData.get(position).getQuantity(), Color.RED); -// holder.img_cart_count.setImageDrawable(drawable); + + Picasso.with(cart.getBaseContext()) + .load(listData.get(position).getImage()) + .resize(70,70) + .centerCrop() + .into(holder.cart_image); holder.btn_quantity.setNumber(listData.get(position).getQuantity()); holder.btn_quantity.setOnValueChangeListener(new ElegantNumberButton.OnValueChangeListener() { diff --git a/Foodify/app/src/main/res/layout/cart_layout.xml b/Foodify/app/src/main/res/layout/cart_layout.xml index a3e0e2e..21eaa14 100644 --- a/Foodify/app/src/main/res/layout/cart_layout.xml +++ b/Foodify/app/src/main/res/layout/cart_layout.xml @@ -16,8 +16,15 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> + +