From f4401ef646faec3ed0ffa57b5ac4bdc723866cb8 Mon Sep 17 00:00:00 2001
From: Nezumi <123229563+Nez27@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:01:56 +0700
Subject: [PATCH] Improve UI
---
.../com/capstone/foodify/API/FoodApi.java | 2 +-
.../capstone/foodify/API/FoodApiToken.java | 2 +-
.../Activity/OrderCheckOutActivity.java | 8 +-
.../foodify/Activity/SignUpActivity.java | 22 +-
app/src/main/res/layout/activity_sign_up.xml | 685 +++++++++---------
5 files changed, 366 insertions(+), 353 deletions(-)
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 48f5a02..83860fa 100644
--- a/app/src/main/java/com/capstone/foodify/API/FoodApi.java
+++ b/app/src/main/java/com/capstone/foodify/API/FoodApi.java
@@ -29,7 +29,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 70f9fbc..f79033d 100644
--- a/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java
+++ b/app/src/main/java/com/capstone/foodify/API/FoodApiToken.java
@@ -46,7 +46,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/OrderCheckOutActivity.java b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
index ecef400..60c6a50 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
@@ -197,8 +197,6 @@ public class OrderCheckOutActivity extends AppCompatActivity {
disableAllInputAddressOption();
getDistanceAndCalculateShipCost(finalAddress);
-
- progress_layout.setVisibility(View.GONE);
}
}
});
@@ -221,6 +219,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
@SuppressLint("SetTextI18n")
@Override
public void onClick(View v) {
+ progress_layout.setVisibility(View.VISIBLE);
//Check address is null or not
if(finalAddress != null){
@@ -255,6 +254,8 @@ public class OrderCheckOutActivity extends AppCompatActivity {
}
})
.show();
+
+ progress_layout.setVisibility(View.GONE);
}
});
@@ -267,6 +268,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
.setMessage("Huỷ thanh toán thành công!")
.setCancelable(true)
.show();
+ progress_layout.setVisibility(View.GONE);
}
@Override
@@ -284,6 +286,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
}
})
.show();
+ progress_layout.setVisibility(View.GONE);
}
});
}
@@ -293,6 +296,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
}
} else {
Toast.makeText(OrderCheckOutActivity.this, "Bạn chưa chọn địa chỉ!", Toast.LENGTH_SHORT).show();
+ progress_layout.setVisibility(View.GONE);
}
}
});
diff --git a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java
index 40c02b9..ab23812 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/SignUpActivity.java
@@ -357,29 +357,27 @@ public class SignUpActivity extends AppCompatActivity {
}
@Override
- public void onVerificationFailed(@NonNull FirebaseException e) {
- // ...
- loadCompleted();
- showError(e.toString());
- }
- })
- .build();
+ public void onVerificationFailed(@NonNull FirebaseException e) {
+ // ...
+ loadCompleted();
+ showError(e.toString());
+ }
+})
+ .build();
PhoneAuthProvider.verifyPhoneNumber(options);
// [END auth_test_phone_verify]
- }
+ }
- private void showError(String msg){
+private void showError(String msg){
errorText.setText(msg);
- }
+ }
private void loading(){
progressLayout.setVisibility(View.VISIBLE);
- signUpButton.setEnabled(false);
}
private void loadCompleted() {
progressLayout.setVisibility(View.GONE);
- signUpButton.setEnabled(true);
}
private void getListDistrict() {
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 094b54a..e48934e 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:clickable="false"
+ >
+ android:layout_height="wrap_content">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
\ No newline at end of file