diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..4d8cb47
Binary files /dev/null and b/.DS_Store differ
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 7ed25a0..ba89e57 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 e5e0061..9c8c2e8 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 3c69962..5b762b3 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 392d1b2..f4f81bc 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 67f6097..63329cf 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 7eaf956..604e7ac 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 0add99f..1201c8d 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 7317f6d..6d25957 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 2af90d8..75d4235 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 e0993f1..fbefea0 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000..e51b4a3
--- /dev/null
+++ b/.idea/assetWizardSettings.xml
@@ -0,0 +1,155 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 74bc656..661d798 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
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f43d428..41871c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,11 @@
+
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a5f05cd
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
similarity index 86%
rename from .idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
rename to .idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
index bf16fff..1e06d96 100644
--- a/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml
+++ b/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml
deleted file mode 100644
index 1e88425..0000000
--- a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 e525b3d..4476d7f 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
similarity index 85%
rename from .idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
rename to .idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
index 27b1867..f29b182 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml
deleted file mode 100644
index e82d254..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 6c5be4d..41f3eb0 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml
deleted file mode 100644
index 0654822..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 dc2eb98..e66a90e 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml
deleted file mode 100644
index 0f48c63..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 a61fdc1..c468b58 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml
deleted file mode 100644
index 84afd19..0000000
--- a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 1100bde..d4dc9e3 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml
deleted file mode 100644
index 135919e..0000000
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 cb47636..4ed0ce3 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml
deleted file mode 100644
index 16d9680..0000000
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 8ebba22..5633d90 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml
deleted file mode 100644
index 5f95641..0000000
--- a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 8824394..1821837 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
similarity index 77%
rename from .idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
rename to .idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
index 80e4d73..6ccf636 100644
--- a/.idea/libraries/Gradle__com_android_support_collections_28_0_0_jar.xml
+++ b/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml
deleted file mode 100644
index 615d6cb..0000000
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 316ac61..6ea5a65 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3.xml
similarity index 90%
rename from .idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml
rename to .idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3.xml
index c0adf88..1fe25d7 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml
deleted file mode 100644
index 413b3be..0000000
--- a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 94c8370..99e45cf 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml
deleted file mode 100644
index 0d09320..0000000
--- a/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 6a26849..6ca912e 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1.xml
deleted file mode 100644
index a11d8d4..0000000
--- a/.idea/libraries/Gradle__com_android_support_customtabs_27_1_1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 1091527..a8cfef6 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml
deleted file mode 100644
index 6b48e90..0000000
--- a/.idea/libraries/Gradle__com_android_support_customview_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 730695d..349022e 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml
deleted file mode 100644
index eb8567f..0000000
--- a/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 b1d50af..3046322 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml
deleted file mode 100644
index a1e52c0..0000000
--- a/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 146cf9e..3a83bd4 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml
deleted file mode 100644
index 2ebcc72..0000000
--- a/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 de7fe6a..a258b70 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml
deleted file mode 100644
index 24d56ae..0000000
--- a/.idea/libraries/Gradle__com_android_support_loader_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 c096b0b..2b51f03 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml
deleted file mode 100644
index b460ca2..0000000
--- a/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 f9926c9..9b4e192 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_multidex_1_0_2.xml
deleted file mode 100644
index a9d3728..0000000
--- a/.idea/libraries/Gradle__com_android_support_multidex_1_0_2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 27b7682..4edce0c 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2.xml
deleted file mode 100644
index c74d520..0000000
--- a/.idea/libraries/Gradle__com_android_support_multidex_instrumentation_1_0_2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 1c341a9..c680543 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml
deleted file mode 100644
index 3b52c2b..0000000
--- a/.idea/libraries/Gradle__com_android_support_print_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e442377..7d0ab01 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml
deleted file mode 100644
index f16e96b..0000000
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 34003ee..411a614 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml
deleted file mode 100644
index c5a3cf3..0000000
--- a/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e9bbebf..491b777 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
similarity index 93%
rename from .idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
rename to .idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
index 0fdecce..24e83bc 100644
--- a/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_jar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml
deleted file mode 100644
index 9ff8cf7..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 19daea9..f8c92ff 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml
deleted file mode 100644
index 52601c1..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 1406db6..35bf93a 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml
deleted file mode 100644
index af7194a..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 f47ae39..cd1ecfe 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml
deleted file mode 100644
index 70e6bd3..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 f530644..98a2603 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml
deleted file mode 100644
index f590f25..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e82a9fa..cd085c3 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml
deleted file mode 100644
index b9911bf..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 6b06e03..6df5658 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml
deleted file mode 100644
index ec7228b..0000000
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 f35a37b..1585de2 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml
deleted file mode 100644
index e4d2b92..0000000
--- a/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 96990f3..90ff92a 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
@@ -6,6 +6,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml
deleted file mode 100644
index a04a89b..0000000
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 0db45f8..3315b93 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml
deleted file mode 100644
index 961b4f9..0000000
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 71b8a0f..80e16e2 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml
deleted file mode 100644
index cabd11c..0000000
--- a/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e343936..facf32f 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml b/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml
deleted file mode 100644
index 70e4255..0000000
--- a/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 7ab6d0d..340189e 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml
deleted file mode 100644
index 01a1253..0000000
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 37cd646..8681be0 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml b/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml
deleted file mode 100644
index d3b686b..0000000
--- a/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 b95d36f..98c2027 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1.xml
deleted file mode 100644
index 60bd346..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_15_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 f80691b..8808e49 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1.xml
deleted file mode 100644
index c13e983..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_15_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 6116d6d..5744294 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1.xml
deleted file mode 100644
index 7aa9d7e..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_15_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 4b0069d..2dec147 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1.xml
deleted file mode 100644
index aff32c8..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_clearcut_15_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 8053c38..a4610e8 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0.xml
deleted file mode 100644
index 6e919f3..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 a06de7f..f27d23f 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1.xml
deleted file mode 100644
index bb5fe62..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_phenotype_15_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 51dcac2..5770893 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1.xml
deleted file mode 100644
index 7bd44a0..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_15_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 d8c8707..3d5f52d 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1.xml
deleted file mode 100644
index 2fea91a..0000000
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_15_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 62adbae..5691ef4 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6_jar.xml b/.idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6.xml
similarity index 68%
rename from .idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6_jar.xml
rename to .idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6.xml
index e435b1b..49312fc 100644
--- a/.idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6_jar.xml
+++ b/.idea/libraries/Gradle__com_google_auto_value_auto_value_annotations_1_6.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1_jar.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1_jar.xml
rename to .idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1.xml
index 079a964..9e7fcf0 100644
--- a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1_jar.xml
+++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_3_0_1.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml
rename to .idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml
index 2f5eebc..0a6ccc4 100644
--- a/.idea/libraries/Gradle__com_google_code_gson_gson_2_7_jar.xml
+++ b/.idea/libraries/Gradle__com_google_code_gson_gson_2_7.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_2_13_jar.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_2_13.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_google_dagger_dagger_2_13_jar.xml
rename to .idea/libraries/Gradle__com_google_dagger_dagger_2_13.xml
index 7172e2a..0744f15 100644
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_2_13_jar.xml
+++ b/.idea/libraries/Gradle__com_google_dagger_dagger_2_13.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13.xml
deleted file mode 100644
index 7a5cc37..0000000
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_2_13.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 a9eed52..070bf2f 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13.xml b/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13.xml
deleted file mode 100644
index c83251c..0000000
--- a/.idea/libraries/Gradle__com_google_dagger_dagger_android_support_2_13.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 f330fbd..d740845 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2_jar.xml b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2.xml
similarity index 68%
rename from .idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2_jar.xml
rename to .idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2.xml
index 707937c..7c1244f 100644
--- a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2_jar.xml
+++ b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_1_2.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1.xml
deleted file mode 100644
index ced180f..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 57c3606..7b6130c 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1.xml
deleted file mode 100644
index 1b6259b..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_impl_16_1_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 1e56e54..4a0b305 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1.xml
deleted file mode 100644
index c3142a2..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e54220e..5acd658 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1.xml
deleted file mode 100644
index 17c52ba..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 8c31a03..ac3bd27 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0.xml
deleted file mode 100644
index bdfcf83..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_16_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 ce08e10..fb899ea 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0.xml
deleted file mode 100644
index 67a6d18..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 980541c..6317923 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0.xml
deleted file mode 100644
index a31b2cd..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_17_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 b07e34c..e27c671 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0.xml
deleted file mode 100644
index 9ec7896..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_inappmessaging_display_17_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 778d132..6dc1842 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0.xml
deleted file mode 100644
index 0e35407..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e43426c..28df7d2 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1.xml
deleted file mode 100644
index f165179..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_impl_16_0_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 480e627..5b0b418 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0.xml b/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0.xml
deleted file mode 100644
index b79c80e..0000000
--- a/.idea/libraries/Gradle__com_google_firebase_protolite_well_known_types_16_0_0.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 61a32d1..9c4d1cf 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_google_guava_guava_20_0_jar.xml b/.idea/libraries/Gradle__com_google_guava_guava_20_0.xml
similarity index 62%
rename from .idea/libraries/Gradle__com_google_guava_guava_20_0_jar.xml
rename to .idea/libraries/Gradle__com_google_guava_guava_20_0.xml
index bbfeb85..11bc9db 100644
--- a/.idea/libraries/Gradle__com_google_guava_guava_20_0_jar.xml
+++ b/.idea/libraries/Gradle__com_google_guava_guava_20_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1_jar.xml b/.idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1.xml
similarity index 69%
rename from .idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1_jar.xml
rename to .idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1.xml
index 24b63a6..4e993bd 100644
--- a/.idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1_jar.xml
+++ b/.idea/libraries/Gradle__com_google_protobuf_protobuf_lite_3_0_1.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_simplify_ink_1_0_2.xml b/.idea/libraries/Gradle__com_simplify_ink_1_0_2.xml
deleted file mode 100644
index 8c768df..0000000
--- a/.idea/libraries/Gradle__com_simplify_ink_1_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 078d8f4..30a5832 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
rename to .idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
index 5c4dd4e..662b001 100644
--- a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0_jar.xml
rename to .idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0.xml
index 2320883..093005f 100644
--- a/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_8_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5_jar.xml b/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5_jar.xml
rename to .idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5.xml
index 5ce9079..980c165 100644
--- a/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_okhttp_okhttp_2_7_5.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml
rename to .idea/libraries/Gradle__com_squareup_okio_okio_1_13_0.xml
index 3e834aa..913412c 100644
--- a/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_okio_okio_1_13_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2_jar.xml b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2_jar.xml
rename to .idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2.xml
index a70b3c1..6f17795 100644
--- a/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_picasso_picasso_2_5_2.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2.xml
similarity index 69%
rename from .idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2_jar.xml
rename to .idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2.xml
index 260ed10..bb411af 100644
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_0_2.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0.xml
similarity index 69%
rename from .idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0_jar.xml
rename to .idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0.xml
index d08de11..9a2818b 100644
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_3_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0_jar.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml
similarity index 61%
rename from .idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0_jar.xml
rename to .idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml
index 3981ae6..9185989 100644
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0_jar.xml
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_3_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_grpc_grpc_context_1_12_0_jar.xml b/.idea/libraries/Gradle__io_grpc_grpc_context_1_12_0.xml
similarity index 62%
rename from .idea/libraries/Gradle__io_grpc_grpc_context_1_12_0_jar.xml
rename to .idea/libraries/Gradle__io_grpc_grpc_context_1_12_0.xml
index 7a47460..8681634 100644
--- a/.idea/libraries/Gradle__io_grpc_grpc_context_1_12_0_jar.xml
+++ b/.idea/libraries/Gradle__io_grpc_grpc_context_1_12_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_grpc_grpc_core_1_12_0_jar.xml b/.idea/libraries/Gradle__io_grpc_grpc_core_1_12_0.xml
similarity index 62%
rename from .idea/libraries/Gradle__io_grpc_grpc_core_1_12_0_jar.xml
rename to .idea/libraries/Gradle__io_grpc_grpc_core_1_12_0.xml
index ea264f1..f860ddc 100644
--- a/.idea/libraries/Gradle__io_grpc_grpc_core_1_12_0_jar.xml
+++ b/.idea/libraries/Gradle__io_grpc_grpc_core_1_12_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0_jar.xml b/.idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0.xml
similarity index 62%
rename from .idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0_jar.xml
rename to .idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0.xml
index a8005d2..6feae1b 100644
--- a/.idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0_jar.xml
+++ b/.idea/libraries/Gradle__io_grpc_grpc_okhttp_1_12_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0_jar.xml b/.idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0.xml
similarity index 61%
rename from .idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0_jar.xml
rename to .idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0.xml
index c6a2258..29c3ec0 100644
--- a/.idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0_jar.xml
+++ b/.idea/libraries/Gradle__io_grpc_grpc_protobuf_lite_1_12_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0_jar.xml b/.idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0.xml
similarity index 62%
rename from .idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0_jar.xml
rename to .idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0.xml
index 0eb6c8e..9dd9677 100644
--- a/.idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0_jar.xml
+++ b/.idea/libraries/Gradle__io_grpc_grpc_stub_1_12_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0_jar.xml b/.idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0.xml
similarity index 61%
rename from .idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0_jar.xml
rename to .idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0.xml
index 508b6d6..4eb9960 100644
--- a/.idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0_jar.xml
+++ b/.idea/libraries/Gradle__io_opencensus_opencensus_api_0_11_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0_jar.xml b/.idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0.xml
similarity index 68%
rename from .idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0_jar.xml
rename to .idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0.xml
index 5ecf33c..aaed18a 100644
--- a/.idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0_jar.xml
+++ b/.idea/libraries/Gradle__io_opencensus_opencensus_contrib_grpc_metrics_0_11_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2.xml
deleted file mode 100644
index 11804cb..0000000
--- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxandroid_2_0_2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 e765c96..4a617fa 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
@@ -3,6 +3,7 @@
+
diff --git a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14_jar.xml b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14.xml
similarity index 61%
rename from .idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14_jar.xml
rename to .idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14.xml
index f0a81b8..5a4956a 100644
--- a/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14_jar.xml
+++ b/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_14.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
similarity index 62%
rename from .idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
rename to .idea/libraries/Gradle__javax_inject_javax_inject_1.xml
index f9c9a30..62012ea 100644
--- a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml
+++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
similarity index 62%
rename from .idea/libraries/Gradle__junit_junit_4_12_jar.xml
rename to .idea/libraries/Gradle__junit_junit_4_12.xml
index f4f25a8..6c078d6 100644
--- a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml
+++ b/.idea/libraries/Gradle__junit_junit_4_12.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
similarity index 62%
rename from .idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
rename to .idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
index 5855a29..fbe9697 100644
--- a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml
+++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
similarity index 61%
rename from .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
rename to .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
index 50cf2b9..09cf23d 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
similarity index 61%
rename from .idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
rename to .idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
index a5eaca5..1a77dd8 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
similarity index 61%
rename from .idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
rename to .idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
index b4dabdc..3d45e8e 100644
--- a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml
+++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml
similarity index 69%
rename from .idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
rename to .idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml
index 7616606..2d8f97a 100644
--- a/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml
+++ b/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2.xml
@@ -1,9 +1,11 @@
-
+
-
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 51fa3e5..e3f3f99 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,12 +16,14 @@
+
+
-
+
@@ -31,11 +33,13 @@
+
+
-
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 6f3a0d1..08c494d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
-
+
\ No newline at end of file
diff --git a/app/app.iml b/.idea/modules/app/vn-delivery.app.iml
similarity index 57%
rename from app/app.iml
rename to .idea/modules/app/vn-delivery.app.iml
index deca146..03d247b 100644
--- a/app/app.iml
+++ b/.idea/modules/app/vn-delivery.app.iml
@@ -1,5 +1,5 @@
-
+
@@ -19,117 +19,59 @@
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -185,5 +127,16 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c9fb87..3c32513 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,23 +23,200 @@
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
@@ -52,76 +229,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -130,37 +237,8 @@
-
-
- textView3
- txtDriver
- saveLoadersWorkers
- ink
- Headless
- getRoutes
- checked = 0
- txtIdRuta
- heightCellRoute
- vndelivery
- app.verdnatura.es/bin/
- result
- saveLocal
- listClientesTickets.add
- app.verd
- repartidores
- /delivery
- save_sign
- saveSign
- app.verdnatura.es/silex
-
-
- $PROJECT_DIR$
- $PROJECT_DIR$/app/src/main/java
- $PROJECT_DIR$/app
-
-
-
+
@@ -168,113 +246,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
@@ -296,18 +287,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -321,12 +300,13 @@
-
+
+
@@ -335,8 +315,6 @@
-
-
@@ -364,11 +342,16 @@
+
+
+
+
+
@@ -402,391 +385,71 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
file://$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
- 604
-
+ 610
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/.DS_Store b/app/.DS_Store
new file mode 100644
index 0000000..482a845
Binary files /dev/null and b/app/.DS_Store differ
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 394cc4d..e29c403 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/src/.DS_Store b/app/src/.DS_Store
new file mode 100644
index 0000000..f6a4b60
Binary files /dev/null and b/app/src/.DS_Store differ
diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store
new file mode 100644
index 0000000..f1ebbdc
Binary files /dev/null and b/app/src/main/.DS_Store differ
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..e72648d
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
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 13e1f6b..e242be2 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/INTERFACES/RestClient.java
@@ -8,6 +8,7 @@ import retrofit2.http.HeaderMap;
import retrofit2.http.POST;
import verdnatura.es.repartoverdnatura.MODELS.Check;
import verdnatura.es.repartoverdnatura.MODELS.Cliente;
+import verdnatura.es.repartoverdnatura.MODELS.DeliveryInfo;
import verdnatura.es.repartoverdnatura.MODELS.Ruta;
import verdnatura.es.repartoverdnatura.MODELS.Version;
import verdnatura.es.repartoverdnatura.MODELS.Worker;
@@ -50,5 +51,8 @@ public interface RestClient {
@POST("/delivery/addNote")
Call addNote(@HeaderMap Map headers,@Body Object[] args);
+ @POST("/delivery/getInfo")
+ Call> getInfo(@HeaderMap Map 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 2bb42f4..9d02b32 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java
@@ -1,13 +1,87 @@
package verdnatura.es.repartoverdnatura;
+import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.widget.TextView;
+
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import verdnatura.es.repartoverdnatura.ADAPTERS.WorkerAdapter;
+import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
+import verdnatura.es.repartoverdnatura.MODELS.DeliveryInfo;
+import verdnatura.es.repartoverdnatura.MODELS.Ruta;
+import verdnatura.es.repartoverdnatura.MODELS.Worker;
+import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
+import verdnatura.es.repartoverdnatura.UTILS.Utils;
public class InfoActivity extends AppCompatActivity {
+ private TextView txtRazonSocial,txtNif, txtDireccionFiscal,txtMunicipio, txtCodigoPostal;
+ private RestClient restClient;
+ public Ruta route;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_info);
+
+ txtRazonSocial = (TextView) findViewById(R.id.txtRazonSocial);
+ txtNif = (TextView) findViewById(R.id.txtNif);
+ txtDireccionFiscal = (TextView) findViewById(R.id.txtDireccionFiscal);
+ txtMunicipio = (TextView) findViewById(R.id.txtMunicipio);
+ txtCodigoPostal = (TextView) findViewById(R.id.txtCodigoPostal);
+
+ restClient = ApiUtils.getAPIService();
+
+
+ Intent intent = this.getIntent();
+ Bundle bundle = intent.getExtras();
+ if (bundle != null){
+ route = (Ruta) bundle.getSerializable("route");
+ if (route != null){
+ getInfo();
+ }
+ }
+
+
+ }
+
+
+ private void getInfo(){
+ txtCodigoPostal.setText("");
+ txtDireccionFiscal.setText("");
+ txtMunicipio.setText("");
+ 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>() {
+ @Override
+ public void onResponse(Call> call, Response> 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> call, Throwable t) {
+ Utils.progressBar.getDialog().dismiss();
+ }
+ });
+
+
}
}
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/DeliveryInfo.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/DeliveryInfo.java
new file mode 100644
index 0000000..477d9b2
--- /dev/null
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MODELS/DeliveryInfo.java
@@ -0,0 +1,66 @@
+package verdnatura.es.repartoverdnatura.MODELS;
+
+import com.google.gson.annotations.SerializedName;
+
+public class DeliveryInfo {
+
+ @SerializedName("name")
+ private String name;
+ @SerializedName("street")
+ private String street;
+ @SerializedName("city")
+ private String city;
+ @SerializedName("nif")
+ private String nif;
+ @SerializedName("postCode")
+ private String postCode;
+
+ public DeliveryInfo(String name, String street, String city, String nif, String postCode) {
+ this.name = name;
+ this.street = street;
+ this.city = city;
+ this.nif = nif;
+ this.postCode = postCode;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getStreet() {
+ return street;
+ }
+
+ public void setStreet(String street) {
+ this.street = street;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getNif() {
+ return nif;
+ }
+
+ public void setNif(String nif) {
+ this.nif = nif;
+ }
+
+ public String getPostCode() {
+ return postCode;
+ }
+
+ public void setPostCode(String postCode) {
+ this.postCode = postCode;
+ }
+}
+
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
index df443ce..f95f0bc 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/Tickets.java
@@ -585,6 +585,12 @@ public class Tickets extends AppCompatActivity {
startActivityForResult(i,2);
}
+ public void goToInfo(View v){
+ Intent i = new Intent(this,InfoActivity.class);
+ i.putExtra("route",route);
+ startActivityForResult(i,2);
+ }
+
public void goToNotes(int position){
posForNote = position;
Intent i = new Intent(this,NoteActivity.class);
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 efa89ba..e5b7915 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java
@@ -5,8 +5,8 @@ import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
public class ApiUtils {
private ApiUtils() {}
- public static final String BASE_URL = "http://192.168.1.33:8000/";
- //public static final String BASE_URL = "https://app.verdnatura.es/";
+ //public static final String BASE_URL = "http://192.168.1.111:8009/";
+ 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/res/.DS_Store b/app/src/main/res/.DS_Store
new file mode 100644
index 0000000..4393513
Binary files /dev/null and b/app/src/main/res/.DS_Store differ
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2a47255
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_info.xml b/app/src/main/res/layout/activity_info.xml
index 376f823..7705fd5 100644
--- a/app/src/main/res/layout/activity_info.xml
+++ b/app/src/main/res/layout/activity_info.xml
@@ -85,6 +85,76 @@
android:textColor="@color/colorMainBg"
android:textSize="14sp" />
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -139,6 +209,8 @@
tools:layout_editor_absoluteY="308dp"
/>
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_tickets.xml b/app/src/main/res/layout/activity_tickets.xml
index c9be69a..0f74a4a 100644
--- a/app/src/main/res/layout/activity_tickets.xml
+++ b/app/src/main/res/layout/activity_tickets.xml
@@ -42,7 +42,7 @@
android:text="0/15 signed clients"
android:textColor="@color/colorSecundary"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/imageView2"
+ app:layout_constraintEnd_toStartOf="@+id/imageInfo"
app:layout_constraintStart_toStartOf="parent" />
+
+
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..7353dbd 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..7353dbd 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 7a8ae76..dc491f9 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..8881e90
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 5a917fa..1993cbe 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..b20356c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 783a70f..1d336c7 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..a79960e
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 64c0b7b..1110a4c 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..d0480b1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index c429c20..2c8654d 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4591eea
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..9ee1bac
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+
+
+ #F7931E
+
\ No newline at end of file
diff --git a/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml b/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml
index d55ee8f..48cb5b3 100644
--- a/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml
+++ b/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml
@@ -1,5 +1,5 @@
-
-
+
+
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 d32be1c..138ad83 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,83 +1,100 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/build/intermediates/lint-cache/maven.google/master-index.xml b/build/intermediates/lint-cache/maven.google/master-index.xml
index 159db11..9ef4196 100644
--- a/build/intermediates/lint-cache/maven.google/master-index.xml
+++ b/build/intermediates/lint-cache/maven.google/master-index.xml
@@ -1,139 +1,176 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 2cedebf..8676442 100644
--- a/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
+++ b/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml
@@ -58,6 +58,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -98,6 +110,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -140,4 +167,3 @@
-
diff --git a/local.properties b/local.properties
index ec10cb2..3eb060c 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.
-#Mon Nov 25 09:14:37 CET 2019
-sdk.dir=/Users/ainki/Library/Android/sdk
+#Thu Jan 28 07:39:45 CET 2021
+sdk.dir=/Users/enriqueblascoblanquer/Library/Android/sdk
diff --git a/vn-delivery.iml b/vn-delivery.iml
index 9315211..e8bfb42 100644
--- a/vn-delivery.iml
+++ b/vn-delivery.iml
@@ -1,5 +1,5 @@
-
+
@@ -8,10 +8,11 @@
-
+
+