version23.8Beta

This commit is contained in:
Sergio De la torre 2023-03-24 13:45:05 +01:00
parent f3a360643c
commit 02d852d88c
19 changed files with 14 additions and 173 deletions

View File

@ -1,2 +0,0 @@
#Mon Nov 25 09:23:07 CET 2019
gradle.version=5.4.1

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
</component>
</project>

View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="Embedded JDK" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>

View File

@ -1,108 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable-v24/ic_eye.xml" value="0.299" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1640625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/button_background.xml" value="0.2734375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/check.xml" value="0.252" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/expedition_find.xml" value="0.239" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/ic_history.xml" value="0.2625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/ic_launcher_background.xml" value="0.187" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/ic_launcher_foreground.xml" value="0.1640625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/input_background.xml" value="0.2734375" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/pencil_edit.xml" value="0.2625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/revision_icon.xml" value="0.187" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_cargar_bultos.xml" value="0.2078125" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_configure.xml" value="0.12512664640324214" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_expedition_info.xml" value="0.2" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_expedition_summary.xml" value="0.264" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_info.xml" value="0.4839816933638444" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_loaders.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_loadvan.xml" value="0.22" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_login.xml" value="0.1585144927536232" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_note.xml" value="0.13020833333333334" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_scan.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_sign.xml" value="0.14450867052023122" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_tickets.xml" value="0.26878612716763006" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/component_custom_edit_dialog.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/header_route.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/phone_dialog.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/phone_row.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/previous_delete.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/progress_bar.xml" value="0.2803442028985507" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/revision_icon.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_check.xml" value="0.25271739130434784" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_expedition_info.xml" value="0.17806484295845998" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_expedition_summary.xml" value="0.365625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_expeditionscanned.xml" value="0.20878623188405798" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_mensaje.xml" value="0.12512664640324214" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_route.xml" value="0.2427536231884058" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_routeSelected.xml" value="0.25271739130434784" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_route_consignatario.xml" value="0.24947916666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_routeselected.xml" value="0.15625" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_sub_ticket.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_ticket.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_worker.xml" value="0.15217391304347827" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/ticket_pending_row.xml" value="0.3333333333333333" />
</map>
</option>
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="15">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
<item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
<item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
<item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
<item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
<item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
<item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="15">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
<item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
<item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
<item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
<item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
<item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
<item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
<item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
<item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
<item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
<component name="SuppressKotlinCodeStyleNotification">
<option name="disableForAll" value="true" />
</component>
</project>

View File

@ -40,46 +40,16 @@
</configurations>
</component>
<component name="ChangeListManager">
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="Versión 23.4Beta en Sfusion">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.main.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.unitTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.unitTest.iml" afterDir="false" />
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="version23.8Beta">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClientSalix.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClientSalix.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
</list>
<list id="573aca20-ee47-4986-8c3a-4ceacdea9f42" name="No subir" comment="Version sin ficheros ." />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\alexandre\.android\avd\Pixel_5_API_30.avd]" />
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@ -142,7 +112,7 @@
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="test" />
<entry key="$PROJECT_DIR$" value="4632_guardarFirmas_salix_copia" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -365,7 +335,14 @@
<option name="project" value="LOCAL" />
<updated>1673366849427</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary="Version sin ficheros .">
<created>1679661077969</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1679661077969</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -396,7 +373,8 @@
<MESSAGE value="Versión 9.5 App preparada para modificar consultas back, icono cargar cualquier ruta ya direcciona a la pantalla resumen." />
<MESSAGE value="Versión 23.2Beta en Sfusion" />
<MESSAGE value="Versión 23.4Beta en Sfusion" />
<option name="LAST_COMMIT_MESSAGE" value="Versión 23.4Beta en Sfusion" />
<MESSAGE value="Version sin ficheros ." />
<option name="LAST_COMMIT_MESSAGE" value="Version sin ficheros ." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>