diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin
index 0289498..30f6732 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.bin and b/.gradle/5.1.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock
index dbe73fa..e794447 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.lock and b/.gradle/5.1.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin
index 5a22643..ba2dfda 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.bin and b/.gradle/5.1.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock
index 8766b8e..7ee8267 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.lock and b/.gradle/5.1.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.1.1/javaCompile/classAnalysis.bin b/.gradle/5.1.1/javaCompile/classAnalysis.bin
index d98b261..971b3f5 100644
Binary files a/.gradle/5.1.1/javaCompile/classAnalysis.bin and b/.gradle/5.1.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.1.1/javaCompile/javaCompile.lock b/.gradle/5.1.1/javaCompile/javaCompile.lock
index 477705b..278def0 100644
Binary files a/.gradle/5.1.1/javaCompile/javaCompile.lock and b/.gradle/5.1.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 474e6fe..07f4d0d 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 6156780..f3c1306 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 835fd4b..b127684 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 84f55f6..ebc9322 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -31,13 +31,15 @@
-
-
+
+
-
-
-
-
+
+
+
+
+
+
@@ -60,19 +62,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -80,8 +73,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110,6 +113,8 @@
heightCellRoute
vndelivery
app.verdnatura.es/bin/
+ result
+ saveLocal
$PROJECT_DIR$
@@ -132,7 +137,6 @@
-
@@ -143,14 +147,17 @@
-
+
+
+
+
-
+
@@ -163,6 +170,8 @@
+
+
@@ -188,10 +197,6 @@
-
-
-
-
@@ -200,8 +205,6 @@
-
-
@@ -353,13 +356,13 @@
-
-
+
+
-
+
@@ -376,13 +379,31 @@
+
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
+ 178
+
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
+ 186
+
+
+
+
+ file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
+ 602
+
+
+
+
+
+
-
-
-
-
-
-
@@ -401,41 +422,27 @@
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
@@ -484,13 +491,6 @@
-
-
-
-
-
-
-
@@ -512,12 +512,12 @@
-
+
@@ -543,13 +543,6 @@
-
-
-
-
-
-
-
@@ -598,12 +591,12 @@
-
+
@@ -613,27 +606,20 @@
-
+
-
-
-
-
-
-
-
-
+
@@ -642,17 +628,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 2b1359e..ac22296 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
applicationId "verdnatura.es.repartoverdnatura"
minSdkVersion 19
targetSdkVersion 28
- versionCode 7
- versionName "1.7"
+ versionCode 8
+ versionName "1.8"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}
diff --git a/app/release/output.json b/app/release/output.json
index 326fb5c..21b3801 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"1.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/release/vndelivery.apk b/app/release/vn-delivery.apk
similarity index 76%
rename from app/release/vndelivery.apk
rename to app/release/vn-delivery.apk
index 6a64ac0..78fead3 100644
Binary files a/app/release/vndelivery.apk and b/app/release/vn-delivery.apk differ
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
index cc294ed..9fcf592 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
@@ -211,10 +211,10 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
}
public void saveLocal(SignDataUpload data){
- data.setIdClient(clientTickets.getClient());
- LocalStorage.saveSign(this,data,clientTickets.getClientName(),idRuta);
+ data.setIdClient(clientTickets.getAddress());
+ LocalStorage.saveSign(this,data,clientTickets.getAddress(),idRuta);
Intent returnIntent = new Intent();
- returnIntent.putExtra("idCliente",clientTickets.getClient());
+ returnIntent.putExtra("idCliente",clientTickets.getAddress());
setResult(Activity.RESULT_OK,returnIntent);
finish();
}
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
index aa1621a..864f679 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
@@ -6,7 +6,7 @@ public class ApiUtils {
private ApiUtils() {}
//public static final String BASE_URL = "http://172.20.202.248:8080/";
- public static final String BASE_URL = "https://app.verdnatura.es/";
+ public static final String BASE_URL = "https://app.verdnatura.es/";
public static RestClient getAPIService() {
return RetrofitClient.getClient(BASE_URL).create(RestClient.class);
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java
index 7992005..16f0deb 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java
@@ -262,7 +262,7 @@ public class LocalStorage {
int cont = 0;
ClientTickets aux = null;
for (ClientTickets c : clientesTickets){
- if (c.getClientName().equals(clientName)){
+ if (c.getAddress().equals(clientName)){
clientesTickets.get(cont).setSigned(true);
clientesTicketsFirmados.add(clientesTickets.get(cont));
aux = c;
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index dffca36..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index dae5e08..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 14ed0af..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index d8ae031..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index beed3cd..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ