diff --git a/app/build.gradle b/app/build.gradle index bd61afd..51ba435 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,7 +26,7 @@ android { minSdk 26 targetSdk 32 versionCode 1 - versionName "0.5.2" + versionName "0.5.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" signingConfig signingConfigs.release diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 8b7bc24..ca8470b 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 35b386e..157ddb1 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 1, - "versionName": "0.5.2", + "versionName": "0.5.4", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/capstone/foodify/Activity/TrackingOrderActivity.java b/app/src/main/java/com/capstone/foodify/Activity/TrackingOrderActivity.java index da073de..8e416f4 100644 --- a/app/src/main/java/com/capstone/foodify/Activity/TrackingOrderActivity.java +++ b/app/src/main/java/com/capstone/foodify/Activity/TrackingOrderActivity.java @@ -151,6 +151,7 @@ public class TrackingOrderActivity extends FragmentActivity implements OnMapRead mMap.getUiSettings().setMapToolbarEnabled(true); mMap.getUiSettings().setCompassEnabled(true); + mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(16.054407,108.202164), 10)); trackingLocation(); } @@ -173,7 +174,7 @@ public class TrackingOrderActivity extends FragmentActivity implements OnMapRead if(shippingMarker == null){ shippingMarker = mMap.addMarker(new MarkerOptions() .position(latLng) - .title("Người giao") + .title("Shipper") .icon(BitmapDescriptorFactory.fromResource(R.drawable.shipper))); } else { shippingMarker.setPosition(latLng); diff --git a/app/src/main/java/com/capstone/foodify/Common.java b/app/src/main/java/com/capstone/foodify/Common.java index 6cabb27..dc9edfc 100644 --- a/app/src/main/java/com/capstone/foodify/Common.java +++ b/app/src/main/java/com/capstone/foodify/Common.java @@ -37,6 +37,7 @@ public class Common { public static String FCM_TOKEN = null; 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%2Fuser-default-01.png?alt=media&token=b13f27da-b39a-4d89-9cba-acba869d60ce"; public static final String MAP_API = "AIzaSyAY14Ic32UP26Hg6GILznOfbBihiY5BUxw"; public static final String FORMAT_DATE="dd-MM-yyyy"; public static final String VALID_EMAIL_ADDRESS_REGEX = "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$"; 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 b4108c6..ad49a9f 100644 --- a/app/src/main/java/com/capstone/foodify/Model/User.java +++ b/app/src/main/java/com/capstone/foodify/Model/User.java @@ -1,5 +1,6 @@ package com.capstone.foodify.Model; +import com.capstone.foodify.Common; import com.google.gson.annotations.SerializedName; import java.io.Serializable; @@ -27,7 +28,7 @@ public class User implements Serializable { this.email = email; this.fullName = fullName; this.identifiedCode = identifiedCode; - this.imageUrl = ""; + this.imageUrl = Common.DEFAULT_IMAGE_URL; this.phoneNumber = phoneNumber; this.roleName = "ROLE_USER"; this.isLocked = false; diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml index 48a6195..16b36da 100644 --- a/app/src/main/res/layout/item_order.xml +++ b/app/src/main/res/layout/item_order.xml @@ -22,7 +22,7 @@ android:text="Order #123456789" android:fontFamily="@font/koho_bold" android:textColor="@color/primaryColor" - android:textSize="20sp" + android:textSize="18sp" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent"