From d8a35888a19846adfc0910e838692ccd8880f42b Mon Sep 17 00:00:00 2001 From: Nezumi <123229563+Nez27@users.noreply.github.com> Date: Tue, 4 Apr 2023 21:33:31 +0700 Subject: [PATCH] Improve layout --- .../Activity/OrderCheckOutActivity.java | 2 +- .../foodify/Activity/SignUpActivity.java | 2 +- .../Activity/VerifyAccountActivity.java | 1 + .../capstone/foodify/Adapter/FoodAdapter.java | 9 +------- .../foodify/Adapter/FoodSearchAdapter.java | 20 ++---------------- .../foodify/Adapter/FoodShopAdapter.java | 18 ++-------------- .../foodify/Adapter/OrderDetailAdapter.java | 21 ++----------------- .../capstone/foodify/Adapter/ShopAdapter.java | 10 +-------- app/src/main/res/layout/item_food_basket.xml | 4 ++++ .../main/res/layout/item_food_favorite.xml | 4 ++++ app/src/main/res/layout/item_food_search.xml | 4 ++++ app/src/main/res/layout/item_food_shop.xml | 6 +++++- app/src/main/res/layout/item_order_detail.xml | 4 ++++ app/src/main/res/layout/item_shop.xml | 2 ++ 14 files changed, 34 insertions(+), 73 deletions(-) diff --git a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java index 34f8a1e..81141bf 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java @@ -72,7 +72,7 @@ import vn.zalopay.sdk.listeners.PayOrderListener; public class OrderCheckOutActivity extends AppCompatActivity { private static final String TAKE_FOOD_FROM_SHOP = "Đến shop lấy"; - private static final String ZALO_PAYMENT_METHOD = "ZALO PAY"; + private static final String ZALO_PAYMENT_METHOD = "Zalo Pay"; private static final String CASH_PAYMENT = "CASH"; private static Double LAT_SHOP = 0.0; private static Double LNG_SHOP = 0.0; diff --git a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java index c7362f8..68eed04 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java @@ -216,7 +216,7 @@ public class SignUpActivity extends AppCompatActivity { signUp(user); } else { loadCompleted(); - Toast.makeText(SignUpActivity.this, "Email or Phone exist!", Toast.LENGTH_SHORT).show(); + Toast.makeText(SignUpActivity.this, "Địa chỉ email hoặc số điện thoại đã trùng, vui lòng kiểm tra lại!", Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java b/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java index b3f17a8..211caac 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/VerifyAccountActivity.java @@ -250,6 +250,7 @@ public class VerifyAccountActivity extends AppCompatActivity { progressLayout.setVisibility(View.GONE); //Create user success; Toast.makeText(VerifyAccountActivity.this, "Tạo tài khoản thành công!", Toast.LENGTH_SHORT).show(); + FirebaseAuth.getInstance().signOut(); startActivity(new Intent(VerifyAccountActivity.this, SignInActivity.class)); finish(); } else { diff --git a/app/src/main/java/com/capstone/foodify/Adapter/FoodAdapter.java b/app/src/main/java/com/capstone/foodify/Adapter/FoodAdapter.java index 3aa449e..0fa5ad8 100644 --- a/app/src/main/java/com/capstone/foodify/Adapter/FoodAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Adapter/FoodAdapter.java @@ -57,14 +57,7 @@ public class FoodAdapter extends RecyclerView.Adapter= 24){ - StringBuilder stringBuilder = new StringBuilder(food.getName()); - stringBuilder.replace(24, food.getName().length(), "..." ); - holder.name.setText(stringBuilder); - } else { - holder.name.setText(foodName); - } + holder.name.setText(food.getName()); //When food does not have image if(food.getImages().size() == 0){ diff --git a/app/src/main/java/com/capstone/foodify/Adapter/FoodSearchAdapter.java b/app/src/main/java/com/capstone/foodify/Adapter/FoodSearchAdapter.java index f8bba97..c69a66a 100644 --- a/app/src/main/java/com/capstone/foodify/Adapter/FoodSearchAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Adapter/FoodSearchAdapter.java @@ -56,25 +56,9 @@ public class FoodSearchAdapter extends RecyclerView.Adapter= LENGTH_CHARACTER){ - StringBuilder stringBuilder = new StringBuilder(food.getName()); - stringBuilder.replace(LENGTH_CHARACTER, food.getName().length(), "..." ); - holder.name.setText(stringBuilder); - } else { - 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); - } + holder.name.setText(food.getName()); + holder.shopName.setText(food.getShop().getName()); //When food does not have image if(food.getImages().size() == 0){ diff --git a/app/src/main/java/com/capstone/foodify/Adapter/FoodShopAdapter.java b/app/src/main/java/com/capstone/foodify/Adapter/FoodShopAdapter.java index 011629c..7b97af9 100644 --- a/app/src/main/java/com/capstone/foodify/Adapter/FoodShopAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Adapter/FoodShopAdapter.java @@ -61,23 +61,9 @@ public class FoodShopAdapter extends RecyclerView.Adapter= MAX_CHARACTER){ - StringBuilder stringBuilder = new StringBuilder(food.getName()); - stringBuilder.replace(MAX_CHARACTER, food.getName().length(), "..." ); - holder.foodName.setText(stringBuilder); - } else { - holder.foodName.setText(foodName); - } + holder.foodName.setText(food.getName()); - String description = food.getDescription(); - if(description.length() >= MAX_CHARACTER){ - StringBuilder stringBuilder = new StringBuilder(food.getDescription()); - stringBuilder.replace(MAX_CHARACTER, food.getDescription().length(), "..." ); - holder.description.setText(stringBuilder); - } else { - holder.description.setText(description); - } + holder.description.setText(food.getDescription()); //Check value discountPercent float cost; diff --git a/app/src/main/java/com/capstone/foodify/Adapter/OrderDetailAdapter.java b/app/src/main/java/com/capstone/foodify/Adapter/OrderDetailAdapter.java index 11b693a..d5c7a9f 100644 --- a/app/src/main/java/com/capstone/foodify/Adapter/OrderDetailAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Adapter/OrderDetailAdapter.java @@ -46,26 +46,9 @@ public class OrderDetailAdapter extends RecyclerView.Adapter= 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); - } - + holder.food_name.setText(food.getName()); + holder.shop_name.setText(food.getShopName()); //Check value discountPercent float cost = 0; diff --git a/app/src/main/java/com/capstone/foodify/Adapter/ShopAdapter.java b/app/src/main/java/com/capstone/foodify/Adapter/ShopAdapter.java index 0e343a0..cdee41f 100644 --- a/app/src/main/java/com/capstone/foodify/Adapter/ShopAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Adapter/ShopAdapter.java @@ -50,15 +50,7 @@ public class ShopAdapter extends RecyclerView.Adapter= 24){ - StringBuilder stringBuilder = new StringBuilder(shop.getName()); - stringBuilder.replace(24, shop.getName().length(), "..." ); - holder.shopName.setText(stringBuilder); - } else { - holder.shopName.setText(shopName); - } + holder.shopName.setText(shop.getName()); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/res/layout/item_food_basket.xml b/app/src/main/res/layout/item_food_basket.xml index f9f4376..2f7e97f 100644 --- a/app/src/main/res/layout/item_food_basket.xml +++ b/app/src/main/res/layout/item_food_basket.xml @@ -78,6 +78,8 @@ android:layout_marginEnd="10dp" app:layout_constraintStart_toEndOf="@id/image_view" app:layout_constraintTop_toTopOf="parent" + android:maxLines="2" + android:ellipsize="end" />