From fe6836d8dfcf3ea7f442b3966345f0179a12acb4 Mon Sep 17 00:00:00 2001 From: Nezumi <123229563+Nez27@users.noreply.github.com> Date: Thu, 30 Mar 2023 09:43:50 +0700 Subject: [PATCH] Fix bug --- .idea/deploymentTargetDropDown.xml | 17 -------------- .../com/capstone/foodify/API/FoodApi.java | 2 +- .../capstone/foodify/API/FoodApiToken.java | 2 +- .../foodify/Activity/SignInActivity.java | 18 +++++++++++---- .../foodify/Fragment/SearchFragment.java | 5 +++++ .../java/com/capstone/foodify/Model/Role.java | 22 +++++++++++++++++++ .../java/com/capstone/foodify/Model/User.java | 9 ++++++++ 7 files changed, 52 insertions(+), 23 deletions(-) delete mode 100644 .idea/deploymentTargetDropDown.xml create mode 100644 app/src/main/java/com/capstone/foodify/Model/Role.java diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 43f6bd4..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file 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 af4c6c3..d56b5a9 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("http://192.168.1.183:8080/api/").addConverterFactory(GsonConverterFactory.create(gson)) + .baseUrl("https://foodify-backend-production.up.railway.app/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 880284a..74d337a 100644 --- a/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java +++ b/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java @@ -49,7 +49,7 @@ public interface FoodApiToken { FoodApiToken apiService = new Retrofit.Builder() .client(client) - .baseUrl("http://192.168.1.183:8080/api/").addConverterFactory(GsonConverterFactory.create(gson)) + .baseUrl("https://foodify-backend-production.up.railway.app/api/").addConverterFactory(GsonConverterFactory.create(gson)) .build() .create(FoodApiToken.class); 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 38a2793..bf8238c 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java @@ -169,18 +169,28 @@ public class SignInActivity extends AppCompatActivity { @Override public void onResponse(Call call, Response response) { if(response.code() == 200){ + User userData = response.body(); if(userData != null){ //Check user is lock or not if(!userData.isLocked()){ - Common.CURRENT_USER = userData; + //Check role account + if(userData.getRole().getRoleName().equals("ROLE_USER")){ + Common.CURRENT_USER = userData; - //Dismiss progress bar - progressLayout.setVisibility(View.GONE); + //Dismiss progress bar + progressLayout.setVisibility(View.GONE); - startActivity(new Intent(SignInActivity.this, MainActivity.class)); + startActivity(new Intent(SignInActivity.this, MainActivity.class)); + } 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(); + + //Dismiss progress bar + progressLayout.setVisibility(View.GONE); + } } else{ Toast.makeText(SignInActivity.this, "Tài khoản của bạn đã bị khoá!", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java index fe5bd2f..325e233 100644 --- a/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java +++ b/app/src/main/java/com/capstone/foodify/Fragment/SearchFragment.java @@ -178,6 +178,7 @@ public class SearchFragment extends Fragment { //If search not found if(listFoodSearch.size() == 0){ + end_of_list_text_view.setVisibility(View.GONE); searchNotFound.setVisibility(View.VISIBLE); progressBar.setVisibility(View.GONE); } @@ -245,6 +246,10 @@ public class SearchFragment extends Fragment { FoodApi.apiService.listFoodByCategory(statusCategoryChecked, page, LIMIT, "id", "asc").enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { + + searchNotFound.setVisibility(View.GONE); + end_of_list_text_view.setVisibility(View.GONE); + //Init total page and total elements value LAST_PAGE = response.body().getPage().isLast(); loadFoodAdapter(response); diff --git a/app/src/main/java/com/capstone/foodify/Model/Role.java b/app/src/main/java/com/capstone/foodify/Model/Role.java new file mode 100644 index 0000000..dafa341 --- /dev/null +++ b/app/src/main/java/com/capstone/foodify/Model/Role.java @@ -0,0 +1,22 @@ +package com.capstone.foodify.Model; + +public class Role { + private int id; + private String roleName; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getRoleName() { + return roleName; + } + + public void setRoleName(String roleName) { + this.roleName = roleName; + } +} diff --git a/app/src/main/java/com/capstone/foodify/Model/User.java b/app/src/main/java/com/capstone/foodify/Model/User.java index ee8547e..b4108c6 100644 --- a/app/src/main/java/com/capstone/foodify/Model/User.java +++ b/app/src/main/java/com/capstone/foodify/Model/User.java @@ -17,6 +17,7 @@ public class User implements Serializable { private boolean isLocked; private String phoneNumber; private String roleName; + private Role role; private int defaultAddress; private List
addresses; @@ -128,4 +129,12 @@ public class User implements Serializable { public void setAddresses(List
addresses) { this.addresses = addresses; } + + public Role getRole() { + return role; + } + + public void setRole(Role role) { + this.role = role; + } }