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

Fix bug

Browse Source
This commit is contained in:
Nezumi
2023-05-18 16:37:02 +07:00
parent 75e882214f
commit 7e5fd06c2b
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+13 -2
View File
@@ -5,6 +5,16 @@ plugins {
}
android {
signingConfigs {
release {
storeFile file('D:\\Capstone-Project\\mykeystore\\foodify-shipper.jks')
storePassword 'Phanhuuloi2@@1'
keyAlias 'foodify-shipper'
keyPassword 'Phanhuuloi2@@1'
}
}
namespace 'com.capstone.foodify.shipper'
compileSdk 31
@@ -34,6 +44,7 @@ android {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release
}
}
compileOptions {
@@ -76,6 +87,6 @@ dependencies {
// ADD the API-only library to all variants
implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta08'
implementation(project(':aestheticdialogs'))
implementation(project(':SJDialog'))
implementation 'com.github.gabriel-TheCode:AestheticDialogs:1.3.6'
implementation 'com.github.SlaVcE14:SJ-Dialog:1.6'
}
app/src/main/java/com/capstone/foodify/shipper/Activity/OrderDetailActivity.java
+8 -8
View File
@@ -208,7 +208,14 @@ public class OrderDetailActivity extends AppCompatActivity {
geofencingClient = LocationServices.getGeofencingClient(this);
geofenceHelper = new GeofenceHelper(this);
if(!order.getStatus().equals(COMPLETE_STATUS) || !order.getStatus().equals(CANCEL_STATUS)){
if(order.getStatus().equals(COMPLETE_STATUS) || order.getStatus().equals(CANCEL_STATUS)){
btn_call.setVisibility(View.GONE);
btn_shipping.setVisibility(View.GONE);
btn_cancel_order.setVisibility(View.GONE);
btn_confirm_ship_completed.setVisibility(View.GONE);
progressLayout.setVisibility(View.GONE);
} else {
getLocation();
final Handler handler = new Handler(Looper.getMainLooper());
@@ -225,13 +232,6 @@ public class OrderDetailActivity extends AppCompatActivity {
}
}
}, 5000);
} else {
btn_call.setVisibility(View.GONE);
btn_shipping.setVisibility(View.GONE);
btn_cancel_order.setVisibility(View.GONE);
btn_confirm_ship_completed.setVisibility(View.GONE);
progressLayout.setVisibility(View.GONE);
}
}
app/src/main/java/com/capstone/foodify/shipper/Common.java
+2 -2
View File
@@ -30,8 +30,8 @@ public class Common {
public static FirebaseUser FIREBASE_USER = null;
public static Location CURRENT_LOCATION = null;
public static final FirebaseAppDistribution firebaseAppDistribution = FirebaseAppDistribution.getInstance();
public static final String BASE_URL = "https://foodify-backend-production.up.railway.app/api/";
public static final String MAP_API = "AIzaSyAY14Ic32UP26Hg6GILznOfbBihiY5BUxw";
public static final String BASE_URL = "https://foodify.up.railway.app/api/";
public static final String MAP_API = "AIzaSyADfFAkQxU6yfPAUsNfZjHgFgFwQnNeeWY";
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}$";
public static final String PASSWORD_PATTERN = "^(?=.*[0-9])(?=.*[A-Z])(?=.*[@#$%^&+=!_])(?=\\S+$).{4,}$";
settings.gradle
-2
View File
@@ -16,5 +16,3 @@ dependencyResolutionManagement {
}
rootProject.name = "Foodify Shipper"
include ':app'
include ':aestheticdialogs'
include ':SJDialog'