nezumi/Foodify
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/Foodify.git synced 2026-09-22 20:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add comment function

Browse Source
This commit is contained in:
Nezumi
2023-03-28 20:44:30 +07:00
parent d38434952f
commit 14db095a9e
16 changed files with 259 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/capstone/foodify/API/FoodApi.java
+4
View File
@@ -1,6 +1,7 @@
package com.capstone.foodify.API;
import com.capstone.foodify.Model.Category;
import com.capstone.foodify.Model.Comment;
import com.capstone.foodify.Model.DistrictWardResponse;
import com.capstone.foodify.Model.Food;
import com.capstone.foodify.Model.Response.Comments;
@@ -82,4 +83,7 @@ public interface FoodApi {
@GET("products/{productId}/comments")
Call<Comments> getCommentByProductId(@Path("productId") int productId, @Query("pageNo") int pageNo, @Query("pageSize") int pageSize, @Query("sortBy") String sortBy, @Query("sortDir") String sortDir);
@GET("products/{productId}/users/{userId}")
Call<Comment> getUserComment(@Path("productId") int productId, @Path("userId") int userId);
}
app/src/main/java/com/capstone/foodify/API/FoodApiToken.java
+3
View File
@@ -89,4 +89,7 @@ public interface FoodApiToken {
@DELETE("products/{productId}/comments/{commentId}")
Call<CustomResponse> deleteComment(@Path("productId") int productId, @Path("commentId") int commentId);
@PUT("products/{productId}/comments/{commentId}")
Call<CustomResponse> updateComment(@Path("productId") int productId, @Path("commentId") int commentId, @Body Comment comment);
}
app/src/main/java/com/capstone/foodify/Activity/AccountAndProfileActivity.java
+3 -1
View File
@@ -43,6 +43,7 @@ import com.google.firebase.storage.UploadTask;
import com.makeramen.roundedimageview.RoundedImageView;
import com.squareup.picasso.Picasso;
import com.thecode.aestheticdialogs.AestheticDialog;
import com.thecode.aestheticdialogs.DialogAnimation;
import com.thecode.aestheticdialogs.DialogStyle;
import com.thecode.aestheticdialogs.DialogType;
import com.thecode.aestheticdialogs.OnDialogClickListener;
@@ -295,9 +296,10 @@ public class AccountAndProfileActivity extends AppCompatActivity {
}
private void showDialogCaution() {
new AestheticDialog.Builder(this, DialogStyle.RAINBOW, DialogType.WARNING)
new AestheticDialog.Builder(this, DialogStyle.FLAT, DialogType.WARNING)
.setTitle("Email chưa được xác thực!")
.setMessage("Vui lòng xác thực email để bạn có thể thực hiện việc lấy lại mật khẩu nếu quên!")
.setAnimation(DialogAnimation.SHRINK)
.setCancelable(true)
.show();
}
app/src/main/java/com/capstone/foodify/Activity/AddressManagerActivity.java
+2
View File
@@ -362,6 +362,8 @@ public class AddressManagerActivity extends AppCompatActivity {
//Create dialog
customViewDialog.Builder(this);
customViewDialog.setDialogBackgroundColor(getResources().getColor(R.color.white, null));
if(oldAddress == null){
//If this is the create address form
app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java
+179 -31
View File
@@ -19,6 +19,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.cardview.widget.CardView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.widget.NestedScrollView;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -41,6 +42,9 @@ import com.denzcoskun.imageslider.models.SlideModel;
import com.mcdev.quantitizerlibrary.AnimationStyle;
import com.mcdev.quantitizerlibrary.HorizontalQuantitizer;
import com.mcdev.quantitizerlibrary.QuantitizerListener;
import com.sjapps.library.customdialog.BasicDialog;
import com.sjapps.library.customdialog.DialogButtonEvent;
import com.sjapps.library.customdialog.DialogButtonEvents;
import com.willy.ratingbar.RotationRatingBar;
import com.willy.ratingbar.ScaleRatingBar;
@@ -52,6 +56,7 @@ import retrofit2.Callback;
import retrofit2.Response;
public class FoodDetailActivity extends AppCompatActivity {
ArrayList<Comment> listComment = new ArrayList<>();
private static final int ACTION_CODE = 0;
private static final int CREATE_COMMENT = 1;
private static final int EDIT_COMMENT = 2;
@@ -62,7 +67,7 @@ public class FoodDetailActivity extends AppCompatActivity {
private static boolean LAST_PAGE;
private HorizontalQuantitizer horizontalQuantitizer;
private ImageSlider imageSlider;
private ImageView back_image, not_favorite, is_favorite, delete_button;
private ImageView back_image, not_favorite, is_favorite, delete_button, edt_button;
private String foodId = "";
private Food food;
private TextView foodName_txt, shopName_txt, discount_txt, price_txt, countRating_txt, description_content_txt, endOfListText,
@@ -77,14 +82,10 @@ public class FoodDetailActivity extends AppCompatActivity {
private ConstraintLayout progressLayout;
private NestedScrollView nestedScrollView;
private ProgressBar progressBar;
private CardView user_comment_layout;
private Comment commentUser = null;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_food_detail);
//Init Component
private void initComponent() {
horizontalQuantitizer = findViewById(R.id.quantity_option);
imageSlider = findViewById(R.id.slider);
back_image = findViewById(R.id.back_image);
@@ -109,7 +110,17 @@ public class FoodDetailActivity extends AppCompatActivity {
contentComment = findViewById(R.id.comment_user);
ratingBarComment = findViewById(R.id.rating_bar_comment);
delete_button = findViewById(R.id.delete_button);
user_comment_layout = findViewById(R.id.user_comment_layout);
edt_button = findViewById(R.id.edit_button);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_food_detail);
//Init Component
initComponent();
commentAdapter = new CommentAdapter(this);
@@ -126,6 +137,8 @@ public class FoodDetailActivity extends AppCompatActivity {
hideUI();
if(Common.CURRENT_USER == null){
is_favorite.setVisibility(View.GONE);
not_favorite.setVisibility(View.GONE);
@@ -219,11 +232,20 @@ public class FoodDetailActivity extends AppCompatActivity {
});
}
//Edit button
edt_button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
openCommentDialog(Gravity.CENTER, EDIT_COMMENT);
}
});
//Delete comment
delete_button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(commentUser != null)
showDeleteDialogConfirm();
}
});
}
@@ -307,13 +329,48 @@ public class FoodDetailActivity extends AppCompatActivity {
}
}
private List<Comment> getListComment(int page) {
ArrayList<Comment> listComment = new ArrayList<>();
private void getCommentUser(){
FoodApi.apiService.getUserComment(Integer.parseInt(foodId), Common.CURRENT_USER.getId()).enqueue(new Callback<Comment>() {
@Override
public void onResponse(Call<Comment> call, Response<Comment> response) {
if(response.code() == 200){
//Have user comment
Comment commentData = response.body();
if(commentData != null){
//Init data
commentUser = commentData;
userNameComment.setText(Common.CURRENT_USER.getFullName());
ratingBarComment.setRating(commentData.getRating());
contentComment.setText(commentData.getContent());
showUI();
rating_button.setVisibility(View.GONE);
}
} else if(response.code() == 404){
//Don't have user comment
user_comment_layout.setVisibility(View.GONE);
showUI();
} else {
Toast.makeText(FoodDetailActivity.this, "Có lỗi từ hệ thống! Mã lỗi: " + response.code(), Toast.LENGTH_SHORT).show();
showUI();
}
}
@Override
public void onFailure(Call<Comment> call, Throwable t) {
showUI();
Common.showErrorServerNotification(FoodDetailActivity.this, "Lỗi kết nối!");
}
});
}
private List<Comment> getListComment(int page) {
FoodApi.apiService.getCommentByProductId(Integer.parseInt(foodId), page, PAGE_SIZE, SORT_BY, SORT_DIR).enqueue(new Callback<Comments>() {
@Override
public void onResponse(Call<Comments> call, Response<Comments> response) {
if(response.code() == 200){
List<Comment> tempCommentList = response.body().getComments();
//Init data
@@ -326,22 +383,20 @@ public class FoodDetailActivity extends AppCompatActivity {
}
//Get user's comment
for(Comment tempComment: listComment){
if(tempComment.getUser().getEmail().equals(Common.CURRENT_USER.getEmail())){
//Init data comment
userNameComment.setText(Common.CURRENT_USER.getFullName());
ratingBarComment.setRating(tempComment.getRating());
contentComment.setText(tempComment.getContent());
if(Common.CURRENT_USER != null){
for(Comment tempComment: listComment){
if(tempComment.getUser().getEmail().equals(Common.CURRENT_USER.getEmail())){
//Remove comment from list
listComment.remove(tempComment);
//Remove comment from list
listComment.remove(tempComment);
//Remove button comment
rating_button.setVisibility(View.GONE);
break;
//Remove button comment
rating_button.setVisibility(View.GONE);
break;
}
}
}
if(listComment.size() == 0)
endOfListText.setVisibility(View.GONE);
@@ -359,7 +414,6 @@ public class FoodDetailActivity extends AppCompatActivity {
return listComment;
}
private void hideUI() {
content_view.setVisibility(View.GONE);
}
@@ -377,10 +431,10 @@ public class FoodDetailActivity extends AppCompatActivity {
description_content_txt.setText(food.getDescription());
ratingBar.setRating(food.getAverageRating());
if(food.getCommentCount() == null || Integer.parseInt(food.getCommentCount()) == 0){
if(food.getReviewCount() == null || Integer.parseInt(food.getReviewCount()) == 0){
countRating_txt.setText("Chưa có bình luận nào!");
} else {
countRating_txt.setText(food.getCommentCount() + " rating");
countRating_txt.setText(food.getReviewCount() + " đánh giá");
}
@@ -432,7 +486,9 @@ public class FoodDetailActivity extends AppCompatActivity {
else
notFavoriteIcon();
showUI();
getCommentUser();
}
@Override
@@ -497,9 +553,11 @@ public class FoodDetailActivity extends AppCompatActivity {
Button cancel = dialog.findViewById(R.id.cancel_button);
if(actionCode == EDIT_COMMENT){
//TODO Edit comment
//Init data
if(commentUser != null){
ratingBar.setRating(commentUser.getRating());
comment_content.setText(commentUser.getContent());
}
}
@@ -515,6 +573,7 @@ public class FoodDetailActivity extends AppCompatActivity {
confirm.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
progressLayout.setVisibility(View.VISIBLE);
if(actionCode == CREATE_COMMENT){
//Create comment
@@ -524,6 +583,18 @@ public class FoodDetailActivity extends AppCompatActivity {
public void onResponse(Call<Comment> call, Response<Comment> response) {
if(response.code() == 201){
Toast.makeText(FoodDetailActivity.this, "Đã thêm bình luận thành công!", Toast.LENGTH_SHORT).show();
//Init data
getCommentUser();
//Show comment layout and hide rating button when comment completed!
user_comment_layout.setVisibility(View.VISIBLE);
rating_button.setVisibility(View.GONE);
dialog.dismiss();
} else {
Toast.makeText(FoodDetailActivity.this, "Lỗi hệ thống! Mã lỗi: " + response.code(), Toast.LENGTH_SHORT).show();
}
}
@@ -534,6 +605,34 @@ public class FoodDetailActivity extends AppCompatActivity {
});
} else if(actionCode == EDIT_COMMENT){
//Edit comment
if(commentUser != null){
//Create object comment
Comment newComment = new Comment(comment_content.getText().toString(), ratingBar.getRating(), Common.CURRENT_USER.getId());
FoodApiToken.apiService.updateComment(Integer.parseInt(foodId), commentUser.getId(), newComment).enqueue(new Callback<CustomResponse>() {
@Override
public void onResponse(Call<CustomResponse> call, Response<CustomResponse> response) {
if(response.code() == 200){
Toast.makeText(FoodDetailActivity.this, "Đã cập nhật bình luận thành công!", Toast.LENGTH_SHORT).show();
ratingBarComment.setRating(ratingBar.getRating());
contentComment.setText(comment_content.getText().toString());
dialog.dismiss();
progressLayout.setVisibility(View.GONE);
} else {
Toast.makeText(FoodDetailActivity.this, "Đã có lỗi hệ thống! Mã lỗi: " + response.code(), Toast.LENGTH_SHORT).show();
}
}
@Override
public void onFailure(Call<CustomResponse> call, Throwable t) {
Toast.makeText(FoodDetailActivity.this, "Đã có lỗi kết nối đến hệ thống!", Toast.LENGTH_SHORT).show();
}
});
}
}
@@ -542,9 +641,58 @@ public class FoodDetailActivity extends AppCompatActivity {
dialog.show();
}
private void deleteComment(){
//TODO Delete comment
FoodApiToken.apiService.deleteComment(Integer.parseInt(foodId), commentUser.getId()).enqueue(new Callback<CustomResponse>() {
@Override
public void onResponse(Call<CustomResponse> call, Response<CustomResponse> response) {
if(response.code() == 200){
CustomResponse responseData = response.body();
if(responseData != null){
if(responseData.isTrue()){
Toast.makeText(FoodDetailActivity.this, "Đã xoá bình luận thành công!", Toast.LENGTH_SHORT).show();
//Remove layout comment
rating_button.setVisibility(View.VISIBLE);
user_comment_layout.setVisibility(View.GONE);
commentUser = null;
}
}
} else {
Toast.makeText(FoodDetailActivity.this, "Lỗi hệ thống! Mã lỗi: " + response.code(), Toast.LENGTH_SHORT).show();
}
}
@Override
public void onFailure(Call<CustomResponse> call, Throwable t) {
Toast.makeText(FoodDetailActivity.this, "Đã có lỗi kết nối tới hệ thống!", Toast.LENGTH_SHORT).show();
}
});
}
private void showDeleteDialogConfirm(){
BasicDialog dialog = new BasicDialog();
dialog.Builder(this)
.setTitle("Xác nhận xoá bình luận?")
.setLeftButtonText("Có")
.setRightButtonText("Không")
.setDialogBackgroundColor(getResources().getColor(R.color.white, null))
.setLeftButtonColor(getResources().getColor(R.color.primaryColor, null))
.setRightButtonColor(getResources().getColor(R.color.gray, null))
.onButtonClick(new DialogButtonEvents() {
@Override
public void onLeftButtonClick() {
deleteComment();
dialog.dismiss();
}
@Override
public void onRightButtonClick() {
dialog.dismiss();
}
})
.show();
}
private void dataLoadMore() {
if(!LAST_PAGE){
app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
+5
View File
@@ -373,6 +373,11 @@ public class MainActivity extends AppCompatActivity {
super.onPause();
if (mRequestingLocationUpdates) {
stopLocationUpdates();
if(Common.CURRENT_LOCATION == null){
if(mCurrentLocation != null)
Common.CURRENT_LOCATION = mCurrentLocation;
}
}
}
app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java
+20
View File
@@ -0,0 +1,20 @@
package com.capstone.foodify.Fragment.Order;
import android.os.Bundle;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.capstone.foodify.R;
public class CancelOrderFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_cancel_order, container, false);
}
}
app/src/main/java/com/capstone/foodify/Fragment/Order/ViewPagerAdapter.java
+3 -1
View File
@@ -21,6 +21,8 @@ public class ViewPagerAdapter extends FragmentStateAdapter {
return new ShipOrderFragment();
case 3:
return new CompleteOrderFragment();
case 4:
return new CancelOrderFragment();
default:
return new ProcessOderFragment();
}
@@ -28,6 +30,6 @@ public class ViewPagerAdapter extends FragmentStateAdapter {
@Override
public int getItemCount() {
return 4;
return 5;
}
}
app/src/main/java/com/capstone/foodify/Model/Food.java
+6 -6
View File
@@ -10,7 +10,7 @@ public class Food implements Comparable<Food>{
private float discountPercent;
private float cost;
private float averageRating;
private String commentCount;
private String reviewCount;
private Shop shop;
private List<Category> categories;
private List<Image> images;
@@ -74,12 +74,12 @@ public class Food implements Comparable<Food>{
this.averageRating = averageRating;
}
public String getCommentCount() {
return commentCount;
public String getReviewCount() {
return reviewCount;
}
public void setCommentCount(String commentCount) {
this.commentCount = commentCount;
public void setReviewCount(String reviewCount) {
this.reviewCount = reviewCount;
}
public Shop getShop() {
@@ -132,7 +132,7 @@ public class Food implements Comparable<Food>{
", discountPercent=" + discountPercent +
", cost=" + cost +
", averageRating=" + averageRating +
", commentCount='" + commentCount + '\'' +
", commentCount='" + reviewCount + '\'' +
", shop=" + shop +
", categories=" + categories +
", images=" + images +
app/src/main/res/drawable/baseline_delete_24_white.xml
+5
View File
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
</vector>
app/src/main/res/layout/activity_food_detail.xml
+3 -1
View File
@@ -294,6 +294,7 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/add_to_basket_button"
app:layout_constraintStart_toStartOf="parent"
android:gravity="center_horizontal"
>
<Button
@@ -307,6 +308,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:drawableLeft="@drawable/pencil"
/>
</LinearLayout>
@@ -453,7 +455,7 @@
android:layout_height="match_parent"
android:background="#80000000"
android:id="@+id/progress_layout"
android:visibility="gone"
android:visibility="visible"
>
<ProgressBar
app/src/main/res/layout/activity_order.xml
+7
View File
@@ -42,7 +42,9 @@
android:id="@+id/tab_layout"
style="@style/MyCustomTabLayout"
android:layout_below="@id/header"
app:tabGravity="center"
app:tabIndicatorColor="@color/primaryColor"
app:tabMode="scrollable"
>
<com.google.android.material.tabs.TabItem
@@ -65,6 +67,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<com.google.android.material.tabs.TabItem
android:text="Đã huỷ"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</com.google.android.material.tabs.TabLayout>
<androidx.viewpager2.widget.ViewPager2
app/src/main/res/layout/fragment_cancel_order.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Fragment.Order.CancelOrderFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/hello_blank_fragment" />
</FrameLayout>
app/src/main/res/layout/item_food_basket.xml
+2 -2
View File
@@ -17,7 +17,7 @@
android:textColor="@color/white"
android:fontFamily="@font/opensans"
android:text="@string/delete"
android:textSize="20sp"
android:textSize="15sp"
android:textStyle="bold"
android:layout_toStartOf="@id/img_delete"
android:layout_centerVertical="true"
@@ -30,7 +30,7 @@
android:id="@+id/img_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/baseline_delete_24"
android:src="@drawable/baseline_delete_24_white"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
app/src/main/res/layout/item_food_favorite.xml
+2 -2
View File
@@ -17,7 +17,7 @@
android:textColor="@color/white"
android:fontFamily="@font/opensans"
android:text="@string/delete"
android:textSize="20sp"
android:textSize="15sp"
android:textStyle="bold"
android:layout_toStartOf="@id/img_delete"
android:layout_centerVertical="true"
@@ -30,7 +30,7 @@
android:id="@+id/img_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/baseline_delete_24"
android:src="@drawable/baseline_delete_24_white"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"