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

Change ip api url

Browse Source
This commit is contained in:
Nezumi
2023-03-17 10:20:10 +07:00
parent e0141d0520
commit 3c6f837ab2
6 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/capstone/foodify/API/FoodApiToken.java
+1 -1
View File
@@ -41,7 +41,7 @@ public interface FoodApiToken {
FoodApiToken apiService = new Retrofit.Builder()
.client(client)
.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(FoodApiToken.class);
app/src/main/java/com/capstone/foodify/Activity/MainActivity.java
+3 -1
View File
@@ -47,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
// Check if user is signed in (non-null) and update UI accordingly.
user = mAuth.getCurrentUser();
if(user != null){
if(user != null && Common.CURRENT_USER == null){
user.getIdToken(true)
.addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
@Override
@@ -96,10 +96,12 @@ public class MainActivity extends AppCompatActivity {
bottomNavigation();
}
private void initComponent() {
bottomNavigationView = findViewById(R.id.bottom_nav);
viewPager2 = findViewById(R.id.viewPager);
}
private void bottomNavigation() {
viewPagerAdapter = new ViewPagerAdapter(this);
viewPager2.setAdapter(viewPagerAdapter);
app/src/main/java/com/capstone/foodify/Activity/SignInActivity.java
+18
View File
@@ -12,6 +12,7 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.capstone.foodify.API.FoodApi;
import com.capstone.foodify.API.FoodApiToken;
import com.capstone.foodify.Common;
import com.capstone.foodify.Model.User;
import com.capstone.foodify.R;
@@ -168,6 +169,23 @@ public class SignInActivity extends AppCompatActivity {
if(task.isSuccessful()){
Common.TOKEN = task.getResult().getToken();
//Get user from database
FoodApiToken.apiService.getUserFromEmail(user.getEmail()).enqueue(new Callback<User>() {
@Override
public void onResponse(Call<User> call, Response<User> response) {
User userData = response.body();
if(userData != null){
Common.CURRENT_USER = userData;
}
}
@Override
public void onFailure(Call<User> call, Throwable t) {
System.out.println("ERROR: " + t);
Common.showErrorServerNotification(SignInActivity.this);
}
});
//Dismiss progress bar
progressLayout.setVisibility(View.GONE);
app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class HomeFragment extends Fragment {
menuAdapter = new MenuAdapter(getContext());
recyclerView_restaurant = view.findViewById(R.id.recycler_view_restaurant);
shopAdapter = new ShopAdapter(getContext());
progressLayout = view.findViewById(R.id.progress_layout);
progressLayout = getActivity().findViewById(R.id.progress_layout);
if(listFood.isEmpty() || recentFood.isEmpty()){