diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin
index d3663affa5baaecd8bbb543a5144f9e6596b8891..5191f738d35a37ba291b09b187138b58ff9f7dba 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.bin and b/.gradle/5.1.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock
index 7a0aecbc155c831e55599576713d65bd68c22226..66b1c296ab87c59260add6c05b4c408fb4bd6b0a 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.lock and b/.gradle/5.1.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin
index 96fd6c5a2b732ea1d5af949815ca8a6fd1d5dead..9ed1cc501c4e52c4786821de3a6fc1c9e89e1e97 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.bin and b/.gradle/5.1.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock
index d4088a75951e3ada8fd28ef6853b7abfeeba492d..3a3ac98484d864a0468be43d414b68b100d070ca 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.lock and b/.gradle/5.1.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.1.1/javaCompile/classAnalysis.bin b/.gradle/5.1.1/javaCompile/classAnalysis.bin
index b7f85862ba7c960ad0635dc058dd5935f9ea77ad..df46b8d014ba365b0023518db36e25891946273a 100644
Binary files a/.gradle/5.1.1/javaCompile/classAnalysis.bin and b/.gradle/5.1.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.1.1/javaCompile/javaCompile.lock b/.gradle/5.1.1/javaCompile/javaCompile.lock
index 3391dce47c6c37784ba429637e77d18ee52a4a4c..cf4697fbd0388b8d39e609b33116c02c55777a6a 100644
Binary files a/.gradle/5.1.1/javaCompile/javaCompile.lock and b/.gradle/5.1.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.1.1/javaCompile/taskHistory.bin b/.gradle/5.1.1/javaCompile/taskHistory.bin
index 7a98742bc74cd95246f8cc070b40ffa6ecc43069..2f41eca6f9059e98757805ec84a9f8329161cdce 100644
Binary files a/.gradle/5.1.1/javaCompile/taskHistory.bin and b/.gradle/5.1.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index f5f98ee6a2ff6e05c285b9c909159978e913d930..499c04a11265526e7a2401ab7466ec0a5552c1ce 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index f44d2e3afff893e053aa6c9aee7625d95745f31a..46910261605d8fa20c2bbdf4818fa7a85dc78b0e 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 71591097ea0218d71a48c41b69c88fdf5080df2c..47bd81ff324e223261acf802991656d9876f7d31 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,6 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <compositeConfiguration>
- <compositeBuild compositeDefinitionSource="SCRIPT" />
- </compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
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 9aaf28ded30b0a66f052c6572d491c7376603e5b..166498be0a4134e569609adfcdd0ac271a56fb79 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,8 +1,8 @@
<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/73a9437e195a10794f336c31ac3f2796/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73a9437e195a10794f336c31ac3f2796/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c99c069c3cfdc5f5a5bf23405720de06/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c99c069c3cfdc5f5a5bf23405720de06/res" />
</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 e98736f778fd569a3f348ef2c2950ba8af3344f8..626266e053d21da37e2926652d93db865bbaadf1 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,8 +1,8 @@
<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/fc3d91e8d568b2b425c5f35b4aa27bb7/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fc3d91e8d568b2b425c5f35b4aa27bb7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d177ab26cea3966255474cfb329c629/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6d177ab26cea3966255474cfb329c629/jars/classes.jar!/" />
</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 42744cc99850cef5c6a8593cfe8b4d2a940fc9be..3cb93c7e9cdb5d59313d6df37b668fe157387895 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,8 +1,8 @@
<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/2fbd14b1953da3a8d36f2374160d3dc5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2fbd14b1953da3a8d36f2374160d3dc5/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a11eb8aa817504737dbf0cc77d1f094d/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a11eb8aa817504737dbf0cc77d1f094d/jars/classes.jar!/" />
</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 da04e0d326e5aec2e83b528431c56d90e2490a82..a47540621cb945a7e51319cbb9ccd33210a066d2 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,8 +1,8 @@
<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/128b000f29bdaf06d81e160c4600e8e7/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/128b000f29bdaf06d81e160c4600e8e7/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b40a944b73f16ba2402a439832c8e9ae/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b40a944b73f16ba2402a439832c8e9ae/jars/classes.jar!/" />
</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 b38648293eff71dcd21c402c6a93f01dad7563b9..7f0f9b293168f681fd94ad0511476f20d48574f8 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c27c48cb5c9cad41539ecaf59a0b0382/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c27c48cb5c9cad41539ecaf59a0b0382/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/395ac908742fc654406e6e9bf62546fa/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/395ac908742fc654406e6e9bf62546fa/jars/classes.jar!/" />
</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 81285ccf33ea99340453f02a6396035cc51243a2..547be9c1638c74c3316e88bd881857104efe9589 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e3ef7ee405979ea47aaa963fa37ced81/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e3ef7ee405979ea47aaa963fa37ced81/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42797e039ea4dda4283d43e686750d9b/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/42797e039ea4dda4283d43e686750d9b/res" />
</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 b05754a00f4f274f1adcfb899f1ea9e9d146dd7b..d48168e5bf05e4b9b44829ca91b20d2033b028c5 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,11 +1,11 @@
<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/9683dc2af5c92b967de6d45f180ea0ed/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ba8011d14617dc5227181606db50cd40/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9683dc2af5c92b967de6d45f180ea0ed/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9683dc2af5c92b967de6d45f180ea0ed/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ba8011d14617dc5227181606db50cd40/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ba8011d14617dc5227181606db50cd40/jars/classes.jar!/" />
</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 6c9dcb846e869e563b9edc1a122b1f1cad099f34..77c4c1d227a28bfad4fc3ba1160f6fb79d5b6125 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,8 +1,8 @@
<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/0183c40ff03a9758b649c1c287aec28c/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0183c40ff03a9758b649c1c287aec28c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f078f33e4fd3cb82c88fe10a2dde7d49/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f078f33e4fd3cb82c88fe10a2dde7d49/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
index 773343364417f55f640fbad7cce9868b55789a22..f4b71b1fdfc6471572d8683d566662586c9edffd 100644
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:cardview-v7:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77d62c40f7160aca196031c2ad4cb0ce/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77d62c40f7160aca196031c2ad4cb0ce/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/95704d6f0e0152b3167b9d175b9feeb8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/95704d6f0e0152b3167b9d175b9feeb8/res" />
</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 e6a3e2bf74ef9e09a5723385f950b0093d79fd00..81fd80eecc328a4a1dfed1c2d94a246289d9b623 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7578281a1de3d81d82824a81ff37fadd/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7578281a1de3d81d82824a81ff37fadd/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8616768f7f1f3db1e4250f908e44907e/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8616768f7f1f3db1e4250f908e44907e/res" />
</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 31d787c15a8640d7ca01211802df981530d094ef..ba6ed7d68e24716489ea24a195d4924637581ce3 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,11 +1,11 @@
<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/b099c8552c0dce9d03251a54d285bc64/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/04af95db681484cdb6959364ce00e3a9/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b099c8552c0dce9d03251a54d285bc64/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b099c8552c0dce9d03251a54d285bc64/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/04af95db681484cdb6959364ce00e3a9/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/04af95db681484cdb6959364ce00e3a9/res" />
</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 0020702c9cd875a8b94c323a84df5a4594ad254e..52b3c6a4708113734ddb3ca5d2253a70d10aa7a0 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,8 +1,8 @@
<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/da3b25db38da7082f04dcdc93c636e07/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/da3b25db38da7082f04dcdc93c636e07/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/81090ec128e71a3f4073dd94304b662c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/81090ec128e71a3f4073dd94304b662c/res" />
</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 b3c5c61b048fe5487698c51b49f91a574ab1b0c5..9ec151d7eea6613aa19c1676dc36bb0e6b1cffe2 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:customview:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34c34d382baf7c326eadfc8c681efbb8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/34c34d382baf7c326eadfc8c681efbb8/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ed91976dabd449273ddc22fd5748de7/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6ed91976dabd449273ddc22fd5748de7/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
index 4b54ee92f22ab980f16fc49af947c2691b8330d1..a7936a81bc40a25860a43ce4d614e097a514e974 100644
--- a/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:design:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b37419921c5e91f34257c50a5f87da7c/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c652ca56d13fa1da94a4210a97851557/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b37419921c5e91f34257c50a5f87da7c/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b37419921c5e91f34257c50a5f87da7c/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c652ca56d13fa1da94a4210a97851557/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c652ca56d13fa1da94a4210a97851557/jars/classes.jar!/" />
</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 d198352dbc732b9b8bcef39e1e860d3646dde99e..252d7d41fb2cf2fc3091401cb1758884fe31a7f1 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,8 +1,8 @@
<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/5c095a99b3a9d5b3ce93742b070943ae/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c095a99b3a9d5b3ce93742b070943ae/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/430a90511c16b8ba542dea91775efdc6/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/430a90511c16b8ba542dea91775efdc6/jars/classes.jar!/" />
</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 e295daa32d65935f18f3fc5ac7555f0ddda4dba4..b2ae2ef5fa62037d2a60467cc342156aaf81a4e7 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,11 +1,11 @@
<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/f9f2a1b846809b7f0d0e75ceacf4ceac/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43e6376ce68fda4fe45d028305d4e106/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f9f2a1b846809b7f0d0e75ceacf4ceac/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f9f2a1b846809b7f0d0e75ceacf4ceac/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43e6376ce68fda4fe45d028305d4e106/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43e6376ce68fda4fe45d028305d4e106/jars/classes.jar!/" />
</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 d37bfdb7c0b1a08d241ea30d04b263d07b0e76ad..43fc4d5589fe7dc9bd51c0d61180d4b005b138b2 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:interpolator:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/98513d71e12b19fce632523b9bef409a/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/98513d71e12b19fce632523b9bef409a/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9d524336913a3f71891c3246c4e2630/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9d524336913a3f71891c3246c4e2630/jars/classes.jar!/" />
</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 3b269b1258359094ea7853172410cf73cec00d57..1d2749adca288abd824879ef435e82597e39e1e7 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,8 +1,8 @@
<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/91d9789ed93adb173cead20791f1cd8d/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/91d9789ed93adb173cead20791f1cd8d/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d8aeb39f4147d44021d427a12786f7a9/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d8aeb39f4147d44021d427a12786f7a9/jars/classes.jar!/" />
</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 b65e28d2eed9bc9df6b3fb197e8f96bcdf357c9a..aa54c856f10de05dd592c84122118d801cde0489 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,8 +1,8 @@
<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/1ee432f8cfdc374f6a733e7ea60019b9/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ee432f8cfdc374f6a733e7ea60019b9/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73600a19d4d2f4124d01b46fa552ab84/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73600a19d4d2f4124d01b46fa552ab84/res" />
</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 a2d1b8201ccbc0a213f53d28a04cbe242c36c459..d71c8e195bd88ef80548b7f7446ee3404324117a 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,11 +1,11 @@
<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/fa68de3a7ae44327289d09a0ae4e81fe/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0f901f519c5e39d1063ab09ee9409310/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fa68de3a7ae44327289d09a0ae4e81fe/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fa68de3a7ae44327289d09a0ae4e81fe/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0f901f519c5e39d1063ab09ee9409310/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0f901f519c5e39d1063ab09ee9409310/jars/classes.jar!/" />
</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 4e07677f6b5ac01c34b10a4e4bb31bbb7b1406bd..7353ba2a5c0ff971bdf4b42ddc50d0a165e4ef1f 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,11 +1,11 @@
<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/2d2762e5f6522259179cd499b711e5af/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5fce4cf301ce5fda879132fd37c672e7/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2d2762e5f6522259179cd499b711e5af/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2d2762e5f6522259179cd499b711e5af/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5fce4cf301ce5fda879132fd37c672e7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5fce4cf301ce5fda879132fd37c672e7/jars/classes.jar!/" />
</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 2f935e190e482c5ab25b36448c68cd4822102f00..5fae4835785d1c59abc3fef95a7309119385b0aa 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e561fbd6ce375fcf4c40e40260c025ec/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e561fbd6ce375fcf4c40e40260c025ec/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dfab558cc5bdb1c351dc5582ac8d906d/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dfab558cc5bdb1c351dc5582ac8d906d/jars/classes.jar!/" />
</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 e2b6eef77071fc07342186f96eb328a70b266e70..b0aa2092190f8e9385de7d2156b4fe06dae4c1d8 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,11 +1,11 @@
<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/1dc18981de14496abec4094261371ba8/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c83aff76f4e66a9e60eaa443c611d7b/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1dc18981de14496abec4094261371ba8/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1dc18981de14496abec4094261371ba8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c83aff76f4e66a9e60eaa443c611d7b/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c83aff76f4e66a9e60eaa443c611d7b/jars/classes.jar!/" />
</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 760170765495fda6600ff17e6a02d6b56f38fb50..b9eb158535cd794b1405c5bec193aa614e2ed5a7 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,8 +1,8 @@
<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/d65cdd360aef998561f7e4d00a239950/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d65cdd360aef998561f7e4d00a239950/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/026d38cb52f701792db2d196b5b9e9c6/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/026d38cb52f701792db2d196b5b9e9c6/res" />
</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 8ff4429311ace965ebec93b8bce5da2238541945..50c1999ca2af2ef19e1214a730e59a03e2f588b0 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eb1ccc0783511bf938144ab84581b739/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eb1ccc0783511bf938144ab84581b739/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89d054676317ba617b55c22ecef90c25/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/89d054676317ba617b55c22ecef90c25/res" />
</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 8b006bb6702b3ce6330e6de411f1007e188136fa..b99ee883d620f525f8b1e3c250b19abc7fd9c20f 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,11 +1,11 @@
<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/400a528d020232d1e0894b546f3c4125/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/121571701b919cc1fad4e11bb67cde28/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/400a528d020232d1e0894b546f3c4125/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/400a528d020232d1e0894b546f3c4125/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/121571701b919cc1fad4e11bb67cde28/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/121571701b919cc1fad4e11bb67cde28/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
index 50f065c9ee7a6ddb0e9f054759b6d3198548bdfb..62e1a8dea09efea907072ac4b6bebc9da1ceeda0 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-media-compat:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c8cba5cad7758119d47fdc030175b0d/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/95f7c8d570787479d1800d7f0c8df5bc/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c8cba5cad7758119d47fdc030175b0d/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c8cba5cad7758119d47fdc030175b0d/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/95f7c8d570787479d1800d7f0c8df5bc/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/95f7c8d570787479d1800d7f0c8df5bc/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
index b03b1d9de77dd897f1f5304c650604069cf7e55e..4e351430f1ba380b8098939cde8d8aec8431a73c 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-v4:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd21b1c397ad4f18a1f8b92ce143d08a/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd21b1c397ad4f18a1f8b92ce143d08a/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3921f2d054e444ca93bdfe34728eca5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3921f2d054e444ca93bdfe34728eca5/jars/classes.jar!/" />
</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 bd09a31e145f1005933678ce0b1813e0564a71dd..64cfe9f8fd6d322e5e74c764b68e8aadc08bf302 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,8 +1,8 @@
<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/980c2338a340eaf4f4b1bfc5b7388984/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/980c2338a340eaf4f4b1bfc5b7388984/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/db59a54e929b840e2cb30c85e7c4713e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/db59a54e929b840e2cb30c85e7c4713e/jars/classes.jar!/" />
</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 7c4d9bd00c1bc51eee244836426ccac5b946c961..6fc2673e4e1a0298e996b974280f03e6667ce691 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,11 +1,11 @@
<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/060227e09b1dbfd976bad76b6d11d6b8/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4f7b3878816190fecbfd400ad8f79455/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/060227e09b1dbfd976bad76b6d11d6b8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/060227e09b1dbfd976bad76b6d11d6b8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4f7b3878816190fecbfd400ad8f79455/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4f7b3878816190fecbfd400ad8f79455/jars/classes.jar!/" />
</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 4abd28d9f7eb230a54ff0b31b103fe93afcc5c79..60b0adcf66947ab1ba72b484042c3e947df5cda0 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,8 +1,8 @@
<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/9a60fd63ac3c6a213097de5eb88b6936/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9a60fd63ac3c6a213097de5eb88b6936/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/415dfc15d1ee0f4a226528ca39ef3d16/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/415dfc15d1ee0f4a226528ca39ef3d16/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
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 a5134700731729f34c0509de415dc47513851c6a..22b34a1ad35e25f312e30ac9b7f3b2e6db86b8d8 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,8 +1,8 @@
<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/1d96e1f4d3eb71c28a8d75d1a981a4d9/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1d96e1f4d3eb71c28a8d75d1a981a4d9/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/46a6ae4c1aae0cd1da23bc4c574af8e9/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/46a6ae4c1aae0cd1da23bc4c574af8e9/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
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 5d93625aed12016abe325b04c5a904d8b8430508..eceb1621e65cf22251b075d3cef237ad2d7e9b76 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:monitor:1.0.2@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6b11320ccd625e8b6cd72363b97f922b/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6b11320ccd625e8b6cd72363b97f922b/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ea7172856cd2bdd2bb9a1e52acc9e516/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ea7172856cd2bdd2bb9a1e52acc9e516/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
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 0f3c96cdc16da08ac4c88be1db1482a08c54f4cc..3057fc611b4bdc15514318be642eb8ad3d1ed7fc 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test:runner:1.0.2@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/baf6a62b0f86ef86eeb86237446bdc3c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/baf6a62b0f86ef86eeb86237446bdc3c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fe208d7ad3a1bd9450d9cb30daf973b/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fe208d7ad3a1bd9450d9cb30daf973b/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
index d68fef4893040c86aa922f971955eceb1b9d4620..b3e58c3351f50cdd526a8a643155b40eec2a6269 100644
--- a/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:transition:28.0.0@aar">
<ANNOTATIONS>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/de3038f64809c358ea598f95721f5c0c/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b176dc9c5ea40298f145d94cf355c1c/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/de3038f64809c358ea598f95721f5c0c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/de3038f64809c358ea598f95721f5c0c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b176dc9c5ea40298f145d94cf355c1c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b176dc9c5ea40298f145d94cf355c1c/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
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 7d63290ef180a08d8a335731d4f7524b45297b5a..cc437d80bd4b1708368e8dcbd2dc27149d24e574 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,8 +1,8 @@
<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/9685e5d1b82e5339d471ef3690e1c14b/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9685e5d1b82e5339d471ef3690e1c14b/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52bbd96423550b0f2d8c002012c65714/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/52bbd96423550b0f2d8c002012c65714/jars/classes.jar!/" />
</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 ed7619ccc2702b16a6f79c6036d0b53db96369bb..f1bddfcfa641919fce63ad723c2639b1503bd2d7 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,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:viewpager:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/23256ce5d82710cdb0e60f646b96a515/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/23256ce5d82710cdb0e60f646b96a515/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc53f0546723496c77c7a6b75cefb638/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc53f0546723496c77c7a6b75cefb638/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml
index d9184df9ea0685a875b3954cf8d96c5b656a63fd..a06efb3fb230bd4719b06971b9d9845d9876cb45 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/23f8244a380d6252c5a1346b870e06b6/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/23f8244a380d6252c5a1346b870e06b6/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/868605f1a2cdb7950c37f4ffbd9b060f/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/868605f1a2cdb7950c37f4ffbd9b060f/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml
index 04e1ec6e90623c0b82b3d2f587bc3e13ddd5dcbe..7a0646c4ae387b599d893fd185d8ea7eaa5bae2e 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f679b13461953af9daa0af372239228f/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f679b13461953af9daa0af372239228f/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a01a0f1e324cec5ce17d375203f7961e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a01a0f1e324cec5ce17d375203f7961e/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml
index 4b380832f02aad42f6fb0e9f57b70ac820520592..f75a7c2bd351abeef4e7740d53fc3aae461a124a 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-basement:16.2.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1c1b179dc1e932e770dc7876676199c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d1c1b179dc1e932e770dc7876676199c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8777b1571e82e23eef756f8b5e8039ca/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8777b1571e82e23eef756f8b5e8039ca/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/16.2.0/3e3589bff6719404b47afecaa49d192cfa3f5791/play-services-basement-16.2.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml
index 379d7655b310a85d099af8ef7f3bd14cee2d73db..c34421dc00700b0ea84796505e259659a17c24c1 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d03e7e0995d07da7c82f7f3ef47193a/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d03e7e0995d07da7c82f7f3ef47193a/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/278bcafea0b8e8491810702d1aa65179/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/278bcafea0b8e8491810702d1aa65179/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml
index 3f40944e02268e3554ce6704191c57cfa607f5e1..a6576f27a2b3b759026df9d16738e6be8b0f9551 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-location:16.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d723e939358732f836b17942a46e6879/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d723e939358732f836b17942a46e6879/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18a354b40c32be7771ffe4fe2e276d0f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18a354b40c32be7771ffe4fe2e276d0f/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml
index a0a8289535aba2ae9a3ed2eaedabb3cd9b5e9f9f..a4224faed7008d2f32e1f5993abe5db84659c981 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-maps:16.1.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cba209207f23e033526a17afee416f5d/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cba209207f23e033526a17afee416f5d/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2d4b82b669d1641299c345936d275088/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2d4b82b669d1641299c345936d275088/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-maps/16.1.0/68568da8e0d63d5d6fc4b6dfe9e01edc038e6a43/play-services-maps-16.1.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml
index b79fb3e4c6d04eaaba178f0363e5009b324ceda5..7e20ec0a7e4d843e765fada2c2d22231a5304369 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-measurement:16.4.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e50cac7f36d8efef272116f9862e5686/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e50cac7f36d8efef272116f9862e5686/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ad4e171e7c91c88f4998013cd0e9c89d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ad4e171e7c91c88f4998013cd0e9c89d/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement/16.4.0/6ffd880f8d48b22cade5f0a40bc63ec6bbd71818/play-services-measurement-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml
index 643d89d70c4c865c5899357fc70f855d0b4d08c1..b7ea1adb65d8ec11e7f9d5efabf92f3b0f750755 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-measurement-api:16.4.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/053a77ca9117d19e35edade3e4861875/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/053a77ca9117d19e35edade3e4861875/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0a30a72f612f8d4f22508953debeae5d/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0a30a72f612f8d4f22508953debeae5d/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-api/16.4.0/e3d686c60b90e01a909c923347c0e7aff8023b99/play-services-measurement-api-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml
index d01ad6cc1da7037e6e9af3faff72752d0fa8a2f2..56affa2971e6b4f4754f6c69924149a7f5774625 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-measurement-base:16.4.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/112f0235d233a1508dc24c75d3d2c028/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/112f0235d233a1508dc24c75d3d2c028/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e0d4c889658e70637cd3626c45627b3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e0d4c889658e70637cd3626c45627b3/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-base/16.4.0/8ff2fadcad61bc126ae562e28dedf98219fdc30d/play-services-measurement-base-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml
index 57a32fb619cd7fb7cacbd0b1fcbd6c465ee6c5ab..aa6f09a6b66f8a77bade102de5eb5362e4419819 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-measurement-impl:16.4.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bdc5a6f86a6684061a45aa38d52dbb3d/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bdc5a6f86a6684061a45aa38d52dbb3d/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5af36adafbb16c4860aa3abb55f61a21/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5af36adafbb16c4860aa3abb55f61a21/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-impl/16.4.0/98fea79e4a77817f0ce14dd933ef096cd7d79b20/play-services-measurement-impl-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml
index ccf79e1a244367ebb2816256f471d7214e4a83fd..b30770ec415a195dbd090689223e5a083fdbcb9f 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-measurement-sdk:16.4.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83f76ad423dcc2feb2c4af9f76ce0463/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/83f76ad423dcc2feb2c4af9f76ce0463/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9106d1ca78f401819e38acebff7ef96d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9106d1ca78f401819e38acebff7ef96d/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-sdk/16.4.0/88561e7c3615c80f0579c3ac4ee9d8ae8bd7df61/play-services-measurement-sdk-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml
index 1806f23af58fee9b270ad6511d5ac5ed9852ec75..95392654894eb26eb414d5a72eed4f1aadfe2409 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-measurement-sdk-api:16.4.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdbee56806da0fbd6318e85c8f5be4d0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdbee56806da0fbd6318e85c8f5be4d0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3de5ff00697c309c728f4aaa91b9a62c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3de5ff00697c309c728f4aaa91b9a62c/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-measurement-sdk-api/16.4.0/b0889362b29c0c1a24c5af14e126d069e86c2644/play-services-measurement-sdk-api-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_places_placereport_16_0_0_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_places_placereport_16_0_0_aar.xml
index 06b9227c39e5dbe2b8a8d683bd84c0edc3a163bd..26eaf0891e9044f59d038ef75dd798c5eccfbe05 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_places_placereport_16_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_places_placereport_16_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-places-placereport:16.0.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8b409cc502f14d2657055c891b11300/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e8b409cc502f14d2657055c891b11300/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c8ba49762b3cd2e8c86e4af61e60fd8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c8ba49762b3cd2e8c86e4af61e60fd8/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml
index 41fe697be7db31cd2745954e618a6030c0a7e238..ec3764c38f7926336af90d902c43cb6fdf4732e2 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-stats:16.0.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7bfdc395cdd119f45196e2d8eac0570/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c7bfdc395cdd119f45196e2d8eac0570/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43b573622b2bb6ea6ff1d064c8721e1e/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43b573622b2bb6ea6ff1d064c8721e1e/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml
index e04d1d5e63f75d2f0b6c13e412dbc69997660d54..4c40ca89b04baac101f852d7821dd074e6a6a5cb 100644
--- a/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e51e500d4b117cdb6c7d7ac8de3bfd5f/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e51e500d4b117cdb6c7d7ac8de3bfd5f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdc85e7ea2453de233fce81efc7bd69e/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdc85e7ea2453de233fce81efc7bd69e/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml
index 342627e50bb6e99390a5d789fe58a9485da0786d..ffb010008af44632dd44f390c2789d4158648435 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-analytics:16.4.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f9bc381709e1ba0620ad248c25dd6da/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1f9bc381709e1ba0620ad248c25dd6da/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbb6708b206c2c88ed38cc67deac1f3f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbb6708b206c2c88ed38cc67deac1f3f/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-analytics/16.4.0/b884044d2f8732260837f470f4ed231a876cb2e3/firebase-analytics-16.4.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml
index 7034e2d90aab84228c869075d6931251ff4eb913..e35fa033493ec8870773da7d40d64b91415bf140 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-auth:16.2.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f06380dd22f543142dc340749be9b2f/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f06380dd22f543142dc340749be9b2f/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ecabb35dd0e8d2819c180fd7ff01068b/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ecabb35dd0e8d2819c180fd7ff01068b/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-auth/16.2.1/8bbeffaefcb0edbf09b108d2a63ce8e2d1508f3a/firebase-auth-16.2.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml
index 17a6d846dfb3322185142d1ec2e2fe5b111fc7e6..e55de5954f1bb982e39cb2202bc088dffd7fc4c6 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-auth-interop:16.0.1@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9caa75a9731145526c7213c9e5c54f96/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9caa75a9731145526c7213c9e5c54f96/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a544424d2778c73e6da2e4d96a753090/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a544424d2778c73e6da2e4d96a753090/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml
index 95606ab760076b8db03cf190666600c3ebcfcf04..538db7053879a407959094720bae55b4cf79c59f 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-common:16.1.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b9742de854db338cb04c311b68bd7d0/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b9742de854db338cb04c311b68bd7d0/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6b72e1545762d9bd45375230bde655c5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6b72e1545762d9bd45375230bde655c5/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-common/16.1.0/e6e3a5d7f4d0cf5797dadd5443a6978dc58ae4e5/firebase-common-16.1.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml
index 5643307f07ffcf749cb7bb644740eade1203e4ba..dff2718303c737647d92443238cfafb1a4765ef4 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-core:16.0.8@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a67a2f2039641164889b39b73c452a52/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a67a2f2039641164889b39b73c452a52/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c75802d0b7ee65118d3fc70dbcc34e2f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c75802d0b7ee65118d3fc70dbcc34e2f/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-core/16.0.8/d744794686c273d9fe2fdad77ee686c87a47625b/firebase-core-16.0.8-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml
index 729902268b4d666449bd4a91aa75411479f2ec6c..1efbe367391056e7eba2c0cdaf15d527b52a3789 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-database:16.1.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4da09ff6e6784bcab8c9eb83e56ec256/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4da09ff6e6784bcab8c9eb83e56ec256/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b2bbc580d892fc86a70075b610108167/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b2bbc580d892fc86a70075b610108167/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-database/16.1.0/e7623d62fd877e924d874fc13b225b748a57e95f/firebase-database-16.1.0-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml
index 0f841524919c5bdf218fc83655f3ef8ec35ca255..4898167ff5b31a1d3bc28c6bf041d189809df708 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-database-collection:16.0.1@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd5b7abb146db9331a389c892b33542c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fd5b7abb146db9331a389c892b33542c/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/214fbcddb5faf1e82afb6c1410958e68/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/214fbcddb5faf1e82afb6c1410958e68/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-database-collection/16.0.1/b5886c1473251920abb7253028aafb63b2d5e0a5/firebase-database-collection-16.0.1-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml
index 109f6797e2f74a61c8f50fd4a6260ab008682903..61d40300c1fc4a49755094d1643664a497a86ba8 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-iid:17.0.3@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64df84967a891448421f657f4d916f90/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/64df84967a891448421f657f4d916f90/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/30bb0608b5869f7d5f2395e2f3d1c05c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/30bb0608b5869f7d5f2395e2f3d1c05c/jars/classes.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-iid/17.0.3/f75ec044e44b868f2a037e753b0287889e224837/firebase-iid-17.0.3-javadoc.jar!/" />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml
index 5684180e73d395bb78fdb156e7fd914ae8f5326d..dea64cf1d4a1c0b1571bcbccd45555503641fecb 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-iid-interop:16.0.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c6bc5bb52a808e92658f7bd26294de70/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c6bc5bb52a808e92658f7bd26294de70/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cbe8d04442ace0808acaca5a5fce5ff/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6cbe8d04442ace0808acaca5a5fce5ff/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml
index 03a56f4b0cf158fd5cc0722414d87466f4f8e3a3..cf74c7f55ef78e8821212d03da87c615bd4db0ca 100644
--- a/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.google.firebase:firebase-measurement-connector:17.0.1@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d860c49bfe0d1f49e58f1aee2d9279c7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d860c49bfe0d1f49e58f1aee2d9279c7/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b2ff2c3c576dee715308a328decfc8d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7b2ff2c3c576dee715308a328decfc8d/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_2_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_2_aar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e8085843217b93773543cb0a4f2959f250341b42
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_2_aar.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+ <library name="Gradle: com.google.firebase:firebase-storage:16.0.2@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d12e3d2027e43119e7315bc2389fa517/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d12e3d2027e43119e7315bc2389fa517/res" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.firebase/firebase-storage/16.0.2/2cd7ed0c5274400e44176096767c74a2c2cd039e/firebase-storage-16.0.2-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f5c6d9eb6a991d73b50e99d55a1a22a208ef247d..0d45e8dac234fb8d8ce72a22fa160d3a6ababc22 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e0e25a0f7bfe9d3008a7972690ddfe56337cdb27..ae460545bd78875f77362ce23b5afb94c51e508e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,7 @@ dependencies {
implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.google.firebase:firebase-auth:16.2.1'
implementation 'com.google.firebase:firebase-database:16.1.0'
+ implementation 'com.google.firebase:firebase-storage:16.0.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/local.properties b/local.properties
index a193279c6a76f86c58d75b4f6521add25ff4f6d7..8ff529b69915b63320fc941a5f78ce3e4b18659d 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.
-#Fri May 10 22:44:00 BST 2019
-sdk.dir=/Users/shahz/Library/Android/sdk
+#Sun May 12 09:08:42 BST 2019
+sdk.dir=C\:\\Users\\Liliya Yankova\\AppData\\Local\\Android\\Sdk
diff --git a/src/main/java/com/example/liliyayankova/unirides/Driver_Profile.java b/src/main/java/com/example/liliyayankova/unirides/Driver_Profile.java
index 1613167197da5ec5c444fcad7e6cb64bf5999b5b..7d434950e3d7595f0bb51f3d0098b24e4902c8a1 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Driver_Profile.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Driver_Profile.java
@@ -4,13 +4,8 @@ import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.os.StrictMode;
import android.provider.MediaStore;
-import android.support.annotation.RequiresApi;
+import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
@@ -24,6 +19,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.database.DataSnapshot;
@@ -31,33 +28,21 @@ import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.ValueEventListener;
+import com.google.firebase.storage.FirebaseStorage;
+import com.google.firebase.storage.StorageReference;
+import com.google.firebase.storage.UploadTask;
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
import java.util.Date;
import static java.lang.String.valueOf;
public class Driver_Profile extends AppCompatActivity {
- /**Constant field for the result from the camera*/
- private static final int CAPTURE_IMAGE_ACTIVITY_REQUEST_CODE = 100;
+ private static final int CAMERA_REQUEST_CODE=1;
- /** Identifiers for checking whether the captured file is an image or a video... */
- public static final int MEDIA_TYPE_IMAGE = 1;
-
- /**A variable for the file that will contain the pictures*/
- private Uri fileUri;
- /**A variable for getting the data back*/
- private InputStream stream = null;
- /**A variable for the image*/
- private Bitmap map;
-
- /**Constant fields for the permissions of the usage of camera and external storage*/
+ /**Constant fields for the permissions of the usage of camera */
private final int MY_PERMISSIONS_REQUEST_CAMERA = 1;
- private final int MY_PERMISSIONS_REQUEST_EXTERNAL_STORAGE = 2;
private TextView name;
private TextView lastName;
@@ -187,101 +172,54 @@ public class Driver_Profile extends AppCompatActivity {
requestPermissions(new String[]{Manifest.permission.CAMERA},
MY_PERMISSIONS_REQUEST_CAMERA);
}
-
-
/** When the button is clicked a intent is created for opening the camera */
Intent picIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-
- /**Creating a file to store the pictures*/
- fileUri = getOutputMediaFileUri(MEDIA_TYPE_IMAGE);
- /**Setting a name for the file*/
- picIntent.putExtra(MediaStore.EXTRA_OUTPUT, fileUri);
- StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
- StrictMode.setVmPolicy(builder.build());
- /**Starting the activity and waiting for the result back*/
- startActivityForResult( picIntent, CAPTURE_IMAGE_ACTIVITY_REQUEST_CODE );
+ startActivityForResult( picIntent, CAMERA_REQUEST_CODE );
}
});
}
- /**Method which compresses a picture. It is saved as a bitmap but converted to an array of bytes*/
- public static byte[] getPicture(Bitmap bitmap){
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- bitmap.compress(Bitmap.CompressFormat.PNG, 0, byteArrayOutputStream);
- return byteArrayOutputStream.toByteArray();
- }
-
-
/**Method which waits for the result of the camera*/
protected void onActivityResult(int requestCode, int resultCode, Intent data)
{
/**Checks whether it is the intent from the camera*/
- if ( requestCode == CAPTURE_IMAGE_ACTIVITY_REQUEST_CODE && resultCode == RESULT_OK )
+ if ( requestCode == CAMERA_REQUEST_CODE && resultCode == RESULT_OK )
{
- try {
- /**Getting the data returned*/
- stream = getContentResolver().openInputStream(fileUri);
- map = BitmapFactory.decodeStream(stream);
-
- /**Object of type PictureProperties is created so the picture can be taken*/
- ImageProperties pic = new ImageProperties(fileUri);
-
- /**The rotation of the picture is set*/
- imageVD.setRotation(pic.getCameraPhotoOrientation());
-
- /**Displaying the image*/
- imageVD.setImageBitmap(map);
- /**Compressing it*/
- getPicture(map);
- }catch ( Exception e )
- {
- e.printStackTrace();
- }
- }
- }
-
- /**A file is created for saving an image*/
- @RequiresApi(api = Build.VERSION_CODES.M)
- private Uri getOutputMediaFileUri(int type){
- return Uri.fromFile(getOutputMediaFile(type));
- }
-
- /** Create a File for saving an image */
- @RequiresApi(api = Build.VERSION_CODES.M)
- private File getOutputMediaFile(int type){
- /**Checks for permissions for using the external storage - SD card*/
- if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
- != PackageManager.PERMISSION_GRANTED) {
-
- requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
- MY_PERMISSIONS_REQUEST_EXTERNAL_STORAGE);
- }
-
- File mediaStorageDir = new File(Environment.getExternalStoragePublicDirectory(
- Environment.DIRECTORY_PICTURES), "UniRides");
-
+ //get the camera image
+ Bundle extras = data.getExtras();
+ Bitmap bitmap = (Bitmap) data.getExtras().get("data");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ bitmap.compress(Bitmap.CompressFormat.JPEG, 100, baos);
+ byte[] dataBAOS = baos.toByteArray();
+
+//set the image into imageview
+ imageVD.setImageBitmap(bitmap);
+
+ //Firebase storage folder where you want to put the images
+ StorageReference storageRef = FirebaseStorage.getInstance().getReferenceFromUrl("gs://unirides-e7561.appspot.com/");
+
+//name of the image file (add time to have different files to avoid rewrite on the same file)
+ StorageReference imagesRef = storageRef.child("filename" + new Date().getTime());
+
+//upload image
+ UploadTask uploadTask = imagesRef.putBytes(dataBAOS);
+ uploadTask.addOnFailureListener(new OnFailureListener() {
+ @Override
+ public void onFailure(@NonNull Exception exception) {
+ Toast.makeText(getApplicationContext(),"Sending failed", Toast.LENGTH_SHORT).show();
+ }
+ }).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
+ @Override
+ public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
+ // taskSnapshot.getMetadata() contains file metadata such as size, content-type, and download URL
- /**Creates a directory for storage*/
- if (! mediaStorageDir.exists()){
- if (! mediaStorageDir.mkdirs()){
- Log.d("UniRides", "failed to create directory");
- return null;
- }
- }
+ }
+ });
- /**Creates a media file for the images*/
- String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
- File mediaFile;
- if (type == MEDIA_TYPE_IMAGE){
- mediaFile = new File(mediaStorageDir.getPath() + File.separator +
- "IMG_"+ timeStamp + ".jpg");
- }else {
- return null;
}
- return mediaFile;
}
@Override
diff --git a/src/main/java/com/example/liliyayankova/unirides/ImageProperties.java b/src/main/java/com/example/liliyayankova/unirides/ImageProperties.java
deleted file mode 100644
index 840c69c42dd4f43f316f1a5b88fe575d3dce01fd..0000000000000000000000000000000000000000
--- a/src/main/java/com/example/liliyayankova/unirides/ImageProperties.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.example.liliyayankova.unirides;
-
-import android.media.ExifInterface;
-import android.net.Uri;
-import android.util.Log;
-
-class ImageProperties {
- /** Path to the image we want to display... */
- private Uri imagePath;
-
- public ImageProperties(Uri imageUri)
- {
- imagePath = imageUri;
- }
-
- /**
- * Method for getting the orientation of the image to be displayed on the main scree.
- * We use the ExifInterface class that gives access to the EXIF metadata of an image.
- *
- * @return The orientation of the image
- */
- public int getCameraPhotoOrientation()
- {
- int rotate = 0;
- try {
- ExifInterface exif = new ExifInterface(imagePath.getPath());
- int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED);
-
- // float longitude = convertToDegree(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE));
-
- // float latitude = convertToDegree(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
- //this is in a degree minute seconds format a
- // Log.i("Image Address", longitude + " ," + latitude);
-
- switch (orientation) {
- case ExifInterface.ORIENTATION_ROTATE_270:
- rotate = 270;
- break;
- case ExifInterface.ORIENTATION_ROTATE_180:
- rotate = 180;
- break;
- case ExifInterface.ORIENTATION_ROTATE_90:
- rotate = 90;
- break;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- //tells you how much rotation you need
-
- Log.v("ROTATION:", "Rotate Value: " + rotate);
- return rotate;
- }
-
- /**
- * Method for returning the longitude of the image to be displayed.
- * @return
- */
- public Float getCameraAddressLong()
- {
- String longitude = null;
- try {
-// context.getContentResolver().notifyChange(imageUri, null);
- // File imageFile = new File(imagePath);
-
- //reading the tags from the JPEG file
- ExifInterface exif = new ExifInterface(imagePath.getPath());
- longitude = exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE);
-
-
- //this is in a degree minute seconds format a
- Log.i("Image Address", convertToDegree(longitude) +"as double");
-
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- //tells you how much rotation you need
- return convertToDegree(longitude);
- }
-
- /**
- * Method for returning the latitude of the image to be displayed.
- * @return
- */
- public Float getCameraAddressLat()
- {
- String latitude = null;
- try {
-// context.getContentResolver().notifyChange(imageUri, null);
- // File imageFile = new File(imagePath);
-
- //reading the tags from the JPEG file
- ExifInterface exif = new ExifInterface(imagePath.getPath());
- latitude = exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE);
-
-
- //this is in a degree minute seconds format a
- Log.i("Image Address", convertToDegree(latitude) +"as double");
-
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- //tells you how much rotation you need
- return convertToDegree(latitude);
- }
-
- private Float convertToDegree(String stringDMS){
- Float result = null;
- String[] DMS = stringDMS.split(",", 3);
-
- String[] stringD = DMS[0].split("/", 2);
- Double D0 = new Double(stringD[0]);
- Double D1 = new Double(stringD[1]);
- Double FloatD = D0/D1;
-
- String[] stringM = DMS[1].split("/", 2);
- Double M0 = new Double(stringM[0]);
- Double M1 = new Double(stringM[1]);
- Double FloatM = M0/M1;
-
- String[] stringS = DMS[2].split("/", 2);
- Double S0 = new Double(stringS[0]);
- Double S1 = new Double(stringS[1]);
- Double FloatS = S0/S1;
-
- result = new Float(FloatD + (FloatM/60) + (FloatS/3600));
-
- return result;
- }
-}
-
diff --git a/src/main/java/com/example/liliyayankova/unirides/User_Profile.java b/src/main/java/com/example/liliyayankova/unirides/User_Profile.java
index bbcd43527c7a9b2ab45a613b17778d443ddf4769..9c1ca7cf9c937b8d9eeabd31777a0ac5c8a6579f 100644
--- a/src/main/java/com/example/liliyayankova/unirides/User_Profile.java
+++ b/src/main/java/com/example/liliyayankova/unirides/User_Profile.java
@@ -10,6 +10,7 @@ import android.os.Build;
import android.os.Environment;
import android.os.StrictMode;
import android.provider.MediaStore;
+import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
@@ -24,6 +25,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.database.DataSnapshot;
@@ -31,6 +34,9 @@ import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.ValueEventListener;
+import com.google.firebase.storage.FirebaseStorage;
+import com.google.firebase.storage.StorageReference;
+import com.google.firebase.storage.UploadTask;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -42,22 +48,10 @@ import static java.lang.String.valueOf;
public class User_Profile extends AppCompatActivity {
- /**Constant field for the result from the camera*/
- private static final int CAPTURE_IMAGE_ACTIVITY_REQUEST_CODE = 100;
+ private static final int CAMERA_REQUEST_CODE=1;
- /** Identifiers for checking whether the captured file is an image or a video... */
- public static final int MEDIA_TYPE_IMAGE = 1;
-
- /**A variable for the file that will contain the pictures*/
- private Uri fileUri;
- /**A variable for getting the data back*/
- private InputStream stream = null;
- /**A variable for the image*/
- private Bitmap map;
-
- /**Constant fields for the permissions of the usage of camera and external storage*/
+ /**Constant fields for the permissions of the usage of camera */
private final int MY_PERMISSIONS_REQUEST_CAMERA = 1;
- private final int MY_PERMISSIONS_REQUEST_EXTERNAL_STORAGE = 2;
//TODO: layout and functionality of profile activity needs to be done!
TextView name;
@@ -165,99 +159,51 @@ public class User_Profile extends AppCompatActivity {
MY_PERMISSIONS_REQUEST_CAMERA);
}
-
/** When the button is clicked a intent is created for opening the camera */
Intent picIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-
- /**Creating a file to store the pictures*/
- fileUri = getOutputMediaFileUri(MEDIA_TYPE_IMAGE);
- /**Setting a name for the file*/
- picIntent.putExtra(MediaStore.EXTRA_OUTPUT, fileUri);
- StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
- StrictMode.setVmPolicy(builder.build());
- /**Starting the activity and waiting for the result back*/
- startActivityForResult( picIntent, CAPTURE_IMAGE_ACTIVITY_REQUEST_CODE );
+ startActivityForResult( picIntent, CAMERA_REQUEST_CODE );
}
});
}
- /**Method which compresses a picture. It is saved as a bitmap but converted to an array of bytes*/
- public static byte[] getPicture(Bitmap bitmap){
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- bitmap.compress(Bitmap.CompressFormat.PNG, 0, byteArrayOutputStream);
- return byteArrayOutputStream.toByteArray();
- }
-
-
- /**Method which waits for the result of the camera*/
+ /**Method which waits for the result of the camera*/
protected void onActivityResult(int requestCode, int resultCode, Intent data)
{
/**Checks whether it is the intent from the camera*/
- if ( requestCode == CAPTURE_IMAGE_ACTIVITY_REQUEST_CODE && resultCode == RESULT_OK )
+ if ( requestCode == CAMERA_REQUEST_CODE && resultCode == RESULT_OK )
{
- try {
- /**Getting the data returned*/
- stream = getContentResolver().openInputStream(fileUri);
- map = BitmapFactory.decodeStream(stream);
-
- /**Object of type PictureProperties is created so the picture can be taken*/
- ImageProperties pic = new ImageProperties(fileUri);
-
- /**The rotation of the picture is set*/
- imageVP.setRotation(pic.getCameraPhotoOrientation());
-
- /**Displaying the image*/
- imageVP.setImageBitmap(map);
- /**Compressing it*/
- getPicture(map);
- }catch ( Exception e )
- {
- e.printStackTrace();
- }
- }
- }
-
- /**A file is created for saving an image*/
- @RequiresApi(api = Build.VERSION_CODES.M)
- private Uri getOutputMediaFileUri(int type){
- return Uri.fromFile(getOutputMediaFile(type));
- }
-
- /** Create a File for saving an image */
- @RequiresApi(api = Build.VERSION_CODES.M)
- private File getOutputMediaFile(int type){
- /**Checks for permissions for using the external storage - SD card*/
- if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
- != PackageManager.PERMISSION_GRANTED) {
-
- requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
- MY_PERMISSIONS_REQUEST_EXTERNAL_STORAGE);
- }
-
- File mediaStorageDir = new File(Environment.getExternalStoragePublicDirectory(
- Environment.DIRECTORY_PICTURES), "UniRides");
-
-
- /**Creates a directory for storage*/
- if (! mediaStorageDir.exists()){
- if (! mediaStorageDir.mkdirs()){
- Log.d("UniRides", "failed to create directory");
- return null;
- }
- }
+ //get the camera image
+ Bundle extras = data.getExtras();
+ Bitmap bitmap = (Bitmap) data.getExtras().get("data");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ bitmap.compress(Bitmap.CompressFormat.JPEG, 100, baos);
+ byte[] dataBAOS = baos.toByteArray();
+
+//set the image into imageview
+ imageVP.setImageBitmap(bitmap);
+
+ //Firebase storage folder where you want to put the images
+ StorageReference storageRef = FirebaseStorage.getInstance().getReferenceFromUrl("gs://unirides-e7561.appspot.com/");
+
+//name of the image file (add time to have different files to avoid rewrite on the same file)
+ StorageReference imagesRef = storageRef.child("filename" + new Date().getTime());
+
+//upload image
+ UploadTask uploadTask = imagesRef.putBytes(dataBAOS);
+ uploadTask.addOnFailureListener(new OnFailureListener() {
+ @Override
+ public void onFailure(@NonNull Exception exception) {
+ Toast.makeText(getApplicationContext(),"Sending failed", Toast.LENGTH_SHORT).show();
+ }
+ }).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
+ @Override
+ public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
+ // taskSnapshot.getMetadata() contains file metadata such as size, content-type, and download URL
- /**Creates a media file for the images*/
- String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
- File mediaFile;
- if (type == MEDIA_TYPE_IMAGE){
- mediaFile = new File(mediaStorageDir.getPath() + File.separator +
- "IMG_"+ timeStamp + ".jpg");
- }else {
- return null;
+ }
+ });
}
-
- return mediaFile;
}
@Override
diff --git a/unirides.iml b/unirides.iml
index efac2debb54671163da5d711b6b7060b5939bf72..791a9d803b893f2646b7fd8da33288d62fb6c544 100644
--- a/unirides.iml
+++ b/unirides.iml
@@ -70,13 +70,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -84,29 +77,27 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
@@ -114,14 +105,10 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -159,6 +146,7 @@
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-flags:16.0.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.2.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-core:16.0.8@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-storage:16.0.2@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" />