diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f1d44717885c3671ad510338ff12472e8baee8a3
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..43e18723f59e15a831680b710b10218253d52ec4
Binary files /dev/null and b/.gradle/5.1.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.1.1/fileChanges/last-build.bin b/.gradle/5.1.1/fileChanges/last-build.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
Binary files /dev/null and b/.gradle/5.1.1/fileChanges/last-build.bin differ
diff --git a/.gradle/5.1.1/fileContent/fileContent.lock b/.gradle/5.1.1/fileContent/fileContent.lock
new file mode 100644
index 0000000000000000000000000000000000000000..0226ef693eec5d64e4b3f7d3e76f5cbd597533a3
Binary files /dev/null and b/.gradle/5.1.1/fileContent/fileContent.lock differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..1a5c1b5fd29dd7c45b55ce8d2fabab22da42a4aa
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..f657af5742588222b91d689da41138fecf81aee1
Binary files /dev/null and b/.gradle/5.1.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.1.1/fileHashes/resourceHashesCache.bin b/.gradle/5.1.1/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7fab46a35b38bfe377714770e7fc10d2fbeae0e2
Binary files /dev/null and b/.gradle/5.1.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/5.1.1/gc.properties b/.gradle/5.1.1/gc.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.gradle/5.1.1/javaCompile/classAnalysis.bin b/.gradle/5.1.1/javaCompile/classAnalysis.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c82cd864244e459676393e23ac2b5093badfdc91
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..c495c7f1aa18296682359742b32c71aa7d4cad0c
Binary files /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..019ea36fb671f06c010e878911b5ec5f9d4ba8e0
Binary files /dev/null and b/.gradle/5.1.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index f1835acfa060bc87d8e755341fbdbefb6a4a1c06..ba40e7b3471be826260aa25d51f56f1e559fe6b4 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 1e7a8c53cfd4224c06fe4ad946b742a153abc528..3917ca7ce1ea5c67ab6f957372ed0e430d304f70 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 13b9db39a6279d5d720018447f59671a25e2da08..4ef3ec9ad431fb3af0a5809f24f57630142f9725 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 3517d71c7fceb2631048f77edfb40aba75e43efe..1b3919cc3cea16bd2677f4ef0956bc71f041a8cd 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
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 166498be0a4134e569609adfcdd0ac271a56fb79..a26d333d9319c59db6312efada2e31018c48d858 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/c99c069c3cfdc5f5a5bf23405720de06/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c99c069c3cfdc5f5a5bf23405720de06/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1ddab27c57a116ccd67f397b1d0cbb3/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f1ddab27c57a116ccd67f397b1d0cbb3/jars/classes.jar!/" />
</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 626266e053d21da37e2926652d93db865bbaadf1..e593d930a8de964c91a4331ae87dbd14d94c7921 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="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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7aed3e4b6b51da3ba4e1a6583590d815/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7aed3e4b6b51da3ba4e1a6583590d815/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 3cb93c7e9cdb5d59313d6df37b668fe157387895..666a5d2de9b6141899a585b94ff172eb38f57ac8 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2edd907cb4b02bdc1e1b3fcd1336d10c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2edd907cb4b02bdc1e1b3fcd1336d10c/res" />
</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 a47540621cb945a7e51319cbb9ccd33210a066d2..bbab9329bd8b3c3d65b445d8fd68d2745bf37101 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1638308ae1b7b952095c1ae09bf3bf10/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1638308ae1b7b952095c1ae09bf3bf10/res" />
</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 7f0f9b293168f681fd94ad0511476f20d48574f8..20abdd965c34eb3e599c4eb8b45710c99cdb98e9 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/395ac908742fc654406e6e9bf62546fa/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/395ac908742fc654406e6e9bf62546fa/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7cdd667d9edc3c7722b88c42064610b/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e7cdd667d9edc3c7722b88c42064610b/res" />
</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 547be9c1638c74c3316e88bd881857104efe9589..ce6e1584b7c9829d6b5b8f3839b7fb5d63401bb8 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="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" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c61ea99d8f012ff840857f410830b507/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c61ea99d8f012ff840857f410830b507/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 d48168e5bf05e4b9b44829ca91b20d2033b028c5..18dfe9cc4fe9ed0744d081dbdccd63fcc020e213 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/ba8011d14617dc5227181606db50cd40/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3130850cf28d7ef9f18dfa871489eb27/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3130850cf28d7ef9f18dfa871489eb27/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3130850cf28d7ef9f18dfa871489eb27/res" />
</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 77c4c1d227a28bfad4fc3ba1160f6fb79d5b6125..9fb6e944fa60ec8f849c9bc8bb4e98b29b77e24b 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/f078f33e4fd3cb82c88fe10a2dde7d49/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f078f33e4fd3cb82c88fe10a2dde7d49/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eaaea6236999500633d2a24a2823e6e8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/eaaea6236999500633d2a24a2823e6e8/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 f4b71b1fdfc6471572d8683d566662586c9edffd..fd0496dcb8dab709e48b8a39859cd33f603c0fa6 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="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" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e04a97ff00d28f77d05dfe58715e5d18/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e04a97ff00d28f77d05dfe58715e5d18/jars/classes.jar!/" />
</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 81fd80eecc328a4a1dfed1c2d94a246289d9b623..fba8a3992a0b1f48a4bd75905f7bb7162274bc29 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="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" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811bcc1c7426cdc327bb39a75e05eb73/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/811bcc1c7426cdc327bb39a75e05eb73/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 ba6ed7d68e24716489ea24a195d4924637581ce3..4b91dc37d4c112746ca079e8d726507a93a51b66 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/04af95db681484cdb6959364ce00e3a9/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43c60b53a800ff5e086998cb5419e5a7/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43c60b53a800ff5e086998cb5419e5a7/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43c60b53a800ff5e086998cb5419e5a7/jars/classes.jar!/" />
</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 52b3c6a4708113734ddb3ca5d2253a70d10aa7a0..e1ade3047f5faa5d59aef239f76e033d8446ab74 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/81090ec128e71a3f4073dd94304b662c/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/81090ec128e71a3f4073dd94304b662c/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c43ccea522d81501f7b1db5dc342e39f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c43ccea522d81501f7b1db5dc342e39f/jars/classes.jar!/" />
</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 9ec151d7eea6613aa19c1676dc36bb0e6b1cffe2..522130d07f68cff5bb6fa203520e19438a92a4d3 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="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" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e9b0bbd41e5e73d108c616e2237f42e0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e9b0bbd41e5e73d108c616e2237f42e0/jars/classes.jar!/" />
</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 a7936a81bc40a25860a43ce4d614e097a514e974..4b9528bafb31bce99f177e97d4afcbf289a18700 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/c652ca56d13fa1da94a4210a97851557/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec8c50647f66cd4b0b79800196df1c8/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec8c50647f66cd4b0b79800196df1c8/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7ec8c50647f66cd4b0b79800196df1c8/res" />
</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 252d7d41fb2cf2fc3091401cb1758884fe31a7f1..0fd27651962f9a509a65f8e09dd85735b233371e 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/792506c3a81b5c0d545da77055930ed3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/792506c3a81b5c0d545da77055930ed3/res" />
</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 b2ae2ef5fa62037d2a60467cc342156aaf81a4e7..dd782639d9a22a1516e88a6661862241f14c7dda 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/43e6376ce68fda4fe45d028305d4e106/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1060649a970b090f41a1ffc452b7a760/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1060649a970b090f41a1ffc452b7a760/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1060649a970b090f41a1ffc452b7a760/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 43fc4d5589fe7dc9bd51c0d61180d4b005b138b2..10dede2368c2913434101ab5fad18e2b4afa913e 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/d9d524336913a3f71891c3246c4e2630/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9d524336913a3f71891c3246c4e2630/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bd6fd2664373fb8537729aa265fa11c4/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bd6fd2664373fb8537729aa265fa11c4/res" />
</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 1d2749adca288abd824879ef435e82597e39e1e7..163f2f7283fa286bcb8cae6900b20f91845d74bf 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="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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/569da9078a77e13932e6056678d1464d/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/569da9078a77e13932e6056678d1464d/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 aa54c856f10de05dd592c84122118d801cde0489..2522ba7f0073f2c12174d9b15e52df46c6d5be6e 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/73600a19d4d2f4124d01b46fa552ab84/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/73600a19d4d2f4124d01b46fa552ab84/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37e7db454c64300ce74930ef92870548/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/37e7db454c64300ce74930ef92870548/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 d71c8e195bd88ef80548b7f7446ee3404324117a..5e2993ee46983dba6b3c14c033daaf71b20a322f 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/0f901f519c5e39d1063ab09ee9409310/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1cfd33c244e7c5f1258f37fe5c19f1a/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1cfd33c244e7c5f1258f37fe5c19f1a/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b1cfd33c244e7c5f1258f37fe5c19f1a/res" />
</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 7353ba2a5c0ff971bdf4b42ddc50d0a165e4ef1f..f723dc4048a6fa9ce10310e7aae3acc7e3e6a5ed 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/5fce4cf301ce5fda879132fd37c672e7/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a5d153332a925eb6daa5f1f5b7adba9/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a5d153332a925eb6daa5f1f5b7adba9/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6a5d153332a925eb6daa5f1f5b7adba9/res" />
</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 5fae4835785d1c59abc3fef95a7309119385b0aa..01023406491ec996a4b24841c3dbb08736677f6b 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/dfab558cc5bdb1c351dc5582ac8d906d/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dfab558cc5bdb1c351dc5582ac8d906d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2206e972fccf147045366113cfab7eb1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2206e972fccf147045366113cfab7eb1/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 b0aa2092190f8e9385de7d2156b4fe06dae4c1d8..c962a4a47c1ca240aaa5664d5bdd06a46d762b44 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/8c83aff76f4e66a9e60eaa443c611d7b/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edc2e73e68502b20c48a430c436619cf/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edc2e73e68502b20c48a430c436619cf/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edc2e73e68502b20c48a430c436619cf/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 b9eb158535cd794b1405c5bec193aa614e2ed5a7..d1f67d227a93225da995e1b114cef13a2f2f24fa 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/026d38cb52f701792db2d196b5b9e9c6/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/026d38cb52f701792db2d196b5b9e9c6/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7e9d651f343ec427b4eee4f699be4b6/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f7e9d651f343ec427b4eee4f699be4b6/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 50c1999ca2af2ef19e1214a730e59a03e2f588b0..5f6e61c96d210233b828bb30612e28d10610715c 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="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" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/335e28948a0724c82a99dc690d752303/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/335e28948a0724c82a99dc690d752303/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 b99ee883d620f525f8b1e3c250b19abc7fd9c20f..959c5d6abb37dcadac26ff7ed07208e97157d544 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/121571701b919cc1fad4e11bb67cde28/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/41b1c1de26ff8b63a410082f430bd0ae/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/41b1c1de26ff8b63a410082f430bd0ae/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/41b1c1de26ff8b63a410082f430bd0ae/jars/classes.jar!/" />
</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 62e1a8dea09efea907072ac4b6bebc9da1ceeda0..f8863c1b3981ac55bb5648fd224e5fad5e937759 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/95f7c8d570787479d1800d7f0c8df5bc/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dd8a7f010ada3a841bc30bf9cf665c04/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dd8a7f010ada3a841bc30bf9cf665c04/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dd8a7f010ada3a841bc30bf9cf665c04/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 4e351430f1ba380b8098939cde8d8aec8431a73c..9eeb2a5bc550d9b63030161416c6f73f12fa2801 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/d3921f2d054e444ca93bdfe34728eca5/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d3921f2d054e444ca93bdfe34728eca5/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/82c850389c5b901c14f5723531a55e5b/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/82c850389c5b901c14f5723531a55e5b/res" />
</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 64cfe9f8fd6d322e5e74c764b68e8aadc08bf302..502c6ec3086a2ea09c33b780e00b7ec9ba182e20 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6213bbad4d9c9dad1bbec66fc95d62fe/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6213bbad4d9c9dad1bbec66fc95d62fe/res" />
</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 6fc2673e4e1a0298e996b974280f03e6667ce691..412b78a8ee71012c12267a87c88c1f9016fa27c4 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/4f7b3878816190fecbfd400ad8f79455/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b79081fd0b77bb0dbb114fc9e6760219/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b79081fd0b77bb0dbb114fc9e6760219/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b79081fd0b77bb0dbb114fc9e6760219/res" />
</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 60b0adcf66947ab1ba72b484042c3e947df5cda0..4a40f206a5e6fb5e78bb7bf31c463a3384da90ed 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/415dfc15d1ee0f4a226528ca39ef3d16/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/415dfc15d1ee0f4a226528ca39ef3d16/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/576971d67ac0a462319e6e550bbc7b91/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/576971d67ac0a462319e6e550bbc7b91/jars/classes.jar!/" />
</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 22b34a1ad35e25f312e30ac9b7f3b2e6db86b8d8..4724615d1197bf6192354dd0409b0bc7b2f884ae 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="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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/207aa2aeb2dccf412f1b582565bb8546/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/207aa2aeb2dccf412f1b582565bb8546/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 eceb1621e65cf22251b075d3cef237ad2d7e9b76..4b99e6c619b178537c8f2224fff3246ac084f1f8 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/ea7172856cd2bdd2bb9a1e52acc9e516/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ea7172856cd2bdd2bb9a1e52acc9e516/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3b32b873677760a961de10124979d034/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3b32b873677760a961de10124979d034/res" />
</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 3057fc611b4bdc15514318be642eb8ad3d1ed7fc..96551266d1217a309be7783ba64f90ae561aaa0f 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/3fe208d7ad3a1bd9450d9cb30daf973b/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3fe208d7ad3a1bd9450d9cb30daf973b/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edab8227e2a32eca6df7d0fdf275c1f9/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/edab8227e2a32eca6df7d0fdf275c1f9/res" />
</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 b3e58c3351f50cdd526a8a643155b40eec2a6269..25c772911bffb4ef6b0c32523231c278d1cf4961 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/7b176dc9c5ea40298f145d94cf355c1c/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2317561b61aed41fdf6657e89c4929f2/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2317561b61aed41fdf6657e89c4929f2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2317561b61aed41fdf6657e89c4929f2/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 cc437d80bd4b1708368e8dcbd2dc27149d24e574..7f16be7281c11b56c3f389ea0684055bf452da40 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="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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a83b1431a469844d2a7cf14ad6994dd/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5a83b1431a469844d2a7cf14ad6994dd/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 f1bddfcfa641919fce63ad723c2639b1503bd2d7..2a4756d1ce8f6cd26a30867b948fc00306c98b8e 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/dc53f0546723496c77c7a6b75cefb638/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/dc53f0546723496c77c7a6b75cefb638/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4d5094019d9dd47babd8bc940c57af37/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4d5094019d9dd47babd8bc940c57af37/res" />
</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 a06efb3fb230bd4719b06971b9d9845d9876cb45..07d6ae2e11f213c951a5c5c27a0972ef241df8d1 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/868605f1a2cdb7950c37f4ffbd9b060f/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/868605f1a2cdb7950c37f4ffbd9b060f/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31bfc4f7eec15155bd06cb544d316c19/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31bfc4f7eec15155bd06cb544d316c19/jars/classes.jar!/" />
</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 7a0646c4ae387b599d893fd185d8ea7eaa5bae2e..85e4f2459f1ad8b96a959992174b206a18d93c31 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aff18a80f59f46f223f8cd8352488f69/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/aff18a80f59f46f223f8cd8352488f69/res" />
</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 f75a7c2bd351abeef4e7740d53fc3aae461a124a..eadc434511f1a977a619c0d0768dd9c598577953 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/8777b1571e82e23eef756f8b5e8039ca/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8777b1571e82e23eef756f8b5e8039ca/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8dc35d56addedabee372c48b93f50b5c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8dc35d56addedabee372c48b93f50b5c/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 c34421dc00700b0ea84796505e259659a17c24c1..75704153eea588a1ee1867806c05c4ba7f3fb045 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e96876a095a350434bdd42ffd8629e2d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e96876a095a350434bdd42ffd8629e2d/res" />
</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 a6576f27a2b3b759026df9d16738e6be8b0f9551..30f228ab91e963f4ec2116d7efc375e1fc610bfc 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/18a354b40c32be7771ffe4fe2e276d0f/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/18a354b40c32be7771ffe4fe2e276d0f/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71d2c02279f04e623c682e5948efb4cf/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/71d2c02279f04e623c682e5948efb4cf/res" />
</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 a4224faed7008d2f32e1f5993abe5db84659c981..3b5f3d301ad7bd1d6075bd4404ab8a06ba541fd4 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="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" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c3d4a4bb43d218ea8979263a5cb2f80/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5c3d4a4bb43d218ea8979263a5cb2f80/jars/classes.jar!/" />
</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 7e20ec0a7e4d843e765fada2c2d22231a5304369..57a0d392f2fc68f0d5cea979ac3a5f574a155f1c 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/ad4e171e7c91c88f4998013cd0e9c89d/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ad4e171e7c91c88f4998013cd0e9c89d/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61c282e29f80d22e7c8e6e2bae65c5a5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/61c282e29f80d22e7c8e6e2bae65c5a5/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 b7ea1adb65d8ec11e7f9d5efabf92f3b0f750755..3408d8811f5612dacc2df80b49801c3a0267580a 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f59927a1ad6c3a75ccba740d1daf9a5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5f59927a1ad6c3a75ccba740d1daf9a5/res" />
</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 56affa2971e6b4f4754f6c69924149a7f5774625..fef1ae6a2b05a24d7a1381eb5269471bf7e19e37 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/4e0d4c889658e70637cd3626c45627b3/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e0d4c889658e70637cd3626c45627b3/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ee30746c63eb2186a6251b4fc9119f8/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ee30746c63eb2186a6251b4fc9119f8/jars/classes.jar!/" />
</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 aa6f09a6b66f8a77bade102de5eb5362e4419819..13d17b955fe63fd8ada5685f817895188e3c9abf 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ebe24e2b67b22e6734fa48156d5a301/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8ebe24e2b67b22e6734fa48156d5a301/res" />
</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 b30770ec415a195dbd090689223e5a083fdbcb9f..165bca097d6abb7977fbc373a1d9032b07e0a116 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/9106d1ca78f401819e38acebff7ef96d/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9106d1ca78f401819e38acebff7ef96d/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e5742b302aa803638589a3b903fcbe48/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e5742b302aa803638589a3b903fcbe48/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/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 95392654894eb26eb414d5a72eed4f1aadfe2409..56c8102415d4d08327ffc8e1ebb8fb678d1ab97d 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="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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d828696aa497d1650024fec778ab5150/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d828696aa497d1650024fec778ab5150/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 26eaf0891e9044f59d038ef75dd798c5eccfbe05..75cdc428e9903432ad091577d8df0f348f9ff664 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/8c8ba49762b3cd2e8c86e4af61e60fd8/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c8ba49762b3cd2e8c86e4af61e60fd8/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/544edd79b93032c2db7502405d1379ad/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/544edd79b93032c2db7502405d1379ad/jars/classes.jar!/" />
</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 ec3764c38f7926336af90d902c43cb6fdf4732e2..fe0d2af215a3dbfda2244b79f21652a17ffa5283 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/43b573622b2bb6ea6ff1d064c8721e1e/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/43b573622b2bb6ea6ff1d064c8721e1e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38703f9776ba9f10dd3efdde11d08328/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/38703f9776ba9f10dd3efdde11d08328/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 4c40ca89b04baac101f852d7821dd074e6a6a5cb..936ab5b22da0ec88f65cd48ce899a65e19c3d3c2 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/fdc85e7ea2453de233fce81efc7bd69e/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fdc85e7ea2453de233fce81efc7bd69e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9a65cf708e7da39e775b6754574fb8d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d9a65cf708e7da39e775b6754574fb8d/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 ffb010008af44632dd44f390c2789d4158648435..d581158e67d972e61cb4af2df147165915be0737 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/cbb6708b206c2c88ed38cc67deac1f3f/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cbb6708b206c2c88ed38cc67deac1f3f/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/05aaad10cf023846f4e479b7d0d9e83a/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/05aaad10cf023846f4e479b7d0d9e83a/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 e35fa033493ec8870773da7d40d64b91415bf140..9250a7a71ce11217043cfe797244ae7cd96a8b1d 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cca49277aea77119cba2e35273dd9768/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/cca49277aea77119cba2e35273dd9768/res" />
</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 e55de5954f1bb982e39cb2202bc088dffd7fc4c6..f5a4cf3a76b0fa98acb25f758ee5805d86ff916d 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="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" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab311d660699b5f7ac4a67e2b96fa4c5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ab311d660699b5f7ac4a67e2b96fa4c5/jars/classes.jar!/" />
</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 538db7053879a407959094720bae55b4cf79c59f..9ea95ab8cfbb4819a7ac257b16d78ffed5c2321c 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="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" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87d6202a37dc4c9c4978dffa4d93714c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/87d6202a37dc4c9c4978dffa4d93714c/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 dff2718303c737647d92443238cfafb1a4765ef4..0ee75ff79db90bfdbb47851f9b7ab3e3cef4966d 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/c75802d0b7ee65118d3fc70dbcc34e2f/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c75802d0b7ee65118d3fc70dbcc34e2f/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/88a9fce8d404e5f5cef4763fea05244f/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/88a9fce8d404e5f5cef4763fea05244f/res" />
</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 1efbe367391056e7eba2c0cdaf15d527b52a3789..fd99e2aa327f38ea535c6083465de68592e50a6d 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="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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a1be0db2fd5cb278a94feeec1c2552ba/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/a1be0db2fd5cb278a94feeec1c2552ba/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 4898167ff5b31a1d3bc28c6bf041d189809df708..faed6aa1f0bb4109433ec02c083f9a87289522f3 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="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" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ddc6ed91afc63249b83c2942ad1249f/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0ddc6ed91afc63249b83c2942ad1249f/jars/classes.jar!/" />
</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 61d40300c1fc4a49755094d1643664a497a86ba8..bf4250f1b7dee522e0a8ff39ded6a37db3f3c1dc 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="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!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0801de71e7a36e2562cc85b1ddea38aa/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0801de71e7a36e2562cc85b1ddea38aa/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 dea64cf1d4a1c0b1571bcbccd45555503641fecb..1c0365a54f3e1a813c49cf2be71f12b22b8651dd 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="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!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/46254619ca981c4beabaa0604579a08e/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/46254619ca981c4beabaa0604579a08e/res" />
</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 cf74c7f55ef78e8821212d03da87c615bd4db0ca..66f90853afc78866e938a85e0cae369b53411a12 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="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" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e2d001fc645ed6b99bd9557184fdb2b/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e2d001fc645ed6b99bd9557184fdb2b/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
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/.idea/modules.xml b/.idea/modules.xml
index ea9a4643847ca8cb594c453646263c76411c406b..28226e39988a590b253e71596589b79b81acda31 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/unirides_homepage.iml" filepath="$PROJECT_DIR$/unirides_homepage.iml" />
+ <module fileurl="file://$PROJECT_DIR$/unirides.iml" filepath="$PROJECT_DIR$/unirides.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 5b097c11df0048d673bdf359864fe37de8782811..69b3d5de8713ce80bc4020c86031f50b93dc9624 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -6,17 +6,15 @@
Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the 'MyLocation' functionality.
-->
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
- <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.INTERNET" />
-
<uses-permission android:name="android.permission.CAMERA" />
-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -29,7 +27,6 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
<!--
The API key for Google Maps-based APIs is defined as a string resource.
(See the file "res/values/google_maps_api.xml").
@@ -44,6 +41,7 @@
<activity
android:name=".Homepage"
+ android:label="@string/app_name"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -51,33 +49,44 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity android:name=".Offline_Map"
+ android:label="@string/offline_map" />
<activity
android:name=".Login"
android:label="@string/title_activity_login"
android:screenOrientation="portrait" />
<activity
android:name=".Register"
+ android:label="@string/register"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".Driver_Register"
+ android:label="@string/register"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".User_Register"
+ android:label="@string/register"
android:screenOrientation="portrait" />
-
<activity
- android:name=".Main"
+ android:name=".Driver_Main"
+ android:label="Home"
+ android:screenOrientation="portrait" />
+ <activity
+ android:name=".User_Main"
android:label="Home"
android:screenOrientation="portrait" />
-
<activity
android:name=".Map"
- android:label="@string/title_activity_map"
- android:parentActivityName=".Main"/>
-
+ android:label="@string/title_activity_map" />
+ <activity
+ android:name=".Route"
+ android:label="@string/create_route" />
<activity
android:name=".Profile"
- android:label="@string/profile"
- android:parentActivityName=".Main"/>
+ android:label="@string/profile" />
<activity
android:name=".Settings"
- android:label="@string/settings"
- android:parentActivityName=".Main"/>
-
+ android:label="@string/settings" />
</application>
</manifest>
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java b/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..62b3ed75b2df508313a3d57b3cb7f8671d6a050c
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Driver_Main.java
@@ -0,0 +1,104 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.Toast;
+
+public class Driver_Main extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_driver_main);
+
+ //setting the user_toolbar layout as the action bar
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ try {
+ setSupportActionBar(toolbar);
+ } catch (Exception e) {
+ Log.e("TOOLBAR", e.toString());
+ }
+
+ ImageButton view_map_button = findViewById(R.id.view_route_button);
+ view_map_button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent map_i = new Intent(Driver_Main.this, Map.class);
+ startActivity(map_i);
+ }
+ });
+
+ ImageButton create_route_button = findViewById(R.id.create_route_button);
+ create_route_button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent route_i = new Intent(Driver_Main.this, Route.class);
+ startActivity(route_i);
+ }
+ });
+
+ }
+
+ //Override for the user_toolbar menu items
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater menuInflater = getMenuInflater();
+ menuInflater.inflate(R.menu.toolbar_menu, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+
+ //checks the id of the item, if the item id matches a case id then the code in that case block will execute
+ switch(item.getItemId()){
+
+ case(R.id.item_home):
+
+ //already home, so do nothing.
+ return true;
+
+ case(R.id.item_logout):
+
+ /*
+ TODO:
+ Possibly add a way to log out here? (not sure if we are even tracking the login instance
+ within each activity? as far as I understand the login just gets you to the next activity
+ however if you "logout" and just press the back button after it takes you back to the homepage
+ it will act as if you are still logged in when you reenter).
+ for now i have just set it so it goes back to the homepage (where you can register or login).
+ */
+
+ Toast.makeText(Driver_Main.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+ Intent logout_i = new Intent(Driver_Main.this, Homepage.class);
+ startActivity(logout_i);
+
+ return true;
+
+ case(R.id.item_profile):
+
+ Intent profile_i = new Intent(Driver_Main.this, Profile.class);
+ profile_i.putExtra("userType", Login.userType.DRIVER);
+ startActivity(profile_i);
+ return true;
+
+ case(R.id.item_settings):
+
+ Intent settings_i = new Intent(Driver_Main.this, Settings.class);
+ settings_i.putExtra("userType", Login.userType.DRIVER);
+ startActivity(settings_i);
+ return true;
+
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java b/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b9625d084a68aac4738001bbdaeaec1ceb33662
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Driver_Register.java
@@ -0,0 +1,127 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+public class Driver_Register extends AppCompatActivity {
+ private EditText forename;
+ private EditText surname;
+ private EditText email;
+ private EditText password;
+ private EditText age;
+ private EditText car_model;
+ private EditText licence_plate;
+ private EditText time_driving;
+ private Button sign_up;
+
+ /* Used for Firebase authorisation in creating a new account */
+ private FirebaseAuth firebaseAuth;
+
+ /* Allows access to the Firebase Database */
+ private FirebaseDatabase firebaseDatabase;
+
+ /* Used to add values to the database */
+ private DatabaseReference dbReference;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_driver_register);
+ this.forename = findViewById(R.id.forename);
+ this.surname = findViewById(R.id.surname);
+ this.email = findViewById(R.id.email);
+ this.password = findViewById(R.id.password);
+ this.age = findViewById(R.id.age);
+ this.car_model = findViewById(R.id.car_model);
+ this.licence_plate = findViewById(R.id.license_plate);
+ this.time_driving = findViewById(R.id.time_driving);
+ this.sign_up = findViewById(R.id.signup_button);
+
+ this.firebaseAuth = FirebaseAuth.getInstance();
+ this.firebaseDatabase = FirebaseDatabase.getInstance();
+ this.dbReference = firebaseDatabase.getReference();
+
+ //sign_up button listener
+ sign_up.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ //execute register method
+ registerClick(view);
+ }
+ });
+
+ }
+
+ public void registerClick(View v) {
+ final String forenameText = forename.getText().toString().trim();
+ final String surnameText = surname.getText().toString().trim();
+ final String emailText = email.getText().toString().trim();
+ final String passwordText = password.getText().toString().trim();
+ final String ageText = age.getText().toString().trim();
+
+ final String carModelText = car_model.getText().toString().trim();
+ final String licencePlateText = licence_plate.getText().toString().trim();
+ final String timeDrivingText = time_driving.getText().toString().trim();
+
+ Log.d("Email", emailText);
+ Log.d("Password", passwordText);
+
+ if(TextUtils.isEmpty(forenameText) || TextUtils.isEmpty(surnameText)
+ || TextUtils.isEmpty(emailText) || TextUtils.isEmpty(passwordText)
+ || TextUtils.isEmpty(passwordText) || TextUtils.isEmpty(ageText)) {
+ Toast.makeText(this, "One of the fields is empty!",Toast.LENGTH_SHORT).show();
+
+ }
+ else {
+ firebaseAuth.createUserWithEmailAndPassword(emailText, passwordText)
+ .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+ @Override
+ public void onComplete(@NonNull Task<AuthResult> task) {
+ if(task.isSuccessful()) {
+ FirebaseUser user = firebaseAuth.getCurrentUser();
+ String userId = user.getUid();
+ Toast.makeText(Driver_Register.this, forenameText,Toast.LENGTH_SHORT).show();
+
+ // Code to add values into the database
+ // Only temporary for now, might change these a bit later
+ dbReference.child("drivers").child(userId).child("first_name").setValue(forenameText);
+ dbReference.child("drivers").child(userId).child("last_name").setValue(surnameText);
+ dbReference.child("drivers").child(userId).child("age").setValue(ageText);
+ dbReference.child("drivers").child(userId).child("email").setValue(emailText);
+ dbReference.child("drivers").child(userId).child("average_rating").setValue(0.0);
+ dbReference.child("drivers").child(userId).child("car_model").setValue(carModelText);
+ dbReference.child("drivers").child(userId).child("license_plate").setValue(licencePlateText);
+ dbReference.child("drivers").child(userId).child("time_driving").setValue(timeDrivingText);
+
+ //finish();
+ Toast.makeText(Driver_Register.this, "registration successful",Toast.LENGTH_SHORT).show();
+ Intent home = new Intent(Driver_Register.this, Homepage.class);
+ startActivity(home);
+
+ }
+ else {
+ Toast.makeText(Driver_Register.this, "registration not successful",Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+ }
+
+ }
+
+}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Homepage.java b/src/main/java/com/example/liliyayankova/unirides/Homepage.java
index 187c0da793a7be0d61e3dcf449028c100046a2da..548f1619d51eaef8dfaeb1ed005355d69ef5efb8 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Homepage.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Homepage.java
@@ -5,6 +5,7 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
+import android.widget.ImageButton;
import android.widget.TextView;
public class Homepage extends AppCompatActivity {
@@ -12,6 +13,7 @@ public class Homepage extends AppCompatActivity {
private TextView subheading;
private Button login;
private Button register;
+ private ImageButton offline_map;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -22,6 +24,15 @@ public class Homepage extends AppCompatActivity {
this.subheading = (TextView) findViewById(R.id.subh);
this.login = (Button) findViewById(R.id.loginB);
this.register = (Button) findViewById(R.id.registerB);
+ this.offline_map = findViewById(R.id.offline_map);
+
+ this.offline_map.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent map_i = new Intent(Homepage.this, Offline_Map.class);
+ startActivity(map_i);
+ }
+ });
this.login.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/src/main/java/com/example/liliyayankova/unirides/Login.java b/src/main/java/com/example/liliyayankova/unirides/Login.java
index 7ea1919d9a9efbc137ba03db1e2df0eb63a72f3e..98c2f2da15c22b5a211aaa175a06da528211a43a 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Login.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Login.java
@@ -33,12 +33,20 @@ import android.widget.Toast;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
+import com.google.firebase.FirebaseApp;
import com.google.firebase.FirebaseNetworkException;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
import com.google.firebase.auth.FirebaseAuthInvalidUserException;
import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.UserInfo;
+import com.google.firebase.database.ChildEventListener;
+import com.google.firebase.database.DataSnapshot;
+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 java.util.ArrayList;
@@ -80,6 +88,9 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
/* Connects to Firebase and checks if authorisation was successful */
private FirebaseAuth.AuthStateListener authListener;
+ /* Enum for user type - used in bundles when going back and forth between activities */
+ public enum userType {DRIVER, PASSENGER};
+
/*
TODO: Look at this message from Ronan in Login.java
To be honest, I have no idea what any of this code does prior to my commit
@@ -101,8 +112,7 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
FirebaseUser user = firebaseAuth.getCurrentUser();
if(user != null) {
// User is already logged in, so automatically let them into the app
- Toast.makeText(Login.this, "User has signed in as" + user.getEmail(), Toast.LENGTH_SHORT).show();
- startActivity(new Intent(Login.this, Map.class));
+ changeActivity();
}
}
};
@@ -154,9 +164,10 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
}
} else {
+
// successful - closes login page and sends user to main menu
finish();
- startActivity(new Intent(Login.this, Main.class));
+ changeActivity();
}
}
});
@@ -171,6 +182,60 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
mProgressView = findViewById(R.id.login_progress);
}
+ /**
+ * Method for changing the activity to either the driver or passenger activity after login
+ * This method is only called AFTER a user's credentials have already been confirmed by the
+ * server, it should never be called to confirm a users identity.
+ */
+ public void changeActivity(){
+
+ /*
+ * TODO: make this more efficient as it currently goes through all the users (as far as i can tell)
+ * Therefore it takes more than a split second to switch activities.
+ * may need to disable user input or create a small loading screen if we can't fix this
+ * because you can still interact with the activity while the next one loads! - James
+ */
+
+ //checks if user is a driver or passenger
+ FirebaseUser user = firebaseAuth.getCurrentUser();
+ final String user_id = user.getUid();
+
+ DatabaseReference ref = FirebaseDatabase.getInstance().getReference();
+ ref.child("drivers").child(user_id).addListenerForSingleValueEvent(new ValueEventListener() {
+ @Override
+ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
+
+ if(dataSnapshot.exists()){
+
+ //TODO: remove this or change it - toast to confirm that the user is indeed a driver during testing
+ Toast.makeText(Login.this, "Welcome back Driver!", Toast.LENGTH_SHORT).show();
+ startActivity(new Intent(Login.this, Driver_Main.class));
+
+ }else{
+
+ /*
+ * no other option as the user has already logged in before this method is called, hence they must be a passenger
+ * if they are not a driver
+ */
+ //TODO: remove this or change it - toast to confirm that the user is NOT a driver during testing
+ Toast.makeText(Login.this, "Welcome back Passenger!", Toast.LENGTH_LONG).show();
+ startActivity(new Intent(Login.this, User_Main.class));
+ }
+
+ }
+
+ @Override
+ public void onCancelled(@NonNull DatabaseError databaseError) {
+ //TODO: throw exception?
+ //assume they're a user?
+ startActivity(new Intent(Login.this, User_Main.class));
+ }
+
+ });
+
+
+ }
+
private void populateAutoComplete() {
if (!mayRequestContacts()) {
return;
@@ -269,7 +334,7 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
private boolean isEmailValid(String email) {
//TODO: Replace this with your own logic
- return email.contains("@");
+ return email.contains("@surrey.ac.uk");
}
private boolean isPasswordValid(String password) {
@@ -411,8 +476,7 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
if (success) {
//go to the main activity
- Intent main = new Intent(Login.this, Main.class);
- startActivity(main);
+ changeActivity();
} else {
mPasswordView.setError(getString(R.string.error_incorrect_password));
mPasswordView.requestFocus();
diff --git a/src/main/java/com/example/liliyayankova/unirides/Map.java b/src/main/java/com/example/liliyayankova/unirides/Map.java
index e5c4c1b3835f4ccdba4340ac06f0702020dab9f3..bb4ec8bd0e6abc06c4307c0efd224f3eb7f0c598 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Map.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Map.java
@@ -1,6 +1,7 @@
package com.example.liliyayankova.unirides;
import android.Manifest;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.location.Location;
@@ -12,6 +13,12 @@ import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentActivity;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.widget.Toast;
import com.google.android.gms.common.ConnectionResult;
@@ -29,7 +36,7 @@ import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions;
-public class Map extends FragmentActivity implements
+public class Map extends AppCompatActivity implements
OnMapReadyCallback,
GoogleApiClient.ConnectionCallbacks,
GoogleApiClient.OnConnectionFailedListener,
@@ -57,6 +64,14 @@ public class Map extends FragmentActivity implements
locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
+ //setting the user_toolbar layout as the action bar
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ try {
+ setSupportActionBar(toolbar);
+ } catch (Exception e) {
+ Log.e("TOOLBAR", e.toString());
+ }
+
}
@Override
@@ -133,8 +148,13 @@ public class Map extends FragmentActivity implements
markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_CYAN));
myLocation = mMap.addMarker(markerOptions);
- mMap.moveCamera(CameraUpdateFactory.newLatLng(latLng));
- mMap.animateCamera(CameraUpdateFactory.zoomBy(10));
+ /* Updated this part so that it zooms in on the location, as it was buggy with me, I've left
+ * the original code commented out as it may be useful for if your location is updated?
+ * Either way this works for me at the moment & doesn't default me to the ocean lmao - James
+ */
+ float zoomLevel = 15.0f;
+ mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, zoomLevel));
+ //mMap.animateCamera(CameraUpdateFactory.zoomBy(10));
if(mGoogleApiClient != null){
LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
@@ -166,4 +186,62 @@ public class Map extends FragmentActivity implements
public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
}
+
+ //Override for the user_toolbar menu items
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater menuInflater = getMenuInflater();
+ menuInflater.inflate(R.menu.toolbar_menu, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+
+ //checks the id of the item, if the item id matches a case id then the code in that case block will execute
+ switch(item.getItemId()){
+
+ case(R.id.item_home):
+
+ Intent home_i = new Intent(Map.this, Driver_Main.class);
+ startActivity(home_i);
+ return true;
+
+
+ case(R.id.item_logout):
+
+ /*
+ TODO:
+ Possibly add a way to log out here? (not sure if we are even tracking the login instance
+ within each activity? as far as I understand the login just gets you to the next activity
+ however if you "logout" and just press the back button after it takes you back to the homepage
+ it will act as if you are still logged in when you reenter).
+ for now i have just set it so it goes back to the homepage (where you can register or login).
+ */
+
+ Toast.makeText(Map.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+ Intent logout_i = new Intent(Map.this, Homepage.class);
+ startActivity(logout_i);
+
+ return true;
+
+ case(R.id.item_profile):
+
+ Intent profile_i = new Intent(Map.this, Profile.class);
+ profile_i.putExtra("userType", Login.userType.DRIVER);
+ startActivity(profile_i);
+
+ return true;
+
+ case(R.id.item_settings):
+
+ Intent settings_i = new Intent(Map.this, Settings.class);
+ settings_i.putExtra("userType", Login.userType.DRIVER);
+ startActivity(settings_i);
+ return true;
+
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Offline_Map.java b/src/main/java/com/example/liliyayankova/unirides/Offline_Map.java
new file mode 100644
index 0000000000000000000000000000000000000000..5a080f6bb06e6876ddd547fdaab48bd384b4e95c
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Offline_Map.java
@@ -0,0 +1,196 @@
+package com.example.liliyayankova.unirides;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.location.Location;
+import android.location.LocationManager;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.app.FragmentActivity;
+import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationListener;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.maps.CameraUpdate;
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
+
+public class Offline_Map extends AppCompatActivity implements
+ OnMapReadyCallback,
+ GoogleApiClient.ConnectionCallbacks,
+ GoogleApiClient.OnConnectionFailedListener,
+ LocationListener {
+
+ LocationManager locationManager;
+ private GoogleMap mMap;
+ private GoogleApiClient mGoogleApiClient;
+ private LocationRequest mLocationRequest;
+ private Location currentLocation;
+ private Marker myLocation;
+ private static final int REQUEST_USER_LOCATION_CODE = 99;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_offline__map);
+ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+ checkUserLocationPermission();
+ }
+ // Obtain the SupportMapFragment and get notified when the map is ready to be used.
+ SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
+ .findFragmentById(R.id.map);
+ mapFragment.getMapAsync(this);
+
+ locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
+
+
+ Button back_button = findViewById(R.id.back_button);
+ back_button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent home_i = new Intent(Offline_Map.this, Homepage.class);
+ startActivity(home_i);
+ }
+ });
+
+
+ }
+
+ @Override
+ public void onMapReady(GoogleMap googleMap) {
+ mMap = googleMap;
+ if(ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+ == PackageManager.PERMISSION_GRANTED) {
+
+ buildGoogleApiClient();
+
+ mMap.setMyLocationEnabled(true);
+ }
+ }
+
+ public boolean checkUserLocationPermission(){
+ if(ContextCompat.checkSelfPermission(this,
+ Manifest.permission.ACCESS_FINE_LOCATION)
+ != PackageManager.PERMISSION_GRANTED){
+ if(ActivityCompat.shouldShowRequestPermissionRationale(this,
+ Manifest.permission.ACCESS_FINE_LOCATION)){
+ ActivityCompat.requestPermissions(this, new String[]
+ {Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_USER_LOCATION_CODE);
+ }else{
+ ActivityCompat.requestPermissions(this, new String[]
+ {Manifest.permission.ACCESS_FINE_LOCATION}, REQUEST_USER_LOCATION_CODE);
+ }
+ return false;
+ }else{
+ return true;
+ }
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
+ @NonNull int[] grantResults) {
+ switch (requestCode){
+ case REQUEST_USER_LOCATION_CODE:
+ if(grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+ if (ContextCompat.checkSelfPermission(this,
+ Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+ if (mGoogleApiClient == null) {
+ buildGoogleApiClient();
+ }
+ mMap.setMyLocationEnabled(true);
+ }
+ }else{
+ Toast.makeText(this, "Permission Denied.", Toast.LENGTH_SHORT).show();
+ }
+ return;
+ }
+ }
+
+ protected synchronized void buildGoogleApiClient(){
+ mGoogleApiClient = new GoogleApiClient.Builder(this)
+ .addConnectionCallbacks(this)
+ .addOnConnectionFailedListener(this)
+ .addApi(LocationServices.API)
+ .build();
+
+ mGoogleApiClient.connect();
+ }
+
+ @Override
+ public void onLocationChanged(Location location) {
+ currentLocation = location;
+ if(myLocation != null){
+ myLocation.remove();
+ }
+
+ LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
+ MarkerOptions markerOptions = new MarkerOptions();
+ markerOptions.position(latLng);
+ markerOptions.title("Your current location");
+ markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_CYAN));
+ myLocation = mMap.addMarker(markerOptions);
+
+ /* Updated this part so that it zooms in on the location, as it was buggy with me, I've left
+ * the original code commented out as it may be useful for if your location is updated?
+ * Either way this works for me at the moment & doesn't default me to the ocean lmao - James
+ */
+ float zoomLevel = 15.0f;
+ mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, zoomLevel));
+ //mMap.animateCamera(CameraUpdateFactory.zoomBy(10));
+
+ if(mGoogleApiClient != null){
+ LocationServices.FusedLocationApi.removeLocationUpdates(mGoogleApiClient, this);
+
+ }
+ }
+
+ @Override
+ public void onConnected(@Nullable Bundle bundle) {
+ mLocationRequest = new LocationRequest();
+ mLocationRequest.setInterval(1000);
+ mLocationRequest.setFastestInterval(1000);
+ mLocationRequest.setPriority(LocationRequest.PRIORITY_BALANCED_POWER_ACCURACY);
+
+ if(ContextCompat.checkSelfPermission(this,
+ Manifest.permission.ACCESS_FINE_LOCATION)
+ == PackageManager.PERMISSION_GRANTED) {
+ LocationServices.FusedLocationApi.requestLocationUpdates(mGoogleApiClient,
+ mLocationRequest, this);
+ }
+ }
+
+ @Override
+ public void onConnectionSuspended(int i) {
+
+ }
+
+ @Override
+ public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
+
+ }
+
+
+}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Profile.java b/src/main/java/com/example/liliyayankova/unirides/Profile.java
index cc34acdb334459018e858a8f1efd5d3a56a12d19..cb3c80b38319da3d732d86dd5b94a636349b11ad 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Profile.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Profile.java
@@ -1,16 +1,6 @@
package com.example.liliyayankova.unirides;
-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.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
@@ -18,176 +8,40 @@ import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
import android.widget.Toast;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
public class Profile extends AppCompatActivity {
- /**Constant field for the result from the camera*/
- private static final int CAPTURE_IMAGE_ACTIVITY_REQUEST_CODE = 100;
-
- /** 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*/
- 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!
- private TextView text;
- private Button cameraB;
- private ImageView profile_img;
- private ImageView imageV;
+ private boolean isDriver;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_profile);
- //setting the toolbar layout as the action bar
+ //assume the user is a passenger (isDriver = false) unless bundle extra userType value is DRIVER
+ isDriver = false;
+
+ /* checking if there are any bundle extras (should be the userType) */
+ if(getIntent().getExtras() != null) {
+ //setting userType to this result (DRIVER or PASSENGER)
+ if(getIntent().getExtras().get("userType") == Login.userType.DRIVER){
+ isDriver = true;
+ }
+ }
+
+ //setting the user_toolbar layout as the action bar
Toolbar toolbar = findViewById(R.id.toolbar);
try {
setSupportActionBar(toolbar);
} catch (Exception e) {
Log.e("TOOLBAR", e.toString());
}
-
- text = ( TextView )findViewById( R.id.profile_text );
- profile_img = ( ImageView )findViewById( R.id.profile_image );
- imageV = (ImageView) findViewById(R.id.picture_taken);
- cameraB = ( Button )findViewById( R.id.profile_pic );
- cameraB.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- /**Checks whether the permissions for the usage of camera are given*/
- if (checkSelfPermission(Manifest.permission.CAMERA)
- != PackageManager.PERMISSION_GRANTED) {
-
- 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 );
-
- }
- });
- }
-
- /**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 )
- {
- 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*/
- imageV.setRotation(pic.getCameraPhotoOrientation());
-
- /**Displaying the image*/
- imageV.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;
- }
- }
-
- /**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
- public void onResume(){
- super.onResume();
- }
-
- @Override
- public void onDestroy(){
- super.onDestroy();
- }
-
- //Override for the toolbar menu items
+ //Override for the user_toolbar menu items
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater menuInflater = getMenuInflater();
@@ -203,22 +57,29 @@ public class Profile extends AppCompatActivity {
case(R.id.item_home):
- Intent home_i = new Intent(Profile.this, Main.class);
- startActivity(home_i);
- return true;
+ if (isDriver) {
+ Intent home_i = new Intent(Profile.this, Driver_Main.class);
+ startActivity(home_i);
+ return true;
+ }else{
+ Intent home_i = new Intent(Profile.this, User_Main.class);
+ startActivity(home_i);
+ return true;
+ }
+
case(R.id.item_logout):
- /** TODO:
- * Possibly add a way to log out here? (not sure if we are even tracking the login instance
- * within each activity? as far as I understand the login just gets you to the next activity
- * however if you "logout" and just press the back button after it takes you back to the homepage
- * it will act as if you are still logged in when you reenter).
- *
- * -- for now i have just set it so it goes back to the homepage.
+ /*
+ TODO:
+ Possibly add a way to log out here? (not sure if we are even tracking the login instance
+ within each activity? as far as I understand the login just gets you to the next activity
+ however if you "logout" and just press the back button after it takes you back to the homepage
+ it will act as if you are still logged in when you reenter).
+ for now i have just set it so it goes back to the homepage (where you can register or login).
*/
- Toast.makeText(Profile.this, "Successfully logged out", Toast.LENGTH_SHORT).show();
+ Toast.makeText(Profile.this, "successfully logged out", Toast.LENGTH_SHORT).show();
Intent logout_i = new Intent(Profile.this, Homepage.class);
startActivity(logout_i);
@@ -226,18 +87,25 @@ public class Profile extends AppCompatActivity {
case(R.id.item_profile):
- Intent profile_i = new Intent(Profile.this, Profile.class);
- startActivity(profile_i);
+ //do nothing (we're already in settings)
return true;
case(R.id.item_settings):
Intent settings_i = new Intent(Profile.this, Settings.class);
+
+ if(isDriver){
+ settings_i.putExtra("userType", Login.userType.DRIVER);
+ }else{
+ settings_i.putExtra("userType", Login.userType.PASSENGER);
+ }
+
startActivity(settings_i);
+
return true;
}
return super.onOptionsItemSelected(item);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Register.java b/src/main/java/com/example/liliyayankova/unirides/Register.java
index 625026da6234486204b16d672058f44a3fbf80cb..04c90200c37a13a52046b4d53fd5b9de3e6e986d 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Register.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Register.java
@@ -1,115 +1,37 @@
package com.example.liliyayankova.unirides;
import android.content.Intent;
-import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
-import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.Switch;
-import android.widget.Toast;
-
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.auth.AuthResult;
-import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.FirebaseDatabase;
public class Register extends AppCompatActivity {
- private EditText forename;
- private EditText surname;
- private EditText email;
- private EditText password;
- private EditText age;
- private Button register;
- private CheckBox driverBox;
-
- /* Used for Firebase authorisation in creating a new account */
- private FirebaseAuth firebaseAuth;
-
- /* Allows access to the Firebase Database */
- private FirebaseDatabase firebaseDatabase;
-
- /* Used to add values to the database */
- private DatabaseReference dbReference;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_register);
- this.forename = (EditText) findViewById(R.id.forename);
- this.surname = (EditText) findViewById(R.id.surname);
- this.email = (EditText) findViewById(R.id.email);
- this.password = (EditText) findViewById(R.id.password);
- this.age = (EditText) findViewById(R.id.age);
- this.register = (Button) findViewById(R.id.signup);
- this.driverBox = (CheckBox) findViewById(R.id.checkBox_driver);
- this.firebaseAuth = FirebaseAuth.getInstance();
- this.firebaseDatabase = FirebaseDatabase.getInstance();
- this.dbReference = firebaseDatabase.getReference();
- }
-
- public void registerClick(View v) {
- final String forenameText = forename.getText().toString().trim();
- final String surnameText = surname.getText().toString().trim();
- final String emailText = email.getText().toString().trim();
- final String passwordText = password.getText().toString().trim();
- final String ageText = age.getText().toString().trim();
- Log.d("Email", emailText);
- Log.d("Password", passwordText);
-
- if(TextUtils.isEmpty(forenameText) || TextUtils.isEmpty(surnameText)
- || TextUtils.isEmpty(emailText) || TextUtils.isEmpty(passwordText)
- || TextUtils.isEmpty(passwordText) || TextUtils.isEmpty(ageText)) {
- Toast.makeText(this, "One of the fields is empty!",Toast.LENGTH_SHORT).show();
-
- }
-
- else {
- firebaseAuth.createUserWithEmailAndPassword(emailText, passwordText)
- .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
- @Override
- public void onComplete(@NonNull Task<AuthResult> task) {
- if(task.isSuccessful()) {
- FirebaseUser user = firebaseAuth.getCurrentUser();
- String userId = user.getUid();
- Toast.makeText(Register.this, forenameText,Toast.LENGTH_SHORT).show();
-
- // Code to add values into the database
- // Only temporary for now, might change these a bit later
- dbReference.child("icon_users").child(userId).child("first_name").setValue(forenameText);
- dbReference.child("icon_users").child(userId).child("last_name").setValue(surnameText);
- dbReference.child("icon_users").child(userId).child("age").setValue(ageText);
- dbReference.child("icon_users").child(userId).child("email").setValue(emailText);
- dbReference.child("icon_users").child(userId).child("average_rating").setValue(0.0);
- if (driverBox.isChecked()) {
- dbReference.child("drivers").child(userId).child("car_model").setValue("a really cool car B)");
- dbReference.child("drivers").child(userId).child("license_plate").setValue("TEST PLATE");
- dbReference.child("drivers").child(userId).child("time_driving").setValue("5 years");
- dbReference.child("icon_users").child(userId).child("driver").setValue(true);
- }
- else {
- dbReference.child("icon_users").child(userId).child("driver").setValue(false);
- }
- //finish();
- Toast.makeText(Register.this, "registration successful",Toast.LENGTH_SHORT).show();
- Intent home = new Intent(Register.this, Homepage.class);
- startActivity(home);
-
- }
- else {
- Toast.makeText(Register.this, "registration not successful",Toast.LENGTH_SHORT).show();
- }
- }
- });
- }
+ Button user_register = findViewById(R.id.user_signup);
+ Button driver_register = findViewById(R.id.driver_signup);
+
+ //user button listener
+ user_register.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent i = new Intent(Register.this, User_Register.class);
+ startActivity(i);
+ }
+ });
+
+ //driver button listener
+ driver_register.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent i = new Intent(Register.this, Driver_Register.class);
+ startActivity(i);
+ }
+ });
}
-
}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Route.java b/src/main/java/com/example/liliyayankova/unirides/Route.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ce8969b15fc4fa539fa3181df4ccfcf3448bf8b
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Route.java
@@ -0,0 +1,89 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+public class Route extends AppCompatActivity {
+
+ //TODO: This entire activity for creating and posting routes needs to be done.
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_route);
+
+ //setting the user_toolbar layout as the action bar
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ try {
+ setSupportActionBar(toolbar);
+ } catch (Exception e) {
+ Log.e("TOOLBAR", e.toString());
+ }
+
+ }
+
+ //Override for the user_toolbar menu items
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater menuInflater = getMenuInflater();
+ menuInflater.inflate(R.menu.toolbar_menu, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+
+ //checks the id of the item, if the item id matches a case id then the code in that case block will execute
+ switch(item.getItemId()){
+
+ case(R.id.item_home):
+
+ Intent home_i = new Intent(Route.this, Driver_Main.class);
+ startActivity(home_i);
+ return true;
+
+
+ case(R.id.item_logout):
+
+ /*
+ TODO:
+ Possibly add a way to log out here? (not sure if we are even tracking the login instance
+ within each activity? as far as I understand the login just gets you to the next activity
+ however if you "logout" and just press the back button after it takes you back to the homepage
+ it will act as if you are still logged in when you reenter).
+ for now i have just set it so it goes back to the homepage (where you can register or login).
+ */
+
+ Toast.makeText(Route.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+ Intent logout_i = new Intent(Route.this, Homepage.class);
+ startActivity(logout_i);
+
+ return true;
+
+ case(R.id.item_profile):
+
+ Intent profile_i = new Intent(Route.this, Profile.class);
+ profile_i.putExtra("userType", Login.userType.DRIVER);
+ startActivity(profile_i);
+
+ return true;
+
+ case(R.id.item_settings):
+
+ Intent settings_i = new Intent(Route.this, Settings.class);
+ settings_i.putExtra("userType", Login.userType.DRIVER);
+ startActivity(settings_i);
+ return true;
+
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Settings.java b/src/main/java/com/example/liliyayankova/unirides/Settings.java
index e31a6c286fa78ba47ece672473e5f616f9d7c858..fd107c50802332865e7be0bac3a356f74ba3c967 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Settings.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Settings.java
@@ -12,12 +12,27 @@ import android.widget.Toast;
public class Settings extends AppCompatActivity {
+ //TODO: layout and functionality of settings activity need to be done!
+
+ private boolean isDriver;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings);
- //setting the toolbar layout as the action bar
+ //assume the user is a passenger (isDriver = false) unless bundle extra userType value is DRIVER
+ isDriver = false;
+
+ /* checking if there are any bundle extras (should be the userType) */
+ if(getIntent().getExtras() != null) {
+ //setting userType to this result (DRIVER or PASSENGER)
+ if(getIntent().getExtras().get("userType") == Login.userType.DRIVER){
+ isDriver = true;
+ }
+ }
+
+ //setting the user_toolbar layout as the action bar
Toolbar toolbar = findViewById(R.id.toolbar);
try {
setSupportActionBar(toolbar);
@@ -26,7 +41,7 @@ public class Settings extends AppCompatActivity {
}
}
- //Override for the toolbar menu items
+ //Override for the user_toolbar menu items
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater menuInflater = getMenuInflater();
@@ -42,19 +57,25 @@ public class Settings extends AppCompatActivity {
case(R.id.item_home):
- Intent home_i = new Intent(Settings.this, Main.class);
- startActivity(home_i);
- return true;
+ if (isDriver) {
+ Intent home_i = new Intent(Settings.this, Driver_Main.class);
+ startActivity(home_i);
+ return true;
+ }else{
+ Intent home_i = new Intent(Settings.this, User_Main.class);
+ startActivity(home_i);
+ return true;
+ }
case(R.id.item_logout):
- /** TODO:
- * Possibly add a way to log out here? (not sure if we are even tracking the login instance
- * within each activity? as far as I understand the login just gets you to the next activity
- * however if you "logout" and just press the back button after it takes you back to the homepage
- * it will act as if you are still logged in when you reenter).
- *
- * -- for now i have just set it so it goes back to the homepage.
+ /*
+ TODO:
+ Possibly add a way to log out here? (not sure if we are even tracking the login instance
+ within each activity? as far as I understand the login just gets you to the next activity
+ however if you "logout" and just press the back button after it takes you back to the homepage
+ it will act as if you are still logged in when you reenter).
+ for now i have just set it so it goes back to the homepage (where you can register or login).
*/
Toast.makeText(Settings.this, "successfully logged out", Toast.LENGTH_SHORT).show();
@@ -66,13 +87,20 @@ public class Settings extends AppCompatActivity {
case(R.id.item_profile):
Intent profile_i = new Intent(Settings.this, Profile.class);
+
+ if(isDriver){
+ profile_i.putExtra("userType", Login.userType.DRIVER);
+ }else{
+ profile_i.putExtra("userType", Login.userType.PASSENGER);
+ }
+
startActivity(profile_i);
+
return true;
case(R.id.item_settings):
- Intent settings_i = new Intent(Settings.this, Settings.class);
- startActivity(settings_i);
+ //do nothing (already on the settings page)
return true;
}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Main.java b/src/main/java/com/example/liliyayankova/unirides/User_Main.java
similarity index 62%
rename from src/main/java/com/example/liliyayankova/unirides/Main.java
rename to src/main/java/com/example/liliyayankova/unirides/User_Main.java
index 7d43874c6a0adcf268cec6d75793e2078beee8a3..b2bb785e00ea2eea4059eff1aeae4a68188178bf 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Main.java
+++ b/src/main/java/com/example/liliyayankova/unirides/User_Main.java
@@ -9,18 +9,17 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import android.widget.Button;
import android.widget.ImageButton;
import android.widget.Toast;
-public class Main extends AppCompatActivity {
+public class User_Main extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
+ setContentView(R.layout.activity_user_main);
- //setting the toolbar layout as the action bar
+ //setting the user_toolbar layout as the action bar
Toolbar toolbar = findViewById(R.id.toolbar);
try {
setSupportActionBar(toolbar);
@@ -28,18 +27,18 @@ public class Main extends AppCompatActivity {
Log.e("TOOLBAR", e.toString());
}
- ImageButton map_button = (ImageButton) findViewById(R.id.mapview_button);
+ ImageButton map_button = findViewById(R.id.view_route_button);
map_button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Intent map_i = new Intent(Main.this, Map.class);
+ Intent map_i = new Intent(User_Main.this, Map.class);
startActivity(map_i);
}
});
}
- //Override for the toolbar menu items
+ //Override for the user_toolbar menu items
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater menuInflater = getMenuInflater();
@@ -60,30 +59,32 @@ public class Main extends AppCompatActivity {
case(R.id.item_logout):
- /** TODO:
- * Possibly add a way to log out here? (not sure if we are even tracking the login instance
- * within each activity? as far as I understand the login just gets you to the next activity
- * however if you "logout" and just press the back button after it takes you back to the homepage
- * it will act as if you are still logged in when you reenter).
- *
- * -- for now i have just set it so it goes back to the homepage.
+ /*
+ TODO:
+ Possibly add a way to log out here? (not sure if we are even tracking the login instance
+ within each activity? as far as I understand the login just gets you to the next activity
+ however if you "logout" and just press the back button after it takes you back to the homepage
+ it will act as if you are still logged in when you reenter).
+ for now i have just set it so it goes back to the homepage (where you can register or login).
*/
- Toast.makeText(Main.this, "successfully logged out", Toast.LENGTH_SHORT).show();
- Intent logout_i = new Intent(Main.this, Homepage.class);
+ Toast.makeText(User_Main.this, "successfully logged out", Toast.LENGTH_SHORT).show();
+ Intent logout_i = new Intent(User_Main.this, Homepage.class);
startActivity(logout_i);
return true;
case(R.id.item_profile):
- Intent profile_i = new Intent(Main.this, Profile.class);
+ Intent profile_i = new Intent(User_Main.this, Profile.class);
+ profile_i.putExtra("userType", Login.userType.PASSENGER);
startActivity(profile_i);
return true;
case(R.id.item_settings):
- Intent settings_i = new Intent(Main.this, Settings.class);
+ Intent settings_i = new Intent(User_Main.this, Settings.class);
+ settings_i.putExtra("userType", Login.userType.PASSENGER);
startActivity(settings_i);
return true;
diff --git a/src/main/java/com/example/liliyayankova/unirides/User_Register.java b/src/main/java/com/example/liliyayankova/unirides/User_Register.java
new file mode 100644
index 0000000000000000000000000000000000000000..55fcee015b97f21a70c2b060b4938785638c4868
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/User_Register.java
@@ -0,0 +1,117 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.auth.AuthResult;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+public class User_Register extends AppCompatActivity {
+ private EditText forename;
+ private EditText surname;
+ private EditText email;
+ private EditText password;
+ private EditText age;
+ private Button sign_up;
+
+ /* Used for Firebase authorisation in creating a new account */
+ private FirebaseAuth firebaseAuth;
+
+ /* Allows access to the Firebase Database */
+ private FirebaseDatabase firebaseDatabase;
+
+ /* Used to add values to the database */
+ private DatabaseReference dbReference;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_user_register);
+ this.forename = (EditText) findViewById(R.id.forename);
+ this.surname = (EditText) findViewById(R.id.surname);
+ this.email = (EditText) findViewById(R.id.email);
+ this.password = (EditText) findViewById(R.id.password);
+ this.age = (EditText) findViewById(R.id.age);
+ this.sign_up = (Button) findViewById(R.id.signup_button);
+
+ this.firebaseAuth = FirebaseAuth.getInstance();
+ this.firebaseDatabase = FirebaseDatabase.getInstance();
+ this.dbReference = firebaseDatabase.getReference();
+
+ //sign_up button listener
+ sign_up.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ //execute register method
+ registerClick(view);
+ }
+ });
+
+
+ }
+
+ public void registerClick(View v) {
+ final String forenameText = forename.getText().toString().trim();
+ final String surnameText = surname.getText().toString().trim();
+ final String emailText = email.getText().toString().trim();
+ final String passwordText = password.getText().toString().trim();
+ final String ageText = age.getText().toString().trim();
+
+ Log.d("Email", emailText);
+ Log.d("Password", passwordText);
+
+ if(TextUtils.isEmpty(forenameText) || TextUtils.isEmpty(surnameText)
+ || TextUtils.isEmpty(emailText) || TextUtils.isEmpty(passwordText)
+ || TextUtils.isEmpty(passwordText) || TextUtils.isEmpty(ageText)) {
+ Toast.makeText(this, "One of the fields is empty!",Toast.LENGTH_SHORT).show();
+
+ }
+
+ else {
+ firebaseAuth.createUserWithEmailAndPassword(emailText, passwordText)
+ .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+ @Override
+ public void onComplete(@NonNull Task<AuthResult> task) {
+ if(task.isSuccessful()) {
+ FirebaseUser user = firebaseAuth.getCurrentUser();
+ String userId = user.getUid();
+ Toast.makeText(User_Register.this, forenameText,Toast.LENGTH_SHORT).show();
+
+ // Code to add values into the database
+ // Only temporary for now, might change these a bit later
+ dbReference.child("passengers").child(userId).child("first_name").setValue(forenameText);
+ dbReference.child("passengers").child(userId).child("last_name").setValue(surnameText);
+ dbReference.child("passengers").child(userId).child("age").setValue(ageText);
+ dbReference.child("passengers").child(userId).child("email").setValue(emailText);
+ dbReference.child("passengers").child(userId).child("average_rating").setValue(0.0);
+
+
+ //finish();
+ Toast.makeText(User_Register.this, "registration successful",Toast.LENGTH_SHORT).show();
+ Intent home = new Intent(User_Register.this, Homepage.class);
+ startActivity(home);
+
+ }
+ else {
+ Toast.makeText(User_Register.this, "registration not successful",Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+ }
+
+ }
+
+}
diff --git a/src/main/res/layout/activity_driver_main.xml b/src/main/res/layout/activity_driver_main.xml
new file mode 100644
index 0000000000000000000000000000000000000000..77d46787a05cdebfc12e7acf0a284babb1de2070
--- /dev/null
+++ b/src/main/res/layout/activity_driver_main.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/common_google_signin_btn_text_dark_pressed"
+ android:orientation="vertical"
+ tools:context=".User_Main">
+
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/user_toolbar" />
+
+ <ImageView
+ android:id="@+id/app_logo_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:contentDescription="@string/app_name"
+ app:srcCompat="@drawable/logo_hd" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/view_route_button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="30dp"
+ android:layout_weight="1"
+ android:background="@color/common_google_signin_btn_text_dark_disabled"
+ android:contentDescription="@string/view_routes"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_map"
+ android:text="@string/title_activity_map" />
+
+ <ImageButton
+ android:id="@+id/create_route_button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="30dp"
+ android:layout_weight="1"
+ android:background="@color/common_google_signin_btn_text_dark_disabled"
+ android:contentDescription="@string/create_route"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_plus"
+ android:text="@string/title_activity_map" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_weight="0"
+ android:orientation="horizontal">
+
+ <TextView
+ android:id="@+id/view_route_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:text="@string/view_routes"
+ android:textAllCaps="false"
+ android:textSize="30sp" />
+
+ <TextView
+ android:id="@+id/create_route_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:text="@string/create_route"
+ android:textAllCaps="false"
+ android:textSize="30sp" />
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_driver_register.xml b/src/main/res/layout/activity_driver_register.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4c0c21b56bc53853895f756b00ee8f4af46575cc
--- /dev/null
+++ b/src/main/res/layout/activity_driver_register.xml
@@ -0,0 +1,129 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp">
+
+ <TextView
+ android:id="@+id/driver_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="50dp"
+ android:text="@string/driver_register"
+ android:textSize="30sp"
+ android:textStyle="bold" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <EditText
+ android:id="@+id/forename"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/name"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/surname"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/lastname"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/email"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_email"
+ android:inputType="textEmailAddress" />
+
+ <EditText
+ android:id="@+id/password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_password"
+ android:inputType="textPassword" />
+
+ <EditText
+ android:id="@+id/age"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_age"
+ android:inputType="number" />
+
+ <EditText
+ android:id="@+id/car_model"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/car_model"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/license_plate"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/licence_plate"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/time_driving"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/time_driving"
+ android:inputType="text" />
+
+ <!-- Potentially temporary -->
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/tickbox_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="5dp"
+ android:text="@string/tickbox_text"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <CheckBox
+ android:id="@+id/checkBox_student"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/student_confirmation" />
+
+ <CheckBox
+ android:id="@+id/checkBox_TandC"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/terms_and_conditions" />
+
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/signup_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginBottom="100dp"
+ android:background="@color/colorPrimaryDark"
+ android:text="@string/sign"
+ android:textColor="#FFFFFF" />
+
+
+</LinearLayout>
+
+
+
diff --git a/src/main/res/layout/activity_homepage.xml b/src/main/res/layout/activity_homepage.xml
index e7bc7a4f1a7e44698e931c79757da55eb94c5060..97ad14a6fe6fcacfe982a17e22a4cf636d57bdaf 100644
--- a/src/main/res/layout/activity_homepage.xml
+++ b/src/main/res/layout/activity_homepage.xml
@@ -16,9 +16,9 @@
<ImageView
android:id="@+id/imageView4"
- android:layout_width="400dp"
- android:layout_height="400dp"
- android:layout_weight="0"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1.3"
android:contentDescription="@string/app_logo"
android:src="@drawable/logo_hd"
tools:layout_editor_absoluteX="24dp"
@@ -27,40 +27,65 @@
<TextView
android:id="@+id/welcome"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="2"
+ android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/welcome"
android:textAlignment="center"
android:textAllCaps="true"
android:textColor="@color/colorPrimary"
+ android:textSize="24sp"
android:textStyle="bold|italic" />
<TextView
android:id="@+id/subh"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_weight="2"
+ android:layout_height="wrap_content"
android:gravity="top"
android:text="@string/subheading"
android:textAlignment="center"
android:textColor="@color/colorPrimary"
+ android:textSize="18sp"
android:textStyle="italic" />
+ <ImageButton
+ android:id="@+id/offline_map"
+ android:layout_width="200dp"
+ android:layout_height="200dp"
+ android:layout_gravity="center"
+ android:layout_marginTop="30dp"
+ android:contentDescription="@string/offline_map"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_map" />
+
+ <TextView
+ android:id="@+id/map_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:fontFamily="sans-serif"
+ android:gravity="top"
+ android:text="@string/offline_map"
+ android:textAlignment="center"
+ android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+ android:textColor="@color/colorPrimary"
+ android:textSize="18sp" />
+
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="2"
+ android:layout_weight="1.5"
android:gravity="center"
android:orientation="horizontal">
<Button
android:id="@+id/loginB"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="20dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="50dp"
+ android:layout_marginTop="70dp"
+ android:layout_marginEnd="25dp"
+ android:layout_marginBottom="50dp"
+ android:layout_weight="1"
android:background="@color/colorPrimary"
android:text="@string/login"
android:textAllCaps="false"
@@ -70,10 +95,13 @@
<Button
android:id="@+id/registerB"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="20dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="25dp"
+ android:layout_marginTop="70dp"
+ android:layout_marginEnd="50dp"
+ android:layout_marginBottom="50dp"
+ android:layout_weight="1"
android:background="@color/colorPrimaryDark"
android:text="@string/register"
android:textAllCaps="false"
diff --git a/src/main/res/layout/activity_login.xml b/src/main/res/layout/activity_login.xml
index c14178ea29d9b38dac77d0cee350f033a67ffab8..d6c8087c2edec6488d97cd02acae2a4a9c9d32d7 100644
--- a/src/main/res/layout/activity_login.xml
+++ b/src/main/res/layout/activity_login.xml
@@ -24,7 +24,7 @@
android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="0"
+ android:layout_weight="1"
android:foregroundGravity="center">
<LinearLayout
@@ -46,7 +46,7 @@
android:inputType="textEmailAddress"
android:maxLines="1"
android:singleLine="true"
- android:text="user@surrey.ac.uk" />
+ android:text="driv3r@surrey.ac.uk" />
</android.support.design.widget.TextInputLayout>
@@ -65,7 +65,7 @@
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"
- android:text="password" />
+ android:text="qwerty" />
</android.support.design.widget.TextInputLayout>
@@ -82,4 +82,26 @@
</LinearLayout>
</ScrollView>
+
+ <TextView
+ android:id="@+id/hint_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Easy Logins for Testing (will be removed later!)"
+ android:textSize="24sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/hint_for_tests"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Passenger: Username = passenger@surrey.ac.uk, password = password"
+ android:textSize="24sp" />
+
+ <TextView
+ android:id="@+id/hint_for_tests2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Driver: Username = driv3r@surrey.ac.uk, password = qwerty"
+ android:textSize="24sp" />
</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_map.xml b/src/main/res/layout/activity_map.xml
index 3ee874c14b6eb2f5f7dc4daddac0060571862026..1e48ff9697cd6f7a6bf89f454116942dde7900a4 100644
--- a/src/main/res/layout/activity_map.xml
+++ b/src/main/res/layout/activity_map.xml
@@ -1,7 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical"
+ tools:context=".Map">
+
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/user_toolbar" />
+
+ <fragment
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
@@ -10,5 +20,4 @@
-
-
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_offline__map.xml b/src/main/res/layout/activity_offline__map.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1d94a67e4818372877e67a0963cabc810f7c2bfc
--- /dev/null
+++ b/src/main/res/layout/activity_offline__map.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/common_google_signin_btn_text_dark_default"
+ android:gravity="center"
+ android:orientation="vertical"
+ tools:context=".Offline_Map">
+
+ <fragment
+ android:id="@+id/map"
+ android:name="com.google.android.gms.maps.SupportMapFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ tools:context=".Offline_Map" />
+
+ <Button
+ android:id="@+id/back_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/common_google_signin_btn_icon_light_normal_background"
+ android:backgroundTint="@color/common_google_signin_btn_text_dark_default"
+ android:text="@string/back" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_profile.xml b/src/main/res/layout/activity_profile.xml
index a3f1033503cd830dc6e3e62cf125ee758e32f88c..bc06fdb072032f9a4f57a4f34f834428c11bfe04 100644
--- a/src/main/res/layout/activity_profile.xml
+++ b/src/main/res/layout/activity_profile.xml
@@ -9,7 +9,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/user_toolbar" />
<TextView
android:id="@+id/profile_text"
diff --git a/src/main/res/layout/activity_register.xml b/src/main/res/layout/activity_register.xml
index 19705ba7fe8a84526516164c63dbf425c2cc6bb6..7dfedb11734c0a1a5a9b7f154de40598f602a00c 100644
--- a/src/main/res/layout/activity_register.xml
+++ b/src/main/res/layout/activity_register.xml
@@ -1,104 +1,60 @@
-
+<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="10dp">
+ tools:context=".Register">
- <LinearLayout
+ <TextView
+ android:id="@+id/title_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="2"
+ android:layout_weight="1"
android:gravity="center"
- android:orientation="vertical">
-
- <EditText
- android:id="@+id/forename"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/name"
- android:inputType="text" />
-
- <EditText
- android:id="@+id/surname"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/lastname"
- android:inputType="text" />
-
- <EditText
- android:id="@+id/email"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/prompt_email"
- android:inputType="textEmailAddress" />
-
- <EditText
- android:id="@+id/password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/prompt_password"
- android:inputType="textPassword"
- />
-
- <EditText
- android:id="@+id/age"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="@string/prompt_age"
- android:inputType="number" />
- <CheckBox
- android:id="@+id/checkBox_driver"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/driver_checkbox" /> <!-- Potentially temporary -->
+ android:text="@string/register"
+ android:textAllCaps="false"
+ android:textStyle="bold"
+ android:textSize="30sp" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/info_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="20dp"
+ android:layout_weight="0.5"
+ android:text="@string/register_info"
+ android:textAlignment="center"
+ android:textSize="18sp" />
- <LinearLayout
+ <Button
+ android:id="@+id/user_signup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_margin="20dp"
android:layout_weight="1"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/tickbox_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="5dp"
- android:text="@string/tickbox_text"
- android:textSize="14sp"
- android:textStyle="bold" />
-
- <CheckBox
- android:id="@+id/checkBox_student"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/student_confirmation" />
-
- <CheckBox
- android:id="@+id/checkBox_TandC"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/terms_and_conditions" />
-
- </LinearLayout>
+ android:background="@color/colorPrimary"
+ android:gravity="center"
+ android:text="@string/user_register"
+ android:textAllCaps="true"
+ android:textColor="@color/ic_launcher_background"
+ android:textStyle="bold" />
<Button
- android:id="@+id/signup"
- android:layout_width="wrap_content"
+ android:id="@+id/driver_signup"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginBottom="100dp"
- android:background="@color/colorPrimary"
- android:onClick="registerClick"
- android:text="@string/sign"
+ android:layout_gravity="center_vertical"
+ android:layout_margin="20dp"
+ android:layout_weight="1"
+ android:background="@color/colorPrimaryDark"
+ android:gravity="center"
+ android:text="@string/driver_register"
android:textAllCaps="true"
android:textColor="@color/ic_launcher_background"
android:textStyle="bold" />
</LinearLayout>
-
-
-
diff --git a/src/main/res/layout/activity_route.xml b/src/main/res/layout/activity_route.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9bfa69c17399f4da93a03e33de6b9f3376b8f92e
--- /dev/null
+++ b/src/main/res/layout/activity_route.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ tools:context=".Settings">
+
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/user_toolbar" />
+
+ <TextView
+ android:id="@+id/create_route_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="20dp"
+ android:gravity="center"
+ android:text="@string/create_route"
+ android:textSize="30sp" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_settings.xml b/src/main/res/layout/activity_settings.xml
index d7af5fa076b7818646f2ad9f0adcad949428ff5b..8c32defa6d77eb8b0d06b7f06c82a520079283ac 100644
--- a/src/main/res/layout/activity_settings.xml
+++ b/src/main/res/layout/activity_settings.xml
@@ -9,7 +9,7 @@
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/user_toolbar" />
<TextView
android:id="@+id/settings_text"
diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_user_main.xml
similarity index 87%
rename from src/main/res/layout/activity_main.xml
rename to src/main/res/layout/activity_user_main.xml
index 971df9b4c9637ee4dab9952a9b2e225be78dc9f7..e70cdb326e124921d7ec1aaac8a1af5bf14a5cf7 100644
--- a/src/main/res/layout/activity_main.xml
+++ b/src/main/res/layout/activity_user_main.xml
@@ -6,11 +6,11 @@
android:layout_height="match_parent"
android:background="@color/common_google_signin_btn_text_dark_pressed"
android:orientation="vertical"
- tools:context=".Main">
+ tools:context=".User_Main">
<include
android:id="@+id/toolbar"
- layout="@layout/toolbar" />
+ layout="@layout/user_toolbar" />
<ImageView
android:id="@+id/app_logo_image"
@@ -27,14 +27,14 @@
android:orientation="horizontal">
<ImageButton
- android:id="@+id/mapview_button"
+ android:id="@+id/view_route_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:background="@color/common_google_signin_btn_text_dark_disabled"
- android:contentDescription="@string/routes"
+ android:contentDescription="@string/view_routes"
android:scaleType="fitCenter"
android:src="@drawable/icon_map"
android:text="@string/title_activity_map" />
@@ -48,11 +48,11 @@
android:orientation="horizontal">
<TextView
- android:id="@+id/map_text"
+ android:id="@+id/view_route_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- android:text="@string/routes"
+ android:text="@string/view_routes"
android:textAllCaps="false"
android:textSize="30sp" />
diff --git a/src/main/res/layout/activity_user_register.xml b/src/main/res/layout/activity_user_register.xml
new file mode 100644
index 0000000000000000000000000000000000000000..826e1566778f8fe25e2d1e2817ab098eb4c8128f
--- /dev/null
+++ b/src/main/res/layout/activity_user_register.xml
@@ -0,0 +1,108 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp">
+
+ <TextView
+ android:id="@+id/user_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginTop="50dp"
+ android:text="@string/user_register"
+ android:textSize="30sp"
+ android:textStyle="bold" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1.2"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <EditText
+ android:id="@+id/forename"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/name"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/surname"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/lastname"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/email"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_email"
+ android:inputType="textEmailAddress" />
+
+ <EditText
+ android:id="@+id/password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_password"
+ android:inputType="textPassword" />
+
+ <EditText
+ android:id="@+id/age"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_age"
+ android:inputType="number" />
+
+ <!-- Potentially temporary -->
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/tickbox_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="5dp"
+ android:text="@string/tickbox_text"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+
+ <CheckBox
+ android:id="@+id/checkBox_student"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/student_confirmation" />
+
+ <CheckBox
+ android:id="@+id/checkBox_TandC"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/terms_and_conditions" />
+
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/signup_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="20dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginBottom="100dp"
+ android:background="@color/colorPrimary"
+ android:text="@string/sign"
+ android:textColor="#FFFFFF" />
+
+
+</LinearLayout>
+
+
+
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/user_toolbar.xml
similarity index 93%
rename from src/main/res/layout/toolbar.xml
rename to src/main/res/layout/user_toolbar.xml
index 42ffab24581b5f6d406701b9f2e288c5674262e1..48fabe1c6b7abff7e81805c0ff56ce5f6f7a77d5 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/user_toolbar.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/toolbar"
+ android:id="@+id/driver_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="1"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0dec3066da8dc4684a1b03400473b291389c1d41..a0229542111dce4aeaae65de8bb1a362cfd1d5c5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -6,9 +6,22 @@
<string name="login">Log in</string>
<string name="logout">Log out</string>
<string name="register">Register</string>
+ <!-- TODO: remove/refine the register information for choosing between passenger & driver account -->
+ <string name="register_info">
+ "Choose whether you would like to sign up to UniRides as a Driver user or a Passenger user.\n
+ A driver user can do anything a passenger can do on the app (such as: viewing routes, getting lifts
+ from other drivers, and reviewing other users) but with the added privileges to setup your own
+ custom driver routes and post them for other passengers/drivers to see.\n
+ If you are going to become a driver for UniRides, first of all THANK YOU!\n
+ Secondly, be sure to have your car details (model, licence plate, etc.) as well as your drivers licence
+ and pictures of you and the car at the ready!"
+ </string>
+ <!-- TODO: add the terms and conditions in as a string! -->
+ <string name="user_register">User</string>
+ <string name="driver_register">Driver</string>
<string name="title_activity_login">Sign in</string>
- <!-- Strings related to login -->
+ <!-- Strings related to register/login -->
<string name="prompt_email">Email</string>
<string name="prompt_password">Password</string>
<string name="action_sign_in">Log in</string>
@@ -26,16 +39,21 @@
<string name="sign">Sign up</string>
<string name="app_logo">App Logo</string>
<string name="tickbox_text">Tick the appropriate boxes:</string>
- <string name="driver_checkbox">I am a driver</string> <!-- potentially temporary -->
<string name="student_confirmation">I am a university student or professor</string>
<string name="terms_and_conditions">I agree with UniRides Terms and Conditions</string>
+ <string name="licence_plate">Licence Plate</string>
+ <string name="car_model">Car Model</string>
+ <string name="time_driving">Time Driving</string>
<!-- main/map activity strings -->
<string name="home">Home</string>
<string name="title_activity_map">Map</string>
- <string name="routes">Routes</string>
+ <string name="view_routes">View Routes</string>
+ <string name="create_route">Create New Route</string>
<string name="settings">Settings</string>
<string name="profile">Profile</string>
+ <string name="offline_map">Offline Map</string>
+ <string name="back">Back</string>
<!-- Free for commercial use icon credit for any file in drawable with the "icon_" keyword-->
<string name="icon_credit">Icons made by Smashicons and Roundicons</string>
diff --git a/unirides.iml b/unirides.iml
new file mode 100644
index 0000000000000000000000000000000000000000..609bd6f3ae67e9d7735ffa5526219985622e64d4
--- /dev/null
+++ b/unirides.iml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="unirides" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="android-gradle" name="Android-Gradle">
+ <configuration>
+ <option name="GRADLE_PROJECT_PATH" value=":" />
+ </configuration>
+ </facet>
+ <facet type="android" name="Android">
+ <configuration>
+ <option name="SELECTED_BUILD_VARIANT" value="debug" />
+ <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+ <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+ <afterSyncTasks>
+ <task>generateDebugSources</task>
+ </afterSyncTasks>
+ <option name="ALLOW_USER_CONFIGURATION" value="false" />
+ <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+ <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+ <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/google-services/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+ <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
+ <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+ <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+ <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+ <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" />
+ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+ <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" />
+ <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/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/external_libs_dex" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint-cache" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
+ <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" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
+ <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/res" />
+ <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/symbols" />
+ <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" />
+ <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+ <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+ </content>
+ <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk:16.4.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk-api:16.4.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth:16.2.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:17.0.3@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-api:16.4.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-location:16.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-database-collection:16.0.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-base:16.4.0@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-maps:16.1.0@aar" level="project" />
+ <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.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" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-places-placereport:16.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics:16.4.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-database:16.1.0@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth-interop:16.0.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement:16.4.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop:16.0.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-impl:16.4.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats:16.0.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:16.1.0@aar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
+ <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
+ <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector:17.0.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value-annotations:1.6@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar" level="project" />
+ </component>
+</module>
\ No newline at end of file