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

Fix bug and improve layout

Browse Source
This commit is contained in:
Nezumi
2023-03-30 22:04:15 +07:00
parent 19983d5bd1
commit fe2aa91d40
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/capstone/foodify/Activity/FoodDetailActivity.java
+9 -6
View File
@@ -189,7 +189,10 @@ public class FoodDetailActivity extends AppCompatActivity {
rating_button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openCommentDialog(Gravity.CENTER, CREATE_COMMENT);
if(Common.CURRENT_USER != null)
openCommentDialog(Gravity.CENTER, CREATE_COMMENT);
else
startActivity(new Intent(FoodDetailActivity.this, SignInActivity.class));
}
});
@@ -350,6 +353,8 @@ public class FoodDetailActivity extends AppCompatActivity {
ratingBarComment.setRating(commentData.getRating());
contentComment.setText(commentData.getContent());
user_comment_layout.setVisibility(View.VISIBLE);
showUI();
rating_button.setVisibility(View.GONE);
@@ -502,9 +507,6 @@ public class FoodDetailActivity extends AppCompatActivity {
else
notFavoriteIcon();
getCommentUser();
}
@Override
@@ -524,9 +526,10 @@ public class FoodDetailActivity extends AppCompatActivity {
initData();
if(Common.CURRENT_USER != null)
if(Common.CURRENT_USER != null){
checkFoodIsFavorite(Integer.parseInt(foodId));
else
getCommentUser();
} else
showUI();
}
app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
+1 -1
View File
@@ -388,7 +388,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
@Override
public void onClick(@NonNull AestheticDialog.Builder builder) {
Common.LIST_BASKET_FOOD.clear();
startActivity(new Intent(OrderCheckOutActivity.this, MainActivity.class));
startActivity(new Intent(OrderCheckOutActivity.this, OrderActivity.class));
builder.dismiss();
finish();
}
app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
+2 -8
View File
@@ -84,12 +84,6 @@ public class HomeFragment extends Fragment {
return view;
}
@Override
public void onDestroy() {
super.onDestroy();
System.out.println("Main activity destroy!");
}
@Override
public void onResume() {
super.onResume();
@@ -133,8 +127,8 @@ public class HomeFragment extends Fragment {
private List<Menu> getListMenu() {
List<Menu> listMenu = new ArrayList<>();
listMenu.add(new Menu("Recommend Food", listFood));
listMenu.add(new Menu("Popular Food", recentFood));
listMenu.add(new Menu("Món ăn khuyến nghị", listFood));
listMenu.add(new Menu("Món ăn phổ biến", recentFood));
return listMenu;
}
app/src/main/res/layout/activity_food_detail.xml
+1
View File
@@ -338,6 +338,7 @@
app:layout_constraintTop_toBottomOf="@id/linear_layout_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:visibility="gone"
android:id="@+id/user_comment_layout"
>
app/src/main/res/layout/item_order.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:id="@+id/order_tracking_number"
android:text="Order #123456789"
android:fontFamily="@font/bebas"
android:textColor="@color/black"
android:textColor="@color/primaryColor"
android:textSize="25sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"