verdnatura/vn-delivery
verdnatura
/
vn-delivery
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Versión 23.4Beta gitignore and all changes

This commit is contained in:
Sergio De la torre 2023-02-15 07:17:05 +01:00
parent 447eaa7116
commit 18d8bc34b2
30 changed files with 484 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/5.4.1/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
.gradle/5.4.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
.gradle/5.4.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/5.4.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
.gradle/5.4.1/fileHashes/resourceHashesCache.bin
View File

Binary file not shown.

BIN
.gradle/5.4.1/javaCompile/classAnalysis.bin
View File

Binary file not shown.

BIN
.gradle/5.4.1/javaCompile/jarAnalysis.bin
View File

Binary file not shown.

BIN
.gradle/5.4.1/javaCompile/javaCompile.lock
View File

Binary file not shown.

BIN
.gradle/5.4.1/javaCompile/taskHistory.bin
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

2
.idea/compiler.xml
View File

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

17
.idea/deploymentTargetDropDown.xml
View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\sergiodt\.android\avd\Pixel_3a_API_30_x86.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-11-04T07:16:17.624012800Z" />
</component>
</project>

2
.idea/misc.xml
View File

@ -96,7 +96,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

11
.idea/modules/app/vn-delivery.app.iml
View File

@ -10,17 +10,12 @@
</facet> </facet>
<facet type="android" name="Android"> <facet type="android" name="Android">
<configuration> <configuration>
<option name="SELECTED_BUILD_VARIANT" value="release" /> <option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
<afterSyncTasks>
<task>generateReleaseSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/release/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/release;file://$MODULE_DIR$/../../../app/build/generated/res/rs/release;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/release" /> <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" /> <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration> </configuration>
</facet> </facet>

60
.idea/modules/app/vn-delivery.app.main.iml
View File

File diff suppressed because one or more lines are too long

43
.idea/modules/app/vn-delivery.app.unitTest.iml
View File

File diff suppressed because one or more lines are too long

239
.idea/workspace.xml
View File

@ -40,157 +40,45 @@
</configurations> </configurations>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="Versión 9.6 App preparada para el cambio en el back de save_sign.php"> <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.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/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.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/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/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/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/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/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml" beforeDir="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/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.hgignore" beforeDir="false" afterPath="$PROJECT_DIR$/.hgignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_2_13.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_guava_guava_20_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_simplify_ink_1_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_context_1_12_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_core_1_12_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_annotations_13_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_4_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_4_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_4_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.androidTest.iml" beforeDir="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.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.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" /> <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" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/app-releaseTEST_M.apk" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/apk/release/output.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/app-releaseTester.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/app-release_delivery.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/apk/release/output.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-delivery-old.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-delivery.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryCargaDescargaFurgo.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryCargaFurgo.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryCargaFurgoErrro.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryFinal.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryMAD.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryMAD_old.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryTEST.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryTestCargaDescarga.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryTestFinalCarga.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-deliveryTestOneDay.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/apk/release/vn-pickingMAD.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" 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/release/app-release.apk" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/release/output.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output.json" 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/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/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/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/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/ApiUtilsSalix.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/vn-delivery.iml" beforeDir="false" afterPath="$PROJECT_DIR$/vn-delivery.iml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" /> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
<component name="ExternalProjectsData"> <component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$"> <projectState path="$PROJECT_DIR$">
<ProjectState /> <ProjectState />
@ -241,11 +129,16 @@
</file-type-list> </file-type-list>
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/app/build.gradle" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/google-services.json" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values-xlarge/dimens.xml" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/app/src/main/res/values-xlarge/dimens.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/preloaded_fonts.xml" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/ic_launcher_background.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/font_certs.xml" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/app/src/main/res/values/font_certs.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/ic_launcher_background.xml" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/preloaded_fonts.xml" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component> </component>
<component name="ProjectId" id="1bWCL859wVM8jZScmHvfw95Cjm4" /> <component name="ProjectId" id="1bWCL859wVM8jZScmHvfw95Cjm4" />
<component name="ProjectLevelVcsManager"> <component name="ProjectLevelVcsManager">
@ -255,43 +148,23 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">{
<property name="ApkExportedModule" value="vn-delivery.app" /> &quot;keyToString&quot;: {
<property name="DEBUGGABLE_DEVICE" value="zebra_technologies-tc25-19192521400686" /> &quot;ApkExportedModule&quot;: &quot;vn-delivery.app&quot;,
<property name="DEBUGGABLE_PROCESS" value="verdnatura.es.repartoverdnatura" /> &quot;ExportApk.ApkPathForvn-delivery.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-delivery\\&quot;,
<property name="DEBUGGER_ID" value="Auto" /> &quot;PROJECT_TRUSTED_KEY&quot;: &quot;true&quot;,
<property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="VirtualDevicePath@C:\Users\sergiodt\.android\avd\Pixel_3a_API_30_x86.avd" /> &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
<property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2021-06-07T14:25:44.344183900Z" /> &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/AbsListView.java_SELECTED&quot;: &quot;AbsListView&quot;,
<property name="ExportApk.ApkPath" value="C:\Users\sergiodt\AndroidStudioProjects\vn-delivery\apk" /> &quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/ListView.java_SELECTED&quot;: &quot;ListView&quot;,
<property name="ExportApk.BuildType" value="release" /> &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
<property name="ExportApk.BuildVariants" value="release" /> &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-picture/platforms/android&quot;
<property name="ExportApk.Flavors" value="" /> },
<property name="ExportApk.SignV1" value="true" /> &quot;keyToStringList&quot;: {
<property name="ExportApk.SignV2" value="true" /> &quot;ExportApk.BuildVariants&quot;: [
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> &quot;release&quot;
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> ]
<property name="RunOnceActivity.cidr.known.project.marker" value="true" /> }
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> }</component>
<property name="SHOW_ALL_PROCESSES" value="false" />
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/view/View.java_SELECTED" value="View" />
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/AdapterView.java_SELECTED" value="AdapterView" />
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/ImageView.java_SELECTED" value="ImageView" />
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-28/android/widget/TextView.java_SELECTED" value="TextView" />
<property name="android.project.structure.last.selected" value="SDK Location" />
<property name="android.project.structure.proportion" value="0.15" />
<property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
<property name="cidr.known.project.marker" value="true" />
<property name="com.developerphil.adbidea.selecteddevices" value="20211523021031" />
<property name="device.picker.selection" value="3.2_QVGA_ADP2_API_19" />
<property name="last_directory_selection" value="$PROJECT_DIR$/app/src/main/res/values-en" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/apk" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.17" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
<property name="sync.plugin.last.upgrade.timestamp" value="1557288635509" />
</component>
<component name="PsdUISettings"> <component name="PsdUISettings">
<option name="MODULE_TAB" value="Signing Configs" /> <option name="MODULE_TAB" value="Signing Configs" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" /> <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@ -330,8 +203,8 @@
<option name="Android.Gradle.BeforeRunTask" enabled="true" /> <option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false"> <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="vn-delivery.app" /> <module name="vn-delivery.app.main" />
<option name="DEPLOY" value="true" /> <option name="DEPLOY" value="true" />
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" /> <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
<option name="DEPLOY_AS_INSTANT" value="false" /> <option name="DEPLOY_AS_INSTANT" value="false" />
@ -339,13 +212,14 @@
<option name="PM_INSTALL_OPTIONS" value="" /> <option name="PM_INSTALL_OPTIONS" value="" />
<option name="ALL_USERS" value="false" /> <option name="ALL_USERS" value="false" />
<option name="ALWAYS_INSTALL_WITH_PM" value="false" /> <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
<option name="CLEAR_APP_STORAGE" value="false" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" /> <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" /> <option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="false" /> <option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" /> <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" /> <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" /> <option name="DEBUGGER_TYPE" value="Auto" />
@ -375,7 +249,7 @@
<option name="ADVANCED_PROFILING_ENABLED" value="false" /> <option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_PROFILING_ENABLED" value="false" /> <option name="STARTUP_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sampled (Java)" /> <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" /> <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" /> <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
</Profilers> </Profilers>
@ -450,7 +324,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1667978187874</updated> <updated>1667978187874</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="Versión 23.2Beta en Sfusion">
<created>1673366849427</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1673366849427</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.History.Properties"> <component name="Vcs.Log.History.Properties">
@ -473,14 +354,26 @@
</entry> </entry>
</map> </map>
</option> </option>
<option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Añadido carga y descarga de rutas. Añadida info actual. Cambiada checkversion." /> <MESSAGE value="Añadido carga y descarga de rutas. Añadida info actual. Cambiada checkversion." />
<MESSAGE value="Versión 9.4 quitando conductores y modificando carga ruta cualquiera" /> <MESSAGE value="Versión 9.4 quitando conductores y modificando carga ruta cualquiera" />
<MESSAGE value="Versión 9.4 quitando conductores y modificando carga ruta cualquiera. Añadidos ficheros a versionar" /> <MESSAGE value="Versión 9.4 quitando conductores y modificando carga ruta cualquiera. Añadidos ficheros a versionar" />
<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 9.5 App preparada para modificar consultas back, icono cargar cualquier ruta ya direcciona a la pantalla resumen." />
<option name="LAST_COMMIT_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" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt</url>
<line>319</line>
<option name="timeStamp" value="5" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

1
apk/release/output.json
View File

@ -1 +0,0 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"23.2Beta","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

15
app/build.gradle
View File

@ -7,8 +7,9 @@ android {
applicationId "verdnatura.es.repartoverdnatura" applicationId "verdnatura.es.repartoverdnatura"
minSdkVersion 19 minSdkVersion 19
//targetSdkVersion 28 //targetSdkVersion 28
versionCode 30 versionCode 33
versionName "23.2Beta" versionName "23.2Beta"
//versionName "23.2Beta" Madrid 33
//versionName "9.6.1Beta" //versionCode 27 //versionName "9.6.1Beta" //versionCode 27
//versionName "9.6" //versionName "9.6"
//versionName "9.5" versionCode 26 //versionName "9.5" versionCode 26
@ -22,9 +23,19 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
getByName("release") { /* getByName("release") {
applicationIdSuffix = ".sfusion" applicationIdSuffix = ".sfusion"
} }
getByName("debug") {
applicationIdSuffix = ".sfusion"
}*/
getByName("release") {
applicationIdSuffix = ".sfusionMadrid"
}
getByName("debug") {
applicationIdSuffix = ".sfusionMadrid"
}
} }
} }

4
app/google-services.json
View File

@ -10,7 +10,7 @@
"client_info": { "client_info": {
"mobilesdk_app_id": "1:622584359076:android:49dda1d8a6dc59f9", "mobilesdk_app_id": "1:622584359076:android:49dda1d8a6dc59f9",
"android_client_info": { "android_client_info": {
"package_name": "verdnatura.es.repartoverdnatura.sfusion" "package_name": "verdnatura.es.repartoverdnatura.sfusionMadrid"
} }
}, },
"oauth_client": [ "oauth_client": [
@ -18,7 +18,7 @@
"client_id": "622584359076-0ph8u7jfg7ifgs6qe4ueb6oqj9c8mv36.apps.googleusercontent.com", "client_id": "622584359076-0ph8u7jfg7ifgs6qe4ueb6oqj9c8mv36.apps.googleusercontent.com",
"client_type": 1, "client_type": 1,
"android_info": { "android_info": {
"package_name": "verdnatura.es.repartoverdnatura.sfusion", "package_name": "verdnatura.es.repartoverdnatura.sfusionMadrid",
"certificate_hash": "1495f9252766a51f3c48f2e9c8789c85cee831d0" "certificate_hash": "1495f9252766a51f3c48f2e9c8789c85cee831d0"
} }
}, },

BIN
app/release/app-release.apk
View File

Binary file not shown.

2
app/release/output.json
View File

@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":30,"versionName":"23.2Beta","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

170
app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt
View File

@ -6,13 +6,10 @@ import android.content.Intent
import android.media.MediaPlayer import android.media.MediaPlayer
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.util.Log.d
import android.view.View import android.view.View
import android.view.View.OnFocusChangeListener
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.EditText import android.widget.*
import android.widget.ListView
import android.widget.TextView
import android.widget.Toast
import retrofit2.Call import retrofit2.Call
import retrofit2.Callback import retrofit2.Callback
import retrofit2.Response import retrofit2.Response
@ -25,7 +22,6 @@ import verdnatura.es.repartoverdnatura.UTILS.ApiUtils
import verdnatura.es.repartoverdnatura.UTILS.LocalStorage import verdnatura.es.repartoverdnatura.UTILS.LocalStorage
import verdnatura.es.repartoverdnatura.UTILS.Utils import verdnatura.es.repartoverdnatura.UTILS.Utils
class ExpeditionSummaryActivity : AppCompatActivity() { class ExpeditionSummaryActivity : AppCompatActivity() {
var mpError: MediaPlayer? = null var mpError: MediaPlayer? = null
var mpOk: MediaPlayer? = null var mpOk: MediaPlayer? = null
@ -56,7 +52,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
var totalSend = 0 var totalSend = 0
var totalSendSuccessful = 0 var totalSendSuccessful = 0
var positionSelected: Int? = null var positionSelected: Int? = null
var positionOnScreen: Int = 0
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -89,6 +85,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
changeTitle(route = routeOfLoad) changeTitle(route = routeOfLoad)
setEvents() setEvents()
setViews()
} }
@ -97,14 +94,30 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
} }
private fun setViews() {
listView!!.setOnScrollListener(object : AbsListView.OnScrollListener {
override fun onScrollStateChanged(view: AbsListView, scrollState: Int) {
}
override fun onScroll(
view: AbsListView,
firstVisibleItem: Int,
visibleItemCount: Int,
totalItemCount: Int
) {
positionOnScreen = firstVisibleItem
}
})
}
override fun onResume() { override fun onResume() {
super.onResume()
super.onResume()
listExpeditionSummary.clear() listExpeditionSummary.clear()
expedition_getSummary() expedition_getSummary()
if (textAddressSelected!!.text.isNotEmpty()) { if (textAddressSelected!!.text.isNotEmpty()) {
checks checks
txtScan!!.requestFocus() txtScan!!.requestFocus()
} }
@ -114,25 +127,40 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
adress: String?, adress: String?,
position: Int position: Int
) { ) {
//itemScaneed es para ver si se ha escaneado algo y es diferente los consignatarios //itemScaneed es para ver si se ha escaneado algo y es diferente los consignatarios
positionSelected = position positionSelected = position
if (itemScanned && !(textAddressSelected!!.text).equals(adress)) { if (itemScanned && !(textAddressSelected!!.text).equals(adress)) {
totalSend = 2 totalSend = 2
Utils.progressBar.show(this, getResources().getString(R.string.please_wait)) if (listCheck
expeditionState_addByExpeditionMulti(listCheck .filter { it.addressFk == textAddressSelected!!.text }
.filter { it.addressFk == textAddressSelected!!.text } .filter { it.routeFk == textViewRoute!!.text }
.filter { it.routeFk == textViewRoute!!.text } .filter { it.code == "ON DELIVERY" }.isNotEmpty()
.filter { it.code == "ON DELIVERY" }, "ON DELIVERY" ) {
) Utils.progressBar.show(this, getResources().getString(R.string.please_wait))
expeditionState_addByExpeditionMulti(listCheck
.filter { it.addressFk == textAddressSelected!!.text }
.filter { it.routeFk == textViewRoute!!.text }
.filter { it.code == "ON DELIVERY" }, "ON DELIVERY"
)
} else {
totalSend = -1
}
expeditionState_addByExpeditionMulti(listCheck if (listCheck
.filter { it.addressFk == textAddressSelected!!.text } .filter { it.addressFk == textAddressSelected!!.text }
.filter { it.routeFk == textViewRoute!!.text } .filter { it.routeFk == textViewRoute!!.text }
.filter { it.code != "ON DELIVERY" }, "LOST" .filter { it.code != "ON DELIVERY" }.isNotEmpty()
) ) {
expeditionState_addByExpeditionMulti(listCheck
.filter { it.addressFk == textAddressSelected!!.text }
.filter { it.routeFk == textViewRoute!!.text }
.filter { it.code != "ON DELIVERY" }, "LOST"
)
} else {
totalSend = -1
}
itemScanned = false itemScanned = false
} }
@ -145,7 +173,8 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
} }
private val checks: Unit private
val checks: Unit
get() { get() {
val listDownload: ArrayList<Check> = ArrayList() val listDownload: ArrayList<Check> = ArrayList()
@ -166,7 +195,6 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
if (response.isSuccessful) { if (response.isSuccessful) {
for (c in response.body()!!) { for (c in response.body()!!) {
if (!c.code.isNullOrBlank()) { if (!c.code.isNullOrBlank()) {
if (c.code.equals("ON DELIVERY")) { if (c.code.equals("ON DELIVERY")) {
@ -208,7 +236,6 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
fun getLocalDataExpedition() { fun getLocalDataExpedition() {
val list: List<Check> = LocalStorage.getExpeditions(this) val list: List<Check> = LocalStorage.getExpeditions(this)
listCheck = LocalStorage.getExpeditions(this) listCheck = LocalStorage.getExpeditions(this)
if (list.size > 0) { if (list.size > 0) {
@ -221,19 +248,18 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
.filter { it.routeFk == textViewRoute!!.text } .filter { it.routeFk == textViewRoute!!.text }
.filter { it.checked == "1" || it.code == "ON DELIVERY" }.size .filter { it.checked == "1" || it.code == "ON DELIVERY" }.size
textLoaded!!.text = checked.toString() + "/" + totalChecks.toString() + " cargadas" textLoaded!!.text =
checked.toString() + "/" + totalChecks.toString() + " cargadas"
hideKeyboard() hideKeyboard()
} }
} }
private fun expedition_getSummary() { private fun expedition_getSummary() {
var oldPosition = positionOnScreen
Utils.progressBar.show(this, resources.getString(R.string.please_wait)) Utils.progressBar.show(this, resources.getString(R.string.please_wait))
val routeData: Array<String?> = arrayOfNulls(1) val routeData: Array<String?> = arrayOfNulls(1)
@ -242,7 +268,6 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
restClient!!.route_getExpeditionSummary(Utils.getMapWhitUser(this), routeData) restClient!!.route_getExpeditionSummary(Utils.getMapWhitUser(this), routeData)
.enqueue(object : Callback<List<ExpeditionInfoSummary>> { .enqueue(object : Callback<List<ExpeditionInfoSummary>> {
override fun onResponse( override fun onResponse(
call: Call<List<ExpeditionInfoSummary>>, call: Call<List<ExpeditionInfoSummary>>,
response: Response<List<ExpeditionInfoSummary>> response: Response<List<ExpeditionInfoSummary>>
@ -263,6 +288,8 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
} }
setAdapter(listExpeditionSummary) setAdapter(listExpeditionSummary)
listView!!.setSelection(oldPosition)
} else { } else {
Utils.progressBar.dialog.dismiss() Utils.progressBar.dialog.dismiss()
@ -275,7 +302,10 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
} }
override fun onFailure(call: Call<List<ExpeditionInfoSummary>>, t: Throwable) { override fun onFailure(
call: Call<List<ExpeditionInfoSummary>>,
t: Throwable
) {
Utils.progressBar.dialog.dismiss() Utils.progressBar.dialog.dismiss()
Utils.showErrorDialog( Utils.showErrorDialog(
this@ExpeditionSummaryActivity, this@ExpeditionSummaryActivity,
@ -285,27 +315,29 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
}) })
} }
private fun setEvents() { private fun setEvents() {
txtScan!!.setOnEditorActionListener { _, actionId, _ ->
txtScan!!.setOnEditorActionListener { _, _, _ -> if (!txtScan!!.text.isNullOrEmpty()) {
Toast.makeText(this, "Expedición :" + txtScan!!.text, Toast.LENGTH_SHORT).show() Toast.makeText(this, "Expedición :" + txtScan!!.text, Toast.LENGTH_SHORT).show()
findExpedition(txtScan!!.text.toString()) findExpedition(txtScan!!.text.toString())
itemScanned = true itemScanned = true
false
}
txtScan!!.onFocusChangeListener = OnFocusChangeListener { _, b ->
if (b) {
txtScan!!.setText("")
} }
} true
listView!!.setOnFocusChangeListener { _, _ ->
txtScan!!.requestFocus()
//txtScan!!.requestFocus()
} }
/* txtScan!!.onFocusChangeListener = OnFocusChangeListener { _, b ->
if (b) {
txtScan!!.setText("")
}else{}
}
listView!!.setOnFocusChangeListener { _, _ ->
txtScan!!.requestFocus()
}*/
} }
@ -342,7 +374,7 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
} }
txtScan!!.setText("") txtScan!!.setText("")
txtScan!!.requestFocus() txtScan!!.requestFocus()
} }
@ -372,14 +404,20 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
} }
private fun expeditionState_addByExpeditionMulti(expeditions: List<Check>, state: String) { private fun expeditionState_addByExpeditionMulti(
expeditions: List<Check>,
state: String
) {
val stateData: Array<Any?> = arrayOfNulls(2) val stateData: Array<Any?> = arrayOfNulls(2)
stateData[0] = expeditions stateData[0] = expeditions
stateData[1] = state stateData[1] = state
restClient!!.expeditionState_addByExpeditionMulti(Utils.getMapWhitUser(this), stateData) restClient!!.expeditionState_addByExpeditionMulti(
Utils.getMapWhitUser(this),
stateData
)
.enqueue(object : Callback<Void> { .enqueue(object : Callback<Void> {
override fun onResponse(call: Call<Void>, response: Response<Void>) { override fun onResponse(call: Call<Void>, response: Response<Void>) {
Utils.progressBar.dialog.dismiss() Utils.progressBar.dialog.dismiss()
@ -424,17 +462,21 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
private fun checkNextAddress(totalSendSuccessful: Int) { private fun checkNextAddress(totalSendSuccessful: Int) {
if (listExpeditionSummary.size > positionSelected!! + 1) {
textAddressSelected!!.text =
if (checked == totalChecks) {
listExpeditionSummary.get(positionSelected!! + 1).address
} else {
listExpeditionSummary.get(positionSelected!!).address
if (listExpeditionSummary.size >= positionSelected!! + 1) { }
textAddressSelected!!.text = listExpeditionSummary.get(positionSelected!! + 1).address //positionSelected = positionSelected!! + 1
positionSelected = positionSelected!! + 1
} }
onResume() onResume()
} }
fun Activity.hideKeyboard() { fun Activity.hideKeyboard() {
hideKeyboard(currentFocus ?: View(this)) hideKeyboard(currentFocus ?: View(this))
} }
@ -456,7 +498,6 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
} }
fun exit(view: View) { fun exit(view: View) {
if (itemScanned && textAddressSelected!!.text.isNotEmpty()) { if (itemScanned && textAddressSelected!!.text.isNotEmpty()) {
@ -467,13 +508,20 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
.filter { it.routeFk == textViewRoute!!.text } .filter { it.routeFk == textViewRoute!!.text }
.filter { it.code == "ON DELIVERY" }, "ON DELIVERY" .filter { it.code == "ON DELIVERY" }, "ON DELIVERY"
) )
if (listCheck
.filter { it.addressFk == textAddressSelected!!.text }
.filter { it.routeFk == textViewRoute!!.text }
.filter { it.code != "ON DELIVERY" }.isNotEmpty()
) {
expeditionState_addByExpeditionMulti(listCheck expeditionState_addByExpeditionMulti(listCheck
.filter { it.addressFk == textAddressSelected!!.text } .filter { it.addressFk == textAddressSelected!!.text }
.filter { it.routeFk == textViewRoute!!.text } .filter { it.routeFk == textViewRoute!!.text }
.filter { it.code != "ON DELIVERY" }, "LOST" .filter { it.code != "ON DELIVERY" }, "LOST"
) )
} else {
totalSend = 1
}
itemScanned = false itemScanned = false
} }

385
app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
View File

@ -9,11 +9,11 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -30,14 +30,12 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import okhttp3.Route;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
import verdnatura.es.repartoverdnatura.ADAPTERS.ClientAdapter; import verdnatura.es.repartoverdnatura.ADAPTERS.ClientAdapter;
import verdnatura.es.repartoverdnatura.ADAPTERS.PhonesAdapter; import verdnatura.es.repartoverdnatura.ADAPTERS.PhonesAdapter;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClient; import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
import verdnatura.es.repartoverdnatura.MODELS.Check;
import verdnatura.es.repartoverdnatura.MODELS.ClientTickets; import verdnatura.es.repartoverdnatura.MODELS.ClientTickets;
import verdnatura.es.repartoverdnatura.MODELS.Cliente; import verdnatura.es.repartoverdnatura.MODELS.Cliente;
import verdnatura.es.repartoverdnatura.MODELS.Ruta; import verdnatura.es.repartoverdnatura.MODELS.Ruta;
@ -49,18 +47,20 @@ import verdnatura.es.repartoverdnatura.UTILS.Utils;
public class Tickets extends AppCompatActivity { public class Tickets extends AppCompatActivity {
public String tlf; public String tlf;
private int positionOnScreen = 0;
private ListView listViewClients; private ListView listViewClients;
private ArrayList<ClientTickets> listClientesTickets = new ArrayList<>(); private ArrayList<ClientTickets> listClientesTickets = new ArrayList<>();
private ArrayList<ClientTickets> listClientesTicketsFirmados = new ArrayList<>(); private ArrayList<ClientTickets> listClientesTicketsFirmados = new ArrayList<>();
private ClientAdapter adapter; private ClientAdapter adapter;
public Ruta route; public Ruta route;
private RestClient restClient; private RestClient restClient;
private TextView txtZona, txtLines,btnVolver,txtClientsToSign,btnShowSigned; private TextView txtZona, txtLines, btnVolver, txtClientsToSign, btnShowSigned;
private boolean isSignedShowed = false; private boolean isSignedShowed = false;
private ListView dialogListView; private ListView dialogListView;
public String uri = ""; public String uri = "";
private int posForNote = 0; private int posForNote = 0;
public ArrayList<SignDataUpload> listData = new ArrayList<>(); public ArrayList<SignDataUpload> listData = new ArrayList<>();
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -77,20 +77,22 @@ public class Tickets extends AppCompatActivity {
@Override @Override
protected void onRestart() { protected void onRestart() {
super.onRestart(); super.onRestart();
setViews(); // setViews();
checkPendingSigns(); checkPendingSigns();
} }
public void checkPendingSigns(){ public void checkPendingSigns() {
Set<String> pendingSigns = LocalStorage.getPendingSigns(this); Set<String> pendingSigns = LocalStorage.getPendingSigns(this);
if (pendingSigns.size() == 0){ if (pendingSigns.size() == 0) {
getData(-1); getData(-1);
}else{ } else {
Gson gson = new Gson(); Gson gson = new Gson();
listData = new ArrayList<>(); listData = new ArrayList<>();
for (String s : pendingSigns){ for (String s : pendingSigns) {
listData.add(gson.fromJson(s,SignDataUpload.class)); listData.add(gson.fromJson(s, SignDataUpload.class));
} }
confirmSave(0); confirmSave(0);
@ -98,7 +100,7 @@ public class Tickets extends AppCompatActivity {
} }
} }
public void confirmSave(final int pos){ public void confirmSave(final int pos) {
if (pos < listData.size()) { if (pos < listData.size()) {
Utils.progressBar.show(this, getResources().getString(R.string.please_wait)); Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
final Tickets that = this; final Tickets that = this;
@ -110,8 +112,8 @@ public class Tickets extends AppCompatActivity {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
if (response.isSuccessful()) { if (response.isSuccessful()) {
// if (response.body().equals("OK")) {*/ // if (response.body().equals("OK")) {*/
confirmSave(pos+1); confirmSave(pos + 1);
/* }else{ /* }else{
getData(pos); getData(pos);
}*/ }*/
@ -129,27 +131,28 @@ public class Tickets extends AppCompatActivity {
getData(pos); getData(pos);
} }
}); });
}else{ } else {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
getData(pos); getData(pos);
} }
} }
private void setViews(){ private void setViews() {
listViewClients = this.findViewById(R.id.listClientes); listViewClients = this.findViewById(R.id.listClientes);
//Tarea 4659 //Tarea 4659
/* listViewClients.setOnScrollListener(new AbsListView.OnScrollListener() { listViewClients.setOnScrollListener(new AbsListView.OnScrollListener() {
@Override @Override
public void onScrollStateChanged(AbsListView view, int scrollState) { public void onScrollStateChanged(AbsListView view, int scrollState) {
Log.d("VERDNATURA::","has changed"); //Log.d("VERDNATURA::","has changed");
} }
@Override @Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
Log.d("VERDNATURA::","has scroll"+firstVisibleItem); // Log.d("VERDNATURA::","has scroll"+firstVisibleItem);
positionOnScreen = firstVisibleItem;
} }
});*/ });
txtZona = this.findViewById(R.id.textView19); txtZona = this.findViewById(R.id.textView19);
txtLines = this.findViewById(R.id.textView35); txtLines = this.findViewById(R.id.textView35);
@ -161,17 +164,17 @@ public class Tickets extends AppCompatActivity {
} }
private void getData(int pos){ private void getData(int pos) {
//han quedado firmas por subir //han quedado firmas por subir
ArrayList<SignDataUpload> listAux = new ArrayList<>(); ArrayList<SignDataUpload> listAux = new ArrayList<>();
if(pos < listData.size() && pos != -1){ if (pos < listData.size() && pos != -1) {
for(int i = pos; i < listData.size(); i++){ for (int i = pos; i < listData.size(); i++) {
listAux.add(listData.get(i)); listAux.add(listData.get(i));
} }
LocalStorage.udpatePendingSigns(this,listAux,route.getId()); LocalStorage.udpatePendingSigns(this, listAux, route.getId());
}else{ } else {
LocalStorage.udpatePendingSigns(this,listAux,route.getId()); LocalStorage.udpatePendingSigns(this, listAux, route.getId());
} }
txtLines.setText(""); txtLines.setText("");
@ -179,64 +182,63 @@ public class Tickets extends AppCompatActivity {
listClientesTickets = new ArrayList<>(); listClientesTickets = new ArrayList<>();
listClientesTicketsFirmados = new ArrayList<>(); listClientesTicketsFirmados = new ArrayList<>();
listViewClients.setVisibility(View.VISIBLE); listViewClients.setVisibility(View.VISIBLE);
Utils.progressBar.show(this,getResources().getString(R.string.please_wait)); Utils.progressBar.show(this, getResources().getString(R.string.please_wait));
String idR = route.getId(); String idR = route.getId();
String[] routeData = new String[1]; String[] routeData = new String[1];
routeData[0] = idR; routeData[0] = idR;
restClient.getClients(Utils.getMapWhitUser(this),routeData).enqueue(new Callback<List<Cliente>>() { restClient.getClients(Utils.getMapWhitUser(this), routeData).enqueue(new Callback<List<Cliente>>() {
@Override @Override
public void onResponse(Call<List<Cliente>> call, Response<List<Cliente>> response) { public void onResponse(Call<List<Cliente>> call, Response<List<Cliente>> response) {
Utils.progressBar.getDialog().dismiss(); Utils.progressBar.getDialog().dismiss();
Log.i("VERDNATURA","Vamos a por los clientes o tickets"); Log.i("VERDNATURA", "Vamos a por los clientes o tickets");
Boolean exists = false; Boolean exists = false;
if(response.isSuccessful()){ if (response.isSuccessful()) {
for(Cliente cliente : response.body()){ for (Cliente cliente : response.body()) {
exists = false; exists = false;
for (ClientTickets c : listClientesTicketsFirmados){ for (ClientTickets c : listClientesTicketsFirmados) {
if(c.getAddress().equals(cliente.getAddress())){ if (c.getAddress().equals(cliente.getAddress())) {
Map<String,String> values = new HashMap<>(); Map<String, String> values = new HashMap<>();
values.put("Packages",cliente.getPackages()); values.put("Packages", cliente.getPackages());
values.put("Warehouse",cliente.getWarehouse()); values.put("Warehouse", cliente.getWarehouse());
values.put("Id",cliente.getId()); values.put("Id", cliente.getId());
values.put("Polizon",cliente.getPolizon()); values.put("Polizon", cliente.getPolizon());
values.put("PackingType",cliente.getPackingType()); values.put("PackingType", cliente.getPackingType());
c.addTicket(values); c.addTicket(values);
c.setNote(c.getNote()+" - "+ cliente.getNote()); c.setNote(c.getNote() + " - " + cliente.getNote());
exists = true; exists = true;
break; break;
} }
} }
for (ClientTickets c : listClientesTickets){ for (ClientTickets c : listClientesTickets) {
if(c.getAddress().equals(cliente.getAddress())){ if (c.getAddress().equals(cliente.getAddress())) {
Map<String,String> values = new HashMap<>(); Map<String, String> values = new HashMap<>();
values.put("Packages",cliente.getPackages()); values.put("Packages", cliente.getPackages());
values.put("Warehouse",cliente.getWarehouse()); values.put("Warehouse", cliente.getWarehouse());
values.put("Id",cliente.getId()); values.put("Id", cliente.getId());
values.put("Polizon",cliente.getPolizon()); values.put("Polizon", cliente.getPolizon());
values.put("PackingType",cliente.getPackingType()); values.put("PackingType", cliente.getPackingType());
c.addTicket(values); c.addTicket(values);
c.setNote(c.getNote()+" - "+ cliente.getNote()); c.setNote(c.getNote() + " - " + cliente.getNote());
exists = true; exists = true;
break; break;
} }
} }
if (!exists) {
if(!exists){ Map<String, String> values = new HashMap<>();
Map<String,String> values = new HashMap<>(); values.put("Packages", cliente.getPackages());
values.put("Packages",cliente.getPackages()); values.put("Warehouse", cliente.getWarehouse());
values.put("Warehouse",cliente.getWarehouse()); values.put("Id", cliente.getId());
values.put("Id",cliente.getId()); values.put("Polizon", cliente.getPolizon());
values.put("Polizon",cliente.getPolizon()); values.put("PackingType", cliente.getPackingType());
values.put("PackingType",cliente.getPackingType()); ArrayList<Map<String, String>> arrayValues = new ArrayList<>();
ArrayList<Map<String,String>> arrayValues = new ArrayList<>();
arrayValues.add(values); arrayValues.add(values);
if(cliente.getSigned().equals("0")){ if (cliente.getSigned().equals("0")) {
listClientesTickets.add(new ClientTickets(cliente.getClient(), listClientesTickets.add(new ClientTickets(cliente.getClient(),
cliente.getClientName(), cliente.getClientName(),
cliente.getAddress(), cliente.getAddress(),
@ -251,7 +253,7 @@ public class Tickets extends AppCompatActivity {
cliente.getPhones(), cliente.getPhones(),
arrayValues, arrayValues,
cliente.getPolizon())); cliente.getPolizon()));
}else{ } else {
listClientesTicketsFirmados.add(new ClientTickets(cliente.getClient(), listClientesTicketsFirmados.add(new ClientTickets(cliente.getClient(),
cliente.getClientName(), cliente.getClientName(),
cliente.getAddress(), cliente.getAddress(),
@ -275,11 +277,11 @@ public class Tickets extends AppCompatActivity {
Set<String> localSigns = LocalStorage.getPendingSigns(that); Set<String> localSigns = LocalStorage.getPendingSigns(that);
Gson gson = new Gson(); Gson gson = new Gson();
ArrayList<ClientTickets> listAux = new ArrayList<>(); ArrayList<ClientTickets> listAux = new ArrayList<>();
for (String s : localSigns){ for (String s : localSigns) {
SignDataUpload sdu = gson.fromJson(s,SignDataUpload.class); SignDataUpload sdu = gson.fromJson(s, SignDataUpload.class);
int count = 0; int count = 0;
for(ClientTickets c : listClientesTickets){ for (ClientTickets c : listClientesTickets) {
if (sdu.getIdClient().equals(c.getClient())){ if (sdu.getIdClient().equals(c.getClient())) {
listAux.add(listClientesTickets.get(count)); listAux.add(listClientesTickets.get(count));
break; break;
} }
@ -292,22 +294,22 @@ public class Tickets extends AppCompatActivity {
} }
if (isSignedShowed) {
if (isSignedShowed){ adapter = new ClientAdapter(that, listClientesTicketsFirmados);
adapter = new ClientAdapter(that,listClientesTicketsFirmados); } else {
}else{ adapter = new ClientAdapter(that, listClientesTickets);
adapter = new ClientAdapter(that,listClientesTickets);
} }
listViewClients.setAdapter(adapter); listViewClients.setAdapter(adapter);
txtLines.setText(""+listClientesTicketsFirmados.size()+"/"+(listClientesTicketsFirmados.size()+listClientesTickets.size())+" "+that.getResources().getString(R.string.clientes_firmados)); txtLines.setText("" + listClientesTicketsFirmados.size() + "/" + (listClientesTicketsFirmados.size() + listClientesTickets.size()) + " " + that.getResources().getString(R.string.clientes_firmados));
//GUARDAR EN LOCAL //GUARDAR EN LOCAL
LocalStorage.saveListClientesTickets(that,listClientesTickets,route.getId()); LocalStorage.saveListClientesTickets(that, listClientesTickets, route.getId());
LocalStorage.saveListClientesTicketsFirmados(that,listClientesTicketsFirmados,route.getId()); LocalStorage.saveListClientesTicketsFirmados(that, listClientesTicketsFirmados, route.getId());
setPositionListView();
} else {
}else{
getLocalData(); getLocalData();
setPositionListView();
} }
} }
@ -321,40 +323,47 @@ public class Tickets extends AppCompatActivity {
}); });
} }
public void getLocalData(){ private void setPositionListView() {
listClientesTicketsFirmados = LocalStorage.getClientesTicketsFirmados(this,route.getId()); try {
listClientesTickets = LocalStorage.getClientesTickets(this,route.getId()); listViewClients.setSelection(positionOnScreen);
} catch (Exception e){
listViewClients.setSelection(0);
}
}
if (listClientesTicketsFirmados.size()== 0 && listClientesTickets.size() == 0){ public void getLocalData() {
Utils.showErrorDialogAndFinish(this,this.getResources().getString(R.string.error_conexion)); listClientesTicketsFirmados = LocalStorage.getClientesTicketsFirmados(this, route.getId());
listViewClients.setVisibility(View.GONE); listClientesTickets = LocalStorage.getClientesTickets(this, route.getId());
if (listClientesTicketsFirmados.size() == 0 && listClientesTickets.size() == 0) {
Utils.showErrorDialogAndFinish(this, this.getResources().getString(R.string.error_conexion));
listViewClients.setVisibility(View.GONE);
} }
if (isSignedShowed){ if (isSignedShowed) {
adapter = new ClientAdapter(this,listClientesTicketsFirmados); adapter = new ClientAdapter(this, listClientesTicketsFirmados);
}else{ } else {
adapter = new ClientAdapter(this,listClientesTickets); adapter = new ClientAdapter(this, listClientesTickets);
} }
listViewClients.setAdapter(adapter); listViewClients.setAdapter(adapter);
txtLines.setText(""+listClientesTicketsFirmados.size()+"/"+(listClientesTicketsFirmados.size()+listClientesTickets.size())+" "+this.getResources().getString(R.string.clientes_firmados)); txtLines.setText("" + listClientesTicketsFirmados.size() + "/" + (listClientesTicketsFirmados.size() + listClientesTickets.size()) + " " + this.getResources().getString(R.string.clientes_firmados));
} }
public void showPhones(int pos){ public void showPhones(int pos) {
ArrayList<String> phones = new ArrayList<>(); ArrayList<String> phones = new ArrayList<>();
if (isSignedShowed){ if (isSignedShowed) {
for (String phone : listClientesTicketsFirmados.get(pos).getPhones()){ for (String phone : listClientesTicketsFirmados.get(pos).getPhones()) {
if (phone!=""){ if (phone != "") {
phones.add(phone); phones.add(phone);
} }
} }
phones.add(listClientesTicketsFirmados.get(pos).getSalePersonPhone()); phones.add(listClientesTicketsFirmados.get(pos).getSalePersonPhone());
}else{ } else {
for (String phone : listClientesTickets.get(pos).getPhones()){ for (String phone : listClientesTickets.get(pos).getPhones()) {
if (phone!=""){ if (phone != "") {
phones.add(phone); phones.add(phone);
} }
} }
@ -367,18 +376,19 @@ public class Tickets extends AppCompatActivity {
alertDialog.setView(convertView); alertDialog.setView(convertView);
alertDialog.setTitle(getResources().getString(R.string.telefono)); alertDialog.setTitle(getResources().getString(R.string.telefono));
ListView lv = convertView.findViewById(R.id.dialoglist); ListView lv = convertView.findViewById(R.id.dialoglist);
PhonesAdapter adapter = new PhonesAdapter(this,phones){}; PhonesAdapter adapter = new PhonesAdapter(this, phones) {
};
lv.setAdapter(adapter); lv.setAdapter(adapter);
alertDialog.show(); alertDialog.show();
} }
public void llamarTelefono(String phone){ public void llamarTelefono(String phone) {
tlf = phone; tlf = phone;
if (Build.VERSION.SDK_INT >= 23) { if (Build.VERSION.SDK_INT >= 23) {
String[] PERMISSIONS = {android.Manifest.permission.CALL_PHONE}; String[] PERMISSIONS = {android.Manifest.permission.CALL_PHONE};
if (!hasPermissions(this, PERMISSIONS)) { if (!hasPermissions(this, PERMISSIONS)) {
ActivityCompat.requestPermissions((Activity) this, PERMISSIONS, 112 ); ActivityCompat.requestPermissions((Activity) this, PERMISSIONS, 112);
} else { } else {
makeCall(); makeCall();
} }
@ -414,26 +424,26 @@ public class Tickets extends AppCompatActivity {
} }
} }
public void makeCall(){ public void makeCall() {
String uri = "tel:" + tlf.trim() ; String uri = "tel:" + tlf.trim();
Intent intent = new Intent(Intent.ACTION_CALL); Intent intent = new Intent(Intent.ACTION_CALL);
intent.setData(Uri.parse(uri)); intent.setData(Uri.parse(uri));
startActivity(intent); startActivity(intent);
} }
public void goMaps(int pos){ public void goMaps(int pos) {
final Tickets that = this; final Tickets that = this;
final int posicion = pos; final int posicion = pos;
if(isGoogleMapsInstalled()){ if (isGoogleMapsInstalled()) {
if (isSignedShowed){ if (isSignedShowed) {
if (listClientesTicketsFirmados.get(pos).getLatitude() == null || listClientesTicketsFirmados.get(pos).getLatitude().equals("0.0")){ if (listClientesTicketsFirmados.get(pos).getLatitude() == null || listClientesTicketsFirmados.get(pos).getLatitude().equals("0.0")) {
uri = "geo:0,0?q="+listClientesTicketsFirmados.get(pos).getClientName() + uri = "geo:0,0?q=" + listClientesTicketsFirmados.get(pos).getClientName() +
" " + listClientesTicketsFirmados.get(pos).getAddressName() + " " + listClientesTicketsFirmados.get(pos).getAddressName() +
" " + listClientesTicketsFirmados.get(pos).getCity()+ " " + listClientesTicketsFirmados.get(pos).getCity() +
" " + listClientesTicketsFirmados.get(pos).getPostalCode(); " " + listClientesTicketsFirmados.get(pos).getPostalCode();
startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(uri))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(uri)));
}else{ } else {
AlertDialog.Builder builder1 = new AlertDialog.Builder(this); AlertDialog.Builder builder1 = new AlertDialog.Builder(this);
builder1.setMessage(that.getResources().getString(R.string.ver_loc)); builder1.setMessage(that.getResources().getString(R.string.ver_loc));
builder1.setCancelable(true); builder1.setCancelable(true);
@ -442,11 +452,11 @@ public class Tickets extends AppCompatActivity {
that.getResources().getString(R.string.nombre), that.getResources().getString(R.string.nombre),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
uri = "geo:0,0?q="+listClientesTicketsFirmados.get(posicion).getClientName() + uri = "geo:0,0?q=" + listClientesTicketsFirmados.get(posicion).getClientName() +
" " + listClientesTicketsFirmados.get(posicion).getAddressName() + " " + listClientesTicketsFirmados.get(posicion).getAddressName() +
" " + listClientesTicketsFirmados.get(posicion).getCity()+ " " + listClientesTicketsFirmados.get(posicion).getCity() +
" " + listClientesTicketsFirmados.get(posicion).getPostalCode(); " " + listClientesTicketsFirmados.get(posicion).getPostalCode();
startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(uri))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(uri)));
} }
}); });
@ -455,9 +465,9 @@ public class Tickets extends AppCompatActivity {
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
uri = "geo:0,0?q="+listClientesTicketsFirmados.get(posicion).getLatitude() + uri = "geo:0,0?q=" + listClientesTicketsFirmados.get(posicion).getLatitude() +
" " + listClientesTicketsFirmados.get(posicion).getLongitude(); " " + listClientesTicketsFirmados.get(posicion).getLongitude();
startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(uri))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(uri)));
} }
}); });
@ -467,14 +477,14 @@ public class Tickets extends AppCompatActivity {
} }
}else{ } else {
if (listClientesTickets.get(pos).getLatitude() == null || listClientesTickets.get(pos).getLatitude().equals("0.0")){ if (listClientesTickets.get(pos).getLatitude() == null || listClientesTickets.get(pos).getLatitude().equals("0.0")) {
uri = "geo:0,0?q="+listClientesTickets.get(pos).getClientName() + uri = "geo:0,0?q=" + listClientesTickets.get(pos).getClientName() +
" " + listClientesTickets.get(pos).getAddressName() + " " + listClientesTickets.get(pos).getAddressName() +
" " + listClientesTickets.get(pos).getCity()+ " " + listClientesTickets.get(pos).getCity() +
" " + listClientesTickets.get(pos).getPostalCode(); " " + listClientesTickets.get(pos).getPostalCode();
startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(uri))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(uri)));
}else { } else {
AlertDialog.Builder builder1 = new AlertDialog.Builder(this); AlertDialog.Builder builder1 = new AlertDialog.Builder(this);
builder1.setMessage(that.getResources().getString(R.string.ver_loc)); builder1.setMessage(that.getResources().getString(R.string.ver_loc));
builder1.setCancelable(true); builder1.setCancelable(true);
@ -483,11 +493,11 @@ public class Tickets extends AppCompatActivity {
that.getResources().getString(R.string.nombre), that.getResources().getString(R.string.nombre),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
uri = "geo:0,0?q="+listClientesTickets.get(posicion).getClientName() + uri = "geo:0,0?q=" + listClientesTickets.get(posicion).getClientName() +
" " + listClientesTickets.get(posicion).getAddressName() + " " + listClientesTickets.get(posicion).getAddressName() +
" " + listClientesTickets.get(posicion).getCity()+ " " + listClientesTickets.get(posicion).getCity() +
" " + listClientesTickets.get(posicion).getPostalCode(); " " + listClientesTickets.get(posicion).getPostalCode();
startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(uri))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(uri)));
} }
}); });
@ -496,9 +506,9 @@ public class Tickets extends AppCompatActivity {
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
uri = "geo:0,0?q="+listClientesTickets.get(posicion).getLatitude() + uri = "geo:0,0?q=" + listClientesTickets.get(posicion).getLatitude() +
" " + listClientesTickets.get(posicion).getLongitude(); " " + listClientesTickets.get(posicion).getLongitude();
startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(uri))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(uri)));
} }
}); });
@ -509,8 +519,7 @@ public class Tickets extends AppCompatActivity {
} }
} else {
}else{
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage("Please install Google Maps"); builder.setMessage("Please install Google Maps");
builder.setCancelable(false); builder.setCancelable(false);
@ -528,45 +537,42 @@ public class Tickets extends AppCompatActivity {
} }
public void goSign(int pos){ public void goSign(int pos) {
// Intent i = new Intent(this,SignActivity.class); // Intent i = new Intent(this,SignActivity.class);
Intent i = new Intent(this,UnLoadVanActivity.class); Intent i = new Intent(this, UnLoadVanActivity.class);
if (isSignedShowed){ if (isSignedShowed) {
i.putExtra("clientTicket",listClientesTicketsFirmados.get(pos)); i.putExtra("clientTicket", listClientesTicketsFirmados.get(pos));
}else{ } else {
i.putExtra("clientTicket",listClientesTickets.get(pos)); i.putExtra("clientTicket", listClientesTickets.get(pos));
} }
i.putExtra("idRuta",route.getId()); i.putExtra("idRuta", route.getId());
startActivityForResult(i,1); startActivityForResult(i, 1);
} }
public boolean isGoogleMapsInstalled() { public boolean isGoogleMapsInstalled() {
try try {
{ ApplicationInfo info = getPackageManager().getApplicationInfo("com.google.android.apps.maps", 0);
ApplicationInfo info = getPackageManager().getApplicationInfo("com.google.android.apps.maps", 0 );
return true; return true;
} } catch (PackageManager.NameNotFoundException e) {
catch(PackageManager.NameNotFoundException e)
{
return false; return false;
} }
} }
public void showSigned(View v){ public void showSigned(View v) {
if(isSignedShowed){ if (isSignedShowed) {
adapter = new ClientAdapter(this,listClientesTickets); adapter = new ClientAdapter(this, listClientesTickets);
isSignedShowed = false; isSignedShowed = false;
txtClientsToSign.setText(getResources().getString(R.string.tickets_por_firmar)); txtClientsToSign.setText(getResources().getString(R.string.tickets_por_firmar));
btnShowSigned.setText(getResources().getString(R.string.ver_firmados)); btnShowSigned.setText(getResources().getString(R.string.ver_firmados));
}else{ } else {
adapter = new ClientAdapter(this,listClientesTicketsFirmados); adapter = new ClientAdapter(this, listClientesTicketsFirmados);
isSignedShowed = true; isSignedShowed = true;
txtClientsToSign.setText(getResources().getString(R.string.clientes_firmados)); txtClientsToSign.setText(getResources().getString(R.string.clientes_firmados));
btnShowSigned.setText(getResources().getString(R.string.ver_por_firmar)); btnShowSigned.setText(getResources().getString(R.string.ver_por_firmar));
@ -574,11 +580,11 @@ public class Tickets extends AppCompatActivity {
listViewClients.setAdapter(adapter); listViewClients.setAdapter(adapter);
} }
public void showNote(int pos){ public void showNote(int pos) {
String mensaje = ""; String mensaje = "";
if(isSignedShowed){ if (isSignedShowed) {
mensaje = listClientesTicketsFirmados.get(pos).getNote(); mensaje = listClientesTicketsFirmados.get(pos).getNote();
}else{ } else {
mensaje = listClientesTickets.get(pos).getNote(); mensaje = listClientesTickets.get(pos).getNote();
} }
AlertDialog alertDialog = new AlertDialog.Builder(this).create(); AlertDialog alertDialog = new AlertDialog.Builder(this).create();
@ -593,11 +599,11 @@ public class Tickets extends AppCompatActivity {
alertDialog.show(); alertDialog.show();
} }
public void showPolizon(int pos,int posTicket){ public void showPolizon(int pos, int posTicket) {
String polizon = ""; String polizon = "";
if (isSignedShowed){ if (isSignedShowed) {
polizon = listClientesTicketsFirmados.get(pos).getTickets().get(posTicket).get("Polizon"); polizon = listClientesTicketsFirmados.get(pos).getTickets().get(posTicket).get("Polizon");
}else{ } else {
polizon = listClientesTickets.get(pos).getTickets().get(posTicket).get("Polizon"); polizon = listClientesTickets.get(pos).getTickets().get(posTicket).get("Polizon");
} }
AlertDialog alertDialog = new AlertDialog.Builder(this).create(); AlertDialog alertDialog = new AlertDialog.Builder(this).create();
@ -612,55 +618,55 @@ public class Tickets extends AppCompatActivity {
alertDialog.show(); alertDialog.show();
} }
public void goToConfig(View v){ public void goToConfig(View v) {
Intent i = new Intent(this,ConfigureActivity.class); Intent i = new Intent(this, ConfigureActivity.class);
i.putExtra("route",route); i.putExtra("route", route);
startActivityForResult(i,2); startActivityForResult(i, 2);
} }
public void goToInfo(View v){ public void goToInfo(View v) {
Intent i = new Intent(this,InfoActivity.class); Intent i = new Intent(this, InfoActivity.class);
i.putExtra("route",route); i.putExtra("route", route);
startActivityForResult(i,2); startActivityForResult(i, 2);
} }
public void goToNotes(int position){ public void goToNotes(int position) {
posForNote = position; posForNote = position;
Intent i = new Intent(this,NoteActivity.class); Intent i = new Intent(this, NoteActivity.class);
if (isSignedShowed){ if (isSignedShowed) {
i.putExtra("clientTicket",listClientesTicketsFirmados.get(position)); i.putExtra("clientTicket", listClientesTicketsFirmados.get(position));
}else{ } else {
i.putExtra("clientTicket",listClientesTickets.get(position)); i.putExtra("clientTicket", listClientesTickets.get(position));
} }
i.putExtra("isSignedShowed",isSignedShowed); i.putExtra("isSignedShowed", isSignedShowed);
startActivityForResult(i,3); startActivityForResult(i, 3);
} }
public void goToExpeditionByAddress(int pos,String adress){ public void goToExpeditionByAddress(int pos, String adress) {
Intent i = new Intent(this,UnLoadVanActivity.class); Intent i = new Intent(this, UnLoadVanActivity.class);
i.putExtra("adress",adress); i.putExtra("adress", adress);
i.putExtra("routeId",route.getId()); i.putExtra("routeId", route.getId());
i.putExtra("route",route); i.putExtra("route", route);
if (isSignedShowed){ if (isSignedShowed) {
i.putExtra("clientTicket",listClientesTicketsFirmados.get(pos)); i.putExtra("clientTicket", listClientesTicketsFirmados.get(pos));
}else{ } else {
i.putExtra("clientTicket",listClientesTickets.get(pos)); i.putExtra("clientTicket", listClientesTickets.get(pos));
} }
i.putExtra("idRuta",route.getId()); i.putExtra("idRuta", route.getId());
startActivityForResult(i,1); startActivityForResult(i, 1);
// startActivity(i); // startActivity(i);
/* List<Check> listExpeditions= LocalStorage.getExpeditions(this); /* List<Check> listExpeditions= LocalStorage.getExpeditions(this);
@ -684,24 +690,23 @@ public class Tickets extends AppCompatActivity {
} }
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (requestCode == 1){ if (requestCode == 1) {
if (resultCode == Activity.RESULT_OK){ if (resultCode == Activity.RESULT_OK) {
checkPendingSigns(); checkPendingSigns();
} }
}else if (requestCode == 2){ } else if (requestCode == 2) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
route = (Ruta) data.getSerializableExtra("route"); route = (Ruta) data.getSerializableExtra("route");
} }
}else if (requestCode == 3){ } else if (requestCode == 3) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
ClientTickets ct = (ClientTickets) data.getSerializableExtra("clientTicket"); ClientTickets ct = (ClientTickets) data.getSerializableExtra("clientTicket");
if (data.getBooleanExtra("isSignedShowed",false)){ if (data.getBooleanExtra("isSignedShowed", false)) {
listClientesTicketsFirmados.get(posForNote).setNote(ct.getNote()); listClientesTicketsFirmados.get(posForNote).setNote(ct.getNote());
}else{ } else {
listClientesTickets.get(posForNote).setNote(ct.getNote()); listClientesTickets.get(posForNote).setNote(ct.getNote());
} }

8
app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
View File

@ -5,11 +5,11 @@ import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
public class ApiUtils { public class ApiUtils {
private ApiUtils() {} private ApiUtils() {}
//public static final String BASE_URL = "http://10.1.4.42:9000/"; //public static final String BASE_URL = "http://10.1.4.42:9000/";
//public static final String BASE_URL = "http://192.168.1.132:9000/"; //public static final String BASE_URL = "http://192.168.1.128:9000/";
//public static final String BASE_URL = "https://test-app.verdnatura.es/"; public static final String BASE_URL = "https://test-app.verdnatura.es/";
public static final String BASE_URL = "https://app.verdnatura.es/"; //public static final String BASE_URL = "https://app.verdnatura.es/";
public static RestClient getAPIService() { public static RestClient getAPIService() {
return RetrofitClient.getClient(BASE_URL).create(RestClient.class); return RetrofitClient.getClient(BASE_URL).create(RestClient.class);

6
app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java
View File

@ -6,9 +6,9 @@ public class ApiUtilsSalix {
private ApiUtilsSalix() {} private ApiUtilsSalix() {}
public static final String BASE_URL_SALIX = "https://salix.verdnatura.es/"; //public static final String BASE_URL_SALIX = "https://salix.verdnatura.es/";
//public static final String BASE_URL_SALIX = "https://test-salix.verdnatura.es/"; public static final String BASE_URL_SALIX = "https://test-salix.verdnatura.es/";
//public static final String BASE_URL_SALIX = "http://localhost:3000/"; // public static final String BASE_URL_SALIX = "http://localhost:3000/";
public static RestClientSalix getAPIService() { public static RestClientSalix getAPIService() {
return RetrofitClientSalix.getClient(BASE_URL_SALIX).create(RestClientSalix.class); return RetrofitClientSalix.getClient(BASE_URL_SALIX).create(RestClientSalix.class);
} }

64
build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml
View File

@ -2,25 +2,25 @@
<com.google.firebase> <com.google.firebase>
<crash-plugin versions="1.1.2,1.1.3,1.1.4,1.1.5"/> <crash-plugin versions="1.1.2,1.1.3,1.1.4,1.1.5"/>
<firebase-abt versions="15.0.0,15.0.1,16.0.0,16.0.1,17.1.0,17.1.1,18.0.0,18.0.1,19.0.0,19.0.1,19.1.0,20.0.0,21.0.0,21.0.1,21.0.2,21.1.0"/> <firebase-abt versions="15.0.0,15.0.1,16.0.0,16.0.1,17.1.0,17.1.1,18.0.0,18.0.1,19.0.0,19.0.1,19.1.0,20.0.0,21.0.0,21.0.1,21.0.2,21.1.0"/>
<firebase-ads versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,17.0.0,17.1.0,17.1.1,17.1.2,17.1.3,17.2.0,17.2.1,18.0.0,18.1.0,18.1.1,18.2.0,18.3.0,19.0.0,19.0.1,19.1.0,19.2.0,19.3.0,19.4.0,19.5.0,19.6.0,19.7.0,19.8.0,20.0.0,20.1.0,20.2.0,20.3.0,20.4.0,20.5.0,20.6.0,21.0.0,21.1.0,21.2.0,21.3.0,21.4.0"/> <firebase-ads versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,17.0.0,17.1.0,17.1.1,17.1.2,17.1.3,17.2.0,17.2.1,18.0.0,18.1.0,18.1.1,18.2.0,18.3.0,19.0.0,19.0.1,19.1.0,19.2.0,19.3.0,19.4.0,19.5.0,19.6.0,19.7.0,19.8.0,20.0.0,20.1.0,20.2.0,20.3.0,20.4.0,20.5.0,20.6.0,21.0.0,21.1.0,21.2.0,21.3.0,21.4.0,21.5.0"/>
<firebase-ads-lite versions="15.0.0,15.0.1,16.0.1,17.0.0,17.1.0,17.1.1,17.1.2,17.1.3,17.2.0,17.2.1,18.0.0,18.1.0,18.1.1,18.2.0,18.3.0,19.0.0,19.0.1,19.1.0,19.2.0,19.3.0,19.4.0,19.5.0,19.6.0,19.7.0,19.8.0,20.0.0,20.1.0,20.2.0,20.3.0,20.4.0,20.5.0,20.6.0,21.0.0,21.1.0,21.2.0,21.3.0,21.4.0"/> <firebase-ads-lite versions="15.0.0,15.0.1,16.0.1,17.0.0,17.1.0,17.1.1,17.1.2,17.1.3,17.2.0,17.2.1,18.0.0,18.1.0,18.1.1,18.2.0,18.3.0,19.0.0,19.0.1,19.1.0,19.2.0,19.3.0,19.4.0,19.5.0,19.6.0,19.7.0,19.8.0,20.0.0,20.1.0,20.2.0,20.3.0,20.4.0,20.5.0,20.6.0,21.0.0,21.1.0,21.2.0,21.3.0,21.4.0,21.5.0"/>
<firebase-analytics versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.0.3,16.0.4,16.0.5,16.0.6,16.3.0,16.4.0,16.5.0,17.0.0,17.0.1,17.1.0,17.2.0,17.2.1,17.2.2,17.2.3,17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.6.0,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1,21.2.0"/> <firebase-analytics versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.0.3,16.0.4,16.0.5,16.0.6,16.3.0,16.4.0,16.5.0,17.0.0,17.0.1,17.1.0,17.2.0,17.2.1,17.2.2,17.2.3,17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.6.0,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1,21.2.0"/>
<firebase-analytics-impl versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.1.1,16.2.1,16.2.2,16.2.3,16.2.4,16.3.0"/> <firebase-analytics-impl versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.1.1,16.2.1,16.2.2,16.2.3,16.2.4,16.3.0"/>
<firebase-analytics-impl-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-analytics-impl-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-analytics-ktx versions="17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.6.0,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1,21.2.0"/> <firebase-analytics-ktx versions="17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.6.0,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1,21.2.0"/>
<firebase-analytics-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-analytics-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-annotations versions="16.0.0,16.1.0"/> <firebase-annotations versions="16.0.0,16.1.0,16.2.0"/>
<firebase-appcheck versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0"/> <firebase-appcheck versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1"/>
<firebase-appcheck-debug versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0"/> <firebase-appcheck-debug versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1"/>
<firebase-appcheck-debug-testing versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0"/> <firebase-appcheck-debug-testing versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1"/>
<firebase-appcheck-interop versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0"/> <firebase-appcheck-interop versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1"/>
<firebase-appcheck-ktx versions="16.0.2,16.1.0"/> <firebase-appcheck-ktx versions="16.0.2,16.1.0,16.1.1"/>
<firebase-appcheck-playintegrity versions="16.0.0,16.0.1,16.0.2,16.1.0"/> <firebase-appcheck-playintegrity versions="16.0.0,16.0.1,16.0.2,16.1.0,16.1.1"/>
<firebase-appcheck-safetynet versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0"/> <firebase-appcheck-safetynet versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05,16.0.0-beta06,16.0.0,16.0.1,16.0.2,16.1.0,16.1.1"/>
<firebase-appdistribution versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05"/> <firebase-appdistribution versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04,16.0.0-beta05"/>
<firebase-appdistribution-api versions="16.0.0-beta03,16.0.0-beta04,16.0.0-beta05"/> <firebase-appdistribution-api versions="16.0.0-beta03,16.0.0-beta04,16.0.0-beta05"/>
<firebase-appdistribution-api-ktx versions="16.0.0-beta03,16.0.0-beta04,16.0.0-beta05"/> <firebase-appdistribution-api-ktx versions="16.0.0-beta03,16.0.0-beta04,16.0.0-beta05"/>
<firebase-appdistribution-gradle versions="0.2.0,0.2.1,0.2.2,0.2.3,1.0.0,1.1.0,1.2.0,1.3.0,1.3.1,1.4.0,1.4.1,2.0.0,2.0.1,2.1.0,2.1.1,2.1.2,2.1.3,2.2.0,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1"/> <firebase-appdistribution-gradle versions="0.2.0,0.2.1,0.2.2,0.2.3,1.0.0,1.1.0,1.2.0,1.3.0,1.3.1,1.4.0,1.4.1,2.0.0,2.0.1,2.1.0,2.1.1,2.1.2,2.1.3,2.2.0,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.2.0"/>
<firebase-appdistribution-ktx versions="16.0.0-beta01,16.0.0-beta02"/> <firebase-appdistribution-ktx versions="16.0.0-beta01,16.0.0-beta02"/>
<firebase-appindexing versions="10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2,17.1.0,18.0.0,19.0.0,19.1.0,19.2.0,20.0.0"/> <firebase-appindexing versions="10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2,17.1.0,18.0.0,19.0.0,19.1.0,19.2.0,20.0.0"/>
<firebase-appindexing-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-appindexing-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
@ -31,22 +31,22 @@
<firebase-auth-ktx versions="19.3.1,19.3.2,19.4.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.0.3,21.0.4,21.0.5,21.0.6,21.0.7,21.0.8,21.1.0"/> <firebase-auth-ktx versions="19.3.1,19.3.2,19.4.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.0.3,21.0.4,21.0.5,21.0.6,21.0.7,21.0.8,21.1.0"/>
<firebase-auth-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-auth-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-auth-module versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0"/> <firebase-auth-module versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0"/>
<firebase-bom versions="16.0.0,17.0.0,17.1.0,18.0.0,18.1.0,19.0.0,20.0.0,20.0.1,20.1.0,21.0.0,21.1.0,22.0.0,22.1.0,22.2.0,22.2.1,22.3.0,23.0.0,24.0.0,24.0.1,24.0.2,24.1.0,24.2.0,24.3.0,24.4.0,24.5.0,24.6.0,24.7.0,24.7.1,25.0.0,25.1.0,25.1.1,25.2.0,25.2.1,25.2.2,25.3.0,25.3.1,25.4.0,25.4.1,25.5.0,25.6.0,25.6.1,25.7.0,25.8.0,25.9.0,25.10.0,25.11.0,25.12.0,25.13.0,26.0.0,26.1.0,26.1.1,26.2.0,26.3.0,26.4.0,26.5.0,26.6.0,26.7.0,26.8.0,27.0.0,27.1.0,28.0.0,28.0.1,28.1.0,28.2.0,28.2.1,28.3.0,28.3.1,28.4.0,28.4.1,28.4.2,29.0.0,29.0.1,29.0.2,29.0.3,29.0.4,29.1.0,29.2.0,29.2.1,29.3.0,29.3.1,30.0.0,30.0.1,30.0.2,30.1.0,30.2.0,30.3.0,30.3.1,30.3.2,30.4.0,30.4.1,30.5.0,31.0.0,31.0.1,31.0.2,31.0.3,31.1.0,31.1.1"/> <firebase-bom versions="16.0.0,17.0.0,17.1.0,18.0.0,18.1.0,19.0.0,20.0.0,20.0.1,20.1.0,21.0.0,21.1.0,22.0.0,22.1.0,22.2.0,22.2.1,22.3.0,23.0.0,24.0.0,24.0.1,24.0.2,24.1.0,24.2.0,24.3.0,24.4.0,24.5.0,24.6.0,24.7.0,24.7.1,25.0.0,25.1.0,25.1.1,25.2.0,25.2.1,25.2.2,25.3.0,25.3.1,25.4.0,25.4.1,25.5.0,25.6.0,25.6.1,25.7.0,25.8.0,25.9.0,25.10.0,25.11.0,25.12.0,25.13.0,26.0.0,26.1.0,26.1.1,26.2.0,26.3.0,26.4.0,26.5.0,26.6.0,26.7.0,26.8.0,27.0.0,27.1.0,28.0.0,28.0.1,28.1.0,28.2.0,28.2.1,28.3.0,28.3.1,28.4.0,28.4.1,28.4.2,29.0.0,29.0.1,29.0.2,29.0.3,29.0.4,29.1.0,29.2.0,29.2.1,29.3.0,29.3.1,30.0.0,30.0.1,30.0.2,30.1.0,30.2.0,30.3.0,30.3.1,30.3.2,30.4.0,30.4.1,30.5.0,31.0.0,31.0.1,31.0.2,31.0.3,31.1.0,31.1.1,31.2.0"/>
<firebase-common versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.0,16.0.1,16.0.2,16.0.3,16.0.4,16.1.0,17.0.0,17.1.0,18.0.0,19.0.0,19.1.0,19.2.0,19.3.0,19.3.1,19.4.0,19.5.0,20.0.0,20.1.0,20.1.1,20.1.2,20.2.0"/> <firebase-common versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.0,16.0.1,16.0.2,16.0.3,16.0.4,16.1.0,17.0.0,17.1.0,18.0.0,19.0.0,19.1.0,19.2.0,19.3.0,19.3.1,19.4.0,19.5.0,20.0.0,20.1.0,20.1.1,20.1.2,20.2.0,20.3.0"/>
<firebase-common-ktx versions="16.1.0,17.0.0,18.0.0,19.0.0,19.1.0,19.2.0,19.3.0,19.3.1,19.4.0,19.5.0,20.0.0,20.1.0,20.1.1,20.1.2,20.2.0"/> <firebase-common-ktx versions="16.1.0,17.0.0,18.0.0,19.0.0,19.1.0,19.2.0,19.3.0,19.3.1,19.4.0,19.5.0,20.0.0,20.1.0,20.1.1,20.1.2,20.2.0,20.3.0"/>
<firebase-common-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-common-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-components versions="16.0.0,16.0.1,16.1.0,17.0.0,17.0.1"/> <firebase-components versions="16.0.0,16.0.1,16.1.0,17.0.0,17.0.1,17.1.0"/>
<firebase-config versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.1.0,16.1.2,16.1.3,16.3.0,16.4.0,16.4.1,16.5.0,17.0.0,18.0.0,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.2.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.1.0,21.1.1,21.1.2,21.2.0"/> <firebase-config versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.1.0,16.1.2,16.1.3,16.3.0,16.4.0,16.4.1,16.5.0,17.0.0,18.0.0,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.2.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.1.0,21.1.1,21.1.2,21.2.0,21.2.1"/>
<firebase-config-ktx versions="19.0.2,19.0.3,19.0.4,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.2.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.1.0,21.1.1,21.1.2,21.2.0"/> <firebase-config-ktx versions="19.0.2,19.0.3,19.0.4,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.2.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,21.0.0,21.0.1,21.0.2,21.1.0,21.1.1,21.1.2,21.2.0,21.2.1"/>
<firebase-config-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-config-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-core versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.0.3,16.0.4,16.0.5,16.0.6,16.0.7,16.0.8,16.0.9,17.0.0,17.0.1,17.1.0,17.2.0,17.2.1,17.2.2,17.2.3,17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.5.1,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1"/> <firebase-core versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.0.3,16.0.4,16.0.5,16.0.6,16.0.7,16.0.8,16.0.9,17.0.0,17.0.1,17.1.0,17.2.0,17.2.1,17.2.2,17.2.3,17.3.0,17.4.0,17.4.1,17.4.2,17.4.3,17.4.4,17.5.0,17.5.1,18.0.0,18.0.1,18.0.2,18.0.3,19.0.0,19.0.1,19.0.2,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,21.0.0,21.1.0,21.1.1"/>
<firebase-crash versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.2.0,16.2.1"/> <firebase-crash versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.0,16.0.1,16.2.0,16.2.1"/>
<firebase-crash-license versions="11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-crash-license versions="11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-crashlytics versions="17.0.0-beta01,17.0.0-beta02,17.0.0-beta03,17.0.0-beta04,17.0.0,17.0.1,17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2"/> <firebase-crashlytics versions="17.0.0-beta01,17.0.0-beta02,17.0.0-beta03,17.0.0-beta04,17.0.0,17.0.1,17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2,18.3.3"/>
<firebase-crashlytics-buildtools versions="2.0.0-beta01,2.0.0-beta02,2.0.0-beta03,2.0.0-beta04,2.0.0,2.1.0,2.1.1,2.2.0,2.2.1,2.3.0,2.4.0,2.4.1,2.5.0,2.5.1,2.5.2,2.6.0,2.6.1,2.7.0,2.7.1,2.8.0,2.8.1,2.9.0,2.9.1,2.9.2"/> <firebase-crashlytics-buildtools versions="2.0.0-beta01,2.0.0-beta02,2.0.0-beta03,2.0.0-beta04,2.0.0,2.1.0,2.1.1,2.2.0,2.2.1,2.3.0,2.4.0,2.4.1,2.5.0,2.5.1,2.5.2,2.6.0,2.6.1,2.7.0,2.7.1,2.8.0,2.8.1,2.9.0,2.9.1,2.9.2"/>
<firebase-crashlytics-gradle versions="2.0.0-beta01,2.0.0-beta02,2.0.0-beta03,2.0.0-beta04,2.0.0,2.1.0,2.1.1,2.2.0,2.2.1,2.3.0,2.4.0,2.4.1,2.5.0,2.5.1,2.5.2,2.6.0,2.6.1,2.7.0,2.7.1,2.8.0,2.8.1,2.9.0,2.9.1,2.9.2"/> <firebase-crashlytics-gradle versions="2.0.0-beta01,2.0.0-beta02,2.0.0-beta03,2.0.0-beta04,2.0.0,2.1.0,2.1.1,2.2.0,2.2.1,2.3.0,2.4.0,2.4.1,2.5.0,2.5.1,2.5.2,2.6.0,2.6.1,2.7.0,2.7.1,2.8.0,2.8.1,2.9.0,2.9.1,2.9.2"/>
<firebase-crashlytics-ktx versions="17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2"/> <firebase-crashlytics-ktx versions="17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2,18.3.3"/>
<firebase-crashlytics-ndk versions="17.0.0-beta01,17.0.0-beta03,17.0.0-beta04,17.0.0,17.0.1,17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2"/> <firebase-crashlytics-ndk versions="17.0.0-beta01,17.0.0-beta03,17.0.0-beta04,17.0.0,17.0.1,17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.3.1,17.4.0,17.4.1,18.0.0,18.0.1,18.1.0,18.2.0,18.2.1,18.2.3,18.2.4,18.2.5,18.2.6,18.2.7,18.2.8,18.2.9,18.2.10,18.2.11,18.2.12,18.2.13,18.3.0,18.3.1,18.3.2,18.3.3"/>
<firebase-database versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2,16.0.3,16.0.4,16.0.5,16.0.6,16.1.0,17.0.0,18.0.0,18.0.1,19.0.0,19.1.0,19.2.0,19.2.1,19.3.0,19.3.1,19.4.0,19.5.0,19.5.1,19.6.0,19.7.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0"/> <firebase-database versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2,16.0.3,16.0.4,16.0.5,16.0.6,16.1.0,17.0.0,18.0.0,18.0.1,19.0.0,19.1.0,19.2.0,19.2.1,19.3.0,19.3.1,19.4.0,19.5.0,19.5.1,19.6.0,19.7.0,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0"/>
<firebase-database-collection versions="15.0.0,15.0.1,16.0.0,16.0.1,17.0.0,17.0.1,18.0.0,18.0.1"/> <firebase-database-collection versions="15.0.0,15.0.1,16.0.0,16.0.1,17.0.0,17.0.1,18.0.0,18.0.1"/>
<firebase-database-connection versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2"/> <firebase-database-connection versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.1,16.0.1,16.0.2"/>
@ -61,18 +61,18 @@
<firebase-encoders versions="16.0.0,16.1.0,17.0.0"/> <firebase-encoders versions="16.0.0,16.1.0,17.0.0"/>
<firebase-encoders-json versions="16.0.0,16.1.0,17.0.0,17.1.0,18.0.0"/> <firebase-encoders-json versions="16.0.0,16.1.0,17.0.0,17.1.0,18.0.0"/>
<firebase-encoders-proto versions="16.0.0"/> <firebase-encoders-proto versions="16.0.0"/>
<firebase-firestore versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,16.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.1.2,17.1.3,17.1.4,17.1.5,18.0.0,18.0.1,18.1.0,18.2.0,19.0.0,19.0.1,19.0.2,20.0.0,20.1.0,20.2.0,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.3.0,21.3.1,21.4.0,21.4.1,21.4.2,21.4.3,21.5.0,21.6.0,21.7.0,21.7.1,22.0.0,22.0.1,22.0.2,22.1.0,22.1.1,22.1.2,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,24.0.0,24.0.1,24.0.2,24.1.0,24.1.1,24.1.2,24.2.0,24.2.1,24.2.2,24.3.0,24.3.1,24.4.0,24.4.1"/> <firebase-firestore versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,16.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.1.2,17.1.3,17.1.4,17.1.5,18.0.0,18.0.1,18.1.0,18.2.0,19.0.0,19.0.1,19.0.2,20.0.0,20.1.0,20.2.0,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.3.0,21.3.1,21.4.0,21.4.1,21.4.2,21.4.3,21.5.0,21.6.0,21.7.0,21.7.1,22.0.0,22.0.1,22.0.2,22.1.0,22.1.1,22.1.2,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,24.0.0,24.0.1,24.0.2,24.1.0,24.1.1,24.1.2,24.2.0,24.2.1,24.2.2,24.3.0,24.3.1,24.4.0,24.4.1,24.4.2"/>
<firebase-firestore-ktx versions="18.2.0,19.0.0,20.0.0,20.1.0,20.2.0,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.3.0,21.3.1,21.4.0,21.4.1,21.4.2,21.4.3,21.5.0,21.6.0,21.7.0,21.7.1,22.0.0,22.0.1,22.0.2,22.1.0,22.1.1,22.1.2,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,24.0.0,24.0.1,24.0.2,24.1.0,24.1.1,24.1.2,24.2.0,24.2.1,24.2.2,24.3.0,24.3.1,24.4.0,24.4.1"/> <firebase-firestore-ktx versions="18.2.0,19.0.0,20.0.0,20.1.0,20.2.0,21.0.0,21.1.0,21.1.1,21.2.0,21.2.1,21.3.0,21.3.1,21.4.0,21.4.1,21.4.2,21.4.3,21.5.0,21.6.0,21.7.0,21.7.1,22.0.0,22.0.1,22.0.2,22.1.0,22.1.1,22.1.2,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,24.0.0,24.0.1,24.0.2,24.1.0,24.1.1,24.1.2,24.2.0,24.2.1,24.2.2,24.3.0,24.3.1,24.4.0,24.4.1,24.4.2"/>
<firebase-functions versions="12.0.0,12.0.1,15.0.0,16.0.1,16.1.0,16.1.1,16.1.2,16.1.3,16.2.0,16.3.0,17.0.0,18.0.0,18.1.0,19.0.0,19.0.1,19.0.2,19.1.0,19.2.0,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.2.0,20.2.1"/> <firebase-functions versions="12.0.0,12.0.1,15.0.0,16.0.1,16.1.0,16.1.1,16.1.2,16.1.3,16.2.0,16.3.0,17.0.0,18.0.0,18.1.0,19.0.0,19.0.1,19.0.2,19.1.0,19.2.0,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.2.0,20.2.1,20.2.2"/>
<firebase-functions-ktx versions="19.0.1,19.0.2,19.1.0,19.2.0,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.2.0,20.2.1"/> <firebase-functions-ktx versions="19.0.1,19.0.2,19.1.0,19.2.0,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.2.0,20.2.1,20.2.2"/>
<firebase-functions-license versions="12.0.0,12.0.1"/> <firebase-functions-license versions="12.0.0,12.0.1"/>
<firebase-iid versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,16.0.0,16.2.0,17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.1.0,17.1.1,17.1.2,18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,20.1.4,20.1.5,20.1.6,20.1.7,20.2.0,20.2.1,20.2.2,20.2.3,20.2.4,20.3.0,21.0.0,21.0.1,21.1.0"/> <firebase-iid versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,16.0.0,16.2.0,17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.1.0,17.1.1,17.1.2,18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,20.1.4,20.1.5,20.1.6,20.1.7,20.2.0,20.2.1,20.2.2,20.2.3,20.2.4,20.3.0,21.0.0,21.0.1,21.1.0"/>
<firebase-iid-interop versions="15.0.0,16.0.0,16.0.1,17.0.0,17.1.0"/> <firebase-iid-interop versions="15.0.0,16.0.0,16.0.1,17.0.0,17.1.0"/>
<firebase-iid-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-iid-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-inappmessaging versions="17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.2.0,18.0.0,18.0.1,18.0.2,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0"/> <firebase-inappmessaging versions="17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.2.0,18.0.0,18.0.1,18.0.2,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0"/>
<firebase-inappmessaging-display versions="17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.2.0,18.0.0,18.0.1,18.0.2,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0"/> <firebase-inappmessaging-display versions="17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.1.0,17.1.1,17.2.0,18.0.0,18.0.1,18.0.2,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0"/>
<firebase-inappmessaging-display-ktx versions="19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0"/> <firebase-inappmessaging-display-ktx versions="19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0"/>
<firebase-inappmessaging-ktx versions="19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0"/> <firebase-inappmessaging-ktx versions="19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.1.0,19.1.1,19.1.2,19.1.3,19.1.4,19.1.5,20.0.0,20.1.0,20.1.1,20.1.2,20.1.3,20.2.0,20.3.0"/>
<firebase-installations versions="16.0.0,16.1.0,16.2.0,16.2.1,16.2.2,16.3.0,16.3.1,16.3.2,16.3.3,16.3.4,16.3.5,17.0.0,17.0.1,17.0.2,17.0.3,17.1.0"/> <firebase-installations versions="16.0.0,16.1.0,16.2.0,16.2.1,16.2.2,16.3.0,16.3.1,16.3.2,16.3.3,16.3.4,16.3.5,17.0.0,17.0.1,17.0.2,17.0.3,17.1.0"/>
<firebase-installations-interop versions="16.0.0,16.0.1,17.0.0,17.0.1,17.0.2,17.1.0"/> <firebase-installations-interop versions="16.0.0,16.0.1,17.0.0,17.0.1,17.0.2,17.1.0"/>
<firebase-installations-ktx versions="16.3.3,16.3.4,16.3.5,17.0.0,17.0.1,17.0.2,17.0.3,17.1.0"/> <firebase-installations-ktx versions="16.3.3,16.3.4,16.3.5,17.0.0,17.0.1,17.0.2,17.0.3,17.1.0"/>
@ -85,8 +85,8 @@
<firebase-messaging-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-messaging-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-ml-common versions="15.0.0,16.0.0,16.1.2,16.1.4,16.1.5,16.1.6,16.2.1,16.2.3,17.0.0,19.0.0,20.0.0,20.0.1,21.0.0,22.0.0,22.0.1,22.1.0,22.1.1,22.1.2"/> <firebase-ml-common versions="15.0.0,16.0.0,16.1.2,16.1.4,16.1.5,16.1.6,16.2.1,16.2.3,17.0.0,19.0.0,20.0.0,20.0.1,21.0.0,22.0.0,22.0.1,22.1.0,22.1.1,22.1.2"/>
<firebase-ml-model-interpreter versions="15.0.0,16.0.0,16.2.0,16.2.2,16.2.3,16.2.4,17.0.1,17.0.3,18.0.0,19.0.0,20.0.0,20.0.1,21.0.0,22.0.0,22.0.1,22.0.2,22.0.3,22.0.4"/> <firebase-ml-model-interpreter versions="15.0.0,16.0.0,16.2.0,16.2.2,16.2.3,16.2.4,17.0.1,17.0.3,18.0.0,19.0.0,20.0.0,20.0.1,21.0.0,22.0.0,22.0.1,22.0.2,22.0.3,22.0.4"/>
<firebase-ml-modeldownloader versions="23.0.0,23.0.1,24.0.0,24.0.1,24.0.2,24.0.3,24.0.4,24.0.5,24.1.0,24.1.1"/> <firebase-ml-modeldownloader versions="23.0.0,23.0.1,24.0.0,24.0.1,24.0.2,24.0.3,24.0.4,24.0.5,24.1.0,24.1.1,24.1.2"/>
<firebase-ml-modeldownloader-ktx versions="23.0.1,24.0.0,24.0.1,24.0.2,24.0.3,24.0.4,24.0.5,24.1.0,24.1.1"/> <firebase-ml-modeldownloader-ktx versions="23.0.1,24.0.0,24.0.1,24.0.2,24.0.3,24.0.4,24.0.5,24.1.0,24.1.1,24.1.2"/>
<firebase-ml-natural-language versions="18.0.0,18.1.1,18.2.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,21.0.0,21.0.1,21.0.2,21.0.3,22.0.0,22.0.1"/> <firebase-ml-natural-language versions="18.0.0,18.1.1,18.2.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,21.0.0,21.0.1,21.0.2,21.0.3,22.0.0,22.0.1"/>
<firebase-ml-natural-language-language-id-model versions="18.0.0,18.0.2,18.0.3,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.0.7,20.0.8"/> <firebase-ml-natural-language-language-id-model versions="18.0.0,18.0.2,18.0.3,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.0.7,20.0.8"/>
<firebase-ml-natural-language-smart-reply versions="16.3.6,17.0.0,17.0.1,18.0.0,18.0.1,18.0.2,18.0.3,18.0.4,18.0.5,18.0.6,18.0.7,18.0.8"/> <firebase-ml-natural-language-smart-reply versions="16.3.6,17.0.0,17.0.1,18.0.0,18.0.1,18.0.2,18.0.3,18.0.4,18.0.5,18.0.6,18.0.7,18.0.8"/>
@ -100,8 +100,8 @@
<firebase-ml-vision-image-label-model versions="15.0.0,16.2.0,17.0.2,18.0.0,19.0.0,20.0.0,20.0.1,20.0.2"/> <firebase-ml-vision-image-label-model versions="15.0.0,16.2.0,17.0.2,18.0.0,19.0.0,20.0.0,20.0.1,20.0.2"/>
<firebase-ml-vision-internal-vkp versions="16.0.0,16.0.1,16.0.2,17.0.0,17.0.1,17.0.2"/> <firebase-ml-vision-internal-vkp versions="16.0.0,16.0.1,16.0.2,17.0.0,17.0.1,17.0.2"/>
<firebase-ml-vision-object-detection-model versions="16.0.0,17.0.0,18.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6"/> <firebase-ml-vision-object-detection-model versions="16.0.0,17.0.0,18.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6"/>
<firebase-perf versions="10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,15.2.0,16.0.0,16.1.0,16.1.2,16.2.0,16.2.1,16.2.2,16.2.3,16.2.4,16.2.5,17.0.0,17.0.2,18.0.0,18.0.1,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.0.8,19.0.9,19.0.10,19.0.11,19.1.0,19.1.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.1.1,20.2.0,20.3.0"/> <firebase-perf versions="10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,15.2.0,16.0.0,16.1.0,16.1.2,16.2.0,16.2.1,16.2.2,16.2.3,16.2.4,16.2.5,17.0.0,17.0.2,18.0.0,18.0.1,19.0.0,19.0.1,19.0.2,19.0.3,19.0.4,19.0.5,19.0.6,19.0.7,19.0.8,19.0.9,19.0.10,19.0.11,19.1.0,19.1.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.1.1,20.2.0,20.3.0,20.3.1"/>
<firebase-perf-ktx versions="19.0.9,19.0.10,19.0.11,19.1.0,19.1.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.1.1,20.2.0,20.3.0"/> <firebase-perf-ktx versions="19.0.9,19.0.10,19.0.11,19.1.0,19.1.1,20.0.0,20.0.1,20.0.2,20.0.3,20.0.4,20.0.5,20.0.6,20.1.0,20.1.1,20.2.0,20.3.0,20.3.1"/>
<firebase-perf-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-perf-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-plugins versions="1.1.2,1.1.3,1.1.4,1.1.5,1.2.0,2.0.0"/> <firebase-plugins versions="1.1.2,1.1.3,1.1.4,1.1.5,1.2.0,2.0.0"/>
<firebase-storage versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.1,16.0.2,16.0.3,16.0.4,16.0.5,16.1.0,17.0.0,18.0.0,18.1.0,18.1.1,19.0.0,19.0.1,19.1.0,19.1.1,19.2.0,19.2.1,19.2.2,20.0.0,20.0.1,20.0.2,20.1.0"/> <firebase-storage versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.0.2,16.0.1,16.0.2,16.0.3,16.0.4,16.0.5,16.1.0,17.0.0,18.0.0,18.1.0,18.1.1,19.0.0,19.0.1,19.1.0,19.1.1,19.2.0,19.2.1,19.2.2,20.0.0,20.0.1,20.0.2,20.1.0"/>

6
build/intermediates/lint-cache/maven.google/master-index.xml
View File

@ -37,6 +37,7 @@
<androidx.coordinatorlayout/> <androidx.coordinatorlayout/>
<androidx.core/> <androidx.core/>
<androidx.core.uwb/> <androidx.core.uwb/>
<androidx.credentials/>
<androidx.cursoradapter/> <androidx.cursoradapter/>
<androidx.customview/> <androidx.customview/>
<androidx.databinding/> <androidx.databinding/>
@ -81,6 +82,8 @@
<androidx.percentlayout/> <androidx.percentlayout/>
<androidx.preference/> <androidx.preference/>
<androidx.print/> <androidx.print/>
<androidx.privacysandbox.ads/>
<androidx.privacysandbox.sdkruntime/>
<androidx.privacysandbox.tools/> <androidx.privacysandbox.tools/>
<androidx.profileinstaller/> <androidx.profileinstaller/>
<androidx.recommendation/> <androidx.recommendation/>
@ -115,6 +118,7 @@
<androidx.viewpager2/> <androidx.viewpager2/>
<androidx.wear/> <androidx.wear/>
<androidx.wear.compose/> <androidx.wear.compose/>
<androidx.wear.protolayout/>
<androidx.wear.tiles/> <androidx.wear.tiles/>
<androidx.wear.watchface/> <androidx.wear.watchface/>
<androidx.webkit/> <androidx.webkit/>
@ -164,6 +168,7 @@
<com.android.tools.lint/> <com.android.tools.lint/>
<com.android.tools.metalava/> <com.android.tools.metalava/>
<com.android.tools.pixelprobe/> <com.android.tools.pixelprobe/>
<com.android.tools.smali/>
<com.android.tools.utp/> <com.android.tools.utp/>
<com.android.volley/> <com.android.volley/>
<com.crashlytics.sdk.android/> <com.crashlytics.sdk.android/>
@ -189,6 +194,7 @@
<com.google.android.libraries.cloud.telco.subgraph/> <com.google.android.libraries.cloud.telco.subgraph/>
<com.google.android.libraries.enterprise.amapi/> <com.google.android.libraries.enterprise.amapi/>
<com.google.android.libraries.healthdata/> <com.google.android.libraries.healthdata/>
<com.google.android.libraries.identity.googleid/>
<com.google.android.libraries.maps/> <com.google.android.libraries.maps/>
<com.google.android.libraries.mapsplatform.secrets-gradle-plugin/> <com.google.android.libraries.mapsplatform.secrets-gradle-plugin/>
<com.google.android.libraries.places/> <com.google.android.libraries.places/>

7
vn-delivery.iml
View File

@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="vn-delivery" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <module external.linked.project.id="vn-delivery" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">