nezumi/Foodify
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/Foodify.git synced 2026-09-23 04:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug

Browse Source
This commit is contained in:
Nezumi
2023-03-31 22:23:32 +07:00
parent ddf47a03e0
commit 5f2a6a9e4d
21 changed files with 142 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/capstone/foodify/Adapter/FoodSearchAdapter.java
+13 -1
View File
@@ -61,6 +61,17 @@ public class FoodSearchAdapter extends RecyclerView.Adapter<FoodSearchAdapter.Fo
holder.name.setText(foodName);
}
String shopName = food.getShop().getName();
if(shopName.length() >= 18){
StringBuilder stringBuilder = new StringBuilder(food.getShop().getName());
stringBuilder.replace(18, food.getShop().getName().length(), "..." );
holder.shopName.setText(stringBuilder);
} else {
holder.shopName.setText(shopName);
}
//When food does not have image
if(food.getImages().size() == 0){
holder.image.setImageResource(R.drawable.default_image_food);
@@ -143,7 +154,7 @@ public class FoodSearchAdapter extends RecyclerView.Adapter<FoodSearchAdapter.Fo
public static class FoodViewHolder extends RecyclerView.ViewHolder{
private final ImageView image, basket_icon;
private final TextView price, name, discount;
private final TextView price, name, discount, shopName;
public FoodViewHolder(@NonNull View itemView) {
super(itemView);
@@ -153,6 +164,7 @@ public class FoodSearchAdapter extends RecyclerView.Adapter<FoodSearchAdapter.Fo
price = itemView.findViewById(R.id.price_text_view);
discount = itemView.findViewById(R.id.discount);
basket_icon = itemView.findViewById(R.id.basket_icon);
shopName = itemView.findViewById(R.id.shop_name_text_view);
}
}
}
app/src/main/java/com/capstone/foodify/Adapter/OrderDetailAdapter.java
+21 -1
View File
@@ -43,10 +43,30 @@ public class OrderDetailAdapter extends RecyclerView.Adapter<OrderDetailAdapter.
return;
Picasso.get().load(food.getImg()).into(holder.image_view);
holder.food_name.setText(food.getName());
holder.shop_name.setText(food.getShopName());
holder.quantity.setText("Số lượng: " + food.getQuantity());
String foodName = food.getName();
if(foodName.length() >= 35){
StringBuilder stringBuilder = new StringBuilder(food.getName());
stringBuilder.replace(35, food.getName().length(), "..." );
holder.food_name.setText(stringBuilder);
} else {
holder.food_name.setText(foodName);
}
String shopName = food.getShopName();
if(shopName.length() >= 18){
StringBuilder stringBuilder = new StringBuilder(food.getShopName());
stringBuilder.replace(18, food.getShopName().length(), "..." );
holder.shop_name.setText(stringBuilder);
} else {
holder.shop_name.setText(shopName);
}
//Check value discountPercent
float cost = 0;
if(food.getDiscountPercent() > 0){