From 3d63c5bcfa2704ba30bb0c0b226b4f15af239cc6 Mon Sep 17 00:00:00 2001
From: phanhuuloi27 <73208452+Nezumi2711@users.noreply.github.com>
Date: Sun, 3 Jul 2022 21:09:30 +0700
Subject: [PATCH] Improve Search all food

---
 .../java/com/waterbase/foodify/FoodList.java   | 18 ++++++++++++++++--
 .../com/waterbase/foodify/SearchActivity.java  |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

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 ed8148f..51caefa 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/FoodList.java
@@ -218,6 +218,21 @@ public class FoodList extends AppCompatActivity {
             @Override
             protected void onBindViewHolder(@NonNull FoodViewHolder viewHolder, int i, @NonNull Food model) {
                 viewHolder.food_name.setText(model.getName());
+                if (Integer.parseInt(model.getDiscount()) > 0) {
+                    String foodPrice = model.getPrice() + "đ";
+                    long newFoodPrice = Long.parseLong(model.getPrice()) - Long.parseLong(model.getPrice()) * Long.parseLong(model.getDiscount()) / 100;
+                    SpannableStringBuilder spnBuilder = new SpannableStringBuilder(foodPrice);
+                    StrikethroughSpan strikethroughSpan = new StrikethroughSpan();
+                    spnBuilder.setSpan(strikethroughSpan, 0, foodPrice.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    viewHolder.food_price.setText(spnBuilder);
+                    viewHolder.newPrice.setText(newFoodPrice + "đ");
+                    viewHolder.discount.setText("- " + model.getDiscount() + "%");
+                } else {
+                    viewHolder.food_price.setText(String.format("%s đ", model.getPrice()));
+                    viewHolder.discount.setVisibility(View.GONE);
+                    viewHolder.newPrice.setVisibility(View.GONE);
+                }
+
                 Picasso.with(getBaseContext()).load(model.getImage()).into(viewHolder.food_image);
 
                 viewHolder.setItemClickListener(new ItemClickListener() {
@@ -285,14 +300,13 @@ public class FoodList extends AppCompatActivity {
                     spnBuilder.setSpan(strikethroughSpan, 0, foodPrice.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                     viewHolder.food_price.setText(spnBuilder);
                     viewHolder.newPrice.setText(newFoodPrice + "đ");
+                    viewHolder.discount.setText("- " + model.getDiscount() + "%");
                 } else {
                     viewHolder.food_price.setText(String.format("%s đ", model.getPrice()));
                     viewHolder.discount.setVisibility(View.GONE);
                     viewHolder.newPrice.setVisibility(View.GONE);
                 }
 
-
-                viewHolder.discount.setText("- " + model.getDiscount() + "%");
                 Picasso.with(getBaseContext()).load(model.getImage()).into(viewHolder.food_image);
 
                 //Quick Cart
diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java b/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java
index 803c0c9..1d8e52d 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/SearchActivity.java
@@ -270,6 +270,7 @@ public class SearchActivity extends AppCompatActivity {
                     spnBuilder.setSpan(strikethroughSpan, 0, foodPrice.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
                     viewHolder.food_price.setText(spnBuilder);
                     viewHolder.newPrice.setText(newFoodPrice + "đ");
+                    viewHolder.discount.setText("- " + model.getDiscount() + "%");
                 } else {
                     viewHolder.food_price.setText(String.format("%s đ", model.getPrice()));
                     viewHolder.discount.setVisibility(View.GONE);