diff --git a/app/build.gradle b/app/build.gradle index 4dffa4d..446d422 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,8 @@ dependencies { implementation 'com.github.smarteist:autoimageslider:1.4.0' implementation 'com.github.bumptech.glide:glide:4.14.2' annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2' - implementation "com.github.kojofosu:Quantitizer:1.6.7" + implementation 'com.github.kojofosu:Quantitizer:1.6.7' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.github.ome450901:SimpleRatingBar:1.5.1' + implementation 'com.cepheuen.elegant-number-button:lib:1.0.2' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c0876b8..3b00419 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/Theme.Foodify" + tools:replace="android:theme" tools:targetApi="31"> imageFood = new ArrayList<>(); + private static final List imageFood = new ArrayList<>(); private TextView foodName_txt, shopName_txt, discount_txt, description_txt, price_txt, total_txt, countRating_txt, description_content_txt; private ProgressBar progressBar; private Button add_to_basket_button; @@ -114,6 +118,7 @@ public class FoodDetailActivity extends AppCompatActivity { public void onDecrease() { } + @SuppressLint("SetTextI18n") @Override public void onValueChanged(int i) { Locale locale = new Locale("vi", "VN"); @@ -131,6 +136,7 @@ public class FoodDetailActivity extends AppCompatActivity { getImageFoodById(foodId); + //Turn previous action when click back_image.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -138,12 +144,24 @@ public class FoodDetailActivity extends AppCompatActivity { } }); + //Open dialog review rating_button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { openReviewDialog(Gravity.CENTER); } }); + + //Add food to basket + add_to_basket_button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Common.LIST_BASKET_FOOD.add(new Basket(food.getId(), imageFood.get(0), food.getName(), food.getPrice(), food.getShopName(), + String.valueOf(horizontalQuantitizer.getValue()))); + Toast.makeText(FoodDetailActivity.this, "Thêm vào giỏ hàng thành công!", Toast.LENGTH_SHORT).show(); + startActivity(new Intent(FoodDetailActivity.this, MainActivity.class)); + } + }); } private List getListReview(){ diff --git a/app/src/main/java/com/capstone/foodify/Common.java b/app/src/main/java/com/capstone/foodify/Common.java new file mode 100644 index 0000000..9608760 --- /dev/null +++ b/app/src/main/java/com/capstone/foodify/Common.java @@ -0,0 +1,10 @@ +package com.capstone.foodify; + +import com.capstone.foodify.Model.Basket.Basket; + +import java.util.ArrayList; +import java.util.List; + +public class Common { + public static List LIST_BASKET_FOOD = new ArrayList<>(); +} diff --git a/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java index c15e963..d471140 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/BasketFragment.java @@ -1,20 +1,95 @@ package com.capstone.foodify.Fragment; +import android.graphics.Color; import android.os.Bundle; - -import androidx.fragment.app.Fragment; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.RelativeLayout; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.capstone.foodify.Common; +import com.capstone.foodify.ItemTouchHelperListener; +import com.capstone.foodify.Model.Basket.Basket; +import com.capstone.foodify.Model.Basket.BasketAdapter; +import com.capstone.foodify.Model.Basket.RecyclerViewItemTouchHelperBasketFood; import com.capstone.foodify.R; +import com.google.android.material.snackbar.Snackbar; + +import java.util.ArrayList; +import java.util.List; + +public class BasketFragment extends Fragment implements ItemTouchHelperListener { + + private RecyclerView recyclerView_basket_food; + private BasketAdapter adapter; + private List listBasketFood = new ArrayList<>(); + private RelativeLayout listBasketFoodView; -public class BasketFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_basket, container, false); + View view = inflater.inflate(R.layout.fragment_basket, container, false); + + //Init Component + recyclerView_basket_food = view.findViewById(R.id.recycler_view_basket_food); + listBasketFoodView = view.findViewById(R.id.list_basket_food_view); + adapter = new BasketAdapter(); + + //Get list food in basket + getListBasketFood(); + + //Set layout recyclerview + LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext()); + recyclerView_basket_food.setLayoutManager(linearLayoutManager); + + RecyclerView.ItemDecoration itemDecoration = new DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL); + recyclerView_basket_food.addItemDecoration(itemDecoration); + + ItemTouchHelper.SimpleCallback simpleCallback = new RecyclerViewItemTouchHelperBasketFood(0, ItemTouchHelper.LEFT, this); + new ItemTouchHelper(simpleCallback).attachToRecyclerView(recyclerView_basket_food); + + return view; + } + + private void getListBasketFood(){ + listBasketFood = Common.LIST_BASKET_FOOD; + adapter.setData(listBasketFood); + recyclerView_basket_food.setAdapter(adapter); + } + @Override + public void onResume() { + super.onResume(); + System.out.println("On Resume Fragment"); + } + + @Override + public void onSwiped(RecyclerView.ViewHolder viewHolder) { + if(viewHolder instanceof BasketAdapter.BasketViewHolder){ + String foodNameDelete = listBasketFood.get(viewHolder.getAdapterPosition()).getName(); + + Basket foodDelete = listBasketFood.get(viewHolder.getAdapterPosition()); + int indexDelete = viewHolder.getAdapterPosition(); + + //Remove Item + adapter.removeItem(indexDelete, getContext()); + + //Show notification food has been delete + Snackbar snackbar = Snackbar.make(listBasketFoodView, foodNameDelete + " remove!", Snackbar.LENGTH_LONG); + snackbar.setAction("Undo", new View.OnClickListener() { + @Override + public void onClick(View view) { + adapter.undoItem(foodDelete, indexDelete, getContext()); + } + }); + snackbar.setActionTextColor(Color.YELLOW); + snackbar.show(); + } } } \ No newline at end of file diff --git a/app/src/main/java/com/capstone/foodify/Fragment/FavouriteFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/FavoriteFragment.java similarity index 93% rename from app/src/main/java/com/capstone/foodify/Fragment/FavouriteFragment.java rename to app/src/main/java/com/capstone/foodify/Fragment/FavoriteFragment.java index 5f5b39c..b4ea4e8 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/FavouriteFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/FavoriteFragment.java @@ -21,21 +21,18 @@ import com.capstone.foodify.ItemTouchHelperListener; import com.capstone.foodify.Model.Food.Food; import com.capstone.foodify.Model.Food.FoodFavoriteAdapter; import com.capstone.foodify.R; -import com.capstone.foodify.RecyclerViewItemTouchHelper; +import com.capstone.foodify.Model.Food.RecyclerViewItemTouchHelperFavoriteFood; import com.google.android.material.snackbar.Snackbar; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; import java.util.List; -import java.util.Objects; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; -public class FavouriteFragment extends Fragment implements ItemTouchHelperListener { +public class FavoriteFragment extends Fragment implements ItemTouchHelperListener { private RecyclerView recyclerView_favorite_food; private FoodFavoriteAdapter adapter; @@ -59,11 +56,10 @@ public class FavouriteFragment extends Fragment implements ItemTouchHelperListen recyclerView_favorite_food.setLayoutManager(linearLayoutManager); adapter = new FoodFavoriteAdapter(); - RecyclerView.ItemDecoration itemDecoration = new DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL); recyclerView_favorite_food.addItemDecoration(itemDecoration); - ItemTouchHelper.SimpleCallback simpleCallback = new RecyclerViewItemTouchHelper(0, ItemTouchHelper.LEFT, this); + ItemTouchHelper.SimpleCallback simpleCallback = new RecyclerViewItemTouchHelperFavoriteFood(0, ItemTouchHelper.LEFT, this); new ItemTouchHelper(simpleCallback).attachToRecyclerView(recyclerView_favorite_food); return rootView; } diff --git a/app/src/main/java/com/capstone/foodify/Model/Basket/Basket.java b/app/src/main/java/com/capstone/foodify/Model/Basket/Basket.java new file mode 100644 index 0000000..a15b68c --- /dev/null +++ b/app/src/main/java/com/capstone/foodify/Model/Basket/Basket.java @@ -0,0 +1,67 @@ +package com.capstone.foodify.Model.Basket; + +public class Basket { + private String id; + private String img; + private String name; + private String price; + private String shopName; + private String quantity; + + public Basket(String id, String img, String name, String price, String shopName, String quantity) { + this.id = id; + this.img = img; + this.name = name; + this.price = price; + this.shopName = shopName; + this.quantity = quantity; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPrice() { + return price; + } + + public void setPrice(String price) { + this.price = price; + } + + public String getShopName() { + return shopName; + } + + public void setShopName(String shopName) { + this.shopName = shopName; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } +} diff --git a/app/src/main/java/com/capstone/foodify/Model/Basket/BasketAdapter.java b/app/src/main/java/com/capstone/foodify/Model/Basket/BasketAdapter.java new file mode 100644 index 0000000..e213697 --- /dev/null +++ b/app/src/main/java/com/capstone/foodify/Model/Basket/BasketAdapter.java @@ -0,0 +1,104 @@ +package com.capstone.foodify.Model.Basket; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.capstone.foodify.API.FoodApi; +import com.capstone.foodify.Model.Food.Food; +import com.capstone.foodify.R; +import com.cepheuen.elegantnumberbutton.view.ElegantNumberButton; +import com.squareup.picasso.Picasso; + +import java.util.List; + +public class BasketAdapter extends RecyclerView.Adapter { + + public List listBasketFood; + + public BasketAdapter() { + } + + @SuppressLint("NotifyDataSetChanged") + public void setData(List listBasketFood){ + this.listBasketFood = listBasketFood; + notifyDataSetChanged(); + } + + @NonNull + @Override + public BasketViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_food_basket, parent, false); + return new BasketViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull BasketViewHolder holder, int position) { + Basket foodBasket = listBasketFood.get(position); + + if(foodBasket == null) + return; + + //Init data + holder.foodName.setText(foodBasket.getName()); + holder.shopName.setText(foodBasket.getShopName()); + holder.price.setText(foodBasket.getPrice()); + Picasso.get().load(foodBasket.getImg()).into(holder.imageView); + holder.quantity.setNumber(foodBasket.getQuantity()); + + //Update quantity food when change quantity number + holder.quantity.setOnValueChangeListener(new ElegantNumberButton.OnValueChangeListener() { + @Override + public void onValueChange(ElegantNumberButton view, int oldValue, int newValue) { + foodBasket.setQuantity(String.valueOf(newValue)); + } + }); + } + + @Override + public int getItemCount() { + if(listBasketFood != null) + return listBasketFood.size(); + return 0; + } + + public static class BasketViewHolder extends RecyclerView.ViewHolder{ + + TextView foodName, shopName, price; + public LinearLayout layoutForeGround; + ImageView imageView; + ElegantNumberButton quantity; + + public BasketViewHolder(@NonNull View itemView) { + super(itemView); + + //Init Component + foodName = itemView.findViewById(R.id.food_name_text_view); + shopName = itemView.findViewById(R.id.shop_name_text_view); + price = itemView.findViewById(R.id.price_text_view); + imageView = itemView.findViewById(R.id.image_view); + quantity = itemView.findViewById(R.id.quantity); + + layoutForeGround = itemView.findViewById(R.id.layout_foreground); + } + } + + public void removeItem(int index, Context context){ + listBasketFood.remove(index); + notifyItemRemoved(index); + } + + public void undoItem(Basket food, int index, Context context){ + listBasketFood.add(index, food); + notifyItemInserted(index); + } +} diff --git a/app/src/main/java/com/capstone/foodify/Model/Basket/RecyclerViewItemTouchHelperBasketFood.java b/app/src/main/java/com/capstone/foodify/Model/Basket/RecyclerViewItemTouchHelperBasketFood.java new file mode 100644 index 0000000..41ddb4d --- /dev/null +++ b/app/src/main/java/com/capstone/foodify/Model/Basket/RecyclerViewItemTouchHelperBasketFood.java @@ -0,0 +1,60 @@ +package com.capstone.foodify.Model.Basket; + +import android.graphics.Canvas; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + +import com.capstone.foodify.ItemTouchHelperListener; + +public class RecyclerViewItemTouchHelperBasketFood extends ItemTouchHelper.SimpleCallback{ + + private ItemTouchHelperListener listener; + + public RecyclerViewItemTouchHelperBasketFood(int dragDirs, int swipeDirs, ItemTouchHelperListener listener) { + super(dragDirs, swipeDirs); + this.listener = listener; + } + + @Override + public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) { + return true; + } + + @Override + public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) { + if(listener != null) + listener.onSwiped(viewHolder); + } + + @Override + public void onSelectedChanged(@Nullable RecyclerView.ViewHolder viewHolder, int actionState) { + if(viewHolder != null){ + View foreGroundView = ((BasketAdapter.BasketViewHolder) viewHolder).layoutForeGround; + getDefaultUIUtil().onSelected(foreGroundView); + } + + } + + @Override + public void onChildDrawOver(@NonNull Canvas c, @NonNull RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) { + assert viewHolder != null; + View foreGroundView = ((BasketAdapter.BasketViewHolder) viewHolder).layoutForeGround; + getDefaultUIUtil().onDrawOver(c, recyclerView, foreGroundView, dX, dY, actionState, isCurrentlyActive); + } + + @Override + public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) { + View foreGroundView = ((BasketAdapter.BasketViewHolder) viewHolder).layoutForeGround; + getDefaultUIUtil().onDraw(c, recyclerView, foreGroundView, dX, dY, actionState, isCurrentlyActive); + } + + @Override + public void clearView(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) { + View foreGroundView = ((BasketAdapter.BasketViewHolder) viewHolder).layoutForeGround; + getDefaultUIUtil().clearView(foreGroundView); + } +} diff --git a/app/src/main/java/com/capstone/foodify/Model/Food/Food.java b/app/src/main/java/com/capstone/foodify/Model/Food/Food.java index e880dc6..dc6532e 100644 --- a/app/src/main/java/com/capstone/foodify/Model/Food/Food.java +++ b/app/src/main/java/com/capstone/foodify/Model/Food/Food.java @@ -7,21 +7,10 @@ public class Food implements Comparable{ private String price; private String discount; private String description; - private String shopName; private String reviewCount; - - public String getReviewCount() { - return reviewCount; - } - - public void setReviewCount(String reviewCount) { - this.reviewCount = reviewCount; - } - public Food() { } - public Food(String id, String img, String name, String price, String shopName) { this.id = id; this.img = img; @@ -33,58 +22,51 @@ public class Food implements Comparable{ public String getId() { return id; } - public void setId(String id) { this.id = id; } - public String getImg() { return img; } - public void setImg(String img) { this.img = img; } - public String getName() { return name; } - public void setName(String name) { this.name = name; } - public String getPrice() { return price; } - public void setPrice(String price) { this.price = price; } - public String getDiscount() { return discount; } - public void setDiscount(String discount) { this.discount = discount; } - public String getDescription() { return description; } - public void setDescription(String description) { this.description = description; } public String getShopName() { return shopName; } - public void setShopName(String shopName) { this.shopName = shopName; } - + public String getReviewCount() { + return reviewCount; + } + public void setReviewCount(String reviewCount) { + this.reviewCount = reviewCount; + } @Override public int compareTo(Food food) { diff --git a/app/src/main/java/com/capstone/foodify/Model/Food/FoodFavoriteAdapter.java b/app/src/main/java/com/capstone/foodify/Model/Food/FoodFavoriteAdapter.java index c2cc565..68b9c34 100644 --- a/app/src/main/java/com/capstone/foodify/Model/Food/FoodFavoriteAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Model/Food/FoodFavoriteAdapter.java @@ -105,26 +105,14 @@ public class FoodFavoriteAdapter extends RecyclerView.Adapter() { @Override - public void onResponse(Call call, Response response) { + public void onResponse(@NonNull Call call, @NonNull Response response) { Toast.makeText(context, "Add successful!", Toast.LENGTH_SHORT).show(); } @Override - public void onFailure(Call call, Throwable t) { + public void onFailure(@NonNull Call call, @NonNull Throwable t) { Toast.makeText(context, "Error: " + t, Toast.LENGTH_SHORT).show(); } }); } - - private String convertFromStringToJson(Food foodDelete) throws JSONException { - - JSONObject jsonObject = new JSONObject(); - jsonObject.put("id", foodDelete.getId()); - jsonObject.put("name", foodDelete.getName()); - jsonObject.put("img", foodDelete.getImg()); - jsonObject.put("price", foodDelete.getPrice()); - jsonObject.put("shopName", foodDelete.getShopName()); - - return jsonObject.toString(); - } } diff --git a/app/src/main/java/com/capstone/foodify/Model/Food/FoodSearchAdapter.java b/app/src/main/java/com/capstone/foodify/Model/Food/FoodSearchAdapter.java index f8e4949..fcbb1e5 100644 --- a/app/src/main/java/com/capstone/foodify/Model/Food/FoodSearchAdapter.java +++ b/app/src/main/java/com/capstone/foodify/Model/Food/FoodSearchAdapter.java @@ -71,10 +71,10 @@ public class FoodSearchAdapter extends RecyclerView.Adapter - + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:context=".Fragment.BasketFragment" + android:id="@+id/list_basket_food_view" + > - - + android:orientation="vertical" + > - \ No newline at end of file + + + + + + + + + + + + + + + + +