diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index ba89e57..947d37c 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.bin and b/.gradle/5.4.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index 9c8c2e8..fe29b82 100644
Binary files a/.gradle/5.4.1/executionHistory/executionHistory.lock and b/.gradle/5.4.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index 5b762b3..d4bdf0e 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.bin and b/.gradle/5.4.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index f4f81bc..a824e8f 100644
Binary files a/.gradle/5.4.1/fileHashes/fileHashes.lock and b/.gradle/5.4.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
index 63329cf..4e01d5a 100644
Binary files a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin and b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index 604e7ac..d556d73 100644
Binary files a/.gradle/5.4.1/javaCompile/classAnalysis.bin and b/.gradle/5.4.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index 1201c8d..cdaaefb 100644
Binary files a/.gradle/5.4.1/javaCompile/javaCompile.lock and b/.gradle/5.4.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.4.1/javaCompile/taskHistory.bin b/.gradle/5.4.1/javaCompile/taskHistory.bin
index 6d25957..c4d4f28 100644
Binary files a/.gradle/5.4.1/javaCompile/taskHistory.bin and b/.gradle/5.4.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 75d4235..d887b92 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index fbefea0..2ded953 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 661d798..1a45fb6 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 41871c2..4404972 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -15,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..e34606c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
index 4476d7f..794ac88 100644
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.core:runtime:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/974e66896bf1e6a15b4a556f05d29664/runtime-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/974e66896bf1e6a15b4a556f05d29664/runtime-1.1.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/974e66896bf1e6a15b4a556f05d29664/runtime-1.1.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a12bcb8b3c5e8d93da9c63f547bfa4f/runtime-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a12bcb8b3c5e8d93da9c63f547bfa4f/runtime-1.1.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a12bcb8b3c5e8d93da9c63f547bfa4f/runtime-1.1.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
index 41f3eb0..69ca2d1 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4dc3f6097d9ae13c38771ba93af6ca56/livedata-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4dc3f6097d9ae13c38771ba93af6ca56/livedata-1.1.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4dc3f6097d9ae13c38771ba93af6ca56/livedata-1.1.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a5c51d63f76fc0fc95ec02acdbc4fd09/livedata-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a5c51d63f76fc0fc95ec02acdbc4fd09/livedata-1.1.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a5c51d63f76fc0fc95ec02acdbc4fd09/livedata-1.1.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
index e66a90e..b1e764d 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e3d89c8eb4d5f55e9e82ffd103d38c86/livedata-core-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e3d89c8eb4d5f55e9e82ffd103d38c86/livedata-core-1.1.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e3d89c8eb4d5f55e9e82ffd103d38c86/livedata-core-1.1.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/26732b71661505386aa05331adc69a21/livedata-core-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/26732b71661505386aa05331adc69a21/livedata-core-1.1.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/26732b71661505386aa05331adc69a21/livedata-core-1.1.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
index c468b58..069681e 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbba24d03f2e269000ee33f33ace3303/runtime-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbba24d03f2e269000ee33f33ace3303/runtime-1.1.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbba24d03f2e269000ee33f33ace3303/runtime-1.1.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cce751d95bea2e78f0dd8c1ade314c3d/runtime-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cce751d95bea2e78f0dd8c1ade314c3d/runtime-1.1.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cce751d95bea2e78f0dd8c1ade314c3d/runtime-1.1.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
index d4dc9e3..a1cc1fd 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbb238508617df12280ffdfe6b716e6d/viewmodel-1.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbb238508617df12280ffdfe6b716e6d/viewmodel-1.1.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbb238508617df12280ffdfe6b716e6d/viewmodel-1.1.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7937a4ec025c5029c42abc886385fe31/viewmodel-1.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7937a4ec025c5029c42abc886385fe31/viewmodel-1.1.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7937a4ec025c5029c42abc886385fe31/viewmodel-1.1.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
index 4ed0ce3..b969c3e 100644
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e649e27815aa394ae7e8f414efb7d64/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e649e27815aa394ae7e8f414efb7d64/animated-vector-drawable-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e649e27815aa394ae7e8f414efb7d64/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc61b021941f78f23e72ff6fee45bf57/animated-vector-drawable-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc61b021941f78f23e72ff6fee45bf57/animated-vector-drawable-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc61b021941f78f23e72ff6fee45bf57/animated-vector-drawable-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
index 5633d90..7e50ef1 100644
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:appcompat-v7:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d42611b3fdd98f6aed85f6f1160f3f3/appcompat-v7-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f2e11c435ab2277b5f2cc16fb45c7cc/appcompat-v7-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d42611b3fdd98f6aed85f6f1160f3f3/appcompat-v7-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d42611b3fdd98f6aed85f6f1160f3f3/appcompat-v7-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d42611b3fdd98f6aed85f6f1160f3f3/appcompat-v7-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f2e11c435ab2277b5f2cc16fb45c7cc/appcompat-v7-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f2e11c435ab2277b5f2cc16fb45c7cc/appcompat-v7-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f2e11c435ab2277b5f2cc16fb45c7cc/appcompat-v7-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
index 1821837..2ab1e13 100644
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/74fff980dcdd4fb2ea019076b13d9497/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/74fff980dcdd4fb2ea019076b13d9497/asynclayoutinflater-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/74fff980dcdd4fb2ea019076b13d9497/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fc2f2f557d26e723c4ae65fdfc48377/asynclayoutinflater-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fc2f2f557d26e723c4ae65fdfc48377/asynclayoutinflater-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fc2f2f557d26e723c4ae65fdfc48377/asynclayoutinflater-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml
index 6ea5a65..15d457b 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7293fc2900d47e30daa77fec0fa7d7fe/constraint-layout-1.1.3/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7293fc2900d47e30daa77fec0fa7d7fe/constraint-layout-1.1.3/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7293fc2900d47e30daa77fec0fa7d7fe/constraint-layout-1.1.3/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6b6d897fe936c30e3ecaac8ddb929f20/constraint-layout-1.1.3/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6b6d897fe936c30e3ecaac8ddb929f20/constraint-layout-1.1.3/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6b6d897fe936c30e3ecaac8ddb929f20/constraint-layout-1.1.3/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
index 99e45cf..2421b8c 100644
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/048956e3551ca55626984ba18615ed00/coordinatorlayout-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/806b2401c0ff6227d31b23640add61c1/coordinatorlayout-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/048956e3551ca55626984ba18615ed00/coordinatorlayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/048956e3551ca55626984ba18615ed00/coordinatorlayout-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/048956e3551ca55626984ba18615ed00/coordinatorlayout-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/806b2401c0ff6227d31b23640add61c1/coordinatorlayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/806b2401c0ff6227d31b23640add61c1/coordinatorlayout-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/806b2401c0ff6227d31b23640add61c1/coordinatorlayout-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
index 6ca912e..8b07fa4 100644
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec9528a7d686b1cd33553df03f0285c/cursoradapter-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec9528a7d686b1cd33553df03f0285c/cursoradapter-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec9528a7d686b1cd33553df03f0285c/cursoradapter-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ce6e3af5c19acbd5c84ca3c899f1a6c/cursoradapter-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ce6e3af5c19acbd5c84ca3c899f1a6c/cursoradapter-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ce6e3af5c19acbd5c84ca3c899f1a6c/cursoradapter-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1_aar.xml b/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1_aar.xml
index a8cfef6..013d1b8 100644
--- a/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:customtabs:27.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3a23ade08dcf311824aabbfa2d900ad/customtabs-27.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3a23ade08dcf311824aabbfa2d900ad/customtabs-27.1.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c3a23ade08dcf311824aabbfa2d900ad/customtabs-27.1.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2d2995ccbbe36514f8269ee8a42a7489/customtabs-27.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2d2995ccbbe36514f8269ee8a42a7489/customtabs-27.1.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2d2995ccbbe36514f8269ee8a42a7489/customtabs-27.1.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
index 349022e..d65d9c3 100644
--- a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:customview:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fafcac6dbbb554422ed019e2b6cd3a08/customview-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fafcac6dbbb554422ed019e2b6cd3a08/customview-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fafcac6dbbb554422ed019e2b6cd3a08/customview-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a80375bf2435a1b8c2766fa907cd4814/customview-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a80375bf2435a1b8c2766fa907cd4814/customview-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a80375bf2435a1b8c2766fa907cd4814/customview-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
index 3046322..bde4000 100644
--- a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:documentfile:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e5d18877a1f7bcc92515b4183e7dce8/documentfile-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e5d18877a1f7bcc92515b4183e7dce8/documentfile-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1e5d18877a1f7bcc92515b4183e7dce8/documentfile-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7fd92d3306e2ca46a13f8dea252426a/documentfile-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7fd92d3306e2ca46a13f8dea252426a/documentfile-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a7fd92d3306e2ca46a13f8dea252426a/documentfile-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
index 3a83bd4..3b3e0dd 100644
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f1c755a88025e7b825f4dc118c2361/drawerlayout-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/65188c6559831cc76b46cd4d5278baba/drawerlayout-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f1c755a88025e7b825f4dc118c2361/drawerlayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f1c755a88025e7b825f4dc118c2361/drawerlayout-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52f1c755a88025e7b825f4dc118c2361/drawerlayout-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/65188c6559831cc76b46cd4d5278baba/drawerlayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/65188c6559831cc76b46cd4d5278baba/drawerlayout-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/65188c6559831cc76b46cd4d5278baba/drawerlayout-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
index a258b70..f80f32d 100644
--- a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:interpolator:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/967e0edc99728742c240f7bc15cef2db/interpolator-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/967e0edc99728742c240f7bc15cef2db/interpolator-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/967e0edc99728742c240f7bc15cef2db/interpolator-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9e49f196abbde4176b2365bf480bc96b/interpolator-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9e49f196abbde4176b2365bf480bc96b/interpolator-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9e49f196abbde4176b2365bf480bc96b/interpolator-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
index 2b51f03..d478f95 100644
--- a/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:loader:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/28918c40b9fa2d8a8f966d4c227c3d5d/loader-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/28918c40b9fa2d8a8f966d4c227c3d5d/loader-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/28918c40b9fa2d8a8f966d4c227c3d5d/loader-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c770750578d7a40280fd586a1339b5a/loader-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c770750578d7a40280fd586a1339b5a/loader-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7c770750578d7a40280fd586a1339b5a/loader-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
index 9b4e192..dd49c5e 100644
--- a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d528c7dcabd1d336cc993925bd9821a/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d528c7dcabd1d336cc993925bd9821a/localbroadcastmanager-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d528c7dcabd1d336cc993925bd9821a/localbroadcastmanager-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/559c1b82b98ea8d979c3ed1ba2801871/localbroadcastmanager-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/559c1b82b98ea8d979c3ed1ba2801871/localbroadcastmanager-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/559c1b82b98ea8d979c3ed1ba2801871/localbroadcastmanager-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
index 4edce0c..e44d9e8 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:multidex:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5182ed41501d87ea2fcab2f89b74be9d/multidex-1.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5182ed41501d87ea2fcab2f89b74be9d/multidex-1.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5182ed41501d87ea2fcab2f89b74be9d/multidex-1.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8f6e27e24150b18ab274c8f809c1692d/multidex-1.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8f6e27e24150b18ab274c8f809c1692d/multidex-1.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8f6e27e24150b18ab274c8f809c1692d/multidex-1.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
index c680543..9995da0 100644
--- a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/de16f8aca234bd59e8697e0d729af07c/multidex-instrumentation-1.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/de16f8aca234bd59e8697e0d729af07c/multidex-instrumentation-1.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/de16f8aca234bd59e8697e0d729af07c/multidex-instrumentation-1.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7eff0e40f2bddaf9c409ce81f087a14/multidex-instrumentation-1.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7eff0e40f2bddaf9c409ce81f087a14/multidex-instrumentation-1.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7eff0e40f2bddaf9c409ce81f087a14/multidex-instrumentation-1.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
index 7d0ab01..e171c80 100644
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:print:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89aea177a52cefc712e6037b5d9d7a4e/print-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7bd76f9c7789e492abc217f2d123abf/print-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89aea177a52cefc712e6037b5d9d7a4e/print-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89aea177a52cefc712e6037b5d9d7a4e/print-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89aea177a52cefc712e6037b5d9d7a4e/print-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7bd76f9c7789e492abc217f2d123abf/print-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7bd76f9c7789e492abc217f2d123abf/print-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7bd76f9c7789e492abc217f2d123abf/print-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
index 411a614..46452de 100644
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/053e27470a87d8505c41385bf2160708/recyclerview-v7-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ac82587501f25146d6f2a2f2ac57f8bb/recyclerview-v7-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/053e27470a87d8505c41385bf2160708/recyclerview-v7-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/053e27470a87d8505c41385bf2160708/recyclerview-v7-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/053e27470a87d8505c41385bf2160708/recyclerview-v7-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ac82587501f25146d6f2a2f2ac57f8bb/recyclerview-v7-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ac82587501f25146d6f2a2f2ac57f8bb/recyclerview-v7-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ac82587501f25146d6f2a2f2ac57f8bb/recyclerview-v7-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
index 491b777..9c4a8c7 100644
--- a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d9ec30884f335c81ffa27990e6363b9/slidingpanelayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d9ec30884f335c81ffa27990e6363b9/slidingpanelayout-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9d9ec30884f335c81ffa27990e6363b9/slidingpanelayout-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d6aa41d7c9b2a1070dad625a512b845/slidingpanelayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d6aa41d7c9b2a1070dad625a512b845/slidingpanelayout-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d6aa41d7c9b2a1070dad625a512b845/slidingpanelayout-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
index f8c92ff..e4457de 100644
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-compat:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ec6f8337ff3fb577c3514e442b4c6db/support-compat-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc594acc1e737910b1e141e5c332c58/support-compat-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ec6f8337ff3fb577c3514e442b4c6db/support-compat-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ec6f8337ff3fb577c3514e442b4c6db/support-compat-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ec6f8337ff3fb577c3514e442b4c6db/support-compat-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc594acc1e737910b1e141e5c332c58/support-compat-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc594acc1e737910b1e141e5c332c58/support-compat-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dbc594acc1e737910b1e141e5c332c58/support-compat-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
index 35bf93a..1e57641 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-ui:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/286800ed397fa19decbbf30751b92645/support-core-ui-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/286800ed397fa19decbbf30751b92645/support-core-ui-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/286800ed397fa19decbbf30751b92645/support-core-ui-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/75244229fec40c92df5e4354ed39e3b8/support-core-ui-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/75244229fec40c92df5e4354ed39e3b8/support-core-ui-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/75244229fec40c92df5e4354ed39e3b8/support-core-ui-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
index cd1ecfe..f271d96 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/df137a302f8b5d27f396ad94f14174a9/support-core-utils-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/df137a302f8b5d27f396ad94f14174a9/support-core-utils-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/df137a302f8b5d27f396ad94f14174a9/support-core-utils-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a0d9bbb11ea11690b730b71158b32ffa/support-core-utils-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a0d9bbb11ea11690b730b71158b32ffa/support-core-utils-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a0d9bbb11ea11690b730b71158b32ffa/support-core-utils-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
index 98a2603..a26fb3d 100644
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ab505a5ea453d76777fc28f3c4eaaf5/support-fragment-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/588a3afed8aa31137f0ff77019d9b41d/support-fragment-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ab505a5ea453d76777fc28f3c4eaaf5/support-fragment-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ab505a5ea453d76777fc28f3c4eaaf5/support-fragment-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9ab505a5ea453d76777fc28f3c4eaaf5/support-fragment-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/588a3afed8aa31137f0ff77019d9b41d/support-fragment-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/588a3afed8aa31137f0ff77019d9b41d/support-fragment-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/588a3afed8aa31137f0ff77019d9b41d/support-fragment-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
index cd085c3..9a6004b 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-media-compat:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9db5bdfa1822de257751d048b62eaa6/support-media-compat-26.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9db5bdfa1822de257751d048b62eaa6/support-media-compat-26.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b9db5bdfa1822de257751d048b62eaa6/support-media-compat-26.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5ffa0821cf6c1c7ed183f66e19364fb9/support-media-compat-26.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5ffa0821cf6c1c7ed183f66e19364fb9/support-media-compat-26.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5ffa0821cf6c1c7ed183f66e19364fb9/support-media-compat-26.1.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
index 6df5658..61ed6fb 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-v4:26.1.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4a63f5d348af19f848212ddfee0050b8/support-v4-26.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4a63f5d348af19f848212ddfee0050b8/support-v4-26.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4a63f5d348af19f848212ddfee0050b8/support-v4-26.1.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e9f86dafb21118fde873f54ceedb853/support-v4-26.1.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e9f86dafb21118fde873f54ceedb853/support-v4-26.1.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e9f86dafb21118fde873f54ceedb853/support-v4-26.1.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
index 1585de2..35f43f3 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5493fefb6a1b202de0bc79e045bff60d/support-vector-drawable-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5493fefb6a1b202de0bc79e045bff60d/support-vector-drawable-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5493fefb6a1b202de0bc79e045bff60d/support-vector-drawable-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2e2ffd7e0273de7aa62e34e0363351e/support-vector-drawable-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2e2ffd7e0273de7aa62e34e0363351e/support-vector-drawable-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c2e2ffd7e0273de7aa62e34e0363351e/support-vector-drawable-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
index 90ff92a..22bada9 100644
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml
@@ -1,12 +1,12 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
     <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce295bbb0d9626f0c453ca5a0f45f165/swiperefreshlayout-28.0.0/annotations.zip!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6fda0252ade0e82447cd22f48100a16f/swiperefreshlayout-28.0.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce295bbb0d9626f0c453ca5a0f45f165/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce295bbb0d9626f0c453ca5a0f45f165/swiperefreshlayout-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce295bbb0d9626f0c453ca5a0f45f165/swiperefreshlayout-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6fda0252ade0e82447cd22f48100a16f/swiperefreshlayout-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6fda0252ade0e82447cd22f48100a16f/swiperefreshlayout-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6fda0252ade0e82447cd22f48100a16f/swiperefreshlayout-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
index 3315b93..1531921 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55f9647a98e6c5e6c9653815e56e843c/espresso-core-3.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55f9647a98e6c5e6c9653815e56e843c/espresso-core-3.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55f9647a98e6c5e6c9653815e56e843c/espresso-core-3.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/592bf7c53d37e7215834df87ebdf82eb/espresso-core-3.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/592bf7c53d37e7215834df87ebdf82eb/espresso-core-3.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/592bf7c53d37e7215834df87ebdf82eb/espresso-core-3.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-core/3.0.2/137b6340c2f4bdfede28825af5ac3221f1ed9653/espresso-core-3.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
index 80e16e2..cecbe28 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/11c8b2ea72fd73bec4b003914c130fa3/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/11c8b2ea72fd73bec4b003914c130fa3/espresso-idling-resource-3.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/11c8b2ea72fd73bec4b003914c130fa3/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c91dc3799a9d46ea225c2eecdce88d6c/espresso-idling-resource-3.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c91dc3799a9d46ea225c2eecdce88d6c/espresso-idling-resource-3.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c91dc3799a9d46ea225c2eecdce88d6c/espresso-idling-resource-3.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test.espresso/espresso-idling-resource/3.0.2/d4b16112a486446a92fc3dedce6b0d78ec57b09a/espresso-idling-resource-3.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
index facf32f..5c4ff66 100644
--- a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:monitor:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3d8b7463d1cf310f580efa06ad07af16/monitor-1.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3d8b7463d1cf310f580efa06ad07af16/monitor-1.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3d8b7463d1cf310f580efa06ad07af16/monitor-1.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fa3eebecbbff8163e4055e6f62fe862b/monitor-1.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fa3eebecbbff8163e4055e6f62fe862b/monitor-1.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fa3eebecbbff8163e4055e6f62fe862b/monitor-1.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/monitor/1.0.2/6cc016eaa2b8a238607fe5fc20f27135bf8d7fd/monitor-1.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
index 340189e..6780678 100644
--- a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.test:runner:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d97f8d7141ba854ece6305b17dbd45d9/runner-1.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d97f8d7141ba854ece6305b17dbd45d9/runner-1.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d97f8d7141ba854ece6305b17dbd45d9/runner-1.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/049bda3f636c527c65a3b9fca9ea722a/runner-1.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/049bda3f636c527c65a3b9fca9ea722a/runner-1.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/049bda3f636c527c65a3b9fca9ea722a/runner-1.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.test/runner/1.0.2/493b6daca0eaa2f479bd6028d1754b6b7eecbd5a/runner-1.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
index 8681be0..7a57b43 100644
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3679a5df1589fb2aacf5410158af2a5e/versionedparcelable-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3679a5df1589fb2aacf5410158af2a5e/versionedparcelable-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3679a5df1589fb2aacf5410158af2a5e/versionedparcelable-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99afdbe2ed3d6d188765c81eb88c9106/versionedparcelable-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99afdbe2ed3d6d188765c81eb88c9106/versionedparcelable-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/99afdbe2ed3d6d188765c81eb88c9106/versionedparcelable-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
index 98c2027..18714b1 100644
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:viewpager:28.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08748756751a552fd2043985cf11448b/viewpager-28.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08748756751a552fd2043985cf11448b/viewpager-28.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/08748756751a552fd2043985cf11448b/viewpager-28.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/316b018021464e6ca68bd0a842f1dc54/viewpager-28.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/316b018021464e6ca68bd0a842f1dc54/viewpager-28.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/316b018021464e6ca68bd0a842f1dc54/viewpager-28.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml
index 8808e49..e22a120 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-ads-identifier:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2845f4cce757f434d4afc42843076be0/play-services-ads-identifier-15.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2845f4cce757f434d4afc42843076be0/play-services-ads-identifier-15.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2845f4cce757f434d4afc42843076be0/play-services-ads-identifier-15.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/132f6f2a77e01b2b4e7c9fe4f32861c6/play-services-ads-identifier-15.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/132f6f2a77e01b2b4e7c9fe4f32861c6/play-services-ads-identifier-15.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/132f6f2a77e01b2b4e7c9fe4f32861c6/play-services-ads-identifier-15.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml
index 5744294..1622cd3 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-base:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bbbaa6ccdbc6a5527fbb24244ba23b13/play-services-base-15.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bbbaa6ccdbc6a5527fbb24244ba23b13/play-services-base-15.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bbbaa6ccdbc6a5527fbb24244ba23b13/play-services-base-15.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4e36b293c878b98747256bc1a94d7cc/play-services-base-15.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4e36b293c878b98747256bc1a94d7cc/play-services-base-15.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4e36b293c878b98747256bc1a94d7cc/play-services-base-15.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml
index 2dec147..95233fc 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-basement:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/381e1ed199f5b66fb6d12902d74856e9/play-services-basement-15.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/381e1ed199f5b66fb6d12902d74856e9/play-services-basement-15.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/381e1ed199f5b66fb6d12902d74856e9/play-services-basement-15.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/384c4c0e303c312b3ededd45ff21f65d/play-services-basement-15.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/384c4c0e303c312b3ededd45ff21f65d/play-services-basement-15.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/384c4c0e303c312b3ededd45ff21f65d/play-services-basement-15.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml
index a4610e8..c298302 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-clearcut:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e28a38acccafb497c8812fc529b88b7/play-services-clearcut-15.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e28a38acccafb497c8812fc529b88b7/play-services-clearcut-15.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e28a38acccafb497c8812fc529b88b7/play-services-clearcut-15.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6385222567e93d1b9baf33c178a4fb6/play-services-clearcut-15.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6385222567e93d1b9baf33c178a4fb6/play-services-clearcut-15.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a6385222567e93d1b9baf33c178a4fb6/play-services-clearcut-15.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0_aar.xml
index f27d23f..aecef96 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-measurement-base:16.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ce0e62bc57981839cfd96b12dd5a799/play-services-measurement-base-16.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ce0e62bc57981839cfd96b12dd5a799/play-services-measurement-base-16.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ce0e62bc57981839cfd96b12dd5a799/play-services-measurement-base-16.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c23752bbe571a0523a95ab1b8e99a7e6/play-services-measurement-base-16.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c23752bbe571a0523a95ab1b8e99a7e6/play-services-measurement-base-16.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c23752bbe571a0523a95ab1b8e99a7e6/play-services-measurement-base-16.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml
index 5770893..9e82b34 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-phenotype:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/411ac744dd5ffde0f1741e4a776f73e2/play-services-phenotype-15.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/411ac744dd5ffde0f1741e4a776f73e2/play-services-phenotype-15.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/411ac744dd5ffde0f1741e4a776f73e2/play-services-phenotype-15.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/779f27fd173f69ed56cb1bd176990b1b/play-services-phenotype-15.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/779f27fd173f69ed56cb1bd176990b1b/play-services-phenotype-15.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/779f27fd173f69ed56cb1bd176990b1b/play-services-phenotype-15.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml
index 3d5f52d..0109219 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-stats:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14558b65c6ab228a4750d8f60ab6cc8c/play-services-stats-15.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14558b65c6ab228a4750d8f60ab6cc8c/play-services-stats-15.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14558b65c6ab228a4750d8f60ab6cc8c/play-services-stats-15.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1efaa08e9bdd24a767550f0f8abae865/play-services-stats-15.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1efaa08e9bdd24a767550f0f8abae865/play-services-stats-15.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1efaa08e9bdd24a767550f0f8abae865/play-services-stats-15.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml
index 5691ef4..ed567ca 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.android.gms:play-services-tasks:15.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c532c5d37a00650ebacb04faf38ab550/play-services-tasks-15.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c532c5d37a00650ebacb04faf38ab550/play-services-tasks-15.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c532c5d37a00650ebacb04faf38ab550/play-services-tasks-15.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c71bdd9e7ea379a8c05d94072de69acf/play-services-tasks-15.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c71bdd9e7ea379a8c05d94072de69acf/play-services-tasks-15.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c71bdd9e7ea379a8c05d94072de69acf/play-services-tasks-15.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml
index 070bf2f..81e41b4 100644
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.dagger:dagger-android:2.13@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eab2c94e81b986d915593002461ad506/dagger-android-2.13/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eab2c94e81b986d915593002461ad506/dagger-android-2.13/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eab2c94e81b986d915593002461ad506/dagger-android-2.13/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/195e4ebd2aaf18dd2402178be52fafd2/dagger-android-2.13/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/195e4ebd2aaf18dd2402178be52fafd2/dagger-android-2.13/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/195e4ebd2aaf18dd2402178be52fafd2/dagger-android-2.13/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger-android/2.13/13ddb905895b1fe5703b755b4eda307ec6689be/dagger-android-2.13-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml
index d740845..ed1dd42 100644
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.dagger:dagger-android-support:2.13@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/381e56ac3d46ef26fb150cdadca9f292/dagger-android-support-2.13/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/381e56ac3d46ef26fb150cdadca9f292/dagger-android-support-2.13/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/381e56ac3d46ef26fb150cdadca9f292/dagger-android-support-2.13/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811f7b047bd8d64fa288ba135c725e53/dagger-android-support-2.13/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811f7b047bd8d64fa288ba135c725e53/dagger-android-support-2.13/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811f7b047bd8d64fa288ba135c725e53/dagger-android-support-2.13/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger-android-support/2.13/421e17b850f68627df22fb8fa33e363dc2ee7e8/dagger-android-support-2.13-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml
index 7b6130c..10a84d4 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-analytics:16.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42293fcbad5a59ff1e5469254165939c/firebase-analytics-16.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42293fcbad5a59ff1e5469254165939c/firebase-analytics-16.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42293fcbad5a59ff1e5469254165939c/firebase-analytics-16.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f2085c3dad2df3b94103837a80e568d5/firebase-analytics-16.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f2085c3dad2df3b94103837a80e568d5/firebase-analytics-16.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f2085c3dad2df3b94103837a80e568d5/firebase-analytics-16.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml
index 4a0b305..ec2c050 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-analytics-impl:16.1.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a730d2ee626e53b747ec0a1fd40807a8/firebase-analytics-impl-16.1.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a730d2ee626e53b747ec0a1fd40807a8/firebase-analytics-impl-16.1.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a730d2ee626e53b747ec0a1fd40807a8/firebase-analytics-impl-16.1.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1722d8912fd1cd7b5a0215170b222d2a/firebase-analytics-impl-16.1.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1722d8912fd1cd7b5a0215170b222d2a/firebase-analytics-impl-16.1.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1722d8912fd1cd7b5a0215170b222d2a/firebase-analytics-impl-16.1.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml
index 5acd658..4b44cd4 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-common:16.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd905df5de70290bffaf00bfd93997af/firebase-common-16.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd905df5de70290bffaf00bfd93997af/firebase-common-16.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cd905df5de70290bffaf00bfd93997af/firebase-common-16.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/26a190628c6588674c3edc11fb57ee98/firebase-common-16.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/26a190628c6588674c3edc11fb57ee98/firebase-common-16.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/26a190628c6588674c3edc11fb57ee98/firebase-common-16.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1_aar.xml
index ac3bd27..0baf495 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-core:16.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2a47cdc52ca3a732bb21ac58a064f11b/firebase-core-16.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2a47cdc52ca3a732bb21ac58a064f11b/firebase-core-16.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2a47cdc52ca3a732bb21ac58a064f11b/firebase-core-16.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/44aad7c582443a0b1be3491e0754ddce/firebase-core-16.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/44aad7c582443a0b1be3491e0754ddce/firebase-core-16.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/44aad7c582443a0b1be3491e0754ddce/firebase-core-16.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0_aar.xml
index fb899ea..80e04e1 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-iid:16.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/49b29c08a77860e4e4abe3218f96f8c9/firebase-iid-16.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/49b29c08a77860e4e4abe3218f96f8c9/firebase-iid-16.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/49b29c08a77860e4e4abe3218f96f8c9/firebase-iid-16.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f076c4f55b7f64287d6d7c52826e21cf/firebase-iid-16.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f076c4f55b7f64287d6d7c52826e21cf/firebase-iid-16.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f076c4f55b7f64287d6d7c52826e21cf/firebase-iid-16.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml
index 6317923..ab46aee 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-iid-interop:16.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a2e4fad641a8176f22f81415ae15b475/firebase-iid-interop-16.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a2e4fad641a8176f22f81415ae15b475/firebase-iid-interop-16.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a2e4fad641a8176f22f81415ae15b475/firebase-iid-interop-16.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771fd24ee88d32d7f417da63587d9266/firebase-iid-interop-16.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771fd24ee88d32d7f417da63587d9266/firebase-iid-interop-16.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/771fd24ee88d32d7f417da63587d9266/firebase-iid-interop-16.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml
index e27c671..d227270 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-inappmessaging:17.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4ec1c1103165e1a39ac8bf5cbd6991e/firebase-inappmessaging-17.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4ec1c1103165e1a39ac8bf5cbd6991e/firebase-inappmessaging-17.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a4ec1c1103165e1a39ac8bf5cbd6991e/firebase-inappmessaging-17.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/efcc52f7e9ec1ae89082c74adc764ccd/firebase-inappmessaging-17.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/efcc52f7e9ec1ae89082c74adc764ccd/firebase-inappmessaging-17.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/efcc52f7e9ec1ae89082c74adc764ccd/firebase-inappmessaging-17.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml
index 6dc1842..6a7248c 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-inappmessaging-display:17.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8d9d885af0a5aab63e8cabf5a2a998b/firebase-inappmessaging-display-17.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8d9d885af0a5aab63e8cabf5a2a998b/firebase-inappmessaging-display-17.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c8d9d885af0a5aab63e8cabf5a2a998b/firebase-inappmessaging-display-17.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bf7dd10ff70c45c7e77289ecad9df0f4/firebase-inappmessaging-display-17.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bf7dd10ff70c45c7e77289ecad9df0f4/firebase-inappmessaging-display-17.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bf7dd10ff70c45c7e77289ecad9df0f4/firebase-inappmessaging-display-17.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml
index 28df7d2..f198030 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-measurement-connector:17.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7469f593391cd96ebc5aea83c967e414/firebase-measurement-connector-17.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7469f593391cd96ebc5aea83c967e414/firebase-measurement-connector-17.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7469f593391cd96ebc5aea83c967e414/firebase-measurement-connector-17.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b59c3e2e04b2508cf10d1ce69e6f45ff/firebase-measurement-connector-17.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b59c3e2e04b2508cf10d1ce69e6f45ff/firebase-measurement-connector-17.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b59c3e2e04b2508cf10d1ce69e6f45ff/firebase-measurement-connector-17.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml
index 5b0b418..a1d0a30 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:firebase-measurement-connector-impl:16.0.1@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f898e788a5b5cb5589c6ef1f6aec7e1a/firebase-measurement-connector-impl-16.0.1/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f898e788a5b5cb5589c6ef1f6aec7e1a/firebase-measurement-connector-impl-16.0.1/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f898e788a5b5cb5589c6ef1f6aec7e1a/firebase-measurement-connector-impl-16.0.1/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5e16e1fd56a0d483b806f15525d89ef2/firebase-measurement-connector-impl-16.0.1/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5e16e1fd56a0d483b806f15525d89ef2/firebase-measurement-connector-impl-16.0.1/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5e16e1fd56a0d483b806f15525d89ef2/firebase-measurement-connector-impl-16.0.1/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0_aar.xml
index 9c4d1cf..a71c3ad 100644
--- a/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.google.firebase:protolite-well-known-types:16.0.0@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/906a17dca5049f2ff9d738bc9b9b26bd/protolite-well-known-types-16.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/906a17dca5049f2ff9d738bc9b9b26bd/protolite-well-known-types-16.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/906a17dca5049f2ff9d738bc9b9b26bd/protolite-well-known-types-16.0.0/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fd091a75c51014efa016c19f1a0dfe3/protolite-well-known-types-16.0.0/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fd091a75c51014efa016c19f1a0dfe3/protolite-well-known-types-16.0.0/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fd091a75c51014efa016c19f1a0dfe3/protolite-well-known-types-16.0.0/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_simplify_ink_1_0_2_aar.xml b/.idea/libraries/Gradle__com_simplify_ink_1_0_2_aar.xml
index 30a5832..0efac78 100644
--- a/.idea/libraries/Gradle__com_simplify_ink_1_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_simplify_ink_1_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: com.simplify:ink:1.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34a1e675ff364234c8ecac40303554df/ink-1.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34a1e675ff364234c8ecac40303554df/ink-1.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34a1e675ff364234c8ecac40303554df/ink-1.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55d9da87991b1a20c83f64033232e52f/ink-1.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55d9da87991b1a20c83f64033232e52f/ink-1.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/55d9da87991b1a20c83f64033232e52f/ink-1.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.simplify/ink/1.0.2/af446c0f3b91c5f2b1b08c1fb841ddf231d95d4e/ink-1.0.2-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
index 4a617fa..bb95986 100644
--- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml
@@ -1,9 +1,9 @@
 <component name="libraryTable">
   <library name="Gradle: io.reactivex.rxjava2:rxandroid:2.0.2@aar">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8411afbc2d8af6aa95a3f773ee8612c/rxandroid-2.0.2/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8411afbc2d8af6aa95a3f773ee8612c/rxandroid-2.0.2/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8411afbc2d8af6aa95a3f773ee8612c/rxandroid-2.0.2/AndroidManifest.xml" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66ce927a5955d984cad6eef97666a584/rxandroid-2.0.2/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66ce927a5955d984cad6eef97666a584/rxandroid-2.0.2/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66ce927a5955d984cad6eef97666a584/rxandroid-2.0.2/AndroidManifest.xml" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxandroid/2.0.2/fcdc5a3422c57b141000facfa2c332d3a26d2ad4/rxandroid-2.0.2-javadoc.jar!/" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e3f3f99..0c64e0b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1640625" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/button_background.xml" value="0.2734375" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/ic_launcher_foreground.xml" value="0.1640625" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/drawable/input_background.xml" value="0.2734375" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_cargar_bultos.xml" value="0.2078125" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_loadvan.xml" value="0.22" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_main.xml" value="0.3333333333333333" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_sign.xml" value="0.4466666666666667" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/activity_tickets.xml" value="0.3333333333333333" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/component_custom_edit_dialog.xml" value="0.22604166666666667" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/header_route.xml" value="0.17806484295845998" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_check.xml" value="0.25271739130434784" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_route.xml" value="0.2427536231884058" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_routeSelected.xml" value="0.25271739130434784" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_routeselected.xml" value="0.15625" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_sub_ticket.xml" value="0.3333333333333333" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/row_ticket.xml" value="0.3333333333333333" />
+        <entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/src/main/res/layout/ticket_pending_row.xml" value="0.3333333333333333" />
+      </map>
+    </option>
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="12">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -18,12 +42,15 @@
           <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
           <item index="10" class="java.lang.String" itemvalue="android.annotation.Nullable" />
           <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="11">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -35,11 +62,15 @@
           <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
           <item index="9" class="java.lang.String" itemvalue="android.annotation.NonNull" />
           <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules/app/vn-delivery.app.iml b/.idea/modules/app/vn-delivery.app.iml
index 03d247b..888faf0 100644
--- a/.idea/modules/app/vn-delivery.app.iml
+++ b/.idea/modules/app/vn-delivery.app.iml
@@ -24,10 +24,34 @@
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
+    <facet type="kotlin-language" name="Kotlin">
+      <configuration version="4" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
+        <compilerSettings>
+          <option name="additionalArguments" value="-Xallow-no-source-files" />
+        </compilerSettings>
+        <compilerArguments>
+          <option name="destination" value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/debug" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/24678e0e6c434f64700cf77d8e77956e/multidex-1.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9f62345edbdf6878deadef9f65e989cc/firebase-inappmessaging-display-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a46e112ee9740241e4e88679f090604f/dagger-android-support-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88c0222d9001e81be4ec8248a677aa70/appcompat-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8357e963b04ec3d0864b0f023a9f943/recyclerview-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/29795646546094df3fde239a549820c6/firebase-core-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/7385f8a1def5be3b40264c6ef366e70e/firebase-measurement-connector-impl-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/ae3593ec92063dbf12f177fa248cac93/firebase-analytics-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/72477d242253c17de810f25e048aa4fd/firebase-inappmessaging-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f5a6d2fea3a09d4615ab8d7cdf0e7400/firebase-analytics-impl-16.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88515ad79691dfd14ca3a2b5817758fa/firebase-iid-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/1ffa650cc26e6ab60128bb475d2f015e/firebase-common-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a4c303d74aeadd342034bd99aecaa1be/play-services-stats-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/68f37c0e259530f808198b45c3075239/firebase-measurement-connector-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c27a39e6363cea255e8f408778861590/play-services-clearcut-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5cb2d34ce13a63989520819eec2bfe51/play-services-phenotype-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/286ab05abee4eaf46c0fae750b9603b4/firebase-iid-interop-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b4d8c9bd383252da6cb653b35bd3472c/play-services-base-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e427af849bc6838f9292c52b9ed673e4/play-services-tasks-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/052b7c6ef2a842b0bb9c599086d43d14/play-services-ads-identifier-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6d3f00ed235e8dfe931c421d52d72c0a/play-services-basement-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8bff76e23f9494813d89bd3df60a0d8/support-v4-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/279cab345c4ab8d15a92228a32c320a2/support-fragment-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3918ec52ad7bbc3967750b6119cfd94e/animated-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2e05b10a89db85a189c12a4a8155f2c8/customtabs-27.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/fe88c30f8b67d4315bf734969bfd8274/support-core-ui-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/85ac079d5d65163a723a3762eb098015/support-core-utils-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c90228c0a26f155825f0c88fb9fc9bc9/support-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/46c7a1ac54cfb951e45d2acc46434941/loader-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2b1b58dca386bfb6cbf8f706b005935a/viewpager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f01a7894de6b681084f37d1e2cc01447/coordinatorlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/377c81ecf8901344247e71b578413791/drawerlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a75dd9e6a6f490fedbe76e42c417ff1f/slidingpanelayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bde3bde7da7707d463979244d15f43b8/customview-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bdead750af7ba3c871eaac61a88ba481/swiperefreshlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6cc31adb3c448a6979c970b445370fb4/asynclayoutinflater-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e2353780e93aeaad4f8e49da74e2f2cc/support-media-compat-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d526fa61dcc2035dcda20548dd08edfd/support-compat-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a9e05a510a5250a9d1b4c15434a70c8d/versionedparcelable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5dbd81b632a700e3f9d10c6d3a76594e/cursoradapter-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/4e618266d26df25ab5f76ce89700cc5f/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2f80ce68b9dbe1706f4548ba03997e4e/documentfile-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/35edf416fed54baa0e29d114033fce08/localbroadcastmanager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6dc934d89310458aa467bce5019cacd5/print-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a6c618c27f165adab478a8a78e390426/viewmodel-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5ca5119e872a89cdeb9722611e1c16b0/interpolator-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a798b117f18cd95f9eec0b73feba20b5/dagger-android-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/97273e080923e0b7923ec0aabee8efc0/livedata-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3fe5687f16f4029af55f90678329903b/livedata-core-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b3c7b8dc8b966a3e97ccbd3f016ef389/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9a3effa40db9286cd5e1dcb7d2dde6d7/constraint-layout-1.1.3-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.0.2/f8d87f15b94b8d74e7ccf61d7eedb558811cdb30/converter-gson-2.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.3.0/1eaa5762cb25c31b1905e2bfdfef70a2e0495ea6/converter-scalars-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/bcacde6a8ccedcc56c127403d26b76072fe6214d/retrofit-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.0/5a11f020cce2d11eb71ba916700600e18c4547e7/okhttp-3.8.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-okhttp/1.12.0/3fdb2c85587702865b464b2f6faabf7e2e294a3d/grpc-okhttp-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp/okhttp/2.7.5/7a15a7db50f86c4b64aa3367424a60e3a325b8f1/okhttp-2.7.5.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-protobuf-lite/1.12.0/f5bebfbd5e93b8bbb58888a5cfaa9f490fb7b455/grpc-protobuf-lite-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-stub/1.12.0/fbd2bafe09a89442ab3d7a8d8b3e8bafbd59b4e0/grpc-stub-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.12.0/541a5c68ce85c03190e29bc9e0ec611d2b75ff24/grpc-core-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/751f548c85fa49f330cecbb1875893f971b33c4e/gson-2.7.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/de4f537f5e3927c41a0848a5cccb9ebd/ink-1.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/12c37208696163284a88b03ae92ad268/play-services-measurement-base-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.auto.value/auto-value-annotations/1.6/da725083ee79fdcd86d9f3d8a76e38174a01892a/auto-value-annotations-1.6.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger/2.13/37dc0fc55b65aa10f6e1edc4691a1231c904cfb1/dagger-2.13.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9f836f9cb1e756f7349962d875473d85/protolite-well-known-types-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-lite/3.0.1/59b5b9c6e1a3054696d23492f888c1f8b583f5fc/protobuf-lite-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-context/1.12.0/5b63a170b786051a42cce08118d5ea3c8f60f749/grpc-context-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/20.0/89507701249388e1ed5ddcf8c41f4ce1be7831ef/guava-20.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.2/6dcc08f90f678ac33e5ef78c3c752b6f59e63e0c/error_prone_annotations-2.1.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-contrib-grpc-metrics/0.11.0/d57b877f1a28a613452d45e35c7faae5af585258/opencensus-contrib-grpc-metrics-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-api/0.11.0/c1ff1f0d737a689d900a3e2113ddc29847188c64/opencensus-api-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/8fbd830426c23158946def82cf2418ee/rxandroid-2.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.1.14/20dbf7496e417da474eda12717bf4653dbbd5a6b/rxjava-2.1.14.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.2/7446d06ec8d4f7ffcc53f1da37c95f200dcb9387/picasso-2.5.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/sergiodt/AppData/Local/Android/Sdk/platforms/android-28/android.jar" />
+          <option name="noStdlib" value="true" />
+          <option name="noReflect" value="true" />
+          <option name="moduleName" value="app_debug" />
+          <option name="jvmTarget" value="1.6" />
+          <option name="languageVersion" value="1.4" />
+          <option name="apiVersion" value="1.4" />
+          <option name="pluginOptions">
+            <array />
+          </option>
+          <option name="pluginClasspaths">
+            <array />
+          </option>
+          <option name="errors">
+            <ArgumentParseErrors />
+          </option>
+        </compilerArguments>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
-    <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
@@ -40,9 +64,21 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/../../../app/build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../../app/out" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1" level="project" />
@@ -72,6 +108,10 @@
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.1.14" level="project" />
     <orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.5.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-inappmessaging-display:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.dagger:dagger-android-support:2.13@aar" level="project" />
@@ -127,16 +167,5 @@
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-base:16.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:protolite-well-known-types:16.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3c32513..0dec646 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,31 @@
     </shared>
   </component>
   <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="Headless" />
+    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura::" />
+    <option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
   </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="BranchesTreeState">
+    <expand>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+    </expand>
+    <select />
+  </component>
   <component name="CMakeSettings">
     <configurations>
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
@@ -30,181 +52,109 @@
       <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/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_1_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_1_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_2_13_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_guava_guava_20_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_simplify_ink_1_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_simplify_ink_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_simplify_ink_1_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_context_1_12_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_core_1_12_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2_aar.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/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/runConfigurations.xml" beforeDir="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" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/release/app-release.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/app-release.apk" 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/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/ClientAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/ClientAdapter.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/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/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/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/Cliente.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Cliente.java" 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/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/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/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/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/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_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/mipmap-anydpi-v26/ic_launcher.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-hdpi/ic_launcher.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-hdpi/ic_launcher.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-mdpi/ic_launcher.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-mdpi/ic_launcher.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/ic_launcher.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/ic_launcher.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxhdpi/ic_launcher.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xxhdpi/ic_launcher.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" 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/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/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.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/espresso/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/espresso/group-index.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/group-index.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml" beforeDir="false" afterPath="$PROJECT_DIR$/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml" afterDir="false" />
@@ -216,7 +166,7 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[Pixel_2_API_28]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[20211523021031]" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
       <ProjectState />
@@ -225,20 +175,42 @@
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
-        <projects_view />
+        <projects_view>
+          <tree_state>
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="vn-delivery" type="f1a62948:ProjectNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="vn-delivery" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="vn-delivery" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Dependencies" type="6de06a37:ExternalSystemViewDefaultContributor$MyDependenciesNode" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
       </state>
     </system>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Kotlin Class" />
         <option value="layoutResourceFile" />
         <option value="Class" />
       </list>
     </option>
   </component>
   <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="$PROJECT_DIR$/../KEYSTORE/keystore.jks" />
+    <option name="KEY_STORE_PATH" value="C:\Users\sergiodt\proyectos\androidkeys_quique\keystore.jks" />
     <option name="KEY_ALIAS" value="keystore" />
     <option name="REMEMBER_PASSWORDS" value="true" />
     <option name="BUILD_TARGET_KEY" value="apk" />
@@ -246,6 +218,14 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
   <component name="ProjectId" id="1bWCL859wVM8jZScmHvfw95Cjm4" />
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="1" id="Add" />
@@ -256,9 +236,12 @@
   </component>
   <component name="PropertiesComponent">
     <property name="ApkExportedModule" value="vn-delivery.app" />
-    <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_28" />
-    <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2021-01-28T06:43:16.262Z" />
-    <property name="ExportApk.ApkPath" value="$USER_HOME$/Desktop/appdelivery" />
+    <property name="DEBUGGABLE_DEVICE" value="zebra_technologies-tc25-19192521400686" />
+    <property name="DEBUGGABLE_PROCESS" value="verdnatura.es.repartoverdnatura" />
+    <property name="DEBUGGER_ID" value="Auto" />
+    <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="VirtualDevicePath@C:\Users\sergiodt\.android\avd\Pixel_3a_API_30_x86.avd" />
+    <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2021-06-07T14:25:44.344183900Z" />
+    <property name="ExportApk.ApkPath" value="C:\Users\sergiodt\AndroidStudioProjects\vn-delivery\apk" />
     <property name="ExportApk.BuildType" value="release" />
     <property name="ExportApk.BuildVariants" value="release" />
     <property name="ExportApk.Flavors" value="" />
@@ -267,31 +250,40 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="SHOW_ALL_PROCESSES" value="false" />
     <property name="android.project.structure.last.selected" value="SDK Location" />
     <property name="android.project.structure.proportion" value="0.15" />
     <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
+    <property name="com.developerphil.adbidea.selecteddevices" value="19192521400686" />
     <property name="device.picker.selection" value="3.2_QVGA_ADP2_API_19" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_directory_selection" value="$PROJECT_DIR$/app/src/main/res/drawable" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/app/src/main/res/drawable" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
     <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
     <property name="sync.plugin.last.upgrade.timestamp" value="1557288635509" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/app" />
-    </key>
     <key name="android.template.packageName">
       <recent name="verdnatura.es.repartoverdnatura" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-delivery\app\src\main\res\drawable" />
+      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-delivery\app\src\main\res\layout" />
+      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-delivery\app\src\main\res" />
+      <recent name="$PROJECT_DIR$/app" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-delivery\app\src\main\res\drawable-v24" />
       <recent name="$PROJECT_DIR$/app/src/main/res/drawable" />
     </key>
+    <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="verdnatura.es.repartoverdnatura" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="verdnatura.es.repartoverdnatura.MODELS" />
+    </key>
   </component>
   <component name="RunManager">
-    <configuration name="&lt;template&gt;" type="JUnit" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-    </configuration>
     <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
       <option name="TEST_OBJECT" value="class" />
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
@@ -307,6 +299,7 @@
       <option name="ARTIFACT_NAME" value="" />
       <option name="PM_INSTALL_OPTIONS" value="" />
       <option name="ALL_USERS" value="false" />
+      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
       <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
       <option name="ACTIVITY_EXTRA_FLAGS" value="" />
       <option name="MODE" value="default_activity" />
@@ -362,6 +355,13 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="TestNG">
       <option name="TEST_OBJECT" value="CLASS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -372,6 +372,7 @@
       </method>
     </configuration>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration>$USER_HOME$/.subversion</configuration>
   </component>
@@ -397,59 +398,6 @@
     </option>
     <option name="oldMeFiltersMigrated" value="true" />
   </component>
-  <component name="WindowStateProjectService">
-    <state x="698" y="311" key="#com.intellij.codeInsight.editorActions.RestoreReferencesDialog" timestamp="1611819705195">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state x="698" y="311" key="#com.intellij.codeInsight.editorActions.RestoreReferencesDialog/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611819705195" />
-    <state x="773" y="272" key="#com.intellij.ide.util.MemberChooser" timestamp="1611819444081">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state x="773" y="272" key="#com.intellij.ide.util.MemberChooser/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611819444081" />
-    <state width="1878" height="287" key="GridCell.Tab.0.bottom" timestamp="1611822960380">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.0.bottom/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960380" />
-    <state width="1878" height="287" key="GridCell.Tab.0.center" timestamp="1611822960379">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.0.center/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960379" />
-    <state width="1878" height="287" key="GridCell.Tab.0.left" timestamp="1611822960379">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.0.left/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960379" />
-    <state width="1878" height="287" key="GridCell.Tab.0.right" timestamp="1611822960380">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.0.right/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960380" />
-    <state width="1878" height="287" key="GridCell.Tab.1.bottom" timestamp="1611822960381">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.1.bottom/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960381" />
-    <state width="1878" height="287" key="GridCell.Tab.1.center" timestamp="1611822960381">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.1.center/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960381" />
-    <state width="1878" height="287" key="GridCell.Tab.1.left" timestamp="1611822960380">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.1.left/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960380" />
-    <state width="1878" height="287" key="GridCell.Tab.1.right" timestamp="1611822960381">
-      <screen x="0" y="25" width="1920" height="1055" />
-    </state>
-    <state width="1878" height="287" key="GridCell.Tab.1.right/0.25.1920.1055/1920.25.1920.1055@0.25.1920.1055" timestamp="1611822960381" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint type="java-line">
-          <url>file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java</url>
-          <line>610</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
   <component name="masterDetails">
     <states>
       <state key="ProjectJDKs.UI">
diff --git a/app/build.gradle b/app/build.gradle
index ac22296..878aac0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,20 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "verdnatura.es.repartoverdnatura"
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 8
-        versionName "1.8"
+        //targetSdkVersion 28
+
+        versionCode 12 // test de carga i descarga de furgo
+        //versionCode 11 // test de Cargar Furgo
+        //versionCode 10 es la versión 9.2
+        //versionCode 8
+        versionName "9.2"//versión soluciona fallo si quitamos gps y que no envíe la location 0,0
+        //versionName "9.1"//es la versión que se utiliza para comprar en bbdd
+        //versionName "1.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -34,8 +41,12 @@ dependencies {
     implementation 'com.simplify:ink:1.0.2'
     implementation 'com.google.firebase:firebase-core:16.0.1'
     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'
+repositories {
+    mavenCentral()
+}
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index e29c403..14bf209 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 21b3801..f1e2939 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":8,"versionName":"1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":9,"versionName":"9","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f05048..bba5853 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
 
     <application
         android:allowBackup="true"
+        android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -59,6 +60,15 @@
             android:name=".NoteActivity"
             android:configChanges="orientation"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".LoadVanActivity"
+            android:configChanges="orientation"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".UnLoadVanActivity"
+            android:configChanges="orientation"
+            android:screenOrientation="portrait" />
+
 
         <receiver android:name=".NetworkStateReveiver">
             <intent-filter>
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java b/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java
index bcd9247..be1f4d3 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/CheckAdapter.java
@@ -27,28 +27,42 @@ public class CheckAdapter  extends ArrayAdapter<Check> {
 
         TextView txtId = convertView.findViewById(R.id.txtId);
         TextView txtAddress = convertView.findViewById(R.id.txtAddress);
-        TextView txtWarehouse = convertView.findViewById(R.id.txtWarehouse);
-        TextView txtBulto = convertView.findViewById(R.id.txtBulto);
+        // TextView txtWarehouse = convertView.findViewById(R.id.txtWarehouse);
+       // TextView txtBulto = convertView.findViewById(R.id.txtBulto);
+        TextView txtName = convertView.findViewById(R.id.txtClientName);
         TextView txtCheck = convertView.findViewById(R.id.txtCheck);
         LinearLayout fondo = convertView.findViewById(R.id.fondo);
+        TextView txtConsignatario = convertView.findViewById(R.id.consignatarioId);
+        TextView txtItemPacking = convertView.findViewById(R.id.txtItemPacking  );
 
         txtId.setText(c.getId());
 
-        txtAddress.setText(c.getAddressFk()+" - "+c.getStreet()+" "+c.getCity()+" "+c.getPostalCode());
+        txtAddress.setText(c.getStreet()+" "+c.getCity()+" "+c.getPostalCode());
+        //txtAddress.setText(c.getAddressFk()+" - "+c.getStreet()+" "+c.getCity()+" "+c.getPostalCode());
 
-        txtWarehouse.setText(c.getWarehouse());
+        //txtWarehouse.setText(c.getWarehouse());
+        //txtBulto.setText(c.getBultos());
 
-        txtBulto.setText(c.getBultos());
+        txtName.setText(c.getNickName());
+        txtConsignatario.setText(c.getAddressFk());
+        txtItemPacking.setText(c.getItemPackingTypeFk());
 
-
-        if (c.getChecked().equals("1")){
-            fondo.setBackgroundColor(getContext().getResources().getColor(R.color.colorAccent));
+    if (c.getChecked().equals("1")){
+            fondo.setBackgroundColor(getContext().getResources().getColor(R.color.verdnatura_pumpkin_orange));
             txtCheck.setText("OK");
         }else{
             fondo.setBackgroundColor(getContext().getResources().getColor(R.color.colorMainHeader));
             txtCheck.setText("no");
         }
 
+
+    if (c.getDelivered()!=null){
+        if (c.getDelivered().equals("1")){
+                fondo.setBackgroundColor(getContext().getResources().getColor(R.color.verdnatura_dark_mint));
+                //txtCheck.setText(txtCheck.getText()+"Entregada");
+            }
+        }
+
         return convertView;
     }
 }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/ClientAdapter.java b/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/ClientAdapter.java
index b8d966c..a0cc8e7 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/ClientAdapter.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/ClientAdapter.java
@@ -25,7 +25,7 @@ public class ClientAdapter  extends ArrayAdapter<ClientTickets> {
 
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {
-        ClientTickets clientes = getItem(position);
+        final ClientTickets clientes = getItem(position);
 
         if (convertView == null){
             convertView = LayoutInflater.from(getContext()).inflate(R.layout.row_ticket,parent,false);
@@ -39,6 +39,7 @@ public class ClientAdapter  extends ArrayAdapter<ClientTickets> {
         TextView txtCiudad = convertView.findViewById(R.id.textView26);
         TextView txtNote = convertView.findViewById(R.id.txtNote);
 
+
         txtCliente.setText(clientes.getClient());
         txtConsignatorio.setText(clientes.getAddress());
         txtTienda.setText(clientes.getClientName());
@@ -56,12 +57,17 @@ public class ClientAdapter  extends ArrayAdapter<ClientTickets> {
         LinearLayout viewTickets = convertView.findViewById(R.id.layoutTickets);
         viewTickets.removeAllViews();
         View v;
+
         for (int i =0; i < clientes.getTickets().size();i++){
             v = vi.inflate(R.layout.row_sub_ticket,null);
             TextView txtTicket = v.findViewById(R.id.textView29);
             TextView txtPackage = v.findViewById(R.id.textView31);
             TextView txtWarehouse = v.findViewById(R.id.textView33);
             ImageView btnPolizon = v.findViewById(R.id.btnPolizon);
+
+            TextView txtpackingType = v.findViewById(R.id.packingtype);
+            txtpackingType.setText(clientes.getTickets().get(i).get("PackingType"));
+
             txtTicket.setText(clientes.getTickets().get(i).get("Id"));
             txtPackage.setText(clientes.getTickets().get(i).get("Packages"));
             txtWarehouse.setText(clientes.getTickets().get(i).get("Warehouse"));
@@ -90,6 +96,7 @@ public class ClientAdapter  extends ArrayAdapter<ClientTickets> {
         ImageView btnNote = convertView.findViewById(R.id.imageView7);
         LinearLayout lyNote = convertView.findViewById(R.id.btnNote);
         ImageView btnAddNote = convertView.findViewById(R.id.imageView9);
+        ImageView btnUnload = convertView.findViewById(R.id.imageUnload);
 
         if (clientes.getNote() != null && clientes.getNote().length()>0){
             lyNote.setVisibility(View.VISIBLE);
@@ -143,6 +150,16 @@ public class ClientAdapter  extends ArrayAdapter<ClientTickets> {
             }
         });
 
+        btnUnload.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(getContext() instanceof Tickets){
+                    ((Tickets) getContext()).goToExpeditionByAddress(position,clientes.getAddress());
+                }
+            }
+        });
+
+
         return convertView;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java b/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java
index 615624c..a068812 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/ADAPTERS/RutaAdapter.java
@@ -1,6 +1,9 @@
 package verdnatura.es.repartoverdnatura.ADAPTERS;
 
+import static verdnatura.es.repartoverdnatura.MainActivity.listaRutasCargadas;
+
 import android.content.Context;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -12,6 +15,7 @@ import android.widget.TextView;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 import verdnatura.es.repartoverdnatura.MODELS.Ruta;
@@ -50,6 +54,22 @@ public class RutaAdapter extends ArrayAdapter<Ruta> {
             TextView btnCargador = convertView.findViewById(R.id.btnCargadores);
             TextView txtOnline = convertView.findViewById(R.id.txtOnline);
             ImageView imgNoWeb = convertView.findViewById(R.id.imageView10);
+            ImageView loadVan = convertView.findViewById(R.id.imageLoadVan);
+            TextView loadVanTxt = convertView.findViewById(R.id.loadVanTxt);
+
+
+
+            if (!listaRutasCargadas.isEmpty()){
+               // Log.d("VERDNATURA::","La ruta no está vacía");
+                if (listaRutasCargadas.contains(ruta.getId())){
+                    loadVan.setVisibility(View.GONE);
+                }
+
+            }
+
+           /* if (LocalStorage.loadRutaCargada(loadVan.getContext(),ruta.getId())){
+                loadVan.setVisibility(View.GONE);
+            }*/
 
             txtIdRuta.setText(ruta.getId());
             txtZona.setText(ruta.getAgency());
@@ -67,6 +87,24 @@ public class RutaAdapter extends ArrayAdapter<Ruta> {
                 }
             });
 
+            loadVanTxt.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (getContext() instanceof MainActivity) {
+                        ((MainActivity) getContext()).onLoadSelected(position);
+                    }
+                }
+            });
+
+            loadVan.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (getContext() instanceof MainActivity) {
+                        ((MainActivity) getContext()).onLoadSelected(position);
+                    }
+                }
+            });
+
             btnCargador.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java
index 003ba3f..bfd27cb 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/CargarBultosActivity.java
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.EditText;
@@ -15,6 +16,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,11 +24,14 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 import verdnatura.es.repartoverdnatura.ADAPTERS.CheckAdapter;
+import verdnatura.es.repartoverdnatura.ADAPTERS.RutaAdapter;
 import verdnatura.es.repartoverdnatura.ADAPTERS.WorkerAdapter;
 import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
 import verdnatura.es.repartoverdnatura.MODELS.Check;
+import verdnatura.es.repartoverdnatura.MODELS.Ruta;
 import verdnatura.es.repartoverdnatura.MODELS.Worker;
 import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
+import verdnatura.es.repartoverdnatura.UTILS.LocalStorage;
 import verdnatura.es.repartoverdnatura.UTILS.Utils;
 
 public class CargarBultosActivity extends AppCompatActivity {
@@ -50,6 +55,16 @@ public class CargarBultosActivity extends AppCompatActivity {
         txtIdRuta = findViewById(R.id.textView41);
         btnCargadores = findViewById(R.id.btnCargadores);
         setEvents();
+        showRoutes();
+
+    }
+
+    private void showRoutes(){
+      //  Log.d("VERDNATURA::","eL NUMERO DE RUTAS ES"+listaRutas.size());
+        List<Ruta> list = LocalStorage.getRutas(this);
+        for (Ruta ruta : list){
+            Log.d("VERDNATURA::","La ruta es "+ruta.getId());
+        }
     }
 
     private void setEvents(){
@@ -94,7 +109,7 @@ public class CargarBultosActivity extends AppCompatActivity {
                 if (b){
                     txtRuta.setText("");
                     txtIdRuta.setText(R.string.esccaneaEtiqueta);
-                    btnCargadores.setVisibility(View.GONE);
+                    btnCargadores.setVisibility(View.VISIBLE);
                 }
             }
         });
@@ -108,6 +123,7 @@ public class CargarBultosActivity extends AppCompatActivity {
         });
     }
 
+
     private void checkList(){
 
         String idCheck = txtEscaner.getText().toString();
@@ -221,6 +237,7 @@ public class CargarBultosActivity extends AppCompatActivity {
         startActivity(i);
     }
 
+
         private void getChecks(){
         listCheck = new ArrayList<>();
         final CargarBultosActivity that = this;
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java b/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java
index e242be2..e18a944 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java
@@ -18,12 +18,19 @@ public interface RestClient {
     @POST("/security/login")
     Call<String> login(@HeaderMap Map<String,String> headers, @Body String[] userData);
 
+//cambiada version porque se requería un objeto desde el servidor y solo devolvía un false
     @POST("/security/getVersion")
     Call<Version> getVersion(@HeaderMap Map<String,String> headers, @Body String[] userData);
 
+  //  @POST("/delivery/get_version")
+   // Call<String> getVersion(@HeaderMap Map<String,String> headers, @Body String[] userData);
+
     @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_tickets")
     Call<List<Cliente>> getClients(@HeaderMap Map<String,String> headers, @Body String[] route);
 
@@ -45,6 +52,18 @@ public interface RestClient {
     @POST("/delivery/setRouteOk")
     Call<String> setRouteOk(@HeaderMap Map<String,String> headers,@Body Object[] args);
 
+    @POST("/delivery/expeditionState_add")
+    Call<Void> expeditionState_add(@HeaderMap Map<String,String> headers,@Body Object[] args);
+
+    @POST("/delivery/expeditionState_addByAdress")
+    Call<Void> expeditionState_addByAdress(@HeaderMap Map<String,String> headers,@Body Object[] args);
+
+    @POST("/delivery/expeditionState_addByExpedition")
+    Call<Void> expeditionState_addByExpedition(@HeaderMap Map<String,String> headers,@Body Object[] args);
+
+    @POST("/delivery/expeditionState_addByRoute")
+    Call<Void> expeditionState_addByRoute(@HeaderMap Map<String,String> headers,@Body Object[] args);
+
     @POST("/delivery/saveLoadersWorkers")
     Call<String> saveLoadersWorkers(@HeaderMap Map<String,String> headers,@Body Object[] args);
 
@@ -54,5 +73,9 @@ public interface RestClient {
     @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);
 
+    @POST("/delivery/getInfoFreelance")
+    Call<List<DeliveryInfo>> getInfoFreelance(@HeaderMap Map<String,String> headers, @Body Object[] args);
 }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java
index 9d02b32..57ddfcc 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java
@@ -1,8 +1,11 @@
 package verdnatura.es.repartoverdnatura;
 
+import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.TextView;
 
 import java.util.List;
@@ -20,9 +23,10 @@ import verdnatura.es.repartoverdnatura.UTILS.Utils;
 
 public class InfoActivity extends AppCompatActivity {
 
-    private TextView txtRazonSocial,txtNif, txtDireccionFiscal,txtMunicipio, txtCodigoPostal;
+    private TextView txtRazonSocial,txtNif, txtDireccionFiscal,txtMunicipio, txtCodigoPostal,txtNameCorp,txtNIFCorp,txtAdressCorp,txtVersion;
     private RestClient restClient;
     public Ruta route;
+    private Context Mycontext;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -34,22 +38,45 @@ public class InfoActivity extends AppCompatActivity {
         txtMunicipio = (TextView) findViewById(R.id.txtMunicipio);
         txtCodigoPostal = (TextView) findViewById(R.id.txtCodigoPostal);
 
-        restClient = ApiUtils.getAPIService();
+        txtNameCorp = (TextView) findViewById(R.id.textView7);
+        txtNIFCorp = (TextView) findViewById(R.id.textView5);
+        txtAdressCorp = (TextView) findViewById(R.id.textView6);
 
+        txtVersion=(TextView) findViewById(R.id.textView43);
+
+        restClient = ApiUtils.getAPIService();
 
         Intent intent = this.getIntent();
         Bundle bundle = intent.getExtras();
+
+        company_getInfo(Utils.getIdUserLogin(this));
+        freelance_getInfo(Utils.getIdUserLogin(this));
+
+        version_infoapp();
+
+/*
         if (bundle != null){
             route = (Ruta) bundle.getSerializable("route");
             if (route != null){
                 getInfo();
             }
-        }
-
+        }else{
 
+        }*/
     }
 
+    private void version_infoapp() {
+        Context context = getApplicationContext(); // or activity.getApplicationContext()
+        PackageManager packageManager = getApplicationContext().getPackageManager();
+        try {
 
+            txtVersion.setText(getString(R.string.version)+""+packageManager.getPackageInfo(context.getPackageName(), 0).versionName);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /*
     private void getInfo(){
         txtCodigoPostal.setText("");
         txtDireccionFiscal.setText("");
@@ -57,15 +84,79 @@ public class InfoActivity extends AppCompatActivity {
         txtNif.setText("");
         txtRazonSocial.setText("");
 
-
         Utils.progressBar.show(this,getResources().getString(R.string.please_wait));
         Object[] args = new Object[1];
         args[0] = route.getId();
+
+
         restClient.getInfo(Utils.getMapWhitUser(this),args).enqueue(new Callback<List<DeliveryInfo>>() {
             @Override
             public void onResponse(Call<List<DeliveryInfo>> call, Response<List<DeliveryInfo>> response) {
                 Utils.progressBar.getDialog().dismiss();
                 if (response.isSuccessful()) {
+                    for (DeliveryInfo deliveryInfo : response.body()){
+                        txtCodigoPostal.setText(deliveryInfo.getPostCode());
+                        txtDireccionFiscal.setText(deliveryInfo.getStreet());
+                        txtMunicipio.setText(deliveryInfo.getCity());
+                        txtNif.setText(deliveryInfo.getNif());
+                        txtRazonSocial.setText(deliveryInfo.getName());
+
+                    }
+                }
+            }
+
+            @Override
+            public void onFailure(Call<List<DeliveryInfo>> call, Throwable t) {
+                Utils.progressBar.getDialog().dismiss();
+            }
+        });
+
+
+    }*/
+
+
+    private void company_getInfo(String id){
+
+        Utils.progressBar.show(this,getResources().getString(R.string.please_wait));
+        Object[] args = new Object[1];
+        args[0] =id;
+
+       // restClient.getInfo(Utils.getMapWhitUser(this),args).enqueue(new Callback<List<DeliveryInfo>>() {
+        restClient.getInfoCompany(Utils.getMapWhitUser(this),args).enqueue(new Callback<List<DeliveryInfo>>() {
+            @Override
+            public void onResponse(Call<List<DeliveryInfo>> call, Response<List<DeliveryInfo>> response) {
+                Utils.progressBar.getDialog().dismiss();
+                if (response.isSuccessful()) {
+
+                    for (DeliveryInfo deliveryInfo : response.body()){
+
+                        txtAdressCorp.setText(deliveryInfo.getStreet()+","+deliveryInfo.getPostCode()+" "+deliveryInfo.getCity());
+                        txtNIFCorp.setText(deliveryInfo.getNif());
+                        txtNameCorp.setText(deliveryInfo.getName());
+                    }
+
+                 }
+            }
+
+            @Override
+            public void onFailure(Call<List<DeliveryInfo>> call, Throwable t) {
+               // //Log.i("VERDNATURA","El error es"+t.getMessage().toString());
+                Utils.progressBar.getDialog().dismiss();
+            }
+        });
+
+
+    }
+    private void freelance_getInfo(String id){
+
+        Object[] args = new Object[1];
+        args[0] =id;
+        restClient.getInfoFreelance(Utils.getMapWhitUser(this),args).enqueue(new Callback<List<DeliveryInfo>>() {
+            @Override
+            public void onResponse(Call<List<DeliveryInfo>> call, Response<List<DeliveryInfo>> response) {
+                Utils.progressBar.getDialog().dismiss();
+                if (response.isSuccessful()) {
+
                     for (DeliveryInfo deliveryInfo : response.body()){
                         txtCodigoPostal.setText(deliveryInfo.getPostCode());
                         txtDireccionFiscal.setText(deliveryInfo.getStreet());
@@ -78,10 +169,12 @@ public class InfoActivity extends AppCompatActivity {
 
             @Override
             public void onFailure(Call<List<DeliveryInfo>> call, Throwable t) {
+              //  //Log.i("VERDNATURA","El error es"+t.getMessage().toString());
                 Utils.progressBar.getDialog().dismiss();
             }
         });
 
 
     }
+
 }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java
index 0ea71ff..07c961c 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/LoginActivity.java
@@ -1,6 +1,7 @@
 package verdnatura.es.repartoverdnatura;
 
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -83,11 +84,14 @@ public class LoginActivity extends AppCompatActivity {
                 Utils.progressBar.getDialog().dismiss();
                 if(response.isSuccessful()){
                     Log.i("API","Respuesta: "+response.body());
-                    Utils.saveIdUser(that,response.body());
+                    Utils.saveIdUserLogin(that,response.body());
+                    Utils.saveIdUser(that,response.body().toString());
                     Utils.saveUserPass(that,user,password);
                     startActivity(new Intent(that,MainActivity.class));
                     txtUser.setText("");
                     txtPassword.setText("");
+
+
                 }else{
                     Utils.showErrorDialog(that,that.getResources().getString(R.string.usuario_incorrecto));
                     Log.e("API", "Response is not successful "+response.message());
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java
index e54b0fe..b14300d 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Check.java
@@ -6,10 +6,16 @@ public class Check {
 
     @SerializedName("id")
     private String id;
+
     @SerializedName("ticketFk")
     private String ticketFk;
+
     @SerializedName("checked")
     private String checked;
+
+    @SerializedName("delivered")
+    private String delivered;
+
     @SerializedName("routeFk")
     private String routeFk;
 
@@ -34,17 +40,47 @@ public class Check {
     @SerializedName("alertLevel")
     private String alertLevel;
 
+    @SerializedName("nickname")
+    private String nickname;
 
-    public Check(String id, String ticketFk, String checked) {
+    @SerializedName("itemPackingTypeFk")
+    private String itemPackingTypeFk;
+
+
+
+    public Check(String id, String ticketFk, String checked, String nickname,String address,String street,String city, String postalCode,
+                 String alertLevel,String routeFK,String delivered,String itemPackingTypeFk) {
         this.id = id;
         this.ticketFk = ticketFk;
         this.checked = checked;
+        this.nickname = nickname;
+        this.addressFk = address;
+        this.street = street;
+        this.city = city;
+        this.postalCode= postalCode;
+        this.alertLevel = alertLevel;
+        this.routeFk =routeFK;
+        this.delivered = delivered;
+        this.itemPackingTypeFk =itemPackingTypeFk;
+
+
+        //c.getStreet()+" "+c.getCity()+" "+c.getPostalCode()
+
+    }
+
+    public String getItemPackingTypeFk(){
+        return itemPackingTypeFk;
+    }
+    public void setItemPackingTypeFk(String itemPackingTypeFk){
+        this.itemPackingTypeFk=itemPackingTypeFk;
     }
 
     public String getBultos() {
         return bultos;
     }
 
+    public String getNickName(){return nickname;}
+
     public void setBultos(String bultos) {
         this.bultos = bultos;
     }
@@ -109,6 +145,13 @@ public class Check {
         return checked;
     }
 
+    public String getDelivered(){
+        return delivered;
+    }
+
+    public void setDelivered(String delivered) {
+        this.delivered = delivered;
+    }
     public void setChecked(String checked) {
         this.checked = checked;
     }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Cliente.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Cliente.java
index e9ef088..15813c7 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Cliente.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Cliente.java
@@ -23,6 +23,10 @@ public class Cliente {
     private String City;
     @SerializedName("Warehouse")
     private String Warehouse;
+
+    @SerializedName("PackingType")
+    private String PackingType;
+
     @SerializedName("SalePersonPhone")
     private String SalePersonPhone;
     @SerializedName("Note")
@@ -38,7 +42,9 @@ public class Cliente {
     @SerializedName("Polizon")
     private String Polizon;
 
-    public Cliente(String id, String client, String clientName, String address, String packages, String addressName, String postalCode, String city, String warehouse, String salePersonPhone, String note, ArrayList<String> phones, String signed, String latitude, String longitude, String polizon) {
+
+    //public Cliente(String id, String client, String clientName, String address, String packages, String addressName, String postalCode, String city, String warehouse, String salePersonPhone, String note, ArrayList<String> phones, String signed, String latitude, String longitude, String polizon) {
+    public Cliente(String id, String client, String clientName, String address, String packages, String addressName, String postalCode, String city, String warehouse,String packingType, String salePersonPhone, String note, ArrayList<String> phones, String signed, String latitude, String longitude, String polizon) {
         Id = id;
         Client = client;
         ClientName = clientName;
@@ -48,6 +54,7 @@ public class Cliente {
         PostalCode = postalCode;
         City = city;
         Warehouse = warehouse;
+        PackingType=packingType;
         SalePersonPhone = salePersonPhone;
         Note = note;
         Phones = phones;
@@ -184,4 +191,12 @@ public class Cliente {
     public void setPolizon(String polizon) {
         Polizon = polizon;
     }
+
+
+    public String getPackingType() {return PackingType; }
+
+     public void setPackingType(String packingType) {
+         packingType=packingType;
+    }
+
 }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java
index 02540b8..15921b4 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Ruta.java
@@ -31,9 +31,12 @@ public class Ruta implements Serializable {
     @SerializedName("Chofer")
     private String Chofer;
 
+
     private Boolean isHeader = false;
 
-    public Ruta(String id, String hour, String date, String m3, String plate, String agency, String driver, String kmStart, String kmEnd, String dStart, String dEnd, String chofer) {
+    private String isLoaded="0";
+
+    public Ruta(String id, String hour, String date, String m3, String plate, String agency, String driver, String kmStart, String kmEnd, String dStart, String dEnd, String chofer,String isloaded) {
         Id = id;
         Hour = hour;
         Date = date;
@@ -46,10 +49,18 @@ public class Ruta implements Serializable {
         this.dStart = dStart;
         this.dEnd = dEnd;
         Chofer = chofer;
+        isLoaded=isloaded;
     }
 
     public Ruta(){}
 
+    public String getIsLoaded(){
+        return isLoaded;
+    }
+    public void setIsLoaded(String isloaded){
+        isLoaded = isloaded;
+    }
+
     public Boolean getHeader() {
         return isHeader;
     }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java
index 5becb7a..d2046e6 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/SignDataUpload.java
@@ -16,6 +16,11 @@ public class SignDataUpload {
         Tickets = tickets;
         Location = location;
     }
+    public SignDataUpload(String sign, List<Integer> tickets) {
+        Sign = sign;
+        Tickets = tickets;
+        Location = null;
+    }
 
     public String getSign() {
         return Sign;
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Version.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Version.java
index 66f09f1..f5c8940 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Version.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/Version.java
@@ -4,26 +4,29 @@ import com.google.gson.annotations.SerializedName;
 
 public class Version {
 
-    @SerializedName("id")
-    private String id;
+  //  @SerializedName("id")
+   // private String id;
     @SerializedName("appName")
     private String appName;
     @SerializedName("version")
     private String version;
+    @SerializedName("IsVersionCritical")
+    private String IsVersionCritical;
 
-    public Version(String id, String appName, String version) {
-        this.id = id;
+    public Version(String id, String appName, String version,String IsVersionCritical) {
+    //    this.id = id;
         this.appName = appName;
         this.version = version;
+        this.IsVersionCritical = IsVersionCritical;
     }
 
-    public String getId() {
+  /*  public String getId() {
         return id;
     }
 
     public void setId(String id) {
         this.id = id;
-    }
+    }*/
 
     public String getAppName() {
         return appName;
@@ -37,6 +40,9 @@ public class Version {
         return version;
     }
 
+    public String getVersionIsCritical() {
+        return IsVersionCritical;
+    }
     public void setVersion(String version) {
         this.version = version;
     }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
index 0cd4753..97e9d0f 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
@@ -11,6 +11,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Parcelable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -23,6 +24,7 @@ import android.widget.TextView;
 
 import com.google.gson.Gson;
 
+import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -38,6 +40,7 @@ import retrofit2.Response;
 import verdnatura.es.repartoverdnatura.ADAPTERS.PendingTickets;
 import verdnatura.es.repartoverdnatura.ADAPTERS.RutaAdapter;
 import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
+import verdnatura.es.repartoverdnatura.MODELS.Check;
 import verdnatura.es.repartoverdnatura.MODELS.Ruta;
 import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload;
 import verdnatura.es.repartoverdnatura.MODELS.Ticket;
@@ -46,7 +49,7 @@ import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
 import verdnatura.es.repartoverdnatura.UTILS.LocalStorage;
 import verdnatura.es.repartoverdnatura.UTILS.Utils;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity<RouteLoaded> extends AppCompatActivity {
 
     private ListView listViewRutas, listViewPendingTickets;
     private ArrayList<Ruta> listaRutas = new ArrayList<>();
@@ -62,14 +65,26 @@ public class MainActivity extends AppCompatActivity {
     private final int MY_PERMISSIONS_REQUEST_FINE_LOCATION = 1;
     private ImageView btnUpload;
 
+
+    public static List<String> listaRutasCargadas = new ArrayList<>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+      /*  listaRutasCargadas.addAll(LocalStorage.loadRutasCargadas(this));
+
+        for (String i:listaRutasCargadas){
+            Log.d("VERDNATURA::","La ruta recuperada es onCreate es "+i);
+        }*/
+        //Log.d("VERDNATURA::","La ruta OnCreate es "+LocalStorage.loadRutaCargada(this,"IdRoute128623"));
+
         restClient = ApiUtils.getAPIService();
         setViews();
         getRoutes(null);
+
         getPending();
         registerReceiver(broadcastReceiver, new IntentFilter("UPDATEPENDING"));
 
@@ -79,7 +94,6 @@ public class MainActivity extends AppCompatActivity {
                     MY_PERMISSIONS_REQUEST_FINE_LOCATION);
         }
 
-
     }
 
     BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
@@ -91,8 +105,15 @@ public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onRestart() {
+
+       /* listaRutasCargadas= (ArrayList<String>) LocalStorage.loadRutasCargadas(this);
+         for (String ruta : listaRutasCargadas){
+            Log.d("VERDNATURA::","La rutas cargadas son :"+ruta);
+        }
+*/
         getRoutes(null);
         getPending();
+
         super.onRestart();
     }
 
@@ -137,12 +158,17 @@ public class MainActivity extends AppCompatActivity {
                       }
 
                   }
+
                     that.rutaAdapter = new RutaAdapter(that,listaRutas);
                     that.listViewRutas.setAdapter(that.rutaAdapter);
                     ViewGroup.LayoutParams params = listViewRutas.getLayoutParams();
                     params.height = (heightCellRoute * (listaRutas.size()));
                     listViewRutas.setLayoutParams(params);
                     checkVersion();
+                    LocalStorage.checkDateForClear(that);
+
+                   // getExpeditions();
+
                 }else{
                     getLocalData();
                 }
@@ -159,7 +185,9 @@ public class MainActivity extends AppCompatActivity {
     }
 
     public void goToCargarBultos(View v){
-        Intent i = new Intent(this,CargarBultosActivity.class);
+       // Intent i = new Intent(this,CargarBultosActivity.class);
+
+        Intent i = new Intent(this,LoadVanActivity.class);
         startActivity(i);
 
     }
@@ -198,6 +226,33 @@ public class MainActivity extends AppCompatActivity {
 
     }
 
+    public void getExpeditions(){
+        List<Ruta> list = LocalStorage.getRutas(this);
+        if (list.size() > 0){
+            for (Ruta ruta : list){
+
+                try {
+
+                    Log.d("VERDNATURA::","Las rutas son "+ruta.getId());
+                    Log.d("VERDNATURA::","Las rutas son "+ruta.getDate());
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+            this.rutaAdapter = new RutaAdapter(this,listaRutas);
+            this.listViewRutas.setAdapter(this.rutaAdapter);
+            ViewGroup.LayoutParams params = listViewRutas.getLayoutParams();
+            params.height = (heightCellRoute * (listaRutas.size()));
+            listViewRutas.setLayoutParams(params);
+        }else{
+            txtDriver.setText(this.getResources().getString(R.string.reparto));
+            listViewRutas.setVisibility(View.GONE);
+        }
+
+    }
+
     private void getPending(){
         listaPendientes = new ArrayList<>();
         Set<String> listPendientes = LocalStorage.getPendingSigns(this);
@@ -224,6 +279,12 @@ public class MainActivity extends AppCompatActivity {
         startActivity(i);
     }
 
+    public void onLoadSelected(int pos){
+        Intent i = new Intent(this,LoadVanActivity.class);
+        i.putExtra("route",listaRutas.get(pos));
+        startActivity(i);
+    }
+
     public void logOut(View v){
        final MainActivity that = this;
 
@@ -361,6 +422,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     public void checkVersion(){
+   // //Log.i("VERDNATURA","entramos en checkVersion");
 
 
         String[] userData = new String[1];
@@ -368,21 +430,25 @@ public class MainActivity extends AppCompatActivity {
 
         final MainActivity that = this;
 
+        //sergio: se cambia llamada Callback porque requeria un objeto y se le pasaba un true o false
         restClient.getVersion(Utils.getMapWhitUser(this),userData).enqueue(new Callback<Version>() {
+        //restClient.getVersion(Utils.getMapWhitUser(this),userData).enqueue(new Callback<String>() {
             @Override
             public void onResponse(Call<Version> call, Response<Version> response) {
                 if (response.isSuccessful()){
                     Version v = response.body();
+
                     PackageManager manager = that.getPackageManager();
                     try{
                         PackageInfo info = manager.getPackageInfo(that.getPackageName(), 0);
-                        int versionCode = info.versionCode;
-                        if (versionCode != Integer.parseInt(v.getVersion())){
-                            AlertDialog.Builder builder1 = new AlertDialog.Builder(that);
-                            builder1.setMessage("Existe una nueva versión. Se recomienda actualizar.");
-                            builder1.setCancelable(true);
 
-                            builder1.setPositiveButton(
+
+
+                         if (!v.getVersion().equals(info.versionName)){
+                            AlertDialog.Builder builderVersion = new AlertDialog.Builder(that);
+                             builderVersion.setMessage("Existe una nueva versión. Se recomienda actualizar.");
+                             builderVersion.setCancelable(false);
+                             builderVersion.setPositiveButton(
                                     "Actualizar",
                                     new DialogInterface.OnClickListener() {
                                         public void onClick(DialogInterface dialog, int id) {
@@ -391,26 +457,31 @@ public class MainActivity extends AppCompatActivity {
                                         }
                                     });
 
-                            builder1.setNegativeButton("Cancelar", new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialogInterface, int i) {
+                             if (!v.getVersionIsCritical().equals("1")){
+                                 builderVersion.setNegativeButton("Cancelar", new DialogInterface.OnClickListener() {
+                                     @Override
+                                     public void onClick(DialogInterface dialogInterface, int i) {
 
-                                }
-                            });
-                            AlertDialog alert11 = builder1.create();
-                            alert11.show();
+                                     }
+                                 });
+                             }else{
+                                 builderVersion.setMessage("Existe una nueva versión. Es necesario actualizar para un correcto funcionamiento");
+                             }
+                            AlertDialog alertVersion = builderVersion.create();
+                             alertVersion.show();
                         }
                     }catch (Exception e){
 
                     }
 
 
+                }else{
+
                 }
             }
 
             @Override
             public void onFailure(Call<Version> call, Throwable t) {
-
             }
         });
     }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
index 9fcf592..8d92428 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/SignActivity.java
@@ -122,12 +122,21 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 
+                        Log.d("VERDNATURA::","entramos gps");
+
+
                         final Bitmap drawing = ink.getBitmap();
+
+
+
                         if(clientTickets.getLongitude()!=null && !clientTickets.getLongitude().equals("")){
                             Location l2 = new Location("");
+
                             l2.setLatitude(Double.parseDouble(clientTickets.getLatitude()));
                             l2.setLongitude(Double.parseDouble(clientTickets.getLongitude()));
+
                             if(location != null && distanceTwoPoints(location,l2)>30.0){
+
                                 AlertDialog alertDialog = new AlertDialog.Builder(that).create();
                                 alertDialog.setTitle("Alert");
                                 alertDialog.setMessage(that.getResources().getString(R.string.diferente_loc));
@@ -150,9 +159,16 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
                                             }
                                         });
                                 alertDialog.show();
+
                             }else{
-                                SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())));
-                                confirmSave(data);
+                            //sergio: No subido para comprobar si location == null.
+                                if (location==null) {
+                                    SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing), tickets);
+                                   // SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing), tickets, new verdnatura.es.repartoverdnatura.MODELS.Location("0.0", "0.0"));
+                                    confirmSave(data);
+                                }else{
+                                    SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())));
+                                    confirmSave(data);}
                             }
                         }else{
 
@@ -160,7 +176,8 @@ public class SignActivity extends AppCompatActivity implements LocationListener{
                                 SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location(String.valueOf(location.getLongitude()),String.valueOf(location.getLatitude())));
                                 confirmSave(data);
                             }else{
-                                SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location("0.0","0.0"));
+                                //SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing),tickets,new verdnatura.es.repartoverdnatura.MODELS.Location("0.0","0.0"));
+                                SignDataUpload data = new SignDataUpload(that.BitMapToString(drawing), tickets);
                                 confirmSave(data);
                             }
 
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
index f95f0bc..826f871 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
@@ -36,6 +36,7 @@ import retrofit2.Response;
 import verdnatura.es.repartoverdnatura.ADAPTERS.ClientAdapter;
 import verdnatura.es.repartoverdnatura.ADAPTERS.PhonesAdapter;
 import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
+import verdnatura.es.repartoverdnatura.MODELS.Check;
 import verdnatura.es.repartoverdnatura.MODELS.ClientTickets;
 import verdnatura.es.repartoverdnatura.MODELS.Cliente;
 import verdnatura.es.repartoverdnatura.MODELS.Ruta;
@@ -69,6 +70,8 @@ public class Tickets extends AppCompatActivity {
         restClient = ApiUtils.getAPIService();
         setViews();
         checkPendingSigns();
+        //Log.i("VERDNATURA","Se le pasa la ruta "+route.getId());
+
     }
 
     public void checkPendingSigns(){
@@ -163,6 +166,8 @@ public class Tickets extends AppCompatActivity {
             @Override
             public void onResponse(Call<List<Cliente>> call, Response<List<Cliente>> response) {
                 Utils.progressBar.getDialog().dismiss();
+                Log.i("VERDNATURA","Vamos a por los clientes o tickets");
+
                 Boolean exists = false;
                 if(response.isSuccessful()){
                     for(Cliente cliente : response.body()){
@@ -176,6 +181,7 @@ public class Tickets extends AppCompatActivity {
                                 values.put("Warehouse",cliente.getWarehouse());
                                 values.put("Id",cliente.getId());
                                 values.put("Polizon",cliente.getPolizon());
+                                values.put("PackingType",cliente.getPackingType());
                                 c.addTicket(values);
                                 c.setNote(c.getNote()+" - "+ cliente.getNote());
                                 exists = true;
@@ -190,6 +196,7 @@ public class Tickets extends AppCompatActivity {
                                 values.put("Warehouse",cliente.getWarehouse());
                                 values.put("Id",cliente.getId());
                                 values.put("Polizon",cliente.getPolizon());
+                                values.put("PackingType",cliente.getPackingType());
                                 c.addTicket(values);
                                 c.setNote(c.getNote()+" - "+ cliente.getNote());
                                 exists = true;
@@ -205,6 +212,7 @@ public class Tickets extends AppCompatActivity {
                             values.put("Warehouse",cliente.getWarehouse());
                             values.put("Id",cliente.getId());
                             values.put("Polizon",cliente.getPolizon());
+                            values.put("PackingType",cliente.getPackingType());
                             ArrayList<Map<String,String>> arrayValues = new ArrayList<>();
                             arrayValues.add(values);
                             if(cliente.getSigned().equals("0")){
@@ -500,7 +508,9 @@ public class Tickets extends AppCompatActivity {
     }
 
     public void goSign(int pos){
-        Intent i = new Intent(this,SignActivity.class);
+       // Intent i = new Intent(this,SignActivity.class);
+        Intent i = new Intent(this,UnLoadVanActivity.class);
+
         if (isSignedShowed){
             i.putExtra("clientTicket",listClientesTicketsFirmados.get(pos));
 
@@ -509,6 +519,8 @@ public class Tickets extends AppCompatActivity {
         }
 
         i.putExtra("idRuta",route.getId());
+
+
         startActivityForResult(i,1);
 
 
@@ -605,6 +617,52 @@ public class Tickets extends AppCompatActivity {
         startActivityForResult(i,3);
     }
 
+    public void goToExpeditionByAddress(int pos,String adress){
+
+
+        Intent i = new Intent(this,UnLoadVanActivity.class);
+        i.putExtra("adress",adress);
+        i.putExtra("routeId",route.getId());
+        i.putExtra("route",route);
+
+        if (isSignedShowed){
+            i.putExtra("clientTicket",listClientesTicketsFirmados.get(pos));
+
+        }else{
+            i.putExtra("clientTicket",listClientesTickets.get(pos));
+        }
+
+        i.putExtra("idRuta",route.getId());
+
+
+        startActivityForResult(i,1);
+
+
+       // startActivity(i);
+
+
+       /* List<Check> listExpeditions= LocalStorage.getExpeditions(this);
+
+        for (Check expeditions : listExpeditions){
+            Log.d("VERDNATURA::","La ruta cargada desde LocalStorage es ::");
+        }
+        */
+
+       /* posForNote = position;
+        Intent i = new Intent(this,NoteActivity.class);
+        if (isSignedShowed){
+            i.putExtra("clientTicket",listClientesTicketsFirmados.get(position));
+        }else{
+            i.putExtra("clientTicket",listClientesTickets.get(position));
+        }
+
+        i.putExtra("isSignedShowed",isSignedShowed);
+
+        startActivityForResult(i,3);*/
+    }
+
+
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
 
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
index e5b7915..ea36e40 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
@@ -5,9 +5,13 @@ import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
 public class ApiUtils {
     private ApiUtils() {}
 
-    //public static final String BASE_URL = "http://192.168.1.111:8009/";
+     //public static final String BASE_URL = "http://192.168.1.141:9000/";
+    // public static final String BASE_URL = "http://10.1.2.179:9000/";
+
     public static final String BASE_URL = "https://app.verdnatura.es/";
 
+
+
     public static RestClient getAPIService() {
         return RetrofitClient.getClient(BASE_URL).create(RestClient.class);
     }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java
index 16f0deb..c37beae 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/LocalStorage.java
@@ -3,15 +3,24 @@ package verdnatura.es.repartoverdnatura.UTILS;
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.util.Log;
+
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
+import verdnatura.es.repartoverdnatura.MODELS.Check;
 import verdnatura.es.repartoverdnatura.MODELS.ClientTickets;
 import verdnatura.es.repartoverdnatura.MODELS.Ruta;
 import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload;
@@ -19,6 +28,8 @@ import verdnatura.es.repartoverdnatura.MODELS.SignDataUpload;
 public class LocalStorage {
     static SharedPreferences sp;
 
+
+
     public static void saveRutas(Context context, List<Ruta> rutas){
         clearClients(context,rutas);
         sp = context.getSharedPreferences("delivery",Activity.MODE_PRIVATE);
@@ -30,6 +41,78 @@ public class LocalStorage {
         editor.putString("rutas",json);
         editor.commit();
     }
+
+    public static void saveExpeditions(Context context, List<Check> checks){
+
+        //clearClients(context,rutas);
+        sp = context.getSharedPreferences("expedition",Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sp.edit();
+
+        Gson gson = new Gson();
+        String json = gson.toJson(checks);
+
+        editor.putString("expeditions",json);
+        editor.commit();
+    }
+
+    public static void addExpeditionSave(Context context, List<Check> checks){
+
+        sp = context.getSharedPreferences("expedition",Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sp.edit();
+
+        ArrayList<Check> listCheckSaved=getExpeditions(context);
+        listCheckSaved.addAll(checks);
+
+        Gson gson = new Gson();
+        String json = gson.toJson(listCheckSaved);
+
+        editor.putString("expeditions",json);
+        editor.commit();
+
+    }
+
+
+    public static List<String> loadRutasCargadas(Context context){
+
+        sp = context.getSharedPreferences("delivery",Activity.MODE_PRIVATE);
+        ArrayList<String> rutascargadas = new ArrayList<>();
+        Set<String> set = sp.getStringSet("routeCargada", null);
+        if (set!=null) {
+            for (String rutas : set) {
+                rutascargadas.add(rutas);
+            }
+        }
+        return rutascargadas;
+    }
+
+
+
+    public static void saveRutasCargadas(Context context, List<String> rutasCargadas){
+        sp = context.getSharedPreferences("expedition",Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sp.edit();
+
+        Set<String> set = new HashSet<String>();
+        set.addAll(rutasCargadas);
+        editor.putStringSet("routeCargada", set);
+        editor.commit();
+    }
+
+    public static void saveRutaCargada(Context context, String rutaCargada){
+        sp = context.getSharedPreferences("delivery",0);
+        SharedPreferences.Editor editor = sp.edit();
+        editor.putString("IdRoute"+rutaCargada,rutaCargada);
+        editor.commit();
+    }
+
+    public static Boolean loadRutaCargada(Context context, String rutaCargada){
+        sp = context.getSharedPreferences("delivery",Context.MODE_PRIVATE);
+        String RouteId=sp.getString("IdRoute"+rutaCargada,"");
+        if (RouteId.isEmpty() || RouteId.equals("")){
+            return false;
+        }else return true;
+    }
+
+
     public static void saveListClientesTickets(Context context, List<ClientTickets> listClientesTickets,String idRuta){
         sp = context.getSharedPreferences("delivery",Activity.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
@@ -50,6 +133,43 @@ public class LocalStorage {
         editor.putString("clientTicketsFirmados_"+idRuta,json);
         editor.commit();
     }
+
+    public static ArrayList<Check> getExpeditions(Context context){
+        Gson gson = new Gson();
+        sp = context.getSharedPreferences("expedition",Activity.MODE_PRIVATE);
+        String json = sp.getString("expeditions","");
+        if (json.length() > 0 ){
+            ArrayList<Check> listCheck = new ArrayList<>();
+            List<LinkedTreeMap> list = gson.fromJson(json,List.class);
+            for (int i = 0; i<list.size();i++){
+
+               /* Log.d("VERDNATURA::", "json es "+json);
+                Log.d("VERDNATURA::", "json element es "+list.get(i).get("id"));*/
+
+                listCheck.add(
+                        new Check(((list.get(i) == null) || (list.get(i).get("id") == null) ? "" : list.get(i).get("id")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("ticketFK") == null) ? "" : list.get(i).get("ticketFK")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("checked") == null) ? "" : list.get(i).get("checked")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("nickname") == null) ? "" : list.get(i).get("nickname")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("addressFk") == null) ? "" : list.get(i).get("addressFk")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("street") == null) ? "" : list.get(i).get("street")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("city") == null) ? "" : list.get(i).get("city")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("postalCode") == null) ? "" : list.get(i).get("postalCode")).toString(),
+                         ((list.get(i) == null) || (list.get(i).get("alertLevel") == null) ? "" : list.get(i).get("alertLevel")).toString(),
+                         ((list.get(i) == null) || (list.get(i).get("routeFk") == null) ? "" : list.get(i).get("routeFk")).toString(),
+                                ((list.get(i) == null) || (list.get(i).get("delivered") == null) ? "" : list.get(i).get("delivered")).toString(),
+                                ((list.get(i) == null) || (list.get(i).get("itemPackingTypeFk") == null) ? "" : list.get(i).get("itemPackingTypeFk").toString()
+
+                        )));
+            }
+
+
+            return listCheck;
+        }else{
+            return new ArrayList<>();
+        }
+    }
+
     public static ArrayList<Ruta> getRutas(Context context){
         Gson gson = new Gson();
         sp = context.getSharedPreferences("delivery",Activity.MODE_PRIVATE);
@@ -59,7 +179,7 @@ public class LocalStorage {
             List<LinkedTreeMap> list = gson.fromJson(json,List.class);
             for (int i = 0; i<list.size();i++){
 
-
+              //  Log.d("VERDNATURA::","La ruta en getRutas es "+ list.get(i).get("Id")+"--"+list.get(i).get("isLoaded").toString());
 
                 listRutas.add(new Ruta(((list.get(i) == null) || (list.get(i).get("Id") == null) ? "" : list.get(i).get("Id")).toString(),
                         ((list.get(i) == null) || (list.get(i).get("Hour") == null) ? "" : list.get(i).get("Hour")).toString(),
@@ -72,7 +192,8 @@ public class LocalStorage {
                         ((list.get(i) == null) || (list.get(i).get("kmEnd") == null) ? "" : list.get(i).get("kmEnd")).toString(),
                         ((list.get(i) == null) || (list.get(i).get("dStart") == null) ? "" : list.get(i).get("dStart")).toString(),
                         ((list.get(i) == null) || (list.get(i).get("dEnd") == null) ? "" : list.get(i).get("dEnd")).toString(),
-                        ((list.get(i) == null) || (list.get(i).get("Chofer") == null) ? "" : list.get(i).get("Chofer")).toString()));
+                        ((list.get(i) == null) || (list.get(i).get("Chofer") == null) ? "" : list.get(i).get("Chofer")).toString(),
+                        ((list.get(i) == null) || (list.get(i).get("isLoaded") == null) ? "" : list.get(i).get("isLoaded").toString())));
             }
 
 
@@ -306,4 +427,52 @@ public class LocalStorage {
         editor.remove("listSigns");
         editor.commit();
     }
+    public static void clearExpeditions(Context context){
+        sp = context.getSharedPreferences("expedition",Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sp.edit();
+        editor.remove("expeditions");
+        editor.commit();
+    }
+    public static void saveDateOfDownload(Context context){
+
+        sp = context.getSharedPreferences("datedownload",Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sp.edit();
+
+        Date t = new Date();
+        String today = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date(t.getTime()));
+        editor.putString("datedownload",today);
+        editor.commit();
+
+
+
+    }
+
+
+    public static long getDateDiff(SimpleDateFormat format, String oldDate, String newDate) {
+        try {
+            return TimeUnit.DAYS.convert(format.parse(newDate).getTime() - format.parse(oldDate).getTime(), TimeUnit.MILLISECONDS);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    public static void checkDateForClear(Context context) {
+
+        sp = context.getSharedPreferences("datedownload",Activity.MODE_PRIVATE);
+
+        String today = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(new Date());
+        String daydownloaded =sp.getString("datedownload", "1900-01-01");
+
+
+        if (getDateDiff(new SimpleDateFormat("yyyy-MM-dd"),today,daydownloaded)> 1) {
+
+            clearExpeditions(context);
+
+        }
+       // Log.d("VERDNATURA::","DateOfdownload"+sp.getString("datedownload","1900-01-01") + "-today:"+today+"-difrence"+getDateDiff(new SimpleDateFormat("yyyy-MM-dd"),today,daydownloaded));
+
+        saveDateOfDownload(context);
+    }
+
 }
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
index 618a0d5..bacd160 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/Utils.java
@@ -5,6 +5,7 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.util.Log;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,6 +17,7 @@ public class Utils {
     static Map<String, String> map = new HashMap<>();
 
     public static CustomProgressBar progressBar = new CustomProgressBar();
+    public static CustomProgressBar progressBar_info = new CustomProgressBar();
 
     public static int convertDipToPixels(float dips, Context context) {
         return (int) (dips * context.getResources().getDisplayMetrics().density + 0.5f);
@@ -39,6 +41,7 @@ public class Utils {
         map.put("user", user);
         map.put("pass", password);
         map.put("Content-Type", "application/x-www-form-urlencoded");
+        ////Log.i("VERDNATURA","Mapeado"+map);
         return map;
     }
 
@@ -85,6 +88,19 @@ public class Utils {
         editor.commit();
     }
 
+
+    public static void saveIdUserLogin(Context context,String idUser){
+        sp = context.getSharedPreferences("deliveryLogin",Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sp.edit();
+        editor.putString("idUserLogin",idUser);
+        editor.commit();
+    }
+    public static String getIdUserLogin(Context context){
+        sp = context.getSharedPreferences("deliveryLogin",Activity.MODE_PRIVATE);
+        return sp.getString("idUserLogin","nouser");
+    }
+
+
     public static void saveUserPass(Context context,String user,String pass){
         sp = context.getSharedPreferences("delivery",Activity.MODE_PRIVATE);
         SharedPreferences.Editor editor = sp.edit();
diff --git a/app/src/main/res/layout/activity_info.xml b/app/src/main/res/layout/activity_info.xml
index 7705fd5..98be5ac 100644
--- a/app/src/main/res/layout/activity_info.xml
+++ b/app/src/main/res/layout/activity_info.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    android:background="@color/colorPrimaryDark">
+    android:background="@color/colorPrimaryDark"
+    tools:context=".MainActivity">
 
     <android.support.constraint.ConstraintLayout
         android:id="@+id/constraintLayout"
@@ -21,13 +21,29 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="100dp"
             android:fontFamily="@font/roboto"
             android:text="@string/info"
             android:textColor="@color/colorMainBg"
             android:textSize="14sp"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/textView43"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/textView43"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:fontFamily="@font/roboto"
+            android:text="@string/version"
+            android:textColor="@color/colorMainBg"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -49,7 +65,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -63,7 +79,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/roboto"
-                    android:text="Verdnatura Levante S.L."
+                    android:text="Verdnatura Levante S.L"
                     android:textColor="@color/colorMainBg"
                     android:textSize="14sp" />
 
@@ -81,79 +97,88 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/roboto"
-                    android:text="Av.Espioca 100, 446460 Silla (Valencia)"
+                    android:text="C/ Fenollar 2, 46680 Algemesí (Valencia)"
                     android:textColor="@color/colorMainBg"
                     android:textSize="14sp" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="PORTEADOR"
-                    android:textSize="20dp"
-                    android:textStyle="bold"
                     android:layout_marginTop="16dp"
-                    android:textColor="@color/colorWhite"/>
+                    android:text="PORTEADOR"
+                    android:textColor="@color/colorWhite"
+                    android:textSize="20dp"
+                    android:textStyle="bold" />
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="Razón social:"
                     android:textColor="@color/colorWhite"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
+
                 <TextView
                     android:id="@+id/txtRazonSocial"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="selecciona una ruta"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="@color/colorWhite" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="NIF:"
                     android:textColor="@color/colorWhite"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
+
                 <TextView
                     android:id="@+id/txtNif"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="selecciona una ruta"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="@color/colorWhite" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="Dirección fiscal:"
                     android:textColor="@color/colorWhite"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
+
                 <TextView
                     android:id="@+id/txtDireccionFiscal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="selecciona una ruta"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="@color/colorWhite" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="Municipio:"
                     android:textColor="@color/colorWhite"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
+
                 <TextView
                     android:id="@+id/txtMunicipio"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="selecciona una ruta"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="@color/colorWhite" />
+
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="Código postal:"
                     android:textColor="@color/colorWhite"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
+
                 <TextView
                     android:id="@+id/txtCodigoPostal"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="selecciona una ruta"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="@color/colorWhite" />
 
 
             </LinearLayout>
@@ -161,8 +186,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_marginTop="15dp">
+                android:layout_marginTop="15dp"
+                android:orientation="vertical">
 
             </LinearLayout>
 
@@ -195,19 +220,18 @@
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
                     android:layout_marginTop="10dp"
-                    android:orientation="horizontal"
+                    android:layout_marginBottom="10dp"
                     android:background="@color/colorPrimary"
-                    android:layout_marginBottom="10dp"/>
+                    android:orientation="horizontal" />
             </LinearLayout>
 
             <ListView
-                android:visibility="gone"
                 android:id="@+id/listPendingTickets"
                 android:layout_width="match_parent"
                 android:layout_height="200dp"
+                android:visibility="gone"
                 tools:layout_editor_absoluteX="16dp"
-                tools:layout_editor_absoluteY="308dp"
-                />
+                tools:layout_editor_absoluteY="308dp" />
         </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 6b8581b..740fd7b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -84,8 +84,8 @@
             android:layout_height="wrap_content"
             android:background="@drawable/button_background"
             android:fontFamily="@font/roboto_bold"
+            android:onClick="logIn"
             android:text="@string/login"
-            android:textColor="@color/colorWhite"
-            android:onClick="logIn"/>
+            android:textColor="@color/colorWhite" />
     </LinearLayout>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_check.xml b/app/src/main/res/layout/row_check.xml
index a6a1fe3..5bb2de0 100644
--- a/app/src/main/res/layout/row_check.xml
+++ b/app/src/main/res/layout/row_check.xml
@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
 
-                android:text="id: "
+                android:text="Exped.: "
                 android:textColor="@color/colorMainBg"
                 android:textSize="18sp" />
 
@@ -41,6 +41,64 @@
                 android:textColor="@color/colorMainBg"
                 android:textSize="20sp"
                 android:textStyle="bold" />
+            <TextView
+                android:id="@+id/consignatario"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:text="Consignatario: "
+                android:textColor="@color/colorMainBg"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/consignatarioId"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="698658"
+                android:textColor="@color/colorMainBg"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            >
+            <TextView
+                android:id="@+id/txtItemDescrip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Tipo de embalaje: "
+                android:textColor="@color/colorMainBg"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/txtItemPacking"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="H , V"
+                android:textColor="@color/colorMainBg"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            >
+
+
+            <TextView
+                android:id="@+id/txtClientName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="Sergio de la Torre"
+                android:textColor="@color/colorMainBg"
+                android:textSize="20sp"
+                android:textStyle="bold" />
         </LinearLayout>
 
         <LinearLayout
@@ -48,7 +106,6 @@
             android:layout_height="match_parent"
             android:orientation="horizontal">
 
-
             <TextView
                 android:id="@+id/txtAddress"
                 android:layout_width="wrap_content"
@@ -69,7 +126,8 @@
                 android:layout_height="wrap_content"
                 android:text="Almacén: "
                 android:textColor="@color/colorMainBg"
-                android:textSize="18sp" />
+                android:textSize="18sp"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/txtWarehouse"
@@ -79,7 +137,8 @@
                 android:text="SILLA FV"
                 android:textColor="@color/colorMainBg"
                 android:textSize="20sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:visibility="gone"/>
         </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
@@ -89,9 +148,10 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Butos: "
+                android:text="Bultos: "
                 android:textColor="@color/colorMainBg"
-                android:textSize="18sp" />
+                android:textSize="18sp"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/txtBulto"
@@ -101,7 +161,8 @@
                 android:text="5"
                 android:textColor="@color/colorMainBg"
                 android:textSize="20sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:visibility="gone"/>
         </LinearLayout>
 
         <LinearLayout
@@ -112,7 +173,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Checked: "
+                android:text="Cargada: "
                 android:textColor="@color/colorMainBg"
                 android:textSize="18sp" />
 
@@ -123,7 +184,7 @@
                 android:layout_weight="1"
                 android:text="OK"
                 android:textColor="@color/colorMainBg"
-                android:textSize="20sp"
+                android:textSize="18sp"
                 android:textStyle="bold" />
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/row_route.xml b/app/src/main/res/layout/row_route.xml
index a62988f..a017b75 100644
--- a/app/src/main/res/layout/row_route.xml
+++ b/app/src/main/res/layout/row_route.xml
@@ -159,7 +159,23 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-
+                <ImageView
+                    android:id="@+id/imageLoadVan"
+                    android:layout_width="match_parent"
+                    android:layout_height="30dp"
+                    app:srcCompat="@drawable/camion"
+                    android:layout_marginTop="0dp"
+                    android:layout_marginBottom="5dp"
+                    />
+                <TextView
+                    android:id="@+id/loadVanTxt"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/roboto"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:text="Cargar furgo"
+                    android:textColor="@color/colorPrimary"/>
 
                 <ImageView
                     android:id="@+id/imageView10"
diff --git a/app/src/main/res/layout/row_sub_ticket.xml b/app/src/main/res/layout/row_sub_ticket.xml
index 79674b7..7702ac1 100644
--- a/app/src/main/res/layout/row_sub_ticket.xml
+++ b/app/src/main/res/layout/row_sub_ticket.xml
@@ -80,20 +80,47 @@
                 android:id="@+id/textView34"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="8dp"
+                android:layout_marginRight="0dp"
                 android:layout_weight="0"
                 android:fontFamily="@font/roboto"
                 android:text="@string/warehouse"
+                android:visibility="gone"
                 android:textColor="@color/colorGray" />
 
             <TextView
                 android:id="@+id/textView33"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="0dp"
                 android:layout_weight="0"
                 android:fontFamily="@font/roboto"
                 android:text="Silla FV"
+                android:textColor="@color/colorMainBg"
+                android:visibility="gone"
+                tools:visibility="gone" />
+
+            <TextView
+                android:id="@+id/packintypedescrp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="8dp"
+                android:layout_weight="0"
+                android:fontFamily="@font/roboto"
+                android:text="@string/packingType"
+                android:visibility="visible"
+                android:textColor="@color/colorGray" />
+
+            <TextView
+                android:id="@+id/packingtype"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:fontFamily="@font/roboto"
+                android:text="H o V"
+                android:visibility="visible"
                 android:textColor="@color/colorMainBg" />
+
+
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/row_ticket.xml b/app/src/main/res/layout/row_ticket.xml
index a1a58ba..8f29ce6 100644
--- a/app/src/main/res/layout/row_ticket.xml
+++ b/app/src/main/res/layout/row_ticket.xml
@@ -41,7 +41,8 @@
                     android:orientation="horizontal"
                     android:paddingLeft="5dp"
                     android:paddingTop="5dp"
-                    android:paddingRight="5dp">
+                    android:paddingRight="5dp"
+                    android:gravity="center_vertical">
 
                     <TextView
                         android:id="@+id/textView23"
@@ -50,6 +51,7 @@
                         android:layout_marginRight="8dp"
                         android:fontFamily="@font/roboto"
                         android:text="@string/cliente"
+                        android:layout_weight="1"
                         android:textColor="@color/colorGray" />
 
                     <TextView
@@ -59,6 +61,8 @@
                         android:layout_marginRight="8dp"
                         android:fontFamily="@font/roboto"
                         android:text="5036"
+                        android:textSize="18sp"
+                        android:layout_weight="1"
                         android:textColor="@color/colorMainBg" />
 
                     <TextView
@@ -68,15 +72,21 @@
                         android:layout_marginRight="8dp"
                         android:fontFamily="@font/roboto"
                         android:text="@string/consignatorio"
-                        android:textColor="@color/colorGray" />
+                        android:textColor="@color/colorGray"
+                        android:layout_weight="1"
+                        android:layout_marginLeft="18dp"/>
 
                     <TextView
                         android:id="@+id/textView17"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:fontFamily="@font/roboto"
                         android:text="24820"
-                        android:textColor="@color/colorMainBg" />
+                        android:textAlignment="center"
+                        android:textColor="@color/colorMainBg"
+                        android:textSize="28sp"
+                        android:textStyle="bold" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -224,7 +234,22 @@
                             android:layout_weight="1"
                             app:srcCompat="@drawable/placeholder" />
                     </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/btnUnload"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:padding="8dp">
 
+                        <ImageView
+                            android:id="@+id/imageUnload"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_weight="1"
+                            app:srcCompat="@drawable/camion_descarga" />
+                    </LinearLayout>
                     <LinearLayout
                         android:id="@+id/btnSign"
                         android:layout_width="match_parent"
@@ -232,6 +257,7 @@
                         android:layout_weight="1"
                         android:gravity="center"
                         android:orientation="horizontal"
+                        android:visibility="gone"
                         android:padding="8dp">
 
                         <ImageView
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index eb06f8e..f9f70ec 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -45,7 +45,7 @@
     <string name="km_fin">Finish km</string>
     <string name="hora_inicio">Start hour</string>
     <string name="hora_fin">Finish hour</string>
-    <string name="cargadores">Loaders</string>
+    <string name="cargadores">Drivers</string>
     <string name="trabajador">Worker</string>
     <string name="seleccionados">selecteds</string>
     <string name="notas">Notes</string>
@@ -57,4 +57,6 @@
     <string name="loadbultos">Check route</string>
     <string name="esccaneaEtiqueta">Scan a label to get route</string>
     <string name="errorBulto">This package belongs to a ticket that is not ready, consult a responsible</string>
+    <string name="version">Version app:</string>
+    <string name="packingType">Packing type:</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1efb99c..fd4fbb9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,4 +10,29 @@
     <color name="colorMainBg">#E5E5E5</color>
     <color name="colorGreen">#30D961</color>
     <color name="darkclear">#7B7B7B</color>
+    <color name="verdnatura_pumpkin_orange">#f7931e</color>
+    <color name="verdnatura_black">#000000</color>
+    <color name="verdnatura_black_1">#1d1d1d</color>
+    <color name="verdnatura_black_2">#171717</color>
+    <color name="verdnatura_black_3">#292929</color>
+    <color name="verdnatura_black_4">#242424</color>
+    <color name="verdnatura_black_5">#323232</color>
+    <color name="verdnatura_black_6">#333333</color>
+    <color name="verdnatura_black_7">#282828</color>
+    <color name="verdnatura_black_8">#1a1a1a</color>
+    <color name="verdnatura_black_9">#464446</color>
+    <color name="verdnatura_warm_grey">#707070</color>
+    <color name="verdnatura_brown_grey">#8f8f8f</color>
+    <color name="verdnatura_brown_greylight">#FFB8ADAD</color>
+    <color name="verdnatura_red">#e74c3c</color>
+    <color name="verdnatura_warm_brown">#8b4200</color>
+    <color name="verdnatura_sunflower_yellow">#ffd400</color>
+    <color name="verdnatura_dark_sky_blue">#4ab4e6</color>
+    <color name="verdnatura_dark_mint">#50be87</color>
+    <color name="verdnatura_dark_mint_light">#80be87</color>
+    <color name="verdnatura_dark_mint_light_precontrolled">#b8daba</color>
+    <color name="verdnatura_light_teal">#b8ecd6</color>
+    <color name="verdnatura_white">#ffffff</color>
+    <color name="verdnatura_black_8_alpha_6">#991A1A1A</color>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4c1220..4f2d8c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
     <string name="consignatorio">Consignatorio</string>
     <string name="pc" translatable="false">PC</string>
     <string name="ticket" translatable="false">Ticket</string>
-    <string name="packages" translatable="false">Packages</string>
+    <string name="packages" translatable="false">Bultos</string>
     <string name="warehouse" translatable="false">Warehouse</string>
     <string name="volver">volver</string>
     <string name="please_wait">trabajando</string>
@@ -50,7 +50,7 @@
     <string name="km_fin">Km fin</string>
     <string name="hora_inicio">Hora de inicio</string>
     <string name="hora_fin">Hora fin</string>
-    <string name="cargadores">Cargadores</string>
+    <string name="cargadores">Conductores</string>
     <string name="trabajador">Trabajador</string>
     <string name="seleccionados">seleccionados</string>
     <string name="notas">Notas</string>
@@ -59,7 +59,9 @@
     <string name="disponible_offline">Disponible offline</string>
     <string name="no_disponible">DESCARGAR</string>
     <string name="hora">Hora</string>
-    <string name="loadbultos">Cargar bultos</string>
+    <string name="loadbultos">Cargar furgo</string>
     <string name="esccaneaEtiqueta">Esccanea una etiqueta para obtener ruta</string>
     <string name="errorBulto">Este bulto pertenece a un ticket que no está preaprado, consulta con un responsable</string>
+    <string name="version">Versión app:</string>
+    <string name="packingType">Tipo embalaje:</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index ed1cedc..bc1406e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+    ext.kotlin_version = '1.4.0'
+
     repositories {
         google()
         jcenter()
@@ -9,6 +10,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.2'
         classpath 'com.google.gms:google-services:4.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml b/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml
index 138ad83..e4067b7 100644
--- a/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml
+++ b/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml
@@ -1,77 +1,86 @@
 <?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"/>
-  <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"/>
-  <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"/>
-  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
   <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"/>
+  <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"/>
   <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"/>
-  <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"/>
-  <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"/>
+  <firebase-appcheck versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04"/>
+  <firebase-appcheck-debug versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04"/>
+  <firebase-appcheck-debug-testing versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04"/>
+  <firebase-appcheck-interop versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04"/>
+  <firebase-appcheck-safetynet versions="16.0.0-beta01,16.0.0-beta02,16.0.0-beta03,16.0.0-beta04"/>
+  <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"/>
+  <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"/>
+  <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"/>
   <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"/>
-  <firebase-auth-ktx versions="19.3.1,19.3.2,19.4.0,20.0.0,20.0.1,20.0.2"/>
+  <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"/>
   <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"/>
-  <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"/>
-  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
   <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"/>
-  <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"/>
-  <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"/>
+  <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"/>
+  <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"/>
   <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"/>
+  <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"/>
   <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"/>
-  <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"/>
-  <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"/>
-  <firebase-crashlytics-ktx versions="17.1.0,17.1.1,17.2.1,17.2.2,17.3.0,17.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"/>
-  <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"/>
-  <firebase-database-collection versions="15.0.0,15.0.1,16.0.0,16.0.1,17.0.0,17.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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
   <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"/>
+  <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"/>
   <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"/>
-  <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"/>
-  <firebase-dynamic-links-ktx versions="19.1.0,19.1.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"/>
+  <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"/>
+  <firebase-dynamic-links-ktx versions="19.1.0,19.1.1,20.0.0,20.1.0,20.1.1,21.0.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-encoders versions="16.0.0,16.1.0"/>
-  <firebase-encoders-json versions="16.0.0,16.1.0,17.0.0,17.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"/>
-  <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"/>
-  <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"/>
-  <firebase-functions-ktx versions="19.0.1,19.0.2,19.1.0,19.2.0"/>
+  <firebase-dynamic-module-support versions="16.0.0-beta01"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <firebase-functions-ktx versions="19.0.1,19.0.2,19.1.0,19.2.0,20.0.0,20.0.1"/>
   <firebase-functions-license versions="12.0.0,12.0.1"/>
-  <firebase-iid versions="9.0.0,9.0.1,9.0.2,9.2.0,9.2.1,9.4.0,9.6.0,9.6.1,9.8.0,10.0.0,10.0.1,10.2.0,10.2.1,10.2.4,10.2.6,11.0.0,11.0.1,11.0.2,11.0.4,11.2.0,11.2.2,11.4.0,11.4.2,11.6.0,11.6.2,11.8.0,12.0.0,12.0.1,15.0.0,15.1.0,16.0.0,16.2.0,17.0.0,17.0.1,17.0.2,17.0.3,17.0.4,17.1.0,17.1.1,17.1.2,18.0.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,20.1.0,20.1.1,20.1.2,20.1.4,20.1.5,20.1.6,20.1.7,20.2.0,20.2.1,20.2.2,20.2.3,20.2.4,20.3.0,21.0.0,21.0.1"/>
-  <firebase-iid-interop versions="15.0.0,16.0.0,16.0.1,17.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,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"/>
-  <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"/>
-  <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"/>
-  <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"/>
-  <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"/>
-  <firebase-installations-interop versions="16.0.0,16.0.1"/>
-  <firebase-installations-ktx versions="16.3.3,16.3.4,16.3.5"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <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"/>
+  <firebase-installations-interop versions="16.0.0,16.0.1,17.0.0"/>
+  <firebase-installations-ktx versions="16.3.3,16.3.4,16.3.5,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-measurement-connector versions="15.0.0,16.0.0,17.0.0,17.0.1,18.0.0,18.0.1,18.0.2"/>
+  <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"/>
-  <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"/>
-  <firebase-messaging-ktx versions="20.3.0,21.0.0,21.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,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"/>
+  <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"/>
+  <firebase-messaging-ktx versions="20.3.0,21.0.0,21.0.1,22.0.0,23.0.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"/>
+  <firebase-ml-modeldownloader-ktx versions="23.0.1,24.0.0,24.0.1,24.0.2"/>
   <firebase-ml-natural-language versions="18.0.0,18.1.1,18.2.0,19.0.0,19.0.1,20.0.0,20.0.1,20.0.2,21.0.0,21.0.1,21.0.2,21.0.3,22.0.0,22.0.1"/>
   <firebase-ml-natural-language-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"/>
@@ -85,16 +94,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"/>
-  <firebase-perf-ktx versions="19.0.9,19.0.10,19.0.11,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,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"/>
+  <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"/>
   <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"/>
+  <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"/>
   <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"/>
+  <firebase-storage-ktx versions="19.1.0,19.1.1,19.2.0,19.2.1,19.2.2,20.0.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"/>
-  <protolite-well-known-types versions="15.0.0,16.0.0,16.0.1,17.0.0,17.1.0,17.1.1"/>
-  <testlab-instr-lib versions="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"/>
+  <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>
diff --git a/build/intermediates/lint-cache/maven.google/master-index.xml b/build/intermediates/lint-cache/maven.google/master-index.xml
index 9ef4196..e9f659d 100644
--- a/build/intermediates/lint-cache/maven.google/master-index.xml
+++ b/build/intermediates/lint-cache/maven.google/master-index.xml
@@ -11,6 +11,7 @@
   <androidx.ads/>
   <androidx.annotation/>
   <androidx.appcompat/>
+  <androidx.appsearch/>
   <androidx.arch.core/>
   <androidx.asynclayoutinflater/>
   <androidx.autofill/>
@@ -19,6 +20,7 @@
   <androidx.browser/>
   <androidx.camera/>
   <androidx.car/>
+  <androidx.car.app/>
   <androidx.cardview/>
   <androidx.collection/>
   <androidx.compose/>
@@ -26,6 +28,7 @@
   <androidx.compose.compiler/>
   <androidx.compose.foundation/>
   <androidx.compose.material/>
+  <androidx.compose.material3/>
   <androidx.compose.runtime/>
   <androidx.compose.ui/>
   <androidx.concurrent/>
@@ -38,15 +41,19 @@
   <androidx.databinding/>
   <androidx.datastore/>
   <androidx.documentfile/>
+  <androidx.draganddrop/>
   <androidx.drawerlayout/>
   <androidx.dynamicanimation/>
   <androidx.emoji/>
+  <androidx.emoji2/>
   <androidx.enterprise/>
   <androidx.exifinterface/>
   <androidx.fragment/>
   <androidx.games/>
   <androidx.gaming/>
+  <androidx.glance/>
   <androidx.gridlayout/>
+  <androidx.health/>
   <androidx.heifwriter/>
   <androidx.hilt/>
   <androidx.interpolator/>
@@ -57,17 +64,23 @@
   <androidx.localbroadcastmanager/>
   <androidx.media/>
   <androidx.media2/>
+  <androidx.media3/>
   <androidx.mediarouter/>
+  <androidx.metrics/>
   <androidx.multidex/>
   <androidx.navigation/>
+  <androidx.navigation.safeargs/>
+  <androidx.navigation.safeargs.kotlin/>
   <androidx.paging/>
   <androidx.palette/>
   <androidx.percentlayout/>
   <androidx.preference/>
   <androidx.print/>
+  <androidx.profileinstaller/>
   <androidx.recommendation/>
   <androidx.recyclerview/>
   <androidx.remotecallback/>
+  <androidx.resourceinspection/>
   <androidx.room/>
   <androidx.savedstate/>
   <androidx.security/>
@@ -94,13 +107,18 @@
   <androidx.viewpager/>
   <androidx.viewpager2/>
   <androidx.wear/>
+  <androidx.wear.compose/>
+  <androidx.wear.tiles/>
+  <androidx.wear.watchface/>
   <androidx.webkit/>
   <androidx.window/>
   <androidx.work/>
   <com.android/>
   <com.android.application/>
   <com.android.asset-pack/>
+  <com.android.asset-pack-bundle/>
   <com.android.billingclient/>
+  <com.android.car.ui/>
   <com.android.databinding/>
   <com.android.dynamic-feature/>
   <com.android.installreferrer/>
@@ -125,6 +143,7 @@
   <com.android.tools.build.jetifier/>
   <com.android.tools.chunkio/>
   <com.android.tools.ddms/>
+  <com.android.tools.emulator/>
   <com.android.tools.external.com-intellij/>
   <com.android.tools.external.org-jetbrains/>
   <com.android.tools.fakeadbserver/>
@@ -134,21 +153,33 @@
   <com.android.tools.metalava/>
   <com.android.tools.pixelprobe/>
   <com.android.tools.utp/>
+  <com.android.volley/>
   <com.crashlytics.sdk.android/>
   <com.google.ads.afsn/>
   <com.google.ads.interactivemedia.v3/>
+  <com.google.ads.mediation/>
   <com.google.android.ads/>
   <com.google.android.ads.consent/>
   <com.google.android.apps.common.testing.accessibility.framework/>
   <com.google.android.datatransport/>
+  <com.google.android.enterprise.connectedapps/>
+  <com.google.android.exoplayer/>
+  <com.google.android.fhir/>
+  <com.google.android.flexbox/>
   <com.google.android.games/>
   <com.google.android.gms/>
+  <com.google.android.gms.strict-version-matcher-plugin/>
   <com.google.android.instantapps/>
   <com.google.android.instantapps.thirdpartycompat/>
   <com.google.android.libraries.car/>
+  <com.google.android.libraries.enterprise.amapi/>
+  <com.google.android.libraries.healthdata/>
   <com.google.android.libraries.maps/>
+  <com.google.android.libraries.mapsplatform.secrets-gradle-plugin/>
   <com.google.android.libraries.places/>
   <com.google.android.material/>
+  <com.google.android.mediahome/>
+  <com.google.android.odml/>
   <com.google.android.play/>
   <com.google.android.support/>
   <com.google.android.things/>
@@ -158,11 +189,19 @@
   <com.google.ar/>
   <com.google.ar.sceneform/>
   <com.google.ar.sceneform.ux/>
+  <com.google.assistant.appactions/>
   <com.google.assistant.suggestion/>
+  <com.google.chromeos/>
   <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.gms/>
+  <com.google.gms.google-services/>
+  <com.google.jacquard/>
+  <com.google.mediapipe/>
   <com.google.mlkit/>
   <com.google.oboe/>
   <com.google.prefab/>
diff --git a/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml b/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
index 8676442..b617f27 100644
--- a/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
+++ b/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
@@ -125,7 +125,18 @@
   <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" />
   </library>
-  <library  groupId="com.google.dagger" artifactId="dagger-android" recommended-version="2.15" >
+  <library  groupId="com.google.firebase" artifactId="firebase-ml-vision">
+    <versions from="15.0.0" to="24.1.0" status="deprecated" description="For more information, refer to documentation for specific features.&#13;&#10;Text recognition: https://firebase.google.com/docs/ml/android/recognize-text&#13;&#10;Image labeling: https://firebase.google.com/docs/ml/android/label-images&#13;&#10;Landmark recognition: https://firebase.google.com/docs/ml/android/recognize-landmarks " />
+  </library>
+  <library  groupId="com.google.firebase" artifactId="firebase-ml-model-interpreter">
+    <versions from="15.0.0" to="22.0.4" status="deprecated" description="The Firebase ML Model Interpreter library is deprecated in favor of the Firebase ML Model Downloader library. For more information, visit https://firebase.google.com/docs/ml/android/use-custom-models" />
+  </library>
+
+  <library  groupId="com.google.firebase" artifactId="firebase-perf">
+    <versions to="16.2.1" status="deprecated" description="This version will soon be deprecated. Update to version 19.0.10 or higher to get real time performance data. For more information, visit https://firebase.google.com/docs/perf-mon/troubleshooting" url="https://firebase.google.com/docs/perf-mon/troubleshooting?platform=android#faq-real-time-data"/>
+</library>
+
+  <library  groupId="com.google.dagger" artifactId="dagger-android" recommended-version="2.35.1" >
     <versions from="2.15" />
     <versions from="2.14.1" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
     <versions from="2.14" status="deprecated" description="Bug affecting SDK performance" url="https://github.com/google/dagger/releases/tag/2.15" />
diff --git a/local.properties b/local.properties
index 3eb060c..af2722f 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Jan 28 07:39:45 CET 2021
-sdk.dir=/Users/enriqueblascoblanquer/Library/Android/sdk
+#Thu May 06 17:26:13 CEST 2021
+sdk.dir=C\:\\Users\\sergiodt\\AppData\\Local\\Android\\Sdk
diff --git a/vn-delivery.iml b/vn-delivery.iml
index e8bfb42..cabb566 100644
--- a/vn-delivery.iml
+++ b/vn-delivery.iml
@@ -3,16 +3,18 @@
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
         <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/out/production/classes" />
+    <output-test url="file://$MODULE_DIR$/out/test/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />