Versión 9.5 App preparada para modificar consultas back, icono cargar cualquier ruta ya direcciona a la pantalla resumen.

This commit is contained in:
Sergio De la torre 2022-11-09 08:16:27 +01:00
parent 2a311c72ce
commit 805b4cb6d6
40 changed files with 263 additions and 362 deletions

View File

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

View File

@ -25,7 +25,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_note.xml" value="0.13020833333333334" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_scan.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_sign.xml" value="0.16666666666666666" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_sign.xml" value="0.14450867052023122" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_tickets.xml" value="0.26878612716763006" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/component_custom_edit_dialog.xml" value="0.22604166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/header_route.xml" value="0.17806484295845998" />

View File

@ -9,8 +9,8 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="VERDNATURA::" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
<component name="AutoImportSettings">
@ -40,59 +40,63 @@
</configurations>
</component>
<component name="ChangeListManager">
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="Añadido carga y descarga de rutas. Añadida info actual. Cambiada checkversion.">
<change afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoadVanActivity.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UnLoadVanActivity.kt" afterDir="false" />
<list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="Versión 9.4 quitando conductores y modificando carga ruta cualquiera. Añadidos ficheros a versionar">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/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/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" afterPath="$PROJECT_DIR$/apk/release/vn-delivery.apk" afterDir="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/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ConfigureActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ConfigureActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/WorkerAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/WorkerAdapter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionInfoActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionInfoActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ExpeditionSummaryActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoadersActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoadersActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoadersActivity.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/ExpeditionInfo.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/ExpeditionInfo.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Version.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Version.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/NetworkStateReveiver.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/NoteActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/NoteActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/RetrofitClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/RetrofitClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UnLoadVanActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UnLoadVanActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_expedition_summary.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_expedition_summary.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_info.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_tickets.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_tickets.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/row_expedition_summary.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/row_expedition_summary.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/row_route.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/row_route.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/row_sub_ticket.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/row_sub_ticket.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/row_ticket.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/row_ticket.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-en/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.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/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>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -193,7 +197,7 @@
<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$/app/src/main/res/drawable-v24" />
<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" />
@ -338,7 +342,21 @@
<option name="project" value="LOCAL" />
<updated>1646409844507</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="Versión 9.4 quitando conductores y modificando carga ruta cualquiera">
<created>1665474489592</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1665474489592</updated>
</task>
<task id="LOCAL-00003" summary="Versión 9.4 quitando conductores y modificando carga ruta cualquiera. Añadidos ficheros a versionar">
<created>1665474517638</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1665474517638</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -365,7 +383,9 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Añadido carga y descarga de rutas. Añadida info actual. Cambiada checkversion." />
<option name="LAST_COMMIT_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. Añadidos ficheros a versionar" />
<option name="LAST_COMMIT_MESSAGE" value="Versión 9.4 quitando conductores y modificando carga ruta cualquiera. Añadidos ficheros a versionar" />
</component>
<component name="masterDetails">
<states>

View File

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

View File

@ -7,14 +7,12 @@ android {
applicationId "verdnatura.es.repartoverdnatura"
minSdkVersion 19
//targetSdkVersion 28
versionCode 24
versionName "9.4"
//versionName "9.3.2" // versionCode 23 (madrid)
//versionName "9.3.2" versionCode 21
//versionName "9.3.1" versionCode 20
//versionCode 19 //version 9.3
//versionName "9.3"
versionCode 26
versionName "9.5"
//versionName "9.5" versionCode 26
//versionName "9.6Beta" versionCode 26
//versionName "9.4.1" versionCode 25
//versionName "9.6Beta" versionCode 26
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
@ -44,7 +42,6 @@ dependencies {
implementation 'com.google.firebase:firebase-inappmessaging-display:17.0.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
apply plugin: 'com.google.gms.google-services'

View File

@ -52,10 +52,6 @@
android:name=".ConfigureActivity"
android:configChanges="orientation"
android:screenOrientation="portrait" />
<activity
android:name=".LoadersActivity"
android:configChanges="orientation"
android:screenOrientation="portrait" />
<activity
android:name=".NoteActivity"
android:configChanges="orientation"

View File

@ -15,7 +15,6 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import verdnatura.es.repartoverdnatura.LoadersActivity;
import verdnatura.es.repartoverdnatura.MODELS.Worker;
import verdnatura.es.repartoverdnatura.R;
@ -53,9 +52,9 @@ public class WorkerAdapter extends ArrayAdapter<Worker> implements Filterable {
convertView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (getContext() instanceof LoadersActivity){
/* if (getContext() instanceof LoadersActivity){
((LoadersActivity) getContext()).setSelectedWorker(worker);
}
}*/
}
});

View File

@ -231,11 +231,11 @@ public class CargarBultosActivity extends AppCompatActivity {
}
public void goToLoaders(View v) {
/* public void goToLoaders(View v) {
Intent i = new Intent(this, LoadersActivity.class);
i.putExtra("idRoute", txtRuta.getText().toString());
startActivity(i);
}
}*/
private void getChecks(){

View File

@ -3,6 +3,7 @@ package verdnatura.es.repartoverdnatura
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.media.MediaPlayer
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
@ -45,6 +46,7 @@ class ExpeditionInfoActivity : AppCompatActivity() {
private lateinit var listRoutes: List<Ruta>
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_expedition_info)
@ -72,7 +74,8 @@ class ExpeditionInfoActivity : AppCompatActivity() {
}
private fun expeditionState_addByExpedition(expeditions: List<Check>, state: String) {
Utils.progressBar.dialog.show()
Utils.progressBar.show(this, getResources().getString(R.string.please_wait))
val stateData: Array<Any?> = arrayOfNulls(2)
stateData[0] = expeditions
@ -123,6 +126,7 @@ class ExpeditionInfoActivity : AppCompatActivity() {
Utils.progressBar.dialog.dismiss()
if (response.isSuccessful) {
showSwitch(View.VISIBLE)
for (expedInfo in response.body()!!) {
listExpedition.add(expedInfo)
@ -130,10 +134,9 @@ class ExpeditionInfoActivity : AppCompatActivity() {
}
if (listExpedition.isEmpty() || listExpedition.size < 1) {
Utils.showErrorDialog(
this@ExpeditionInfoActivity,
"No se han encontrado logs para la expedición: " + expedition
)
var expedEmpty = ExpeditionInfoLog()
expedEmpty.created = "Sin registros"
listExpedition.add(expedEmpty)
}
setAdapter(listExpedition)
@ -170,10 +173,10 @@ class ExpeditionInfoActivity : AppCompatActivity() {
if (response.isSuccessful) {
if (response.body().isNullOrEmpty()) {
Utils.showErrorDialog(
/* Utils.showErrorDialog(
this@ExpeditionInfoActivity,
"Expedición sin ruta"
)
)*/
} else {
allRoute!!.visibility = View.VISIBLE
@ -252,7 +255,7 @@ class ExpeditionInfoActivity : AppCompatActivity() {
android.app.AlertDialog.BUTTON_POSITIVE, "SI"
) { dialog, which ->
alertDialog.dismiss()
var expeditions = arrayListOf<Check>()
expeditions.add(
Check(
@ -313,8 +316,9 @@ class ExpeditionInfoActivity : AppCompatActivity() {
}
fun onLoadSelected(view: View) {
if (listRoutes.isNotEmpty()) {
val i = Intent(this, LoadVanActivity::class.java)
val i = Intent(this, ExpeditionSummaryActivity::class.java)
i.putExtra("route", listRoutes[0])
startActivity(i)
}

View File

@ -106,10 +106,10 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
if (textAddressSelected!!.text.isNotEmpty()) {
checks
txtScan!!.requestFocus()
}
}
fun goToExpeditionByAddress(
adress: String?,
position: Int
@ -137,10 +137,8 @@ class ExpeditionSummaryActivity : AppCompatActivity() {
itemScanned = false
}
textAddressTitle!!.visibility = View.VISIBLE
textAddressSelected!!.text = adress
txtScan!!.visibility = View.VISIBLE
txtScan!!.requestFocus()
checks

View File

@ -15,7 +15,6 @@ import verdnatura.es.repartoverdnatura.MODELS.ExpeditionInfoSummary;
import verdnatura.es.repartoverdnatura.MODELS.Ruta;
import verdnatura.es.repartoverdnatura.MODELS.SectorItem;
import verdnatura.es.repartoverdnatura.MODELS.Version;
import verdnatura.es.repartoverdnatura.MODELS.Worker;
public interface RestClient {
@ -36,8 +35,8 @@ public interface RestClient {
@POST("/delivery/get_routes")
Call<List<Ruta>> getRoutes(@HeaderMap Map<String, String> headers);
@POST("/delivery/get_expeditions")
Call<List<Ruta>> getExpeditions(@HeaderMap Map<String, String> headers);
/*@POST("/delivery/get_expeditions")
Call<List<Ruta>> getExpeditions(@HeaderMap Map<String, String> headers);*/
@POST("/delivery/get_tickets")
Call<List<Cliente>> getClients(@HeaderMap Map<String, String> headers, @Body String[] route);
@ -48,8 +47,8 @@ public interface RestClient {
@POST("/delivery/update_routes")
Call<Void> saveConfig(@HeaderMap Map<String, String> headers, @Body Object[] args);
@POST("/delivery/getWorkers")
Call<List<Worker>> getWorkers(@HeaderMap Map<String, String> headers);
/* @POST("/delivery/getWorkers")
Call<List<Worker>> getWorkers(@HeaderMap Map<String, String> headers);*/
@POST("/delivery/getExpeditionFromRoute")
Call<List<Check>> getExpeditionFromRoute(@HeaderMap Map<String, String> headers, @Body Object[] args);
@ -85,14 +84,14 @@ public interface RestClient {
/*@POST("/delivery/expeditionState_addByRoute")
Call<Void> expeditionState_addByRoute(@HeaderMap Map<String,String> headers,@Body Object[] args);*/
@POST("/delivery/saveLoadersWorkers")
/* @POST("/delivery/saveLoadersWorkers")6008
Call<String> saveLoadersWorkers(@HeaderMap Map<String, String> headers, @Body Object[] args);
*/
@POST("/delivery/addNote")
Call<String> addNote(@HeaderMap Map<String, String> headers, @Body Object[] args);
@POST("/delivery/getInfo")
Call<List<DeliveryInfo>> getInfo(@HeaderMap Map<String, String> headers, @Body Object[] args);
/* @POST("/delivery/getInfo")
Call<List<DeliveryInfo>> getInfo(@HeaderMap Map<String, String> headers, @Body Object[] args);*/
@POST("/delivery/getInfoCompany")
Call<List<DeliveryInfo>> getInfoCompany(@HeaderMap Map<String, String> headers, @Body Object[] args);

View File

@ -1,202 +0,0 @@
package verdnatura.es.repartoverdnatura;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.View;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.List;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import verdnatura.es.repartoverdnatura.ADAPTERS.WorkerAdapter;
import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
import verdnatura.es.repartoverdnatura.MODELS.Worker;
import verdnatura.es.repartoverdnatura.MODELS.WorkerSave;
import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
import verdnatura.es.repartoverdnatura.UTILS.Utils;
public class LoadersActivity extends AppCompatActivity {
private ListView workersListView;
private ArrayList<Worker> listWorkers = new ArrayList<>();
private ArrayList<Worker> listWorkersSelected = new ArrayList<>();
private ArrayList<Worker> listWorkersNoSelected = new ArrayList<>();
private WorkerAdapter adapter;
private TextView txtTotal;
private EditText txtWorker;
private RestClient restClient;
public String idRoute = "0";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_loaders);
restClient = ApiUtils.getAPIService();
Intent intent = this.getIntent();
Bundle bundle = intent.getExtras();
idRoute = bundle.getString("idRoute");
setViews();
getWorkers();
setEvents();
}
private void setViews(){
workersListView = findViewById(R.id.listWorkers);
txtTotal = findViewById(R.id.textView38);
txtWorker = findViewById(R.id.editText2);
}
private void setEvents(){
txtWorker.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
Log.i("Worker",txtWorker.getText().toString());
filterList();
}
});
}
public void filterList(){
this.adapter.getFilter().filter(txtWorker.getText());
}
private void getWorkers(){
listWorkers = new ArrayList<>();
final LoadersActivity that = this;
Utils.progressBar.show(this,getResources().getString(R.string.please_wait));
restClient.getWorkers(Utils.getMapWhitUser(this)).enqueue(new Callback<List<Worker>>() {
@Override
public void onResponse(Call<List<Worker>> call, Response<List<Worker>> response) {
Utils.progressBar.getDialog().dismiss();
if (response.isSuccessful()){
for (Worker w : response.body()){
if(w.getRouteLoader() != null && w.getRouteLoader().equals(idRoute)){
w.setSelected(true);
listWorkersSelected.add(w);
}else{
if (listWorkersNoSelected.size() > 0 && !listWorkersNoSelected.get(listWorkersNoSelected.size() -1).getId().equals(w.getId()) ){
w.setSelected(false);
listWorkersNoSelected.add(w);
}else if(listWorkersNoSelected.size() == 0){
w.setSelected(false);
listWorkersNoSelected.add(w);
}
}
}
for (Worker work : listWorkersSelected){
for(Worker workNo : listWorkersNoSelected){
if (workNo.getId().equals(work.getId())){
listWorkersNoSelected.remove(listWorkersNoSelected.indexOf(workNo));
break;
}
}
}
listWorkers.addAll(listWorkersSelected);
listWorkers.addAll(listWorkersNoSelected);
adapter = new WorkerAdapter(that,listWorkers);
workersListView.setAdapter(adapter);
txtTotal.setText(""+getSelecteds()+" "+getResources().getString(R.string.seleccionados));
}else{
Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion));
}
}
@Override
public void onFailure(Call<List<Worker>> call, Throwable t) {
Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion));
}
});
}
public void setSelectedWorker(Worker worker){
int pos = 0;
for (Worker w : listWorkers){
if (worker == w){
break;
}
pos+=1;
}
listWorkers.get(pos).setSelected(!listWorkers.get(pos).getSelected());
adapter.notifyDataSetChanged();
txtTotal.setText(""+getSelecteds()+" "+getResources().getString(R.string.seleccionados));
}
private int getSelecteds(){
int count = 0;
for(Worker w : listWorkers){
if (w.getSelected()) count += 1;
}
return count;
}
public void saveWorkers(View v){
Utils.progressBar.show(this,getResources().getString(R.string.please_wait));
final LoadersActivity that = this;
ArrayList<String> workersId = new ArrayList<>();
for (Worker w:listWorkers){
if (w.getSelected()){
workersId.add(w.getId());
}
}
WorkerSave ws = new WorkerSave(idRoute,workersId);
Object[] args = new Object[1];
args[0] = ws;
restClient.saveLoadersWorkers(Utils.getMapWhitUser(this),args).enqueue(new Callback<String>() {
@Override
public void onResponse(Call<String> call, Response<String> response) {
Utils.progressBar.getDialog().dismiss();
if(response.isSuccessful()){
if (response.body().equals("Finish")){
finish();
}else{
Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion));
}
}else{
Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion));
}
}
@Override
public void onFailure(Call<String> call, Throwable t) {
Utils.progressBar.getDialog().dismiss();
Utils.showErrorDialog(that,that.getResources().getString(R.string.error_conexion));
}
});
}
public void orderWorkers(){
}
}

View File

@ -1,5 +1,7 @@
package verdnatura.es.repartoverdnatura.MODELS
import com.google.gson.annotations.SerializedName
class ExpeditionInfoLog {
@ -15,7 +17,9 @@ class ExpeditionInfoLog {
class ExpeditionInfoSummary{
@SerializedName(value="routeFk",alternate=["route"])
var route: Int? = null
@SerializedName(value="addressFk",alternate=["address"])
var address: String? = null
var itemPackingType: String? = null
var total: Int? = 0

View File

@ -6,27 +6,27 @@ import java.io.Serializable;
public class Ruta implements Serializable {
@SerializedName("Id")
@SerializedName(value="Id", alternate={"id"})
private String Id;
@SerializedName("Hour")
@SerializedName(value="Hour",alternate = "hour")
private String Hour;
@SerializedName("Date")
@SerializedName(value="Date", alternate={"created"})
private String Date;
@SerializedName("M3")
@SerializedName(value="M3", alternate = {"m3"})
private String M3;
@SerializedName("Plate")
@SerializedName(value="Plate", alternate={"numberPlate"})
private String Plate;
@SerializedName("Agency")
@SerializedName(value="Agency",alternate={"name"})
private String Agency;
@SerializedName("Driver")
@SerializedName(value="Driver",alternate = {"driver"})
private String Driver;
@SerializedName("kmStart")
private String kmStart;
@SerializedName("kmEnd")
private String kmEnd;
@SerializedName("dStart")
@SerializedName(value="dStart",alternate = {"started"})
private String dStart;
@SerializedName("dEnd")
@SerializedName(value="dEnd",alternate = {"finished"})
private String dEnd;
@SerializedName("Chofer")
private String Chofer;

View File

@ -12,12 +12,15 @@ public class Version {
private String version;
@SerializedName("IsVersionCritical")
private String IsVersionCritical;
@SerializedName("url")
private String url;
public Version(String id, String appName, String version,String IsVersionCritical) {
public Version(String id, String appName, String version,String IsVersionCritical,String url) {
// this.id = id;
this.appName = appName;
this.version = version;
this.IsVersionCritical = IsVersionCritical;
this.url=url;
}
/* public String getId() {
@ -39,6 +42,9 @@ public class Version {
public String getVersion() {
return version;
}
public String getUrl() {
return url;
}
public String getVersionIsCritical() {
return IsVersionCritical;

View File

@ -112,6 +112,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
private void setViews(){
listViewRutas = findViewById(R.id.listRutas);
listViewPendingTickets = findViewById(R.id.listPendingTickets);
heightCellRoute = Utils.convertDipToPixels(160f,this);
heightCellHeader = Utils.convertDipToPixels(45f,this);
@ -496,7 +497,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
@Override
public void onResponse(Call<Version> call, Response<Version> response) {
if (response.isSuccessful()){
Version v = response.body();
final Version v = response.body();
PackageManager manager = that.getPackageManager();
try{
@ -512,7 +513,7 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
"Actualizar",
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://app.verdnatura.es/bin/vn-delivery.apk")));
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(v.getUrl())));
}
});

View File

@ -17,6 +17,7 @@ import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.AbsListView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@ -137,6 +138,19 @@ public class Tickets extends AppCompatActivity {
private void setViews(){
listViewClients = this.findViewById(R.id.listClientes);
//Tarea 4659
/* listViewClients.setOnScrollListener(new AbsListView.OnScrollListener() {
@Override
public void onScrollStateChanged(AbsListView view, int scrollState) {
Log.d("VERDNATURA::","has changed");
}
@Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
Log.d("VERDNATURA::","has scroll"+firstVisibleItem);
}
});*/
txtZona = this.findViewById(R.id.textView19);
txtLines = this.findViewById(R.id.textView35);
btnVolver = this.findViewById(R.id.textView3);
@ -605,6 +619,7 @@ public class Tickets extends AppCompatActivity {
}
public void goToInfo(View v){
Intent i = new Intent(this,InfoActivity.class);
i.putExtra("route",route);
startActivityForResult(i,2);

View File

@ -5,11 +5,11 @@ import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
public class 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 = "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() {
return RetrofitClient.getClient(BASE_URL).create(RestClient.class);

View File

@ -9,7 +9,9 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.provider.Settings;
import android.support.v4.BuildConfig;
import android.text.InputType;
import android.util.Log;
import android.widget.EditText;
import java.util.HashMap;
import java.util.Map;
@ -122,7 +124,32 @@ public class Utils {
AlertDialog alert11 = builder1.create();
alert11.show();
}
public static void showInputDialogExpedition(final Context context, String title) {
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(title);
// Set up the input
final EditText input = new EditText(context);
// Specify the type of input expected; this, for example, sets the input as a password, and will mask the text
input.setInputType(InputType.TYPE_CLASS_NUMBER );
builder.setView(input);
// Set up the buttons
builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.d("VERDNATURA::",input.getText().toString());
}
});
builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
}
});
builder.show();
}
public static void saveIdUser(Context context, String idUser) {
sp = context.getSharedPreferences("delivery", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = sp.edit();

View File

@ -67,7 +67,12 @@ class UnLoadVanActivity : AppCompatActivity() {
override fun onBackPressed() {
// setRouteLoaded()
if (delivered!=0){
reviewLoad()
}else{
finish()
}
}
private fun reviewLoad(){

View File

@ -95,6 +95,7 @@
android:layout_height="0dp"
android:layout_marginRight="8dp"
android:onClick="onLoadSelected"
android:tooltipText="Permite escanear las expediciones de todos los consigntarios de la ruta"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageExit"
app:layout_constraintTop_toTopOf="parent"

View File

@ -47,6 +47,7 @@
android:layout_height="20dp"
android:layout_marginStart="8dp"
android:padding="0dp"
android:tooltipText="Permite editar sector del usuario"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="parent"

View File

@ -55,6 +55,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/expedition_find"
android:visibility="gone"
android:onClick="goToFound"/>
<ImageView
@ -62,11 +63,13 @@
android:layout_width="30dp"
android:layout_height="0dp"
android:layout_marginEnd="14dp"
android:padding="2dp"
android:tooltipText="Permite ver log,cargar cualquier ruta y marcar expedición encontrada"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageViewFind"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/ic_history"
app:srcCompat="@drawable/expedition_find"
android:onClick="goToExpeditionInfo"/>
@ -77,6 +80,7 @@
android:layout_marginEnd="14dp"
android:onClick="getRoutes"
android:padding="5dp"
android:tooltipText="Actualiza pantalla principal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView7"
app:layout_constraintTop_toTopOf="parent"
@ -89,6 +93,7 @@
android:layout_marginEnd="14dp"
android:onClick="goToInfo"
android:padding="9dp"
android:tooltipText="Muestra información relativa a la empresa"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView8"
app:layout_constraintTop_toTopOf="parent"

View File

@ -52,6 +52,7 @@
android:layout_marginEnd="8dp"
android:onClick="goToConfig"
android:padding="5dp"
android:tooltipText="Permite insertar kilómetros y horas de una ruta"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -64,6 +65,7 @@
android:layout_marginEnd="16dp"
android:onClick="goToInfo"
android:padding="5dp"
android:tooltipText="Muestra información relativa a la empresa"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView2"
app:layout_constraintTop_toTopOf="parent"

View File

@ -98,6 +98,7 @@
android:layout_height="24dp"
android:layout_marginRight="2dp"
android:onClick="onLoadSelected"
android:tooltipText="Permite escanear expediciones del consigntario seleccionado"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageExit"
app:layout_constraintTop_toTopOf="parent"

View File

@ -181,6 +181,7 @@
android:layout_height="30dp"
app:srcCompat="@drawable/camion"
android:layout_marginTop="0dp"
android:tooltipText="Permite escanear expediciones a cargar en la furgoneta"
android:layout_marginBottom="5dp"
/>
<TextView
@ -210,6 +211,7 @@
app:srcCompat="@drawable/noweb"
android:layout_marginTop="0dp"
android:layout_marginBottom="5dp"
android:tooltipText="Permite ver tickets"
/>
<TextView

View File

@ -196,6 +196,7 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_weight="1"
android:tooltipText="Permite ver notas relativas a la entrega"
app:srcCompat="@drawable/note" />
</LinearLayout>
<LinearLayout
@ -212,6 +213,7 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_weight="1"
android:tooltipText="Permite añadir notas relativas a la entrega"
app:srcCompat="@drawable/notes" />
</LinearLayout>
<LinearLayout
@ -228,6 +230,7 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_weight="1"
android:tooltipText="Permite llamar al cliente"
app:srcCompat="@drawable/telephone" />
</LinearLayout>
@ -245,6 +248,7 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_weight="1"
android:tooltipText="Permite ver ubicación de la entrega"
app:srcCompat="@drawable/placeholder" />
</LinearLayout>
<LinearLayout
@ -261,6 +265,7 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_weight="1"
android:tooltipText="Permite escanear expediciones a entregar"
app:srcCompat="@drawable/camion_descarga" />
</LinearLayout>
<LinearLayout

View File

@ -1,91 +1,92 @@
<?xml version='1.0' encoding='UTF-8'?>
<com.google.firebase>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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-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"/>
<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-annotations versions="16.0.0,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"/>
<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"/>
<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"/>
<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"/>
<firebase-appcheck-playintegrity versions="16.0.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"/>
<firebase-appdistribution versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03"/>
<firebase-appdistribution-api versions="16.0.0-beta03"/>
<firebase-appdistribution-api-ktx versions="16.0.0-beta03"/>
<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"/>
<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-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-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-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-ktx versions="16.0.2,16.1.0"/>
<firebase-appcheck-playintegrity versions="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"/>
<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-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"/>
<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-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-auth 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.1,16.0.2,16.0.3,16.0.4,16.0.5,16.1.0,16.2.0,16.2.1,17.0.0,18.0.0,18.1.0,19.0.0,19.1.0,19.2.0,19.3.0,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"/>
<firebase-auth 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.1,16.0.2,16.0.3,16.0.4,16.0.5,16.1.0,16.2.0,16.2.1,17.0.0,18.0.0,18.1.0,19.0.0,19.1.0,19.2.0,19.3.0,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-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"/>
<firebase-auth-impl versions="11.0.0,16.1.0"/>
<firebase-auth-interop versions="15.0.2,16.0.0,16.0.1,17.0.0,18.0.0,19.0.0,19.0.1,19.0.2,20.0.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"/>
<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-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"/>
<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"/>
<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"/>
<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"/>
<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-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-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"/>
<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"/>
<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"/>
<firebase-components versions="16.0.0,16.0.1,16.1.0,17.0.0,17.0.1"/>
<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-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-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"/>
<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-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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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-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"/>
<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"/>
<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-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-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-database-ktx versions="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"/>
<firebase-database-ktx versions="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-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-datatransport versions="16.0.0,17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.0.6,17.0.7,17.0.8,17.0.9,17.0.10,17.0.11,18.0.0,18.0.1,18.1.0,18.1.1,18.1.2,18.1.3,18.1.4,18.1.5,18.1.6"/>
<firebase-dynamic-links versions="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.1,16.1.2,16.1.3,16.1.5,16.1.7,16.1.8,17.0.0,18.0.0,19.0.0,19.1.0,19.1.1,20.0.0,20.1.0,20.1.1,21.0.0,21.0.1"/>
<firebase-dynamic-links-ktx versions="19.1.0,19.1.1,20.0.0,20.1.0,20.1.1,21.0.0,21.0.1"/>
<firebase-datatransport versions="16.0.0,17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5,17.0.6,17.0.7,17.0.8,17.0.9,17.0.10,17.0.11,18.0.0,18.0.1,18.1.0,18.1.1,18.1.2,18.1.3,18.1.4,18.1.5,18.1.6,18.1.7"/>
<firebase-dynamic-links versions="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.1,16.1.2,16.1.3,16.1.5,16.1.7,16.1.8,17.0.0,18.0.0,19.0.0,19.1.0,19.1.1,20.0.0,20.1.0,20.1.1,21.0.0,21.0.1,21.0.2,21.1.0"/>
<firebase-dynamic-links-ktx versions="19.1.0,19.1.1,20.0.0,20.1.0,20.1.1,21.0.0,21.0.1,21.0.2,21.1.0"/>
<firebase-dynamic-links-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-dynamic-module-support versions="16.0.0-beta01,16.0.0-beta02"/>
<firebase-dynamic-module-support versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03"/>
<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-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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<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-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-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"/>
<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"/>
<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"/>
<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"/>
<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"/>
<firebase-installations-interop versions="16.0.0,16.0.1,17.0.0,17.0.1"/>
<firebase-installations-ktx versions="16.3.3,16.3.4,16.3.5,17.0.0,17.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-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-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"/>
<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-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-invites 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.3,16.0.4,16.0.5,16.0.6,16.1.0,16.1.1,17.0.0"/>
<firebase-measurement-connector versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.0,18.0.1,18.0.2,19.0.0,20.0.0"/>
<firebase-measurement-connector-impl versions="15.0.0,16.0.0,16.0.1,17.0.1,17.0.2,17.0.3,17.0.4,17.0.5"/>
<firebase-messaging 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,17.0.0,17.1.0,17.3.0,17.3.1,17.3.2,17.3.3,17.3.4,17.4.0,17.5.0,17.6.0,18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.1.0,20.1.1,20.1.2,20.1.3,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,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7"/>
<firebase-messaging-directboot versions="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,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7"/>
<firebase-messaging-ktx versions="20.3.0,21.0.0,21.0.1,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7"/>
<firebase-messaging 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,17.0.0,17.1.0,17.3.0,17.3.1,17.3.2,17.3.3,17.3.4,17.4.0,17.5.0,17.6.0,18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.1.0,20.1.1,20.1.2,20.1.3,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,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7,23.0.8,23.1.0"/>
<firebase-messaging-directboot versions="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,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7,23.0.8,23.1.0"/>
<firebase-messaging-ktx versions="20.3.0,21.0.0,21.0.1,22.0.0,23.0.0,23.0.1,23.0.2,23.0.3,23.0.4,23.0.5,23.0.6,23.0.7,23.0.8,23.1.0"/>
<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-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"/>
<firebase-ml-modeldownloader-ktx versions="23.0.1,24.0.0,24.0.1,24.0.2,24.0.3,24.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-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-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-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"/>
@ -99,16 +100,16 @@
<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-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"/>
<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"/>
<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"/>
<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"/>
<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-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"/>
<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-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.2,16.0.1,16.0.2,17.0.0"/>
<firebase-storage-common-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<firebase-storage-ktx versions="19.1.0,19.1.1,19.2.0,19.2.1,19.2.2,20.0.0,20.0.1"/>
<firebase-storage-ktx versions="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-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
<perf-plugin versions="1.1.2,1.1.3,1.1.4,1.1.5,1.2.0,1.2.1,1.3.0,1.3.1,1.3.2,1.3.3,1.3.4,1.3.5,1.4.0,1.4.1"/>
<perf-plugin versions="1.1.2,1.1.3,1.1.4,1.1.5,1.2.0,1.2.1,1.3.0,1.3.1,1.3.2,1.3.3,1.3.4,1.3.5,1.4.0,1.4.1,1.4.2"/>
<protolite-well-known-types versions="15.0.0,16.0.0,16.0.1,17.0.0,17.1.0,17.1.1,18.0.0"/>
<testlab-instr-lib versions="0.1,0.2"/>
</com.google.firebase>

View File

@ -53,11 +53,15 @@
<androidx.games/>
<androidx.gaming/>
<androidx.glance/>
<androidx.graphics/>
<androidx.gridlayout/>
<androidx.health/>
<androidx.health.connect/>
<androidx.heifwriter/>
<androidx.hilt/>
<androidx.input/>
<androidx.interpolator/>
<androidx.javascriptengine/>
<androidx.leanback/>
<androidx.legacy/>
<androidx.lifecycle/>
@ -101,6 +105,7 @@
<androidx.textclassifier/>
<androidx.tracing/>
<androidx.transition/>
<androidx.tv/>
<androidx.tvprovider/>
<androidx.ui/>
<androidx.vectordrawable/>
@ -164,6 +169,7 @@
<com.google.ads.afsn/>
<com.google.ads.interactivemedia.v3/>
<com.google.ads.mediation/>
<com.google.ambient.crossdevice/>
<com.google.android.ads/>
<com.google.android.ads.consent/>
<com.google.android.apps.common.testing.accessibility.framework/>
@ -185,12 +191,15 @@
<com.google.android.libraries.mapsplatform.secrets-gradle-plugin/>
<com.google.android.libraries.places/>
<com.google.android.libraries.play.games/>
<com.google.android.livesharing/>
<com.google.android.material/>
<com.google.android.mediahome/>
<com.google.android.odml/>
<com.google.android.play/>
<com.google.android.recaptcha/>
<com.google.android.support/>
<com.google.android.things/>
<com.google.android.tv/>
<com.google.android.ump/>
<com.google.android.wearable/>
<com.google.androidbrowserhelper/>
@ -201,12 +210,14 @@
<com.google.assistant.suggestion/>
<com.google.camerax.effects/>
<com.google.chromeos/>
<com.google.d2c/>
<com.google.devtools.ksp/>
<com.google.fhir/>
<com.google.firebase/>
<com.google.firebase.appdistribution/>
<com.google.firebase.crashlytics/>
<com.google.firebase.firebase-perf/>
<com.google.firebase.testlab/>
<com.google.gms/>
<com.google.gms.google-services/>
<com.google.jacquard/>
@ -215,6 +226,7 @@
<com.google.net.cronet/>
<com.google.oboe/>
<com.google.prefab/>
<com.google.relay/>
<com.google.test.platform/>
<com.google.testing.platform/>
<io.fabric.sdk.android/>

View File

@ -113,17 +113,19 @@
<library groupId="com.google.firebase" artifactId="firebase-config">
<versions from="21.1.0" to="21.1.0" status="deprecated" description="Bug affecting some locales causing HTTP errors" url="https://firebase.google.com/docs/remote-config/get-started?platform=android" />
</library>
<library groupId="com.google.firebase" artifactId="firebase-crashlytics" recommended-version="17.2.2">
<library groupId="com.google.firebase" artifactId="firebase-crashlytics" recommended-version="18.3.1">
<versions from="17.0.0-beta01" to="17.0.0-beta01" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="17.0.0-beta02" to="17.0.0-beta02" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="17.0.0-beta03" to="17.0.0-beta03" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="17.0.0-beta04" to="17.0.0-beta04" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="18.3.0" to="18.3.0" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.1+." url="https://github.com/firebase/firebase-android-sdk/issues/4223" />
</library>
<library groupId="com.google.firebase" artifactId="firebase-crashlytics-ndk" recommended-version="17.2.2">
<library groupId="com.google.firebase" artifactId="firebase-crashlytics-ndk" recommended-version="18.3.1">
<versions from="17.0.0-beta01" to="17.0.0-beta01" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="17.0.0-beta02" to="17.0.0-beta02" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="17.0.0-beta03" to="17.0.0-beta03" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="17.0.0-beta04" to="17.0.0-beta04" status="deprecated" description="The Firebase Crashlytics beta SDK is now deprecated and will continue reporting your app's crashes only until November 15, 2020. To continue getting crash reports in the Firebase console, make sure you upgrade to the generally available Firebase Crashlytics SDK version 17.0.0+.&#13;&#10;For more information, visit https://firebase.google.com/docs/crashlytics/get-started" url="https://firebase.google.com/docs/crashlytics/get-started?platform=android" />
<versions from="18.3.0" to="18.3.0" status="deprecated" description="We detected an issue in this version of the Crashlytics Android SDK. We strongly recommend either using v18.2.13 or earlier or upgrading to v18.3.1+." url="https://github.com/firebase/firebase-android-sdk/issues/4223" />
</library>
<library groupId="com.google.firebase" artifactId="firebase-messaging" recommended-version="20.1.2" >
<versions from="20.1.1" status="deprecated" description="Bug affecting app stability" url="https://firebase.google.com/support/release-notes/android#messaging_v20-1-1" />