diff --git a/.gradle/4.10.1/javaCompile/javaCompile.lock b/.gradle/4.10.1/javaCompile/javaCompile.lock
index a0deb773c19848d97bf00652e5b4afa086e2fe24..0fbb7d68e70b8e059d51ebc3adb2ea36a615edb8 100644
Binary files a/.gradle/4.10.1/javaCompile/javaCompile.lock and b/.gradle/4.10.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/4.10.1/javaCompile/taskHistory.bin b/.gradle/4.10.1/javaCompile/taskHistory.bin
index 2b831ad58146a8c46890b464c6b96711b27656a7..61f64170c80516d9736e5700f0ef1adf568f920c 100644
Binary files a/.gradle/4.10.1/javaCompile/taskHistory.bin and b/.gradle/4.10.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.bin b/.gradle/4.10.1/taskHistory/taskHistory.bin
index a65d1213ddc6d7016b5477e910bc54ca4c07e0fd..32ec052b5b9f7a81345af0f75319d8b0ae7a6e9e 100644
Binary files a/.gradle/4.10.1/taskHistory/taskHistory.bin and b/.gradle/4.10.1/taskHistory/taskHistory.bin differ
diff --git a/.gradle/4.10.1/taskHistory/taskHistory.lock b/.gradle/4.10.1/taskHistory/taskHistory.lock
index bcc4caa6c81de157533a4bb9fc0d1559067c54c9..59263564cdf3c5b9cf947fb73cfc2c7e810a1930 100644
Binary files a/.gradle/4.10.1/taskHistory/taskHistory.lock and b/.gradle/4.10.1/taskHistory/taskHistory.lock differ
diff --git a/.gradle/4.8/fileChanges/last-build.bin b/.gradle/4.8/fileChanges/last-build.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d
Binary files /dev/null and b/.gradle/4.8/fileChanges/last-build.bin differ
diff --git a/.gradle/4.8/fileHashes/fileHashes.bin b/.gradle/4.8/fileHashes/fileHashes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..56c0695e395c724e2b261bd16bfb090ac616fb34
Binary files /dev/null and b/.gradle/4.8/fileHashes/fileHashes.bin differ
diff --git a/.gradle/4.8/fileHashes/fileHashes.lock b/.gradle/4.8/fileHashes/fileHashes.lock
new file mode 100644
index 0000000000000000000000000000000000000000..2bf652c2fa75391cc822253f684b460b74ca04aa
Binary files /dev/null and b/.gradle/4.8/fileHashes/fileHashes.lock differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 2cb21905a5216054e5c618ceb1c982d5891ca636..2abc87c6c48ee2f198e3713c3e8c9df731688476 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 d481e97fd5d117a200907cf02b6c6885b089ac3c..4b1eea7351c74f652385a37302faf73e95aaec18 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/vcsWorkingDirs/gc.properties b/.gradle/vcsWorkingDirs/gc.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..80d8bd823234f656e0671bd81910f699ee04881f
--- /dev/null
+++ b/.idea/assetWizardSettings.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="WizardSettings">
+ <option name="children">
+ <map>
+ <entry key="imageWizard">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="imageAssetPanel">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="actionbar">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="clipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ <option name="values">
+ <map>
+ <entry key="theme" value="HOLO_DARK" />
+ <entry key="themeColor" value="ffffff" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="launcher">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="foregroundImage">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ <entry key="scalingPercent" value="55" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ <option name="values">
+ <map>
+ <entry key="backgroundAssetType" value="COLOR" />
+ <entry key="backgroundColor" value="ffffff" />
+ <entry key="foregroundImage" value="C:\Users\james\Documents\COM2027\logo\4k logo (icon).png" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="launcherLegacy">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="clipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ <entry key="notification">
+ <value>
+ <PersistentState>
+ <option name="children">
+ <map>
+ <entry key="clipArt">
+ <value>
+ <PersistentState>
+ <option name="values">
+ <map>
+ <entry key="color" value="000000" />
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </PersistentState>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index a29fe13a7476d4859fd611eb81bb6926384c4a49..6eac8d181dd47b14d9a4c0249aec623388bae4fb 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 4ea9ff1ccca795ee07f2d401c3331d5757ae57c3..c31f1dcb5b6155784b7c1cdcb5f1664b37d89709 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 35070e5efa730860723770c37dcf3f429d16ddaf..1e1173ccab078a4e7c08b963e276ab9e31e3f588 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-1/files-1.1/runtime-1.1.1.aar/d94db4598cf38cab0ec989cb75296007/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/d94db4598cf38cab0ec989cb75296007/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/4647f3c5a259358cabd500cdaaf3bce9/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/4647f3c5a259358cabd500cdaaf3bce9/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
index 0509f076ab4bb1fba716ee9f6c3eb486d21a0b82..415ba1b9a3491204611267c307a247712d0ea454 100644
--- a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
+++ b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/34e3cd7605fb8921b189f38ddcb18cc9/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/34e3cd7605fb8921b189f38ddcb18cc9/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/08e6c1267380e46c817ffae47aca85e1/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-1.1.1.aar/08e6c1267380e46c817ffae47aca85e1/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 ba1e1fcc6f99757e1913449a427c43e5fd184ebb..22ed136cd86b2e6a81a8e9a4b88c95dcd5b95613 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-1/files-1.1/livedata-core-1.1.1.aar/fc7181c740664f3fa0c34bf297f96676/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/fc7181c740664f3fa0c34bf297f96676/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/9e2c26262ba7f1416e0135ca0b4dc120/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.1.aar/9e2c26262ba7f1416e0135ca0b4dc120/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml
index 5e80c08d08fd1678c195e2dfeca425298f65937c..51f6df0f7e8e098f7fbffa1c6b88c68be28501e4 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-1/files-1.1/runtime-1.1.1.aar/36007207e8f3cc80a586e7b5e9be90ff/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/36007207e8f3cc80a586e7b5e9be90ff/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/8f13024dca789f7443f49ac349a11b66/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runtime-1.1.1.aar/8f13024dca789f7443f49ac349a11b66/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 33e9c41d56cc019a25e93f6b5cfa70397ab953ab..59147f0f1e14d02afbbc60de9a2b0acdf06220e9 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-1/files-1.1/viewmodel-1.1.1.aar/1ae206ec88f58aec6fd5447bb1493e51/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/1ae206ec88f58aec6fd5447bb1493e51/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/897c6994fb3b4cd6cd179588f223a5dc/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.1.aar/897c6994fb3b4cd6cd179588f223a5dc/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml
index 4aef7416d0b27865f1a9c86b9d01e7431b748e33..f9990f435f8cc73a188fa92701f50304bf833467 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-1/files-1.1/animated-vector-drawable-28.0.0.aar/e2530501899080b859de2d1da9ce7cba/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/e2530501899080b859de2d1da9ce7cba/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/b72e7a2d212dce39ed88a29849b101aa/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-28.0.0.aar/b72e7a2d212dce39ed88a29849b101aa/jars/classes.jar!/" />
</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 3d7fd106fa9bd28425639732d8196e5d6abfffb1..75b46b00ea073e134a723efcad6bc078b7ea87b0 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-1/files-1.1/appcompat-v7-28.0.0.aar/f7b6d96335c1f016c4cfa5bc1651c079/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/47e4059b1cfec398fc169d2545728a80/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/f7b6d96335c1f016c4cfa5bc1651c079/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/f7b6d96335c1f016c4cfa5bc1651c079/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/47e4059b1cfec398fc169d2545728a80/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-28.0.0.aar/47e4059b1cfec398fc169d2545728a80/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml
index 76a1a0ce0ac58d991fa4f070d784e9041e5b8b7f..13d1a384205ad1edbc63d2f2f0de48bbd0378071 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/be68762749c9501caf166fb70688119e/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/be68762749c9501caf166fb70688119e/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/99d0c1da0f6372a2480d760f94976fce/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/asynclayoutinflater-28.0.0.aar/99d0c1da0f6372a2480d760f94976fce/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 21ac3b80eabb76f017e7c4bb6b7b50c74be07344..519fa88b7176d128490ea792d230e5b5a7ae06e6 100644
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:cardview-v7:28.0.0@aar">
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/81d8c7beedcdf5472c7c61e39ed15df3/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/81d8c7beedcdf5472c7c61e39ed15df3/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/46b705e1c9fe9b95aa2cf2d3e5e3c121/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-28.0.0.aar/46b705e1c9fe9b95aa2cf2d3e5e3c121/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml
index 10ad5a6893aee6e0fab9b2043db7adf2f0498656..325838840f758b66e5fd055c4dcffdaa084d37e0 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.constraint:constraint-layout:1.1.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/529c035abe3c4335134702ba878a37ce/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/529c035abe3c4335134702ba878a37ce/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/ab60ea566221a5a08b4555fdf470cc09/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/ab60ea566221a5a08b4555fdf470cc09/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
new file mode 100644
index 0000000000000000000000000000000000000000..704eb04cb9d14d889be99cfd7a3c3341a6f9ed06
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.3.aar/a487eb880931552b0fcb7f9d117f523c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.3.aar/a487eb880931552b0fcb7f9d117f523c/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c0adf88faeab6653f78ca993214c9e72d7c959d7
--- /dev/null
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_3_jar.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+ <library name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml
index a0dedadce88115c071e9a239a0869b1ca7cc7689..699c37a7cd5fc8efb45d4e314db50e56245dee6a 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-1/files-1.1/coordinatorlayout-28.0.0.aar/65265c66be546f0d7e3903fac93c2649/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/e6a2d800e7a8894dc61d003021efe503/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/65265c66be546f0d7e3903fac93c2649/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/65265c66be546f0d7e3903fac93c2649/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/e6a2d800e7a8894dc61d003021efe503/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/coordinatorlayout-28.0.0.aar/e6a2d800e7a8894dc61d003021efe503/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 b7ce4ef575035e60e7b4e84d41a932680fe957ba..bafd08519b2e85249b9999f5422e4be8f149feba 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/108f60dc3b8d99fd6cce6f14337ff971/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/108f60dc3b8d99fd6cce6f14337ff971/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/968c08910e2e7ddeabcd6b69cac4b274/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cursoradapter-28.0.0.aar/968c08910e2e7ddeabcd6b69cac4b274/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml
index 051e6c527d61623603431ff78af3e52d84365091..8ad15a0fe3da5e37c8e73a94be89066eb2551cb6 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-1/files-1.1/customview-28.0.0.aar/9c3174043bbf75b9230de2d8c117f978/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/9c3174043bbf75b9230de2d8c117f978/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/ca725edec5457b79c92f41c77220f34c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/customview-28.0.0.aar/ca725edec5457b79c92f41c77220f34c/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 f20480883f2d4a1afb7fd7deeacb70874a42dbbd..575e16e6c99144ee21ebc36336a90b519b5f609d 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-1/files-1.1/design-28.0.0.aar/a30e50016475f77f9aada13049ee0f15/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/b9559e779b6a6b1fd72d91e9d8e39857/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/a30e50016475f77f9aada13049ee0f15/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/a30e50016475f77f9aada13049ee0f15/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/b9559e779b6a6b1fd72d91e9d8e39857/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-28.0.0.aar/b9559e779b6a6b1fd72d91e9d8e39857/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 3b184237da3d71cffe6e6914d1c3e5dc63b1b7cb..82e027c5051fa40c3784eefee78f97f6ec79ae05 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-1/files-1.1/documentfile-28.0.0.aar/7db3561aa6fdd0cfaa3ee06832349db2/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/7db3561aa6fdd0cfaa3ee06832349db2/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/ea910f3afbefcddf78a8263c9f1b739f/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/documentfile-28.0.0.aar/ea910f3afbefcddf78a8263c9f1b739f/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 36b8bd45cd3600aef93e2ed07a3b20e72bf1aff9..e7111e249788188857a825773d0d4c3934ffa306 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-1/files-1.1/drawerlayout-28.0.0.aar/1370bebc983027cdfd2b7dbbd3693b90/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/ca12171131d2091f1cd442f8b616b23c/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/1370bebc983027cdfd2b7dbbd3693b90/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/1370bebc983027cdfd2b7dbbd3693b90/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/ca12171131d2091f1cd442f8b616b23c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/drawerlayout-28.0.0.aar/ca12171131d2091f1cd442f8b616b23c/res" />
</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 9df59fe96541a38da79665f13eddc39a2698e9ab..82fa4da9bac963188932340bf62f97a807a77f4a 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-1/files-1.1/interpolator-28.0.0.aar/9b3503bd06b45f5b81a9836d13a730a7/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/9b3503bd06b45f5b81a9836d13a730a7/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/4ebbe2f050094990dc5d13271a042964/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/interpolator-28.0.0.aar/4ebbe2f050094990dc5d13271a042964/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 c8b48a05e56a895a7da0291bf2b02e4a482bcae1..322dab6d8e6409acb6bb793bce9d0c9c63bbc74e 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-1/files-1.1/loader-28.0.0.aar/a547cbf44a0bdbd65381dbc67ccd130c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/a547cbf44a0bdbd65381dbc67ccd130c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/ff4c7b1e42411ba36cc53a61c72f6099/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/loader-28.0.0.aar/ff4c7b1e42411ba36cc53a61c72f6099/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 d023179c32ae1918993dcfd62acd0a7217b7423a..653fd8d18747888127d7cf159a273a07374f700c 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-1/files-1.1/localbroadcastmanager-28.0.0.aar/99f7ccf8ca50c1802ef68a2f32e122c5/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/99f7ccf8ca50c1802ef68a2f32e122c5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/0e0f04a99d03ddbfe1b400528052dfa2/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/localbroadcastmanager-28.0.0.aar/0e0f04a99d03ddbfe1b400528052dfa2/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 8f98e2ebcd8e851667a6b0868a10540a1fb3faed..e02ef8b474b1f554769e90cd84a06ba07d07f343 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-1/files-1.1/print-28.0.0.aar/272d14e841237d9be29fb73ccf50747d/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/ba975e205adeba6f1cac5fd6700058e6/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/272d14e841237d9be29fb73ccf50747d/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/272d14e841237d9be29fb73ccf50747d/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/ba975e205adeba6f1cac5fd6700058e6/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/print-28.0.0.aar/ba975e205adeba6f1cac5fd6700058e6/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml
index 5702e49507f92df6c60c883811657030de34d0f2..40bf7b40dbad2394ccd43100671f944c8db39499 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-1/files-1.1/recyclerview-v7-28.0.0.aar/b2283be973872f2f52190dc12a11f502/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/f630abfb2d0feeec0049643d5329de1f/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/b2283be973872f2f52190dc12a11f502/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/b2283be973872f2f52190dc12a11f502/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/f630abfb2d0feeec0049643d5329de1f/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-28.0.0.aar/f630abfb2d0feeec0049643d5329de1f/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 dc445272d75ec44c2b237b9406934b2ef911277f..c626ea5c10415c1e9100bb34c2c7cdd4daef37e0 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-1/files-1.1/slidingpanelayout-28.0.0.aar/b269ae7a944488dce3802171c500a67b/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/b269ae7a944488dce3802171c500a67b/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/fcfe1a83586285bdf740db90a61ff360/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/slidingpanelayout-28.0.0.aar/fcfe1a83586285bdf740db90a61ff360/res" />
</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 8264d7de2fb5ff6d797a4b89310ed7e25294e8d2..6fcb99f0ee320d08dd98ad77274a257a1715ebae 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-1/files-1.1/support-compat-28.0.0.aar/75fc0b514f5bdea1894a84cd574944dc/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/9b23d9437c86bbf8bcd82033d3b715a9/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/75fc0b514f5bdea1894a84cd574944dc/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/75fc0b514f5bdea1894a84cd574944dc/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/9b23d9437c86bbf8bcd82033d3b715a9/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-28.0.0.aar/9b23d9437c86bbf8bcd82033d3b715a9/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 5c7b57fee3d9b63b96a4cd0d539db8749ac7464c..ebd12aca648642aac292fe60bf235bec788bcac8 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-1/files-1.1/support-core-ui-28.0.0.aar/e2bd5a9a4f22637aed5335bb2526b416/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/e2bd5a9a4f22637aed5335bb2526b416/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/bfec6b8f03574962788a63302e94466a/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-28.0.0.aar/bfec6b8f03574962788a63302e94466a/jars/classes.jar!/" />
</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 9dd0bcc710f544bdd39b69cc2a5b1faf65060712..7be7d817417660446c9ef65de91108886af3a16c 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-1/files-1.1/support-core-utils-28.0.0.aar/0ac769ea635ba41dc2df8485a6d0a455/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/0ac769ea635ba41dc2df8485a6d0a455/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/8d04ac1faad0801a61d2d5edbd8c677e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-28.0.0.aar/8d04ac1faad0801a61d2d5edbd8c677e/jars/classes.jar!/" />
</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 2ecbb4de8bc0dedd1042dad4f364cab2e09841b1..3092fbec2527a24ca24ac3614a814bd0719fd827 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-1/files-1.1/support-fragment-28.0.0.aar/306b3a5b14ab850d1eb7d110531855bd/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/417f88efddc89a941a7f16073d78a428/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/306b3a5b14ab850d1eb7d110531855bd/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/306b3a5b14ab850d1eb7d110531855bd/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/417f88efddc89a941a7f16073d78a428/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/417f88efddc89a941a7f16073d78a428/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
index 7da253e2441a70521338fb9d8f0d99ba39ae2b9e..3cea19bc5b24b708a2e69e990593001d2c55d4f8 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-media-compat:26.1.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/5db1d5dab4e950f23c622fb50ae82e55/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/5db1d5dab4e950f23c622fb50ae82e55/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ad29bd9984eead44f57602f2ab62412d/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-26.1.0.aar/ad29bd9984eead44f57602f2ab62412d/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
index b4e4a80f5240dc562089cc475fe281273240df0a..7305d1ef78e239c9b764eafc490f5e630639b446 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-v4:26.1.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/db362888a43a0f8b91e6fa599dac27c0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/db362888a43a0f8b91e6fa599dac27c0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/9f3ecf82a54f3b7080f8110bd9b3017e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-26.1.0.aar/9f3ecf82a54f3b7080f8110bd9b3017e/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
index d2085535ce354e2adf8e650127a0c67c3f60bb37..47ed612afc6b717afabceb9b03193de8558a1421 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/be5241d3c3b33305879249014c828bee/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/be5241d3c3b33305879249014c828bee/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/cd92781b19e9bfa3df041ed877db0b8c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-28.0.0.aar/cd92781b19e9bfa3df041ed877db0b8c/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 88f2668468a0f200bc006abd4511276924cfd18e..5e656dd82e39ca871a680ae129a65be095ace0de 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-1/files-1.1/swiperefreshlayout-28.0.0.aar/0b0d6818f55fcf788c968c541ea54141/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/1dc4efd319016f02209e7ee5b1af71b2/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/0b0d6818f55fcf788c968c541ea54141/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/0b0d6818f55fcf788c968c541ea54141/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/1dc4efd319016f02209e7ee5b1af71b2/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/swiperefreshlayout-28.0.0.aar/1dc4efd319016f02209e7ee5b1af71b2/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml
index 90b1d351e16c6feb6608a8dd9e20e39b17ec34ae..224e90d55d0dc5c2551d769b517a267f1cbad059 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="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/a1aaa21815f64bc34d3de5fff1aaf869/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/a1aaa21815f64bc34d3de5fff1aaf869/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/2f70fafe146278c964b7d33e0b3f4169/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-core-3.0.2.aar/2f70fafe146278c964b7d33e0b3f4169/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 a66176e496aab40873b897b532117a7868eb5f73..c827c09185983af033e4e6404fbc3a85b3bc4755 100644
--- a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/c56c56e831281ea82738c8103da43fed/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/c56c56e831281ea82738c8103da43fed/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/db3947f9d152d9f8598f222388824980/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/espresso-idling-resource-3.0.2.aar/db3947f9d152d9f8598f222388824980/res" />
</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 8a0688ad8e7ae2f1d5c27ad0972b1b018660f264..65078077ded325ce7b4e42af0062bc77027fee47 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="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/monitor-1.0.2.aar/ed27524087f131230fcb68e71a87ddad/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/monitor-1.0.2.aar/ed27524087f131230fcb68e71a87ddad/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/monitor-1.0.2.aar/5a2a859867376e6546d0db0a59c06b2b/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/monitor-1.0.2.aar/5a2a859867376e6546d0db0a59c06b2b/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 ef41ff1e3caa012eff6bb455521c36f26a839f41..382e2667542f3184e1c5c5c1829ddae8f04e83ce 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="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/c0f5e0d679e3b373bacc03a0f52b59d0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/c0f5e0d679e3b373bacc03a0f52b59d0/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/1178c79fa795689fc6e6c510104362c5/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/runner-1.0.2.aar/1178c79fa795689fc6e6c510104362c5/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 c6d86a563b5f2950bef5b3be38ae785b0db197ba..3dd1bfea4a0a78f7adb2a7c2fcdae38f1300b24d 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-1/files-1.1/transition-28.0.0.aar/45b167801bf8acd3658491fcc8690d2c/annotations.zip!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/d85e72db61f6085d9950bef225fe2ac5/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/45b167801bf8acd3658491fcc8690d2c/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/45b167801bf8acd3658491fcc8690d2c/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/d85e72db61f6085d9950bef225fe2ac5/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-28.0.0.aar/d85e72db61f6085d9950bef225fe2ac5/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 b5d9dea2efedc87835407117cc8b299812601889..56a48d48dad7ca025d0eae06dc4df173721dc197 100644
--- a/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
+++ b/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml
@@ -1,8 +1,8 @@
<component name="libraryTable">
<library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
<CLASSES>
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/20f727e462eb0009008d26af3db00c85/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/20f727e462eb0009008d26af3db00c85/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/4f4a60797a523e85b4878015bc33c30c/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/versionedparcelable-28.0.0.aar/4f4a60797a523e85b4878015bc33c30c/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 ea8f190759241543d41c48bc682ddb4f9de41453..e3a820f9c74b62a70666628b55c8b58ef2b0dcba 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-1/files-1.1/viewpager-28.0.0.aar/cc758bcd501f2ee943d167593a34de76/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/cc758bcd501f2ee943d167593a34de76/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/c91f60d6e1d597ba312b801449a4b31e/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/c91f60d6e1d597ba312b801449a4b31e/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 5c71a182d1ba74f9887801ee99b14c1c6b13e9e8..5639a1add1d0e8e015d910af4205eab10d446e81 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-1/files-1.1/play-services-base-16.0.1.aar/468f20f4c99de6451d136b0f86a6a10d/res" />
- <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-16.0.1.aar/468f20f4c99de6451d136b0f86a6a10d/jars/classes.jar!/" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-16.0.1.aar/a596ba54f7ece20c794b8756f7366283/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-base-16.0.1.aar/a596ba54f7ece20c794b8756f7366283/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_0_1_aar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a35c77d2225f2b13a891948471154a174290058a
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_0_1_aar.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+ <library name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar">
+ <CLASSES>
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-basement-16.0.1.aar/4db704bbdce0340b659453d6be40f21a/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-basement-16.0.1.aar/4db704bbdce0340b659453d6be40f21a/jars/classes.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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
new file mode 100644
index 0000000000000000000000000000000000000000..fce5f640c5ce201438166905ae772b81646fb8d6
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml
@@ -0,0 +1,12 @@
+<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-1/files-1.1/play-services-maps-16.1.0.aar/4fe3fe5297f2d3c22e4984089140a40e/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-maps-16.1.0.aar/4fe3fe5297f2d3c22e4984089140a40e/res" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-maps/16.1.0/68568da8e0d63d5d6fc4b6dfe9e01edc038e6a43/play-services-maps-16.1.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
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 619310cbc862fd784440e73e268971256fdd58d1..9070761c1fb63b4281d6e9a1a4ac009e345d5325 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-1/files-1.1/play-services-tasks-16.0.1.aar/e9a5a143bd109eb9a139b4559dbcc9a0/jars/classes.jar!/" />
- <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-tasks-16.0.1.aar/e9a5a143bd109eb9a139b4559dbcc9a0/res" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-tasks-16.0.1.aar/0098d2ce6f951d3186548b6aa4dedf03/res" />
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/play-services-tasks-16.0.1.aar/0098d2ce6f951d3186548b6aa4dedf03/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/build.gradle b/build.gradle
index e4c4a1647a89f84f224c46ac6a202aac6513eef6..24177292f563d02e9258a9a10f858b36518011e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,8 +35,9 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.android.support:design:28.0.0'
+ implementation 'com.google.android.gms:play-services-maps:16.1.0'
implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.google.firebase:firebase-auth:16.2.1'
implementation 'com.google.firebase:firebase-database:16.1.0'
diff --git a/local.properties b/local.properties
index 842a774728a43955407170960cb9fce8f53fec7f..8c703ca3368ae1579458bc2d3984bd652c870428 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-#Wed Apr 10 19:36:05 BST 2019
-sdk.dir=C\:\\Users\\Ronan\\AppData\\Local\\Android\\Sdk
+#Sat Apr 06 00:57:39 BST 2019
+sdk.dir=C\:\\Users\\james\\AppData\\Local\\Android\\Sdk
diff --git a/src/debug/res/values/google_maps_api.xml b/src/debug/res/values/google_maps_api.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9aa8e74cc909bc9877f0e70eb13b7d57eb12893e
--- /dev/null
+++ b/src/debug/res/values/google_maps_api.xml
@@ -0,0 +1,28 @@
+<resources>
+ <!--
+ TODO: Before you run your application, you need a Google Maps API key.
+
+ To get one, follow this link, follow the directions and press "Create" at the end:
+
+ https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=9F:7D:89:6C:8D:68:E1:AB:41:7C:BE:64:E7:8A:E1:E5:C7:BC:CD:62%3Bcom.example.liliyayankova.unirides
+
+ You can also add your credentials to an existing key, using these values:
+
+ Package name:
+ 9F:7D:89:6C:8D:68:E1:AB:41:7C:BE:64:E7:8A:E1:E5:C7:BC:CD:62
+
+ SHA-1 certificate fingerprint:
+ 9F:7D:89:6C:8D:68:E1:AB:41:7C:BE:64:E7:8A:E1:E5:C7:BC:CD:62
+
+ Alternatively, follow the directions here:
+ https://developers.google.com/maps/documentation/android/start#get-key
+
+ Once you have your key (it starts with "AIza"), replace the "google_maps_key"
+ string in this file.
+ -->
+
+ //google maps api key = "AIzaSyCnHWgrEhK2TSoEschf8WxjAHi2rkW4QkY"
+
+ //added the google maps api key = "AIzaSyCnHWgrEhK2TSoEschf8WxjAHi2rkW4QkY"
+ <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyCnHWgrEhK2TSoEschf8WxjAHi2rkW4QkY</string>
+</resources>
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 4980901998b682350f2bfa2d45c2041d6bc0ccc9..ef349840af6eacce9c3c6cc1588bdea198ff8cf7 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.liliyayankova.unirides">
+
+ <!--
+ The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
+ 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_FINE_LOCATION" />
+
<!-- To auto-complete the email text field in the login form with the user's emails -->
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
@@ -9,12 +17,27 @@
<application
android:allowBackup="true"
- android:icon="@mipmap/logo"
+ android:icon="@mipmap/ic_launcher_foreground"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
- <activity android:name=".MainMap"></activity>
+
+ <!--
+ The API key for Google Maps-based APIs is defined as a string resource.
+ (See the file "res/values/google_maps_api.xml").
+ Note that the API key is linked to the encryption key used to sign the APK.
+ You need a different API key for each encryption key, including the release key that is used to
+ sign the APK for publishing.
+ You can define the keys for the debug and release targets in src/debug/ and src/release/.
+ -->
+ <meta-data
+ android:name="com.google.android.geo.API_KEY"
+ android:value="@string/google_maps_key" />
+
+ <activity
+ android:name=".Map"
+ android:label="@string/title_activity_map"></activity>
<activity android:name=".Homepage">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/src/main/ic_launcher-web.png b/src/main/ic_launcher-web.png
new file mode 100644
index 0000000000000000000000000000000000000000..8afa749b7bbe64a669e4eef13fac1a2be966f7a4
Binary files /dev/null and b/src/main/ic_launcher-web.png differ
diff --git a/src/main/java/com/example/liliyayankova/unirides/Login.java b/src/main/java/com/example/liliyayankova/unirides/Login.java
index a46c7c75752f2e80d3d3f748db410ea48b0ee5d0..99520adb9add0a4716ae6cade98dd7e6b5819577 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Login.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Login.java
@@ -40,6 +40,7 @@ import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
import com.google.firebase.auth.FirebaseAuthInvalidUserException;
import com.google.firebase.auth.FirebaseUser;
+
import java.util.ArrayList;
import java.util.List;
@@ -101,7 +102,7 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
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, MainMap.class));
+ startActivity(new Intent(Login.this, Map.class));
}
}
};
@@ -409,7 +410,9 @@ public class Login extends AppCompatActivity implements LoaderCallbacks<Cursor>
showProgress(false);
if (success) {
- finish();
+ //go to the google maps activity
+ Intent i = new Intent(Login.this, Map.class);
+ startActivity(i);
} else {
mPasswordView.setError(getString(R.string.error_incorrect_password));
mPasswordView.requestFocus();
diff --git a/src/main/java/com/example/liliyayankova/unirides/MainMap.java b/src/main/java/com/example/liliyayankova/unirides/MainMap.java
deleted file mode 100644
index bcd6adf33ebd46691bb75b9e279fdd8f9c2ac7f3..0000000000000000000000000000000000000000
--- a/src/main/java/com/example/liliyayankova/unirides/MainMap.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.liliyayankova.unirides;
-
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-
-public class MainMap extends AppCompatActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main_map);
- }
-}
diff --git a/src/main/java/com/example/liliyayankova/unirides/Map.java b/src/main/java/com/example/liliyayankova/unirides/Map.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0e7b99dbf94350b6c57b56527a208b3f19c65c5
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Map.java
@@ -0,0 +1,46 @@
+package com.example.liliyayankova.unirides;
+
+import android.support.v4.app.FragmentActivity;
+import android.os.Bundle;
+
+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.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+
+public class Map extends FragmentActivity implements OnMapReadyCallback {
+
+ private GoogleMap mMap;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_map);
+ // 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);
+ }
+
+
+ /**
+ * Manipulates the map once available.
+ * This callback is triggered when the map is ready to be used.
+ * This is where we can add markers or lines, add listeners or move the camera. In this case,
+ * we just add a marker near Sydney, Australia.
+ * If Google Play services is not installed on the device, the user will be prompted to install
+ * it inside the SupportMapFragment. This method will only be triggered once the user has
+ * installed Google Play services and returned to the app.
+ */
+ @Override
+ public void onMapReady(GoogleMap googleMap) {
+ mMap = googleMap;
+
+ // Add a marker in Sydney and move the camera
+ LatLng sydney = new LatLng(-34, 151);
+ mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
+ mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
+ }
+}
diff --git a/src/main/res/drawable/logo_hd.png b/src/main/res/drawable/logo_hd.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd3fed179f1a407ea84858fe016f9d39ca659bfd
Binary files /dev/null and b/src/main/res/drawable/logo_hd.png differ
diff --git a/src/main/res/layout/activity_homepage.xml b/src/main/res/layout/activity_homepage.xml
index 8fe919fe6ffcd041561daa22c05737e4e831785f..e7bc7a4f1a7e44698e931c79757da55eb94c5060 100644
--- a/src/main/res/layout/activity_homepage.xml
+++ b/src/main/res/layout/activity_homepage.xml
@@ -1,61 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
- tools:context=".Homepage">
+ android:layout_weight="1"
+ android:background="@color/ic_launcher_background"
+ android:gravity="center_horizontal"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ tools:context=".Login">
+
+ <ImageView
+ android:id="@+id/imageView4"
+ android:layout_width="400dp"
+ android:layout_height="400dp"
+ android:layout_weight="0"
+ android:contentDescription="@string/app_logo"
+ android:src="@drawable/logo_hd"
+ tools:layout_editor_absoluteX="24dp"
+ tools:layout_editor_absoluteY="23dp" />
<TextView
android:id="@+id/welcome"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:gravity="center"
android:text="@string/welcome"
+ android:textAlignment="center"
android:textAllCaps="true"
- android:textStyle="bold|italic"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.093" />
+ android:textColor="@color/colorPrimary"
+ android:textStyle="bold|italic" />
<TextView
android:id="@+id/subh"
- android:layout_width="wrap_content"
- android:layout_height="26dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:gravity="top"
android:text="@string/subheading"
- android:textStyle="italic"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintHorizontal_bias="0.502"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.191" />
+ android:textAlignment="center"
+ android:textColor="@color/colorPrimary"
+ android:textStyle="italic" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:gravity="center"
+ android:orientation="horizontal">
- <Button
- android:id="@+id/registerB"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/register"
- android:textAllCaps="false"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintHorizontal_bias="0.78"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.501" />
+ <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:background="@color/colorPrimary"
+ android:text="@string/login"
+ android:textAllCaps="false"
+ android:textColor="@color/ic_launcher_background"
+ android:textColorLink="@color/ic_launcher_background" />
- <Button
- android:id="@+id/loginB"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/login"
- android:textAllCaps="false"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintHorizontal_bias="0.182"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.501" />
+ <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:background="@color/colorPrimaryDark"
+ android:text="@string/register"
+ android:textAllCaps="false"
+ android:textColor="@color/ic_launcher_background"
+ android:textColorLink="@color/ic_launcher_background" />
+ </LinearLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_login.xml b/src/main/res/layout/activity_login.xml
index 7de6e9f85112c3621a8d32472c1b40e95d4fc33f..8f4404fe7ad988a84b19514b4bfcdf764864968f 100644
--- a/src/main/res/layout/activity_login.xml
+++ b/src/main/res/layout/activity_login.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center_horizontal"
+ android:gravity="center"
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
@@ -23,12 +23,15 @@
<ScrollView
android:id="@+id/login_form"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:foregroundGravity="center">
<LinearLayout
android:id="@+id/email_login_form"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:orientation="vertical">
<android.support.design.widget.TextInputLayout
@@ -70,7 +73,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
+ android:background="@color/colorPrimary"
android:text="@string/action_sign_in"
+ android:textColor="@color/ic_launcher_background"
android:textStyle="bold" />
</LinearLayout>
diff --git a/src/main/res/layout/activity_main_map.xml b/src/main/res/layout/activity_main_map.xml
deleted file mode 100644
index 9cc10a2f9d4478478bc59645fc27554cc093d5e3..0000000000000000000000000000000000000000
--- a/src/main/res/layout/activity_main_map.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout 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"
- tools:context=".MainMap">
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_map.xml b/src/main/res/layout/activity_map.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8cf42f577c0bc67e845f5ef610db7093a0cc6a64
--- /dev/null
+++ b/src/main/res/layout/activity_map.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:map="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/map"
+ android:name="com.google.android.gms.maps.SupportMapFragment"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".Map" />
\ No newline at end of file
diff --git a/src/main/res/layout/activity_register.xml b/src/main/res/layout/activity_register.xml
index e9b163c375b1e2c2fb1e78d6dbc0a09bb7ce73ce..cc2d3bcf373149e408b46b5247eac35428221b57 100644
--- a/src/main/res/layout/activity_register.xml
+++ b/src/main/res/layout/activity_register.xml
@@ -1,62 +1,94 @@
-<?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_height="match_parent"
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:gravity="center"
+ android:layout_height="match_parent"
android:orientation="vertical"
- android:padding="10dp" >
+ android:padding="10dp">
- <EditText
- android:id="@+id/forename"
- android:layout_height="wrap_content"
+ <LinearLayout
android:layout_width="match_parent"
- android:text="@string/name"
- />
-
- <EditText
- android:id="@+id/surname"
android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/lastname"
- />
+ android:layout_weight="2"
+ android:gravity="center"
+ android:orientation="vertical">
- <EditText
- android:id="@+id/email"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/prompt_email"
- />
+ <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/password"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/prompt_password"
- />
+ <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/age"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/prompt_age"
- />
+ <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" />
+
+ </LinearLayout>
- <Switch
- android:id="@+id/driver_switch"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/driver" />
+ 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>
<Button
android:id="@+id/signup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:onClick="registerClick"
+ android:layout_gravity="center"
+ android:layout_marginBottom="100dp"
+ android:background="@color/colorPrimary"
android:text="@string/sign"
- android:textAllCaps="false"
+ android:textAllCaps="true"
+ android:textColor="@color/ic_launcher_background"
android:textStyle="bold" />
diff --git a/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cfe52eac1ba66ba280a68ca7be8fcf88a16..036d09bc5fd523323794379703c4a111d1e28a04 100644
--- a/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cfe52eac1ba66ba280a68ca7be8fcf88a16..036d09bc5fd523323794379703c4a111d1e28a04 100644
--- a/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
diff --git a/src/main/res/mipmap-hdpi/ic_launcher.png b/src/main/res/mipmap-hdpi/ic_launcher.png
index 898f3ed59ac9f3248734a00e5902736c9367d455..dfcd48c3212b6b0fcb714d75f3d1265989987fff 100644
Binary files a/src/main/res/mipmap-hdpi/ic_launcher.png and b/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..82ce4998189813c6ddbe2bbff1051f8a9afe8d9d
Binary files /dev/null and b/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/src/main/res/mipmap-hdpi/ic_launcher_round.png b/src/main/res/mipmap-hdpi/ic_launcher_round.png
index dffca3601eba7bf5f409bdd520820e2eb5122c75..d62c33c81c608d675af99e15add78f4687b525b3 100644
Binary files a/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/src/main/res/mipmap-mdpi/ic_launcher.png b/src/main/res/mipmap-mdpi/ic_launcher.png
index 64ba76f75e9ce021aa3d95c213491f73bcacb597..98f507ad93bb1bc8e87e40d999b32f8e03dd4073 100644
Binary files a/src/main/res/mipmap-mdpi/ic_launcher.png and b/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..45512365551f9d766c4155291a5e4c34823a7b83
Binary files /dev/null and b/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/src/main/res/mipmap-mdpi/ic_launcher_round.png b/src/main/res/mipmap-mdpi/ic_launcher_round.png
index dae5e082342fcdeee5db8a6e0b27028e2d2808f5..70fe209f63f7b1d23e716055cb0f950541a2c27e 100644
Binary files a/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/src/main/res/mipmap-xhdpi/ic_launcher.png b/src/main/res/mipmap-xhdpi/ic_launcher.png
index e5ed46597ea8447d91ab1786a34e30f1c26b18bd..24d20241696ffd8aed6d4da446aaba331ca3ea3a 100644
Binary files a/src/main/res/mipmap-xhdpi/ic_launcher.png and b/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd9acc45786bcbe3c22a9a89f69bc96eb3fc626a
Binary files /dev/null and b/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 14ed0af35023e4f1901cf03487b6c524257b8483..70776811385f70324f096f8848ab75166d969e06 100644
Binary files a/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b0907cac3bfd8fbfdc46e1108247f0a1055387ec..04d69249f18352d7ded61095d374138985ca1627 100644
Binary files a/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..33d3de89590338d7ad58d9744c180a42c9991da4
Binary files /dev/null and b/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index d8ae03154975f397f8ed1b84f2d4bf9783ecfa26..3df52b2b267e3b604e3bebfe757a97f248b4850d 100644
Binary files a/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 2c18de9e66108411737e910f5c1972476f03ddbf..d361cc8ed2ccf54328c0729680b53f5b280a8731 100644
Binary files a/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000000000000000000000000000000000000..c976574abbb64e2e36d9b4ae30208310d31b6363
Binary files /dev/null and b/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index beed3cdd2c32af5114a7dc70b9ef5b698eb8797e..89c4702d8ce787b1bb12da4d60de99b02f4eae40 100644
Binary files a/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 69b22338c6510250df3b43672635120dbce2fa49..940fbf655544ef2eb464e8e8ae3ac6a969fc2d7c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="colorPrimary">#008577</color>
- <color name="colorPrimaryDark">#00574B</color>
- <color name="colorAccent">#D81B60</color>
+ <color name="colorPrimary">#1D3B76</color>
+ <color name="colorPrimaryDark">#FF280C</color>
+ <color name="colorAccent">#FFAE98</color>
</resources>
diff --git a/src/main/res/values/ic_launcher_background.xml b/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c5d5899fdf0a1b144bf341b29e0c66ba50bbcedd
--- /dev/null
+++ b/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f86f725d44447deb2fce3928a4a11bc8259f8aa1..03b75b715c988eab0913ffdf23af444565068175 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -21,5 +21,9 @@
<string name="lastname">Surname</string>
<string name="prompt_age">Age</string>
<string name="sign">Sign up</string>
- <string name="driver">Driver</string> <!-- Likely temporary before actual driver section -->
+ <string name="app_logo">App Logo</string>
+ <string name="tickbox_text">Tick the appropriate boxes:</string>
+ <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="title_activity_map">Map</string>
</resources>
diff --git a/src/release/res/values/google_maps_api.xml b/src/release/res/values/google_maps_api.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ef79e9f2e292599818e1e59663e66cb62fe2ab5
--- /dev/null
+++ b/src/release/res/values/google_maps_api.xml
@@ -0,0 +1,20 @@
+<resources>
+ <!--
+ TODO: Before you release your application, you need a Google Maps API key.
+
+ To do this, you can either add your release key credentials to your existing
+ key, or create a new key.
+
+ Note that this file specifies the API key for the release build target.
+ If you have previously set up a key for the debug target with the debug signing certificate,
+ you will also need to set up a key for your release certificate.
+
+ Follow the directions here:
+
+ https://developers.google.com/maps/documentation/android/signup
+
+ Once you have your key (it starts with "AIza"), replace the "google_maps_key"
+ string in this file.
+ -->
+ <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">YOUR_KEY_HERE</string>
+</resources>
diff --git a/unirides.iml b/unirides.iml
index 209910633335a7f4bd0746d5554fb5e09ade9029..edc97a414b38a0208800c617e89114bab5b31f3c 100644
--- a/unirides.iml
+++ b/unirides.iml
@@ -99,6 +99,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
@@ -106,6 +107,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+ <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/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
@@ -125,6 +127,7 @@
<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" />
@@ -158,6 +161,9 @@
<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:cardview-v7:28.0.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.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" />
@@ -185,6 +191,19 @@
<orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat:26.1.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" name="Gradle: com.android.support:drawerlayout: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" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.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.android.support:collections:28.0.0@jar" level="project" />
+ <orderEntry type="library" name="Gradle: com.android.support:support-v4:26.1.0@aar" 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.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.android.support:support-media-compat:26.1.0@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" />
@@ -193,6 +212,7 @@
<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" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@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" />