mirror of
https://github.com/Nezumi-2711/Foodify.git
synced 2026-09-22 13:38:41 +00:00
Update new version
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
Binary file not shown.
@@ -12,7 +12,7 @@
|
||||
"filters": [],
|
||||
"attributes": [],
|
||||
"versionCode": 1,
|
||||
"versionName": "0.5.2",
|
||||
"versionName": "0.5.4",
|
||||
"outputFile": "app-release.apk"
|
||||
}
|
||||
],
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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}$";
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user