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

Merge API from back-end to Search Fragment

Browse Source
This commit is contained in:
Nezumi
2023-03-10 16:39:53 +07:00
parent 435d3f8fd2
commit 1553dbd55e
12 changed files with 249 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/capstone/foodify/API/FoodApi.java
+8 -8
View File
@@ -26,7 +26,7 @@ public interface FoodApi {
Gson gson = new GsonBuilder().setDateFormat("HH:mm:ss dd-MM-yyyy").create();
FoodApi apiService = new Retrofit.Builder()
.baseUrl("http://10.0.2.2:8080/api/").addConverterFactory(GsonConverterFactory.create(gson))
.baseUrl("http://192.168.1.183:8080/api/").addConverterFactory(GsonConverterFactory.create(gson))
.build()
.create(FoodApi.class);
@@ -39,17 +39,17 @@ public interface FoodApi {
@GET("shops?pageNo=0&pageSize=10&sortBy=id&sortDir=asc")
Call<Shops> allShops();
@GET("products/search/")
Call<List<Food>> listFood(@Path("search") String search, @Query("pageNo") int pageNo, @Query("pageSize") int pageSize, @Query("sortBy") String sortBy, @Query("sortDir") String sortDir);
@GET("products/search/{name}")
Call<Foods> searchFoodByName(@Path("name") String name, @Query("pageNo") int pageNo, @Query("pageSize") int pageSize, @Query("sortBy") String sortBy, @Query("sortDir") String sortDir);
@GET("listFood")
Call<List<Food>> listFood(@Query("page") int page, @Query("limit") int limit);
@GET("products")
Call<Foods> listFood(@Query("pageNo") int pageNo, @Query("pageSize") int pageSize, @Query("sortBy") String sortBy, @Query("sortDir") String sortDir);
@GET("Category")
@GET("categories")
Call<List<Category>> listCategory();
@GET("Category/{id}/food")
Call<List<Food>> listFoodByCategory(@Path("id") String id);
@GET("products/categories")
Call<Foods> listFoodByCategory(@Query("id") List<Integer> id, @Query("pageNo") int pageNo, @Query("pageSize") int pageSize, @Query("sortBy") String sortBy, @Query("sortDir") String sortDir);
@GET("detail/{id}")
Call<Food> detailFood(@Path("id") String id);
app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java
+81 -33
View File
@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
@@ -25,10 +26,12 @@ import com.capstone.foodify.Common;
import com.capstone.foodify.Model.Category.Category;
import com.capstone.foodify.Model.Food.Food;
import com.capstone.foodify.Model.Food.FoodSearchAdapter;
import com.capstone.foodify.Model.Response.Foods;
import com.capstone.foodify.R;
import com.google.android.material.chip.Chip;
import com.google.android.material.chip.ChipGroup;
import java.nio.file.LinkOption;
import java.util.ArrayList;
import java.util.List;
@@ -38,13 +41,15 @@ import retrofit2.Response;
public class SearchFragment extends Fragment {
private static int CURRENT_PAGE = 1;
private static final int LIMIT = 18;
private static int TOTAL_PAGE = 5;
private static int CURRENT_PAGE = 0;
private static final int LIMIT = 8;
private static int TOTAL_PAGE = 0;
private static int ACTION_CODE = -1;
private static final int LIST_FOOD = -1;
private static final int SEARCH_FOOD = 0;
private static final int LIST_FOOD_BY_CATEGORY = 2;
private String searchQuery = "";
private LinearLayout searchNotFound;
private RecyclerView recycler_view_search;
private NestedScrollView nestedScrollView;
private TextView end_of_list_text_view;
@@ -52,7 +57,7 @@ public class SearchFragment extends Fragment {
private ProgressBar progressBar;
private static final List<Food> listFoodSearch = new ArrayList<>();
private ChipGroup list_Category;
private final List<String> statusCategoryChecked = new ArrayList<>();
private final List<Integer> statusCategoryChecked = new ArrayList<>();
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -67,6 +72,7 @@ public class SearchFragment extends Fragment {
foodAdapter = new FoodSearchAdapter(getContext());
progressBar = view.findViewById(R.id.progress_bar);
end_of_list_text_view = view.findViewById(R.id.end_of_list_text);
searchNotFound = view.findViewById(R.id.search_not_found);
getListCategory();
@@ -76,10 +82,11 @@ public class SearchFragment extends Fragment {
RecyclerView.ItemDecoration itemDecoration = new DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL);
recycler_view_search.addItemDecoration(itemDecoration);
//Fix for lagging when scrolling
recycler_view_search.setNestedScrollingEnabled(false);
recycler_view_search.setAdapter(foodAdapter);
getListFoodByPagination(1);
getListFood(0);
if (nestedScrollView != null) {
nestedScrollView.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
@Override
@@ -94,8 +101,13 @@ public class SearchFragment extends Fragment {
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
//Hide UI search not found
searchNotFound.setVisibility(View.GONE);
//Set action code
ACTION_CODE = SEARCH_FOOD;
CURRENT_PAGE = 1;
CURRENT_PAGE = 0;
listFoodSearch.clear();
showProgressBarAndHideEndOfListText();
if (!query.isEmpty()) {
@@ -110,12 +122,14 @@ public class SearchFragment extends Fragment {
if (searchView.getQuery().length() == 0) {
listFoodSearch.clear();
CURRENT_PAGE = 1;
CURRENT_PAGE = 0;
ACTION_CODE = LIST_FOOD;
showProgressBarAndHideEndOfListText();
foodAdapter.setData(listFood);
foodAdapter.notifyDataSetChanged();
hideProgressBarAndShowEndOfListText();
//Hide UI search not found
searchNotFound.setVisibility(View.GONE);
getListFood(0);
}
return true;
}
@@ -134,27 +148,44 @@ public class SearchFragment extends Fragment {
end_of_list_text_view.setVisibility(View.VISIBLE);
}
private void getListFoodBySearch(String query, int page) {
FoodApi.apiService.listFood(query, page, LIMIT, "id", "asc").enqueue(new Callback<List<Food>>() {
FoodApi.apiService.searchFoodByName(query, page, LIMIT, "id", "asc").enqueue(new Callback<Foods>() {
@Override
public void onResponse(Call<List<Food>> call, Response<List<Food>> response) {
public void onResponse(Call<Foods> call, Response<Foods> response) {
//Init total page and total elements value
TOTAL_PAGE = response.body().getPage().getTotalPages();
loadFoodAdapter(response);
}
@Override
public void onFailure(Call<List<Food>> call, Throwable t) {
Toast.makeText(getContext(), "Lỗi" + t, Toast.LENGTH_LONG).show();
public void onFailure(Call<Foods> call, Throwable t) {
}
});
}
private void loadFoodAdapter(Response<List<Food>> response) {
List<Food> foodData = response.body();
private void loadFoodAdapter(Response<Foods> response) {
Foods foodData = response.body();
listFoodSearch.addAll(foodData);
List<Food> tempFood = foodData.getProducts();
listFoodSearch.addAll(tempFood);
foodAdapter.setData(listFoodSearch);
foodAdapter.notifyDataSetChanged();
hideProgressBarAndShowEndOfListText();
//If list data don't have pagination
if(TOTAL_PAGE == 1)
hideProgressBarAndShowEndOfListText();
//If search not found
if(listFoodSearch.size() == 0){
searchNotFound.setVisibility(View.VISIBLE);
progressBar.setVisibility(View.GONE);
}
}
private void getListCategory() {
@@ -174,12 +205,19 @@ public class SearchFragment extends Fragment {
chip.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
loadFoodByCategory(tempCategory.getId());
//Add category to list category have checked
if(b) {
statusCategoryChecked.add(tempCategory.getId());
statusCategoryChecked.add(Integer.parseInt(tempCategory.getId()));
} else {
statusCategoryChecked.remove(tempCategory.getId());
statusCategoryChecked.remove(Integer.valueOf(tempCategory.getId()));
}
ACTION_CODE = LIST_FOOD_BY_CATEGORY;
listFoodSearch.clear();
CURRENT_PAGE = 0;
showProgressBarAndHideEndOfListText();
getListFoodByCategory(CURRENT_PAGE);
Toast.makeText(getContext(), "Category check: " + statusCategoryChecked, Toast.LENGTH_SHORT).show();
}
});
@@ -203,16 +241,17 @@ public class SearchFragment extends Fragment {
});
}
private void loadFoodByCategory(String id) {
FoodApi.apiService.listFoodByCategory(id).enqueue(new Callback<List<Food>>() {
private void getListFoodByCategory(int page) {
FoodApi.apiService.listFoodByCategory(statusCategoryChecked, page, LIMIT, "id", "asc").enqueue(new Callback<Foods>() {
@Override
public void onResponse(Call<List<Food>> call, Response<List<Food>> response) {
public void onResponse(Call<Foods> call, Response<Foods> response) {
//Init total page and total elements value
TOTAL_PAGE = response.body().getPage().getTotalPages();
loadFoodAdapter(response);
}
@Override
public void onFailure(Call<List<Food>> call, Throwable t) {
public void onFailure(Call<Foods> call, Throwable t) {
//Check internet connection
if(Common.checkInternetConnection(getContext())){
//Has internet connection
@@ -225,15 +264,16 @@ public class SearchFragment extends Fragment {
});
}
private void getListFoodByPagination(int page){
FoodApi.apiService.listFood(page, LIMIT).enqueue(new Callback<List<Food>>() {
private void getListFood(int page){
FoodApi.apiService.listFood(page, LIMIT, "id", "asc").enqueue(new Callback<Foods>() {
@Override
public void onResponse(Call<List<Food>> call, Response<List<Food>> response) {
public void onResponse(Call<Foods> call, Response<Foods> response) {
TOTAL_PAGE = response.body().getPage().getTotalPages();
loadFoodAdapter(response);
}
@Override
public void onFailure(Call<List<Food>> call, Throwable t) {
public void onFailure(Call<Foods> call, Throwable t) {
//Check internet connection
if(Common.checkInternetConnection(getContext())){
//Has internet connection
@@ -249,21 +289,29 @@ public class SearchFragment extends Fragment {
private void dataLoadMore() {
switch (ACTION_CODE){
case LIST_FOOD:{
if(CURRENT_PAGE < TOTAL_PAGE){
getListFoodByPagination(++CURRENT_PAGE);
if(CURRENT_PAGE < TOTAL_PAGE - 1){
getListFood(++CURRENT_PAGE);
} else {
hideProgressBarAndShowEndOfListText();
}
break;
}
case SEARCH_FOOD:{
if(CURRENT_PAGE < TOTAL_PAGE){
if(CURRENT_PAGE < TOTAL_PAGE - 1){
getListFoodBySearch(searchQuery, ++CURRENT_PAGE);
} else {
hideProgressBarAndShowEndOfListText();
}
break;
}
case LIST_FOOD_BY_CATEGORY:{
if(CURRENT_PAGE < TOTAL_PAGE - 1){
getListFoodByCategory(++CURRENT_PAGE);
} else {
hideProgressBarAndShowEndOfListText();
}
break;
}
}
}
app/src/main/java/com/capstone/foodify/Model/Category/Category.java
+9
View File
@@ -3,6 +3,7 @@ package com.capstone.foodify.Model.Category;
public class Category {
private String id;
private String name;
private String imageUrl;
public String getId() {
return id;
@@ -19,4 +20,12 @@ public class Category {
public void setName(String name) {
this.name = name;
}
public String getImageUrl() {
return imageUrl;
}
public void setImageUrl(String imageUrl) {
this.imageUrl = imageUrl;
}
}
app/src/main/java/com/capstone/foodify/Model/Food/Food.java
+17
View File
@@ -116,4 +116,21 @@ public class Food implements Comparable<Food>{
}
return getName().compareTo(food.getName());
}
@Override
public String toString() {
return "Food{" +
"id='" + id + '\'' +
", name='" + name + '\'' +
", description='" + description + '\'' +
", isEnabled=" + isEnabled +
", discountPercent=" + discountPercent +
", cost=" + cost +
", averageRating=" + averageRating +
", reviewCount='" + reviewCount + '\'' +
", shop=" + shop +
", categories=" + categories +
", images=" + images +
'}';
}
}
app/src/main/java/com/capstone/foodify/Model/Food/FoodSearchAdapter.java
+29 -8
View File
@@ -18,6 +18,7 @@ import java.util.List;
public class FoodSearchAdapter extends RecyclerView.Adapter<FoodSearchAdapter.FoodViewHolder>{
public static final int LENGTH_CHARACTER = 40;
private List<Food> listFood;
private Context context;
@@ -45,18 +46,38 @@ public class FoodSearchAdapter extends RecyclerView.Adapter<FoodSearchAdapter.Fo
return;
}
//Init data
String foodName = food.getName();
if(foodName.length() >= 19){
if(foodName.length() >= LENGTH_CHARACTER){
StringBuilder stringBuilder = new StringBuilder(food.getName());
stringBuilder.replace(19, food.getName().length(), "..." );
stringBuilder.replace(LENGTH_CHARACTER, food.getName().length(), "..." );
holder.name.setText(stringBuilder);
} else {
holder.name.setText(foodName);
}
// Picasso.get().load(food.getImg()).into(holder.image);
//
//
// holder.price.setText(Common.changeCurrencyUnit(Float.parseFloat(food.getPrice())));
//When food does not have image
if(food.getImages().size() == 0){
holder.image.setImageResource(R.drawable.default_image_food);
} else {
Picasso.get().load(food.getImages().get(0).getImageUrl()).into(holder.image);
}
//Check value discountPercent
float cost = 0;
if(food.getDiscountPercent() > 0){
//Calculate final cost when apply discountPercent
cost = food.getCost() - (food.getCost() * food.getDiscountPercent()/100);
//Show discountPercent value on screen
holder.discount.setVisibility(View.VISIBLE);
holder.discount.setText("-" + food.getDiscountPercent()+ "%");
} else {
cost = food.getCost();
}
holder.price.setText(Common.changeCurrencyUnit(cost));
}
@Override
@@ -70,7 +91,7 @@ public class FoodSearchAdapter extends RecyclerView.Adapter<FoodSearchAdapter.Fo
public static class FoodViewHolder extends RecyclerView.ViewHolder{
private final ImageView image;
private final TextView price, name;
private final TextView price, name, discount;
public FoodViewHolder(@NonNull View itemView) {
super(itemView);
@@ -78,7 +99,7 @@ public class FoodSearchAdapter extends RecyclerView.Adapter<FoodSearchAdapter.Fo
image = itemView.findViewById(R.id.image_view);
name = itemView.findViewById(R.id.food_name_text_view);
price = itemView.findViewById(R.id.price_text_view);
discount = itemView.findViewById(R.id.discount);
}
}
}
app/src/main/java/com/capstone/foodify/Model/Response/Foods.java
+8
View File
@@ -24,4 +24,12 @@ public class Foods {
public void setPage(Page page) {
this.page = page;
}
@Override
public String toString() {
return "Foods{" +
"products=" + products +
", page=" + page +
'}';
}
}