solved some problems

This commit is contained in:
quique 2019-09-26 08:52:02 +02:00
parent a51a53903f
commit 7aa903f36f
19 changed files with 184 additions and 179 deletions

Binary file not shown.

View File

@ -26,13 +26,18 @@
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.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$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" 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$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="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/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/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/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/release/vndelivery.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/vndelivery.apk" 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/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/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_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/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.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" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -55,66 +60,28 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="239">
<caret line="33" column="16" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" /> <caret line="388" column="108" selection-start-line="388" selection-start-column="108" selection-end-line="388" selection-end-column="108" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="946"> <state relative-caret-position="286">
<caret line="43" column="31" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" /> <caret line="13" selection-start-line="13" selection-end-line="13" />
<folding>
<element signature="e#1000#1001#0" expanded="true" />
<element signature="e#1044#1045#0" expanded="true" />
<element signature="e#1080#1081#0" expanded="true" />
<element signature="e#1116#1117#0" expanded="true" />
<element signature="e#1148#1149#0" expanded="true" />
<element signature="e#1198#1199#0" expanded="true" />
<element signature="e#1240#1241#0" expanded="true" />
<element signature="e#1273#1274#0" expanded="true" />
<element signature="e#1302#1303#0" expanded="true" />
<element signature="e#1346#1347#0" expanded="true" />
<element signature="e#1382#1383#0" expanded="true" />
<element signature="e#1413#1414#0" expanded="true" />
<element signature="e#1440#1441#0" expanded="true" />
<element signature="e#1480#1481#0" expanded="true" />
<element signature="e#1512#1513#0" expanded="true" />
<element signature="e#1549#1550#0" expanded="true" />
<element signature="e#1582#1583#0" expanded="true" />
<element signature="e#1634#1635#0" expanded="true" />
<element signature="e#1678#1679#0" expanded="true" />
<element signature="e#1714#1715#0" expanded="true" />
<element signature="e#1746#1747#0" expanded="true" />
<element signature="e#1796#1797#0" expanded="true" />
<element signature="e#1838#1839#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_check.xml"> <entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224"> <state relative-caret-position="264">
<caret line="50" selection-start-line="50" selection-end-line="50" /> <caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -140,11 +107,14 @@
<find>getRoutes</find> <find>getRoutes</find>
<find>checked = 0</find> <find>checked = 0</find>
<find>txtIdRuta</find> <find>txtIdRuta</find>
<find>heightCellRoute</find>
<find>vndelivery</find>
<find>app.verdnatura.es/bin/</find>
</findStrings> </findStrings>
<dirStrings> <dirStrings>
<dir>$PROJECT_DIR$/app</dir>
<dir>$PROJECT_DIR$</dir> <dir>$PROJECT_DIR$</dir>
<dir>$PROJECT_DIR$/app/src/main/java</dir> <dir>$PROJECT_DIR$/app/src/main/java</dir>
<dir>$PROJECT_DIR$/app</dir>
</dirStrings> </dirStrings>
</component> </component>
<component name="GenerateSignedApkSettings"> <component name="GenerateSignedApkSettings">
@ -165,25 +135,25 @@
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml" />
<option value="$PROJECT_DIR$/build.gradle" /> <option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" /> <option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/row_route.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/row_route.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java" /> <option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java" /> <option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/row_check.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/values/colors.xml" />
<option value="$PROJECT_DIR$/app/build.gradle" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-64" />
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1919" /> <option name="width" value="1920" />
<option name="height" value="777" /> <option name="height" value="1057" />
</component> </component>
<component name="ProjectLevelVcsManager"> <component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="1" id="Add" /> <ConfirmationsSetting value="1" id="Add" />
@ -193,7 +163,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -216,10 +185,13 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
<pane id="AndroidView"> <pane id="AndroidView">
<subPane> <subPane>
<expand> <expand>
<path>
<item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
</path>
<path> <path>
<item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" /> <item name="vn-delivery" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" /> <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
@ -228,6 +200,8 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -364,7 +338,8 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="777" extended-state="6" /> <frame x="0" y="23" width="1920" height="1057" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Designer" order="0" /> <window_info id="Designer" order="0" />
<window_info id="Favorites" order="1" side_tool="true" /> <window_info id="Favorites" order="1" side_tool="true" />
@ -372,19 +347,19 @@
<window_info id="Captures" order="3" side_tool="true" weight="0.25" /> <window_info id="Captures" order="3" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="4" /> <window_info id="Image Layers" order="4" />
<window_info id="Capture Tool" order="5" /> <window_info id="Capture Tool" order="5" />
<window_info content_ui="combo" id="Project" order="6" visible="true" weight="0.20546874" /> <window_info active="true" content_ui="combo" id="Project" order="6" visible="true" weight="0.20520833" />
<window_info id="Structure" order="7" side_tool="true" weight="0.25" /> <window_info id="Structure" order="7" side_tool="true" weight="0.25" />
<window_info id="Resources Explorer" order="8" /> <window_info id="Resources Explorer" order="8" />
<window_info anchor="bottom" id="Logcat" order="0" sideWeight="0.49946466" weight="0.58679444" /> <window_info anchor="bottom" id="Logcat" order="0" sideWeight="0.49946466" weight="0.58679444" />
<window_info anchor="bottom" id="Version Control" order="1" /> <window_info anchor="bottom" id="Version Control" order="1" />
<window_info anchor="bottom" id="Terminal" order="2" sideWeight="0.57916665" weight="0.31921488" /> <window_info anchor="bottom" id="Terminal" order="2" sideWeight="0.57916665" weight="0.31921488" />
<window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.19140625" side_tool="true" visible="true" weight="0.18641618" /> <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.19375" side_tool="true" visible="true" weight="0.18621399" />
<window_info anchor="bottom" id="Build" order="4" sideWeight="0.80859375" visible="true" weight="0.18641618" /> <window_info anchor="bottom" id="Build" order="4" sideWeight="0.80625" visible="true" weight="0.18621399" />
<window_info anchor="bottom" id="Android Profiler" order="5" show_stripe_button="false" /> <window_info anchor="bottom" id="Android Profiler" order="5" />
<window_info anchor="bottom" id="Message" order="6" /> <window_info anchor="bottom" id="Message" order="6" />
<window_info anchor="bottom" id="Find" order="7" /> <window_info anchor="bottom" id="Find" order="7" />
<window_info anchor="bottom" id="Run" order="8" /> <window_info anchor="bottom" id="Run" order="8" />
<window_info anchor="bottom" id="Debug" order="9" sideWeight="0.49598286" weight="0.14904863" /> <window_info anchor="bottom" id="Debug" order="9" sideWeight="0.4953125" weight="0.14917696" />
<window_info anchor="bottom" id="Cvs" order="10" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="11" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="11" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="12" weight="0.3290735" /> <window_info anchor="bottom" id="TODO" order="12" weight="0.3290735" />
@ -397,7 +372,7 @@
<window_info anchor="right" id="Commander" order="5" weight="0.4" /> <window_info anchor="right" id="Commander" order="5" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="6" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="6" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="7" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="7" weight="0.25" />
<window_info active="true" anchor="right" id="Preview" order="8" visible="true" weight="0.07109375" /> <window_info anchor="right" id="Preview" order="8" weight="0.3015625" />
<window_info anchor="right" id="StringPreview" order="9" /> <window_info anchor="right" id="StringPreview" order="9" />
</layout> </layout>
</component> </component>
@ -451,13 +426,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="56" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/update.png"> <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/update.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
@ -509,13 +477,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="32" column="38" selection-start-line="32" selection-start-column="38" selection-end-line="32" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Worker.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Worker.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="110">
@ -523,13 +484,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="748">
<caret line="44" column="27" selection-start-line="44" selection-start-column="27" selection-end-line="44" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="381">
@ -543,13 +497,6 @@
<entry file="android-dummy:///Users/enriqueblascoblanquer/Documents/ANDROID/REPARTO/vn-delivery/app/Translations Editor"> <entry file="android-dummy:///Users/enriqueblascoblanquer/Documents/ANDROID/REPARTO/vn-delivery/app/Translations Editor">
<provider selected="true" editor-type-id="string-resource-editor" /> <provider selected="true" editor-type-id="string-resource-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="271" column="4" selection-start-line="271" selection-start-column="4" selection-end-line="275" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoadersActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/LoadersActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506"> <state relative-caret-position="506">
@ -557,21 +504,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_route.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/RetrofitClient.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/RetrofitClient.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
@ -579,13 +511,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="23" column="4" selection-start-line="23" selection-start-column="4" selection-end-line="23" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_cargar_bultos.xml">
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -594,11 +519,34 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="713"> <state relative-caret-position="528">
<caret line="156" column="21" selection-start-line="156" selection-start-column="21" selection-end-line="156" selection-end-column="21" /> <caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/CustomProgressBar.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="jar://$PROJECT_DIR$/../../../gradle-4.10.3/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/76f3c69879d3e01c082f49d8661c5590838148e1/retrofit-2.3.0-sources.jar!/retrofit2/Call.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="33" column="17" selection-start-line="33" selection-start-column="17" selection-end-line="33" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="23" column="6" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -611,9 +559,10 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="946"> <state relative-caret-position="418">
<caret line="43" column="31" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" /> <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
<folding> <folding>
<element signature="e#971#972#0" expanded="true" />
<element signature="e#1000#1001#0" expanded="true" /> <element signature="e#1000#1001#0" expanded="true" />
<element signature="e#1044#1045#0" expanded="true" /> <element signature="e#1044#1045#0" expanded="true" />
<element signature="e#1080#1081#0" expanded="true" /> <element signature="e#1080#1081#0" expanded="true" />
@ -641,24 +590,72 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528"> <state relative-caret-position="550">
<caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" /> <caret line="32" column="38" selection-start-line="32" selection-start-column="38" selection-end-line="32" selection-end-column="38" />
<folding> </state>
<element signature="imports" expanded="true" /> </provider>
</folding> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364">
<caret line="62" column="43" selection-start-line="62" selection-start-column="43" selection-end-line="62" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="56" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_route.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="36" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="36" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_check.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/row_check.xml">
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224"> <state relative-caret-position="1100">
<caret line="50" selection-start-line="50" selection-end-line="50" /> <caret line="50" selection-start-line="50" selection-end-line="50" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="6" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="388" column="108" selection-start-line="388" selection-start-column="108" selection-end-line="388" selection-end-column="108" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

View File

@ -6,8 +6,8 @@ android {
applicationId "verdnatura.es.repartoverdnatura" applicationId "verdnatura.es.repartoverdnatura"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 28 targetSdkVersion 28
versionCode 5 versionCode 7
versionName "1.5" versionName "1.7"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
} }

View File

@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"1.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] [{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":7,"versionName":"1.7","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

Binary file not shown.

View File

@ -99,7 +99,7 @@ public class MainActivity extends AppCompatActivity {
private void setViews(){ private void setViews(){
listViewRutas = findViewById(R.id.listRutas); listViewRutas = findViewById(R.id.listRutas);
listViewPendingTickets = findViewById(R.id.listPendingTickets); listViewPendingTickets = findViewById(R.id.listPendingTickets);
heightCellRoute = Utils.convertDipToPixels(130f,this); heightCellRoute = Utils.convertDipToPixels(160f,this);
heightCellHeader = Utils.convertDipToPixels(45f,this); heightCellHeader = Utils.convertDipToPixels(45f,this);
txtDriver = findViewById(R.id.textView3); txtDriver = findViewById(R.id.textView3);
btnUpload = findViewById(R.id.btnUpload); btnUpload = findViewById(R.id.btnUpload);
@ -386,7 +386,7 @@ public class MainActivity extends AppCompatActivity {
"Actualizar", "Actualizar",
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://app.verdnatura.es/bin/vndelivery.apk"))); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://app.verdnatura.es/bin/vn-delivery.apk")));
} }
}); });

View File

@ -5,8 +5,8 @@ import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
public class ApiUtils { public class ApiUtils {
private ApiUtils() {} private ApiUtils() {}
public static final String BASE_URL = "http://172.16.5.68:8080/"; //public static final String BASE_URL = "http://172.20.202.248:8080/";
//public static final String BASE_URL = "https://app.verdnatura.es/"; public static final String BASE_URL = "https://app.verdnatura.es/";
public static RestClient getAPIService() { public static RestClient getAPIService() {
return RetrofitClient.getClient(BASE_URL).create(RestClient.class); return RetrofitClient.getClient(BASE_URL).create(RestClient.class);

View File

@ -80,7 +80,8 @@
app:layout_constraintEnd_toStartOf="@+id/imageView8" app:layout_constraintEnd_toStartOf="@+id/imageView8"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/camion" /> app:srcCompat="@drawable/camion"
android:visibility="gone"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<ScrollView <ScrollView

View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#f7931e</color> <color name="colorPrimary">#FA9F0D</color>
<color name="colorPrimaryDark">#222</color> <color name="colorPrimaryDark">#010101</color>
<color name="colorAccent">#F7931E</color> <color name="colorAccent">#FA9F0D</color>
<color name="colorSecundary">#ffdfba</color> <color name="colorSecundary">#ffdfba</color>
<color name="colorMainHeader">#3D3D3D</color> <color name="colorMainHeader">#202022</color>
<color name="colorWhite">#ffffff</color> <color name="colorWhite">#ffffff</color>
<color name="colorGray">#9b9b9b</color> <color name="colorGray">#9b9b9b</color>
<color name="colorMainBg">#E5E5E5</color> <color name="colorMainBg">#E5E5E5</color>
<color name="colorGreen">#85C22E</color> <color name="colorGreen">#30D961</color>
<color name="darkclear">#7B7B7B</color> <color name="darkclear">#7B7B7B</color>
</resources> </resources>

View File

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<com.google.firebase> <com.google.firebase>
<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"/> <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"/>
<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-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"/> <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"/>
<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"/> <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"/>
<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"/> <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"/>
<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"/> <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"/>
<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"/> <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"/>
<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-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-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-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-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"/> <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"/>
<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-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"/> <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"/>
<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"/> <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"/>
<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-auth-impl versions="11.0.0,16.1.0"/> <firebase-auth-impl versions="11.0.0,16.1.0"/>
<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"/>
<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 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-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"/> <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"/>
<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"/> <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"/>
<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"/> <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"/>
<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"/> <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"/>
<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-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"/> <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"/>
<firebase-database-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/> <firebase-database-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"/> <firebase-appindexing-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-impl-license versions="11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1"/>
@ -39,35 +39,40 @@
<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"/>
<testlab-instr-lib versions="0.1"/> <testlab-instr-lib versions="0.1"/>
<firebase-functions-license versions="12.0.0,12.0.1"/> <firebase-functions-license versions="12.0.0,12.0.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"/> <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"/>
<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"/> <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"/>
<firebase-database-collection versions="15.0.0,15.0.1,16.0.0,16.0.1,17.0.0"/> <firebase-database-collection versions="15.0.0,15.0.1,16.0.0,16.0.1,17.0.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"/> <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"/>
<firebase-iid-interop versions="15.0.0,16.0.0,16.0.1,17.0.0"/> <firebase-iid-interop versions="15.0.0,16.0.0,16.0.1,17.0.0"/>
<protolite-well-known-types versions="15.0.0,16.0.0,16.0.1,17.0.0"/> <protolite-well-known-types versions="15.0.0,16.0.0,16.0.1,17.0.0"/>
<firebase-measurement-connector versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.0"/> <firebase-measurement-connector versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.0"/>
<firebase-auth-interop versions="15.0.2,16.0.0,16.0.1,17.0.0,18.0.0"/> <firebase-auth-interop versions="15.0.2,16.0.0,16.0.1,17.0.0,18.0.0,19.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-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-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"/> <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"/>
<firebase-ml-vision-image-label-model versions="15.0.0,16.2.0,17.0.2,18.0.0"/> <firebase-ml-vision-image-label-model versions="15.0.0,16.2.0,17.0.2,18.0.0"/>
<firebase-ml-vision versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.1,18.0.2,19.0.0,19.0.2,19.0.3,20.0.0,21.0.0,22.0.0"/> <firebase-ml-vision versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.1,18.0.2,19.0.0,19.0.2,19.0.3,20.0.0,21.0.0,22.0.0,23.0.0"/>
<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"/> <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"/>
<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"/> <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"/>
<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"/> <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"/>
<firebase-ml-vision-face-model versions="17.0.2,18.0.0"/> <firebase-ml-vision-face-model versions="17.0.2,18.0.0"/>
<perf-plugin versions="1.1.2,1.1.3,1.1.4,1.1.5,1.2.0,1.2.1,1.3.0"/> <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"/>
<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-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-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"/> <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"/>
<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"/> <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"/>
<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"/> <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"/>
<firebase-ml-natural-language-smart-reply-model versions="18.0.0,19.0.0,19.0.1,20.0.0,20.0.1"/> <firebase-ml-natural-language-smart-reply-model versions="18.0.0,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"/>
<firebase-ml-natural-language-smart-reply versions="16.3.6,17.0.0,17.0.1,18.0.0,18.0.1"/> <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"/>
<firebase-firestore-ktx versions="18.2.0,19.0.0,20.0.0,20.1.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"/>
<firebase-common-ktx versions="16.1.0,17.0.0,18.0.0"/> <firebase-common-ktx versions="16.1.0,17.0.0,18.0.0,19.0.0,19.1.0"/>
<firebase-ml-vision-object-detection-model versions="16.0.0,17.0.0,18.0.0"/> <firebase-ml-vision-object-detection-model versions="16.0.0,17.0.0,18.0.0,19.0.1"/>
<firebase-ml-vision-automl versions="16.0.0,17.0.0,18.0.0"/> <firebase-ml-vision-automl versions="16.0.0,17.0.0,18.0.0,18.0.1"/>
<firebase-ml-natural-language-translate versions="19.0.0,19.0.1,20.0.0,20.0.1"/> <firebase-ml-natural-language-translate versions="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"/>
<firebase-ml-natural-language-translate-model versions="19.0.0,19.0.1,20.0.0,20.0.1"/> <firebase-ml-natural-language-translate-model versions="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"/>
<firebase-datatransport versions="16.0.0,17.0.0,17.0.1"/> <firebase-datatransport versions="16.0.0,17.0.0,17.0.1,17.0.2"/>
<firebase-ml-vision-internal-vkp versions="16.0.0"/>
<firebase-functions-ktx versions="19.0.1"/>
<firebase-appdistribution-gradle versions="0.2.0,0.2.1,0.2.2,0.2.3,1.0.0"/>
<firebase-storage-ktx versions="19.1.0"/>
<firebase-config-ktx versions="19.0.2"/>
</com.google.firebase> </com.google.firebase>

View File

@ -129,4 +129,6 @@
<com.google.android.datatransport/> <com.google.android.datatransport/>
<zipflinger/> <zipflinger/>
<androidx.autofill/> <androidx.autofill/>
<androidx.ads/>
<com.android/>
</metadata> </metadata>