diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index e522fed..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules/app/vn-delivery.app.iml b/.idea/modules/app/vn-delivery.app.iml
index 1eb37fb..5e16d1b 100644
--- a/.idea/modules/app/vn-delivery.app.iml
+++ b/.idea/modules/app/vn-delivery.app.iml
@@ -1,5 +1,5 @@
-
+
@@ -46,14 +46,4 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules/app/vn-delivery.app.main.iml b/.idea/modules/app/vn-delivery.app.main.iml
index b7642e6..c139de0 100644
--- a/.idea/modules/app/vn-delivery.app.main.iml
+++ b/.idea/modules/app/vn-delivery.app.main.iml
@@ -1,5 +1,5 @@
-
+
@@ -8,7 +8,7 @@
-
+
@@ -42,119 +42,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules/app/vn-delivery.app.unitTest.iml b/.idea/modules/app/vn-delivery.app.unitTest.iml
index 3b5ec3f..834af42 100644
--- a/.idea/modules/app/vn-delivery.app.unitTest.iml
+++ b/.idea/modules/app/vn-delivery.app.unitTest.iml
@@ -1,5 +1,5 @@
-
+
@@ -19,7 +19,7 @@
-
+
@@ -47,104 +47,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 14ce642..e58cb4d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -41,9 +41,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -104,7 +122,7 @@
-
+
@@ -148,27 +166,27 @@
- {
- "keyToString": {
- "ApkExportedModule": "vn-delivery.app",
- "ExportApk.ApkPathForvn-delivery.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-delivery\\",
- "PROJECT_TRUSTED_KEY": "true",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.cidr.known.project.marker": "true",
- "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/AbsListView.java_SELECTED": "AbsListView",
- "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/ListView.java_SELECTED": "ListView",
- "cidr.known.project.marker": "true",
- "com.google.services.firebase.aqiPopupShown": "true",
- "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-picture/platforms/android",
- "settings.editor.selected.configurable": "experimental"
+
+}]]>
@@ -360,7 +378,19 @@
diff --git a/app/.idea/.gitignore b/app/.idea/.gitignore
new file mode 100644
index 0000000..f6d34b6
--- /dev/null
+++ b/app/.idea/.gitignore
@@ -0,0 +1,191 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+
+# Keystore files
+*.jks
+
+.idea/
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/app/release
+/captures
+.externalNativeBuild
+.cxx
+*.jar
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+captures/
+.navigation/
+*.ipr
+*~
+*.swp
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Patch
+gen-external-apklibs
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iml
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/assetWizardSettings.xml
+.idea/gradle.xml
+.idea/jarRepositories.xml
+.idea/navEditor.xml
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+# End of https://www.toptal.com/developers/gitignore/api/androidstudio
+
diff --git a/app/build.gradle b/app/build.gradle
index e6deecc..c3792e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
applicationId "verdnatura.es.repartoverdnatura"
minSdkVersion 19
//targetSdkVersion 28
- versionCode 45
- versionName "23.14.1Beta"
+ versionCode 46
+ versionName "23.18Beta"
// versionName "23.8Beta" versionCode 40
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
index 82160cc..8b465f6 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
@@ -107,6 +107,7 @@ public class MainActivity extends AppCompatActivity {
getPending();
getPengingExpeditions();
+
super.onRestart();
}
@@ -130,7 +131,7 @@ public class MainActivity extends AppCompatActivity {
restClient.getRoutes(Utils.getMapWhitUser(this)).enqueue(new Callback>() {
@Override
public void onResponse(Call> call, Response> response) {
- Utils.progressBar.getDialog().dismiss();
+
if (response.isSuccessful()) {
//d("VERDNATURA::","recibidos datos");
for (Ruta ruta : response.body()) {
@@ -161,14 +162,12 @@ public class MainActivity extends AppCompatActivity {
ViewGroup.LayoutParams params = listViewRutas.getLayoutParams();
params.height = (heightCellRoute * (listaRutas.size()));
listViewRutas.setLayoutParams(params);
- //Se actualiza por ScaleFusion. Hay redmine para pasar a LoginActivity
- // checkVersion();
+
LocalStorage.checkDateForClear(that);
-
- // getExpeditions();
-
+ Utils.progressBar.getDialog().dismiss();
} else {
getLocalData();
+ Utils.progressBar.getDialog().dismiss();
}
}
diff --git a/app/src/main/res/layout/row_expedition_summary.xml b/app/src/main/res/layout/row_expedition_summary.xml
index 077e179..7b7c71d 100644
--- a/app/src/main/res/layout/row_expedition_summary.xml
+++ b/app/src/main/res/layout/row_expedition_summary.xml
@@ -15,7 +15,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@color/verdnatura_pumpkin_orange"
- android:paddingBottom="8dp"
+ android:paddingBottom="4dp"
android:paddingTop="8dp"
android:paddingLeft="2dp">
@@ -32,7 +32,7 @@
android:text="8319"
android:layout_weight="1"
android:textColor="@color/colorMainBg"
- android:textSize="18sp"
+ android:textSize="22sp"
android:textStyle="bold" />
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
+
+
+
@@ -100,14 +100,14 @@
-
-
+
+
-
+
-
+
diff --git a/build/intermediates/lint-cache/maven.google/master-index.xml b/build/intermediates/lint-cache/maven.google/master-index.xml
index 8386c26..0022bd9 100644
--- a/build/intermediates/lint-cache/maven.google/master-index.xml
+++ b/build/intermediates/lint-cache/maven.google/master-index.xml
@@ -15,6 +15,10 @@
+
+
+
+
@@ -83,8 +87,11 @@
+
+
+
@@ -123,6 +130,7 @@
+
@@ -132,11 +140,14 @@
+
+
+
@@ -197,6 +208,7 @@
+
diff --git a/local.properties b/local.properties
index 65ecb3e..f1e1cfb 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Wed Feb 15 07:35:16 CET 2023
-sdk.dir=C\:\\Users\\alexandre\\AppData\\Local\\Android\\Sdk
+#Wed Apr 26 14:05:44 CEST 2023
+sdk.dir=C\:\\Users\\sergiodt\\AppData\\Local\\Android\\Sdk
diff --git a/vn-delivery.iml b/vn-delivery.iml
deleted file mode 100644
index c433a9b..0000000
--- a/vn-delivery.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file