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

Fix UI

Browse Source
This commit is contained in:
Nezumi
2023-05-18 16:33:46 +07:00
parent 286aa9cf7d
commit 01cba1400f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/release/foodify.apk
BIN
View File
Binary file not shown.
app/src/main/java/com/capstone/foodify/Activity/OrderCheckOutActivity.java
+2 -2
View File
@@ -218,7 +218,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
finalAddress = null;
confirm_address_button.setEnabled(true);
confirm_address_button.setVisibility(View.VISIBLE);
change_address_button.setVisibility(View.GONE);
enabledAllInputAddressOption();
@@ -266,7 +266,7 @@ public class OrderCheckOutActivity extends AppCompatActivity {
Toast.makeText(OrderCheckOutActivity.this, "Bạn chưa xác nhận địa chỉ!", Toast.LENGTH_SHORT).show();
} else {
progress_layout.setVisibility(View.VISIBLE);
confirm_address_button.setEnabled(false);
confirm_address_button.setVisibility(View.GONE);
change_address_button.setVisibility(View.VISIBLE);
disableAllInputAddressOption();
app/src/main/java/com/capstone/foodify/Common.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class Common {
public static Location CURRENT_LOCATION = null;
public static FirebaseUser FIREBASE_USER = null;
public static final String DEFAULT_IMAGE_URL = "https://firebasestorage.googleapis.com/v0/b/foodify-55954.appspot.com/o/Admin%2Fdefault%2Fdefault-ava-01.png?alt=media";
public static final String MAP_API = "YOUR_API_GOOGLE_MAP";
public static final String MAP_API = "YOUR_API";
public static final String FORMAT_DATE="yyyy-MM-dd";
public static final String VALID_EMAIL_ADDRESS_REGEX = "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$";
public static final String PHONE_CODE = "+84";
app/src/main/res/layout/activity_order_check_out.xml
+5 -5
View File
@@ -319,7 +319,7 @@
android:fontFamily="@font/koho_bold"
android:textAllCaps="false"
android:backgroundTint="@color/primaryColor"
android:layout_width="120dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -328,10 +328,10 @@
<Button
android:id="@+id/change_address_button"
android:text="Thay đổi"
android:text="THAY ĐỔI"
android:textAllCaps="false"
android:backgroundTint="@color/secondary"
android:layout_width="120dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -343,10 +343,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:layout_marginTop="70dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
app:layout_constraintTop_toBottomOf="@id/confirm_address_button"
app:layout_constraintTop_toBottomOf="@id/address_option"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:id="@+id/distance_layout"