From 5f2a6a9e4dbde654020e8f0f24d85fb5aeba7df9 Mon Sep 17 00:00:00 2001 From: Nezumi <123229563+Nez27@users.noreply.github.com> Date: Fri, 31 Mar 2023 22:23:32 +0700 Subject: [PATCH] Fix bug --- .../com/capstone/foodify/API/FoodApi.java | 2 +- .../capstone/foodify/API/FoodApiToken.java | 5 +- .../foodify/Activity/FoodDetailActivity.java | 3 +- .../Activity/OrderCheckOutActivity.java | 2 + .../foodify/Activity/OrderDetailActivity.java | 4 +- .../foodify/Activity/SignInActivity.java | 1 + .../foodify/Adapter/FoodSearchAdapter.java | 14 +++- .../foodify/Adapter/OrderDetailAdapter.java | 22 ++++- .../layout/activity_account_and_profile.xml | 9 +- .../res/layout/activity_address_manager.xml | 8 +- .../res/layout/activity_change_password.xml | 7 +- .../res/layout/activity_favorite_food.xml | 9 +- .../res/layout/activity_forgot_password.xml | 9 +- app/src/main/res/layout/activity_order.xml | 11 ++- .../res/layout/activity_order_check_out.xml | 9 +- .../main/res/layout/activity_order_detail.xml | 12 +-- .../main/res/layout/activity_shop_detail.xml | 4 +- app/src/main/res/layout/activity_sign_in.xml | 11 +-- app/src/main/res/layout/activity_sign_up.xml | 8 +- app/src/main/res/layout/item_food_search.xml | 84 ++++++++++--------- app/src/main/res/layout/item_order_detail.xml | 4 +- 21 files changed, 142 insertions(+), 96 deletions(-) diff --git a/app/src/main/java/com/capstone/foodify/API/FoodApi.java b/app/src/main/java/com/capstone/foodify/API/FoodApi.java index 98dbdeb..93daff9 100644 --- a/app/src/main/java/com/capstone/foodify/API/FoodApi.java +++ b/app/src/main/java/com/capstone/foodify/API/FoodApi.java @@ -31,7 +31,7 @@ public interface FoodApi { Gson gson = new GsonBuilder().setDateFormat("HH:mm:ss dd-MM-yyyy").setLenient().create(); FoodApi apiService = new Retrofit.Builder() - .baseUrl("https://foodify-backend-production.up.railway.app/api/").addConverterFactory(GsonConverterFactory.create(gson)) + .baseUrl("http://192.168.1.183:8080/api/").addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(FoodApi.class); diff --git a/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java b/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java index a2348b8..90b4596 100644 --- a/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java +++ b/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java @@ -50,7 +50,7 @@ public interface FoodApiToken { FoodApiToken apiService = new Retrofit.Builder() .client(client) - .baseUrl("https://foodify-backend-production.up.railway.app/api/").addConverterFactory(GsonConverterFactory.create(gson)) + .baseUrl("http://192.168.1.183:8080/api/").addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(FoodApiToken.class); @@ -99,4 +99,7 @@ public interface FoodApiToken { @DELETE("users/{userId}/orders/{orderId}") Call deleteOrder(@Path("userId") int userId, @Path("orderId") int orderId); + + @PUT("users/{userId}/orders/{orderId}/status") + Call updateOrderStatus(@Path("userId") int userId, @Path("orderId") int orderId, @Query("status") String status); } diff --git a/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java b/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java index 0d782af..b50d81d 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java @@ -333,7 +333,8 @@ public class FoodDetailActivity extends AppCompatActivity { } Toast.makeText(FoodDetailActivity.this, "Đã thêm " + food.getName() + " vào giỏ hàng!", Toast.LENGTH_SHORT).show(); - startActivity(new Intent(FoodDetailActivity.this, MainActivity.class)); + onBackPressed(); + finish(); } else { Toast.makeText(FoodDetailActivity.this, "Bạn chưa chọn số lượng đồ ăn cần đặt!", Toast.LENGTH_SHORT).show(); 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 1703833..c86f338 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java @@ -362,6 +362,8 @@ public class OrderCheckOutActivity extends AppCompatActivity { } }); + + progress_layout.setVisibility(View.GONE); } private void createOrderFood(String transactionId, String paymentMethod) { diff --git a/app/src/main/java/com/capstone/foodify/Activity/OrderDetailActivity.java b/app/src/main/java/com/capstone/foodify/Activity/OrderDetailActivity.java index bfb07b8..3c78f94 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/OrderDetailActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/OrderDetailActivity.java @@ -127,13 +127,13 @@ public class OrderDetailActivity extends AppCompatActivity { } private void deleteOrderUser(){ - FoodApiToken.apiService.deleteOrder(Common.CURRENT_USER.getId(), order.getId()).enqueue(new Callback() { + FoodApiToken.apiService.updateOrderStatus(Common.CURRENT_USER.getId(), order.getId(), "CANCELED").enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { if(response.code() == 200){ new AestheticDialog.Builder(OrderDetailActivity.this, DialogStyle.RAINBOW, DialogType.SUCCESS) .setTitle("Thông báo!") - .setMessage("Đã xoá đơn thành công!") + .setMessage("Đã huỷ đơn thành công!") .setCancelable(false) .setOnClickListener(new OnDialogClickListener() { @Override diff --git a/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java b/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java index d4905b7..c8a3a90 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java @@ -225,6 +225,7 @@ public class SignInActivity extends AppCompatActivity { progressLayout.setVisibility(View.GONE); startActivity(new Intent(SignInActivity.this, MainActivity.class)); + finish(); } else { Toast.makeText(SignInActivity.this, "Tài khoản không hợp lệ! Vui lòng kiểm tra lại!", Toast.LENGTH_SHORT).show(); FirebaseAuth.getInstance().signOut(); 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 e65f064..b4c1709 100644 --- a/app/src/main/java/com/capstone/foodify/Adapter/FoodSearchAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Adapter/FoodSearchAdapter.java @@ -61,6 +61,17 @@ public class FoodSearchAdapter extends RecyclerView.Adapter= 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= 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){ diff --git a/app/src/main/res/layout/activity_account_and_profile.xml b/app/src/main/res/layout/activity_account_and_profile.xml index 6b72f68..6a4f999 100644 --- a/app/src/main/res/layout/activity_account_and_profile.xml +++ b/app/src/main/res/layout/activity_account_and_profile.xml @@ -14,11 +14,10 @@ @@ -27,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="20dp" - android:layout_marginTop="20dp" + android:layout_marginTop="35dp" android:fontFamily="@font/bebas" android:text="@string/account_and_profile" android:textColor="@color/black" diff --git a/app/src/main/res/layout/activity_address_manager.xml b/app/src/main/res/layout/activity_address_manager.xml index b98af8d..dfc2720 100644 --- a/app/src/main/res/layout/activity_address_manager.xml +++ b/app/src/main/res/layout/activity_address_manager.xml @@ -17,12 +17,10 @@ diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml index 6c28b38..33627a6 100644 --- a/app/src/main/res/layout/activity_change_password.xml +++ b/app/src/main/res/layout/activity_change_password.xml @@ -14,11 +14,10 @@ diff --git a/app/src/main/res/layout/activity_favorite_food.xml b/app/src/main/res/layout/activity_favorite_food.xml index c54b655..41ec833 100644 --- a/app/src/main/res/layout/activity_favorite_food.xml +++ b/app/src/main/res/layout/activity_favorite_food.xml @@ -20,11 +20,12 @@ diff --git a/app/src/main/res/layout/activity_forgot_password.xml b/app/src/main/res/layout/activity_forgot_password.xml index d17d26f..5913f19 100644 --- a/app/src/main/res/layout/activity_forgot_password.xml +++ b/app/src/main/res/layout/activity_forgot_password.xml @@ -14,11 +14,12 @@ diff --git a/app/src/main/res/layout/activity_order.xml b/app/src/main/res/layout/activity_order.xml index 53f821d..0c0ba08 100644 --- a/app/src/main/res/layout/activity_order.xml +++ b/app/src/main/res/layout/activity_order.xml @@ -11,19 +11,18 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_marginStart="10dp" android:layout_marginTop="20dp" android:layout_marginBottom="10dp" > + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml index 1e0877f..eca2444 100644 --- a/app/src/main/res/layout/activity_order_detail.xml +++ b/app/src/main/res/layout/activity_order_detail.xml @@ -14,14 +14,14 @@ + app:layout_constraintTop_toTopOf="parent" /> @@ -27,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="20dp" - android:layout_marginTop="35dp" + android:layout_marginTop="45dp" android:fontFamily="@font/bebas" android:text="@string/sign_in_text" android:textColor="@color/black" diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index e309eaa..38b5e11 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -22,10 +22,10 @@ @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="20dp" - android:layout_marginTop="20dp" + android:layout_marginTop="30dp" android:fontFamily="@font/bebas" android:text="@string/sign_up_text" android:textColor="@color/black" diff --git a/app/src/main/res/layout/item_food_search.xml b/app/src/main/res/layout/item_food_search.xml index e47c1aa..b4951c3 100644 --- a/app/src/main/res/layout/item_food_search.xml +++ b/app/src/main/res/layout/item_food_search.xml @@ -16,8 +16,8 @@ @@ -33,60 +33,68 @@ - - - - + + + + + + + -