diff --git a/.gradle/5.1.1/executionHistory/executionHistory.bin b/.gradle/5.1.1/executionHistory/executionHistory.bin
index 9748c1b5d9879f0dd8c81fe38022e205653b0d2f..0cc8e27e9aeb57ad5b6c429c3a508312d9e8cc04 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.bin and b/.gradle/5.1.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/5.1.1/executionHistory/executionHistory.lock b/.gradle/5.1.1/executionHistory/executionHistory.lock
index 5714c62e0c716669115acb3e56da3f7171a12bc9..fd44715bf88e487b0773bcad3e9bd9cc3fae98db 100644
Binary files a/.gradle/5.1.1/executionHistory/executionHistory.lock and b/.gradle/5.1.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.bin b/.gradle/5.1.1/fileHashes/fileHashes.bin
index ca6a5838a450b5126068c02ed8a8f4c10b8366b4..c12bf00454a536fc018e78fe6fb30638f8f23164 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.bin and b/.gradle/5.1.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/5.1.1/fileHashes/fileHashes.lock b/.gradle/5.1.1/fileHashes/fileHashes.lock
index 663ce89784c63d67d5b8193a3cac258366635ca1..e4a3f63db5a4261659b014e60f9f7475b9335090 100644
Binary files a/.gradle/5.1.1/fileHashes/fileHashes.lock and b/.gradle/5.1.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/5.1.1/javaCompile/classAnalysis.bin b/.gradle/5.1.1/javaCompile/classAnalysis.bin
new file mode 100644
index 0000000000000000000000000000000000000000..ff7ab81e07e79dd0915ec4f3703e698954743147
Binary files /dev/null and b/.gradle/5.1.1/javaCompile/classAnalysis.bin differ
diff --git a/.gradle/5.1.1/javaCompile/javaCompile.lock b/.gradle/5.1.1/javaCompile/javaCompile.lock
index f639fe396b317174bd92f4979e26de10f9b9e08f..c58fe5a09d54b7193057c32d899d6802ee5eeff9 100644
Binary files a/.gradle/5.1.1/javaCompile/javaCompile.lock and b/.gradle/5.1.1/javaCompile/javaCompile.lock differ
diff --git a/.gradle/5.1.1/javaCompile/taskHistory.bin b/.gradle/5.1.1/javaCompile/taskHistory.bin
index 4d1c2c0bf6f3c705f4164d53bb52605980d55204..59d4b77dedd28e8d0c00990c4f502f5d38dd7d00 100644
Binary files a/.gradle/5.1.1/javaCompile/taskHistory.bin and b/.gradle/5.1.1/javaCompile/taskHistory.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 82e19c409c9f5fa4e7beb5786bfb68507c89a1b4..92ffb1b63166dd3a637fd85b412f652d9e4756d5 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 184d9a9c3d829d7ac5ce21af8dc4d4cbb378eaee..49d313af1d65d7e0b52e830cc6dd425325907129 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index c90da368e619d181572dda0b2a4451d3af17453e..831730185c03ce12a29546af3043dcf8efcb8f9c 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 5a18d1611ccf5bdf71f006c59aa350ede51ec731..99aebad184b892ca36fe4d38dc4012d9f8a5803e 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_1_aar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ee4f646a6172008cf10ea09acaae50810b70b546
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_1_aar.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+ <library name="Gradle: com.google.firebase:firebase-storage:16.0.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66f2fc076c9f7855471efec569cd8fe3/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/66f2fc076c9f7855471efec569cd8fe3/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_google_firebase_firebase_storage_common_16_0_1_aar.xml b/.idea/libraries/Gradle__com_google_firebase_firebase_storage_common_16_0_1_aar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..17d71c6de778c707876b85c078c2bf8fa81fdfce
--- /dev/null
+++ b/.idea/libraries/Gradle__com_google_firebase_firebase_storage_common_16_0_1_aar.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+ <library name="Gradle: com.google.firebase:firebase-storage-common:16.0.1@aar">
+ <CLASSES>
+ <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b4aa456dfd8284aa9f844960e639ffa/jars/classes.jar!/" />
+ <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b4aa456dfd8284aa9f844960e639ffa/res" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5d9c2f7b4cb879fa8a6b3a0d390d8e8e565031b3..dd1da93e8579df1260643635e1705359c00af9fa 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,77 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="AndroidLayouts">
+ <shared>
+ <config />
+ </shared>
+ </component>
+ <component name="AndroidLogFilters">
+ <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
+ </component>
<component name="ChangeListManager">
<list default="true" id="48d0817d-cbae-47a8-8042-8333039f6f83" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_location_16_0_0_aar.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_places_placereport_16_0_0_aar.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/classAnalysis.bin" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_storage_16_0_1_aar.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_storage_common_16_0_1_aar.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewAdapter.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewHolders.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/EditProfile.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseDatabaseHelper.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseStorageHelper.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseUserEntity.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Helper/Helper.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserProfile.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/res/drawable/about.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/res/drawable/moods.jpg" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/res/drawable/userpic.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/res/layout/activity_driveregister.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/res/layout/activity_editprofile.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/res/layout/activity_feedback.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/executionHistory/executionHistory.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/fileHashes/fileHashes.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/javaCompile.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.1.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_3_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_ads_identifier_16_0_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_base_16_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_16_2_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_flags_16_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_16_4_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_api_16_4_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_base_16_4_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_impl_16_4_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_16_4_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_measurement_sdk_api_16_4_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_stats_16_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_tasks_16_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_analytics_16_4_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_16_2_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_auth_interop_16_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_common_16_1_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_core_16_0_8_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_database_16_1_0_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_database_collection_16_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_17_0_3_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_iid_interop_16_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_firebase_firebase_measurement_connector_17_0_1_aar.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/UniRides.iml" beforeDir="false" afterPath="$PROJECT_DIR$/unirides.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Homepage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Homepage.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Main.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Register.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Register.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/res/layout/activity_map.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/res/layout/activity_map.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/res/layout/activity_profile.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/res/layout/activity_profile.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/res/layout/activity_register.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/res/layout/activity_register.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/res/menu/toolbar_menu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/res/menu/toolbar_menu.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/res/values/strings.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/release/res/values/google_maps_api.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/release/res/values/google_maps_api.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/unirides.iml" beforeDir="false" afterPath="$PROJECT_DIR$/unirides.iml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -94,86 +70,127 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gradlew">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_homepage.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-297">
- <caret line="11" column="26" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
+ <state relative-caret-position="240">
+ <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
- <provider selected="true" editor-type-id="text-editor" />
- <provider editor-type-id="android-manifest" />
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_profile.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/logo-web.png">
- <provider selected="true" editor-type-id="images" />
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Homepage.java">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_editprofile.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="495">
- <caret line="44" column="6" selection-start-line="44" selection-start-column="6" selection-end-line="44" selection-end-column="6" />
+ <state relative-caret-position="686">
+ <caret line="97" column="47" lean-forward="true" selection-start-line="95" selection-start-column="8" selection-end-line="99" selection-end-column="58" />
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_driveregister.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" selection-start-line="6" selection-end-line="6" />
+ <state relative-caret-position="890">
+ <caret line="134" lean-forward="true" selection-start-line="134" selection-end-line="134" />
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Login.java">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_map.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="375">
- <caret line="69" selection-start-line="69" selection-end-line="69" />
+ <state relative-caret-position="495">
+ <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
- <provider selected="true" editor-type-id="text-editor" />
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_feedback.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="705">
+ <caret line="47" column="48" selection-start-line="47" selection-start-column="48" selection-end-line="47" selection-end-column="48" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/.idea/modules.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
+ <state relative-caret-position="660">
+ <caret line="44" column="19" lean-forward="true" selection-end-line="60" selection-end-column="15" />
+ <folding>
+ <element signature="e#2030#2046#0" expanded="true" />
+ </folding>
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/build.gradle">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_settings.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
+ <state relative-caret-position="210">
+ <caret line="14" column="10" lean-forward="true" selection-start-line="13" selection-end-line="20" selection-end-column="34" />
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_login.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gradlew.bat">
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_register.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="645">
- <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+ <state relative-caret-position="15">
+ <caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</file>
</leaf>
</component>
+ <component name="FileTemplateManagerImpl">
+ <option name="RECENT_TEMPLATES">
+ <list>
+ <option value="Class" />
+ <option value="layoutResourceFile" />
+ </list>
+ </option>
+ </component>
+ <component name="FindInProjectRecents">
+ <findStrings>
+ <find>photo</find>
+ <find>EditProfile</find>
+ <find>UserProfile</find>
+ <find>Profile</find>
+ </findStrings>
+ <replaceStrings>
+ <replace>userphoto</replace>
+ <replace>Profile</replace>
+ <replace>UserProfile</replace>
+ </replaceStrings>
+ </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RECENT_BRANCH_BY_REPOSITORY">
@@ -226,20 +243,45 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Homepage.java" />
+ <option value="$PROJECT_DIR$/src/release/res/values/google_maps_api.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Register.java" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/editprofile.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/profile_bar.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/content_profile.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Helper/Helper.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserProfile.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseUserEntity.java" />
+ <option value="$PROJECT_DIR$/build.gradle" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseStorageHelper.java" />
+ <option value="$PROJECT_DIR$/src/main/res/menu/toolbar_menu.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Main.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/EditProfile.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewAdapter.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewHolders.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseDatabaseHelper.java" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/activity_register.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/activity_profile.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/values/strings.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/activity_editprofile.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/activity_driveregister.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/activity_map.xml" />
+ <option value="$PROJECT_DIR$/src/main/res/layout/activity_feedback.xml" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" fullScreen="true">
- <option name="width" value="2560" />
- <option name="height" value="1440" />
+ <option name="x" value="84" />
+ <option name="y" value="50" />
+ <option name="width" value="1231" />
+ <option name="height" value="914" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="AndroidView" />
<pane id="Scope" />
- <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -273,11 +315,68 @@
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="unirides" type="462c0819:PsiDirectoryNode" />
</path>
+ <path>
+ <item name="unirides" type="b2602c69:ProjectViewProjectNode" />
+ <item name="unirides" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="unirides" type="462c0819:PsiDirectoryNode" />
+ <item name="Adapters" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="unirides" type="b2602c69:ProjectViewProjectNode" />
+ <item name="unirides" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="unirides" type="462c0819:PsiDirectoryNode" />
+ <item name="Firebase" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="unirides" type="b2602c69:ProjectViewProjectNode" />
+ <item name="unirides" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="res" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="unirides" type="b2602c69:ProjectViewProjectNode" />
+ <item name="unirides" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="res" type="462c0819:PsiDirectoryNode" />
+ <item name="drawable" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="unirides" type="b2602c69:ProjectViewProjectNode" />
+ <item name="unirides" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="res" type="462c0819:PsiDirectoryNode" />
+ <item name="layout" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="unirides" type="b2602c69:ProjectViewProjectNode" />
+ <item name="unirides" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="res" type="462c0819:PsiDirectoryNode" />
+ <item name="menu" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="unirides" type="b2602c69:ProjectViewProjectNode" />
+ <item name="unirides" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="res" type="462c0819:PsiDirectoryNode" />
+ <item name="values" type="462c0819:PsiDirectoryNode" />
+ </path>
</expand>
<select />
</subPane>
</pane>
- <pane id="AndroidView" />
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -290,6 +389,16 @@
<component name="PsdUISettings">
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
</component>
+ <component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides" />
+ <recent name="$PROJECT_DIR$/src/main/res/drawable" />
+ </key>
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/src/main/res/drawable" />
+ <recent name="$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides" />
+ </key>
+ </component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
@@ -399,108 +508,369 @@
</task>
<servers />
</component>
+ <component name="TodoView">
+ <todo-panel id="selected-file">
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ <todo-panel id="all">
+ <are-packages-shown value="true" />
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ </component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="2560" height="1440" extended-state="0" />
<editor active="true" />
<layout>
- <window_info id="Build Variants" side_tool="true" />
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
- <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.17911041" />
+ <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.13899921" />
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Image Layers" order="3" />
<window_info id="Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Resources Explorer" order="6" />
<window_info id="Favorites" order="7" side_tool="true" />
- <window_info anchor="bottom" id="Logcat" />
- <window_info anchor="bottom" id="Android Profiler" />
- <window_info anchor="bottom" id="Run" sideWeight="0.4988086" weight="0.329927" />
- <window_info anchor="bottom" id="Debug" />
- <window_info anchor="bottom" id="Version Control" order="0" />
- <window_info anchor="bottom" id="TODO" order="1" />
- <window_info anchor="bottom" id="Terminal" order="2" sideWeight="0.49960285" visible="true" weight="0.329927" />
- <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.50039715" side_tool="true" visible="true" weight="0.329927" />
- <window_info anchor="bottom" id="Build" order="4" sideWeight="0.4980143" weight="0.21386862" />
- <window_info anchor="right" id="Device File Explorer" side_tool="true" />
+ <window_info id="Build Variants" order="8" side_tool="true" />
+ <window_info anchor="bottom" id="Version Control" order="0" sideWeight="0.4995795" weight="0.3296837" />
+ <window_info anchor="bottom" id="TODO" order="1" sideWeight="0.4995795" weight="0.3296837" />
+ <window_info anchor="bottom" id="Terminal" order="2" sideWeight="0.4978974" visible="true" weight="0.19927007" />
+ <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5021026" side_tool="true" weight="0.33211678" />
+ <window_info anchor="bottom" id="Build" order="4" sideWeight="0.49705634" weight="0.21289538" />
+ <window_info anchor="bottom" id="Run" order="5" sideWeight="0.49705634" weight="0.03649635" />
+ <window_info anchor="bottom" id="Logcat" order="6" sideWeight="0.4978974" weight="0.32846716" />
+ <window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" sideWeight="0.49873844" weight="0.32846716" />
+ <window_info anchor="bottom" id="Debug" order="8" />
+ <window_info anchor="bottom" id="Find" order="9" />
<window_info anchor="right" id="Capture Analysis" order="0" />
<window_info anchor="right" id="Gradle" order="1" weight="0.32983795" />
<window_info anchor="right" id="Theme Preview" order="2" />
<window_info anchor="right" id="Palette	" order="3" />
+ <window_info anchor="right" id="Device File Explorer" order="4" side_tool="true" />
+ <window_info anchor="right" id="Preview" order="5" visible="true" weight="0.2494043" />
</layout>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/local.properties">
+ <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ <provider editor-type-id="android-manifest" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/logo-web.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="6" selection-start-line="6" selection-end-line="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.idea/modules.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="45">
- <caret line="3" column="51" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
+ <state relative-caret-position="105">
+ <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Register.java">
+ <entry file="file://$PROJECT_DIR$/src/release/res/values/google_maps_api.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
- <caret line="28" selection-start-line="28" selection-end-line="28" />
+ <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gradlew.bat">
+ <entry file="file://$USER_HOME$/Library/Android/sdk/sources/android-28/java/util/Optional.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="645">
- <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+ <state relative-caret-position="318">
+ <caret line="214" selection-start-line="214" selection-end-line="214" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gradlew">
+ <entry file="file://$USER_HOME$/Library/Android/sdk/sources/android-28/java/lang/Thread.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-297">
- <caret line="11" column="26" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
+ <state relative-caret-position="-1149">
+ <caret line="767" column="7" selection-start-line="767" selection-start-column="7" selection-end-line="767" selection-end-column="7" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
- <provider selected="true" editor-type-id="text-editor" />
- <provider editor-type-id="android-manifest" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Helper/Helper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="345">
+ <caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/logo-web.png">
- <provider selected="true" editor-type-id="images" />
+ <entry file="file://$PROJECT_DIR$/unirides.iml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.gitignore">
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
+ <state relative-caret-position="315">
+ <caret line="48" column="64" selection-start-line="48" selection-start-column="64" selection-end-line="48" selection-end-column="64" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Map.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" selection-start-line="6" selection-end-line="6" />
+ <state relative-caret-position="-1574">
+ <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/content_profile.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/profile_bar.xml" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Register.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-754">
+ <caret line="86" column="83" selection-start-line="86" selection-start-column="16" selection-end-line="86" selection-end-column="89" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/.idea/modules.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Settings.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="7" column="10" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
+ <state relative-caret-position="60">
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Login.java">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Main.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="375">
- <caret line="69" selection-start-line="69" selection-end-line="69" />
+ <state relative-caret-position="1185">
+ <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewHolders.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="255">
+ <caret line="17" column="26" selection-start-column="2" selection-end-line="19" selection-end-column="3" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseDatabaseHelper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1110">
+ <caret line="74" column="46" lean-forward="true" selection-start-line="74" selection-start-column="46" selection-end-line="74" selection-end-column="46" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#1165#1193#0" expanded="true" />
+ <element signature="e#2986#2999#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Profile.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="315">
+ <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/EditProfile.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1425">
+ <caret line="95" column="36" selection-start-line="95" selection-start-column="36" selection-end-line="95" selection-end-column="36" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Homepage.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="480">
+ <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/UserProfile.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseStorageHelper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="420">
+ <caret line="28" selection-start-line="28" selection-end-line="28" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Login.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="362">
+ <caret line="140" column="105" selection-start-line="140" selection-start-column="105" selection-end-line="140" selection-end-column="105" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/values/strings.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="405">
+ <caret line="27" column="40" selection-start-line="27" selection-start-column="40" selection-end-line="27" selection-end-column="40" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseUserEntity.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="540">
+ <caret line="48" column="5" selection-start-line="48" selection-start-column="5" selection-end-line="48" selection-end-column="5" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/logo_hd.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/userpic.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/icon_users.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/icon_settings.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/icon_plus.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/icon_map.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/icon_earth.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/icon_camera.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/icon_add_image.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/drawable/ic_launcher_background.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewAdapter.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="615">
+ <caret line="41" column="2" lean-forward="true" selection-start-line="41" selection-start-column="2" selection-end-line="41" selection-end-column="2" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/toolbar.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/menu/toolbar_menu.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="540">
+ <caret line="36" column="35" selection-start-line="36" selection-start-column="35" selection-end-line="36" selection-end-column="35" />
+ <folding>
+ <element signature="e#1194#1215#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_profile.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="10" column="32" selection-start-line="10" selection-start-column="32" selection-end-line="10" selection-end-column="32" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_homepage.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_map.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
- <caret line="44" column="6" selection-start-line="44" selection-start-column="6" selection-end-line="44" selection-end-column="6" />
+ <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_register.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="15">
+ <caret line="1" selection-start-line="1" selection-end-line="1" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_settings.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="210">
+ <caret line="14" column="10" lean-forward="true" selection-start-line="13" selection-end-line="20" selection-end-column="34" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_main.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="660">
+ <caret line="44" column="19" lean-forward="true" selection-end-line="60" selection-end-column="15" />
+ <folding>
+ <element signature="e#2030#2046#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_login.xml">
+ <provider selected="true" editor-type-id="text-editor" />
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_editprofile.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="686">
+ <caret line="97" column="47" lean-forward="true" selection-start-line="95" selection-start-column="8" selection-end-line="99" selection-end-column="58" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_driveregister.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="890">
+ <caret line="134" lean-forward="true" selection-start-line="134" selection-end-line="134" />
+ </state>
+ </provider>
+ <provider editor-type-id="android-designer2" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_feedback.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="705">
+ <caret line="47" column="48" selection-start-line="47" selection-start-column="48" selection-end-line="47" selection-end-column="48" />
</state>
</provider>
+ <provider editor-type-id="android-designer2" />
</entry>
</component>
<component name="masterDetails">
diff --git a/build.gradle b/build.gradle
index e0e25a0f7bfe9d3008a7972690ddfe56337cdb27..d36ed5ed4a6fd93a55629497e00f6fa05eb5fcd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,7 @@ dependencies {
implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.google.firebase:firebase-auth:16.2.1'
implementation 'com.google.firebase:firebase-database:16.1.0'
+ implementation 'com.google.firebase:firebase-storage:16.0.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewAdapter.java b/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewAdapter.java
new file mode 100644
index 0000000000000000000000000000000000000000..d9bd588529cc061d564a50a6e2ba897e30422bdb
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewAdapter.java
@@ -0,0 +1,43 @@
+//package com.example.liliyayankova.unirides.Adapters;
+//
+//import android.content.Context;
+//import android.support.v7.widget.RecyclerView;
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//import com.example.liliyayankova.unirides.R;
+//import com.example.liliyayankova.unirides.UserProfile;
+//
+//import java.util.List;
+//
+//public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewHolders> {
+//
+// private List<UserProfile> user;
+//
+// protected Context context;
+//
+// public RecyclerViewAdapter(Context context, List<UserProfile> user) {
+// this.user = user;
+// this.context = context;
+// }
+//
+// @Override
+// public RecyclerViewHolders onCreateViewHolder(ViewGroup parent, int viewType) {
+// //RecyclerViewHolders viewHolder = null;
+// // View layoutView = LayoutInflater.from(parent.getContext()).inflate(R.layout.UserProfile_data_list, parent, false);
+// //viewHolder = new RecyclerViewHolders(layoutView);
+// return null;
+// }
+//
+// @Override
+// public void onBindViewHolder(RecyclerViewHolders holder, int position) {
+// holder.profileHeader.setText(user.get(position).getHeader());
+// holder.profileContent.setText(user.get(position).getProfileContent());
+// }
+//
+// @Override
+// public int getItemCount() {
+// return this.user.size();
+// }
+//
+//}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewHolders.java b/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewHolders.java
new file mode 100644
index 0000000000000000000000000000000000000000..e9cba7a68d61d23569690315356127d6a2722501
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Adapters/RecyclerViewHolders.java
@@ -0,0 +1,20 @@
+//package com.example.liliyayankova.unirides.Adapters;
+//
+//import android.support.v7.widget.RecyclerView;
+//import android.view.View;
+//import android.widget.TextView;
+//import com.example.liliyayankova.unirides.R;
+//
+//
+//public class RecyclerViewHolders extends RecyclerView.ViewHolder{
+//
+// private static final String TAG = RecyclerViewHolders.class.getSimpleName();
+//
+// public TextView profileHeader;
+//
+// public TextView profileContent;
+//
+// public RecyclerViewHolders(final View itemView) {
+// super(itemView);
+// }
+//}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/EditProfile.java b/src/main/java/com/example/liliyayankova/unirides/EditProfile.java
new file mode 100644
index 0000000000000000000000000000000000000000..30fed921f1c32c367005c3f40034716199af097a
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/EditProfile.java
@@ -0,0 +1,101 @@
+package com.example.liliyayankova.unirides;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Toast;
+import com.example.liliyayankova.unirides.Firebase.FirebaseDatabaseHelper;
+import com.example.liliyayankova.unirides.Firebase.FirebaseUserEntity;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+public class EditProfile extends AppCompatActivity {
+
+ // private static final String TAG = EditProfile.class.getSimpleName();
+
+ private EditText forename;
+ private EditText surname;
+ private EditText email;
+ private EditText password;
+ private EditText age;
+ private Button update;
+ private CheckBox driverBox;
+ private ImageView photo;
+ /* Used for Firebase authorisation in creating a new account */
+ private FirebaseAuth firebaseAuth;
+
+ /* Allows access to the Firebase Database */
+ private FirebaseDatabase firebaseDatabase;
+
+ /* Used to add values to the database */
+ private DatabaseReference dbReference;
+
+ private FirebaseAuth.AuthStateListener authStateListener;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_editprofile);
+
+ setTitle("Edit Profile Information");
+
+ this.forename = (EditText) findViewById(R.id.forename);
+ this.surname = (EditText) findViewById(R.id.surname);
+ this.email = (EditText) findViewById(R.id.email);
+ this.password = (EditText) findViewById(R.id.password);
+ this.age = (EditText) findViewById(R.id.age);
+ this.update = (Button) findViewById(R.id.update);
+ this.driverBox = (CheckBox) findViewById(R.id.checkBox_driver);
+ this.firebaseAuth = FirebaseAuth.getInstance();
+ this.firebaseDatabase = FirebaseDatabase.getInstance();
+ this.dbReference = firebaseDatabase.getReference();
+ this.photo = findViewById(R.id.photo);
+
+ Button saveEditButton = (Button)findViewById(R.id.update);
+ saveEditButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ String profileName = forename.getText().toString();
+ String profileSurname = surname.getText().toString();
+ String profileEmail = email.getText().toString();
+ String profilePassword = password.getText().toString();
+ String profileAge = age.getText().toString();
+
+
+ // update the user profile information in Firebase database.
+ if(TextUtils.isEmpty(profileName) || TextUtils.isEmpty(profileSurname) || TextUtils.isEmpty(profileEmail)
+ || TextUtils.isEmpty(profilePassword) || TextUtils.isEmpty(profileAge)){
+ Toast.makeText(EditProfile.this, "Please fill in all the fields", Toast.LENGTH_SHORT).show();
+ }
+
+ FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
+ if (user == null) {
+ Intent firebaseUserIntent = new Intent(EditProfile.this, Login.class);
+ startActivity(firebaseUserIntent);
+ finish();
+ } else {
+ String userId = user.getProviderId();
+ String id = user.getUid();
+
+ FirebaseUserEntity userEntity = new FirebaseUserEntity(id, profileEmail, profileName, profileSurname, profilePassword, profileAge);
+ FirebaseDatabaseHelper firebaseDatabaseHelper = new FirebaseDatabaseHelper();
+ firebaseDatabaseHelper.createUserInFirebaseDatabase(id, userEntity);
+
+ forename.setText("");
+ surname.setText("");
+ email.setText("");
+ password.setText("");
+ age.setText("");
+ }
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseDatabaseHelper.java b/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseDatabaseHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..db913f6be94438a0bb04887f469bf64d66956d59
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseDatabaseHelper.java
@@ -0,0 +1,85 @@
+package com.example.liliyayankova.unirides.Firebase;
+
+import android.app.Activity;
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+
+import com.example.liliyayankova.unirides.UserProfile;
+import com.google.firebase.database.ChildEventListener;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+//import com.example.liliyayankova.unirides.Adapters.RecyclerViewAdapter;
+import com.example.liliyayankova.unirides.Helper.Helper;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FirebaseDatabaseHelper {
+
+ private static final String TAG = FirebaseDatabaseHelper.class.getSimpleName();
+
+ private DatabaseReference databaseReference;
+
+ public FirebaseDatabaseHelper(){
+ databaseReference = FirebaseDatabase.getInstance().getReference();
+ }
+
+ public void createUserInFirebaseDatabase(String userId, FirebaseUserEntity firebaseUserEntity){
+ Map<String, FirebaseUserEntity> user = new HashMap<String, FirebaseUserEntity>();
+ user.put(userId, firebaseUserEntity);
+ databaseReference.child("users").setValue(user);
+ }
+
+ public void isUserKeyExist(final String uid, final Context context, final RecyclerView recyclerView){
+ databaseReference.child("users").addChildEventListener(new ChildEventListener() {
+ @Override
+ public void onChildAdded(DataSnapshot dataSnapshot, String s) {
+ System.out.println("User login 1 " + dataSnapshot.getKey() + " " + dataSnapshot.getValue());
+ List<UserProfile> userData = adapterSourceData(dataSnapshot, uid);
+ System.out.println("User login Size " + userData.size());
+ // RecyclerViewAdapter recyclerViewAdapter = new RecyclerViewAdapter((Activity)context, userData);
+ // recyclerView.setAdapter(recyclerViewAdapter);
+ }
+
+ @Override
+ public void onChildChanged(DataSnapshot dataSnapshot, String s) {
+ List<UserProfile> userData = adapterSourceData(dataSnapshot, uid);
+ System.out.println("User login Size " + userData.size());
+ // RecyclerViewAdapter recyclerViewAdapter = new RecyclerViewAdapter((Activity)context, userData);
+ // recyclerView.setAdapter(recyclerViewAdapter);
+ }
+
+ @Override
+ public void onChildRemoved(DataSnapshot dataSnapshot) {
+
+ }
+
+ @Override
+ public void onChildMoved(DataSnapshot dataSnapshot, String s) {
+
+ }
+
+ @Override
+ public void onCancelled(DatabaseError databaseError) {
+
+ }
+ });
+ }
+
+ private List<UserProfile> adapterSourceData(DataSnapshot dataSnapshot, String uId){
+ List<UserProfile> allUserData = new ArrayList<UserProfile>();
+ if(dataSnapshot.getKey().equals(uId)){
+ FirebaseUserEntity userInformation = dataSnapshot.getValue(FirebaseUserEntity.class);
+ allUserData.add(new UserProfile(Helper.NAME, userInformation.getName()));
+ allUserData.add(new UserProfile(Helper.SURNAME, userInformation.getSurname()));
+ allUserData.add(new UserProfile(Helper.EMAIL, userInformation.getEmail()));
+ allUserData.add(new UserProfile(Helper.PASSWORD, userInformation.getPassword()));
+ allUserData.add(new UserProfile(Helper.AGE, userInformation.getAge()));
+ }
+ return allUserData;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseStorageHelper.java b/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseStorageHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..6dc14b2197b2bd1d62e1ca000a9b230b8bfdf27d
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseStorageHelper.java
@@ -0,0 +1,56 @@
+package com.example.liliyayankova.unirides.Firebase;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.util.Log;
+import android.widget.ImageView;
+
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+import com.google.firebase.storage.FirebaseStorage;
+import com.google.firebase.storage.StorageReference;
+import com.google.firebase.storage.UploadTask;
+
+public class FirebaseStorageHelper {
+
+ private static final String TAG = FirebaseStorageHelper.class.getCanonicalName();
+
+ private FirebaseStorage firebaseStorage;
+
+ private StorageReference rootRef;
+
+ private Context context;
+
+ public FirebaseStorageHelper(Context context){
+ this.context = context;
+ init();
+ }
+
+ private void init(){
+ this.firebaseStorage = FirebaseStorage.getInstance();
+ rootRef = firebaseStorage.getReferenceFromUrl("gs://fir-analyticexample.appspot.com");
+ }
+
+ // image not working so will do the saving method later
+
+// public void saveProfileImageToCloud(String userId, Uri selectedImageUri, final ImageView imageView) {
+//
+// StorageReference photoParentRef = rootRef.child(userId);
+// StorageReference photoRef = photoParentRef.child(selectedImageUri.getLastPathSegment());
+// UploadTask uploadTask = photoRef.putFile(selectedImageUri);
+//
+// uploadTask.addOnFailureListener(new OnFailureListener() {
+// @Override
+// public void onFailure(@NonNull Exception e) {
+// Log.d(TAG, "OnFailure " + e.getMessage());
+// }
+// }).addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
+// @Override
+// public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
+// Uri downloadUrl = taskSnapshot.getDownloadUrl();
+// Glide.with(context).load(downloadUrl.getPath()).into(imageView);
+// }
+// });
+
+ }
diff --git a/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseUserEntity.java b/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseUserEntity.java
new file mode 100644
index 0000000000000000000000000000000000000000..5fa22d46acb37b3a3105f0604d95fa1bb07b8270
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Firebase/FirebaseUserEntity.java
@@ -0,0 +1,50 @@
+package com.example.liliyayankova.unirides.Firebase;
+
+public class FirebaseUserEntity {
+
+ private String uId;
+
+ private String name;
+
+ private String surname;
+
+ private String email;
+
+ private String password;
+
+ private String age;
+
+
+ public FirebaseUserEntity(String uId, String name, String surname, String email, String password, String age) {
+ this.uId = uId;
+ this.name = name;
+ this.surname = surname;
+ this.email = email;
+ this.password = password;
+ this.age = age;
+ }
+
+ public String getuId() {
+ return uId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getSurname() {
+ return surname;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public String getAge() {
+ return age;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Helper/Helper.java b/src/main/java/com/example/liliyayankova/unirides/Helper/Helper.java
new file mode 100644
index 0000000000000000000000000000000000000000..0fc8b3b387e76418024f16ca8653d41f37f76c96
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/Helper/Helper.java
@@ -0,0 +1,25 @@
+package com.example.liliyayankova.unirides.Helper;
+
+import android.content.Context;
+import android.widget.Toast;
+
+public class Helper {
+
+ public static final String NAME = "Name";
+
+ public static final String SURNAME = "Surname";
+
+ public static final String EMAIL = "Email";
+
+ public static final String PASSWORD = "Password";
+
+ public static final String AGE= "Age";
+
+
+ public static boolean isValidEmail(String email){
+ if(email.contains("@")){
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/liliyayankova/unirides/Main.java b/src/main/java/com/example/liliyayankova/unirides/Main.java
index 7d43874c6a0adcf268cec6d75793e2078beee8a3..0e008a2572a77f68c1e87711e1ea0f1e79468923 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Main.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Main.java
@@ -87,6 +87,12 @@ public class Main extends AppCompatActivity {
startActivity(settings_i);
return true;
+ case(R.id.editaccount):
+
+ Intent editaccount_i = new Intent(Main.this, EditProfile.class);
+ startActivity(editaccount_i);
+ return true;
+
}
return super.onOptionsItemSelected(item);
diff --git a/src/main/java/com/example/liliyayankova/unirides/Register.java b/src/main/java/com/example/liliyayankova/unirides/Register.java
index 625026da6234486204b16d672058f44a3fbf80cb..0ae6c48099ca9a51299928d4422bc95cf325833b 100644
--- a/src/main/java/com/example/liliyayankova/unirides/Register.java
+++ b/src/main/java/com/example/liliyayankova/unirides/Register.java
@@ -1,7 +1,14 @@
package com.example.liliyayankova.unirides;
+import android.Manifest;
import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.text.TextUtils;
@@ -10,6 +17,7 @@ import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.EditText;
+import android.widget.ImageView;
import android.widget.Switch;
import android.widget.Toast;
@@ -29,6 +37,24 @@ public class Register extends AppCompatActivity {
private EditText age;
private Button register;
private CheckBox driverBox;
+ private ImageView photo;
+ private static int PReqCode = 1;
+ Uri chosenpic;
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (resultCode == RESULT_OK && requestCode == REQUESTCODE && data!=null){
+
+ // the profile picture has been successfully chosen by the user
+ // profile picture reference saved to a type Uri variable
+ chosenpic = data.getData();
+ photo.setImageURI(chosenpic);
+ }
+ }
+
+ private static int REQUESTCODE= 1;
+
/* Used for Firebase authorisation in creating a new account */
private FirebaseAuth firebaseAuth;
@@ -53,6 +79,50 @@ public class Register extends AppCompatActivity {
this.firebaseAuth = FirebaseAuth.getInstance();
this.firebaseDatabase = FirebaseDatabase.getInstance();
this.dbReference = firebaseDatabase.getReference();
+ this.photo = findViewById(R.id.photo);
+
+ photo.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Toast.makeText(Register.this, "Adding image", Toast.LENGTH_SHORT).show();
+ if (Build.VERSION.SDK_INT >= 22){
+ checkAndRequestForPermission();
+
+ }
+ else{
+ openPhotosGallery();
+ }
+ }
+ });
+ }
+
+ private void openPhotosGallery() {
+ // open photos gallery intent until an image is chosen
+ Toast.makeText(Register.this, "Opening image", Toast.LENGTH_SHORT).show();
+ Intent galleyIntent = new Intent(Intent.ACTION_GET_CONTENT);
+ galleyIntent.setType("image/*");
+ startActivityForResult(galleyIntent,REQUESTCODE);
+ }
+
+ private void checkAndRequestForPermission(){
+
+ Toast.makeText(Register.this, "getting permission", Toast.LENGTH_SHORT).show();
+ if (ContextCompat.checkSelfPermission(Register.this, Manifest.permission.READ_EXTERNAL_STORAGE)
+ != PackageManager.PERMISSION_GRANTED) {
+
+ if (ActivityCompat.shouldShowRequestPermissionRationale(Register.this, Manifest.permission.READ_EXTERNAL_STORAGE)) {
+ Toast.makeText(Register.this, "Accept to obtain the necessary permission", Toast.LENGTH_SHORT).show();
+ } else {
+ ActivityCompat.requestPermissions(Register.this, new String[]{
+ Manifest.permission.READ_EXTERNAL_STORAGE}, PReqCode);
+ Toast.makeText(Register.this, "No permission", Toast.LENGTH_SHORT).show();
+ }
+ }else{
+ openPhotosGallery();
+
+ }
+
+
}
public void registerClick(View v) {
diff --git a/src/main/java/com/example/liliyayankova/unirides/UserProfile.java b/src/main/java/com/example/liliyayankova/unirides/UserProfile.java
new file mode 100644
index 0000000000000000000000000000000000000000..93a7bfdbd6935441ef57d7d74644013dbcc252da
--- /dev/null
+++ b/src/main/java/com/example/liliyayankova/unirides/UserProfile.java
@@ -0,0 +1,21 @@
+package com.example.liliyayankova.unirides;
+
+public class UserProfile {
+
+ private String header;
+
+ private String profileContent;
+
+ public UserProfile(String header, String profileContent) {
+ this.header = header;
+ this.profileContent = profileContent;
+ }
+
+ public String getHeader() {
+ return header;
+ }
+
+ public String getProfileContent() {
+ return profileContent;
+ }
+}
\ No newline at end of file
diff --git a/src/main/res/drawable/about.png b/src/main/res/drawable/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..f805fa43b9b72189aaae9946db3b664d335f7c15
Binary files /dev/null and b/src/main/res/drawable/about.png differ
diff --git a/src/main/res/drawable/moods.jpg b/src/main/res/drawable/moods.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8c3b9a435859c6d099ef4c26f3ba628325dcb392
Binary files /dev/null and b/src/main/res/drawable/moods.jpg differ
diff --git a/src/main/res/drawable/userpic.png b/src/main/res/drawable/userpic.png
new file mode 100644
index 0000000000000000000000000000000000000000..086f95c666872853c8f1302a1dc80d1530d4ecce
Binary files /dev/null and b/src/main/res/drawable/userpic.png differ
diff --git a/src/main/res/layout/activity_driveregister.xml b/src/main/res/layout/activity_driveregister.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0f5106de044b862f84665fed8e270c0aee1d9f73
--- /dev/null
+++ b/src/main/res/layout/activity_driveregister.xml
@@ -0,0 +1,137 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp">
+
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/toolbar" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/welcome"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:gravity="center"
+ android:text="Driver Registration"
+ android:textAlignment="center"
+ android:textAllCaps="true"
+ android:textColor="@color/colorPrimary"
+ android:textStyle="bold|italic" />
+
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="60dp"
+ android:layout_height="80dp"
+ app:srcCompat="@drawable/userpic" />
+
+ <EditText
+ android:id="@+id/forename"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/name"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/surname"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/lastname"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/email"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_email"
+ android:inputType="textEmailAddress" />
+
+ <EditText
+ android:id="@+id/password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_password"
+ android:inputType="textPassword"
+ />
+
+ <EditText
+ android:id="@+id/age"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_age"
+ android:inputType="number" />
+
+ <EditText
+ android:id="@+id/car"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/cartype"
+ android:inputType="textShortMessage" />
+
+ <EditText
+ android:id="@+id/license"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/license"
+ android:inputType="textPassword" />
+
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ 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/update"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginBottom="100dp"
+ android:background="@color/colorPrimary"
+ android:onClick="registerClick"
+ android:text="@string/register"
+ android:textAllCaps="true"
+ android:textColor="@color/ic_launcher_background"
+ android:textStyle="bold" />
+
+
+</LinearLayout>
+
+
+
diff --git a/src/main/res/layout/activity_editprofile.xml b/src/main/res/layout/activity_editprofile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5dd84dd52abbf1c4d26d6c2e61049bf911b9e285
--- /dev/null
+++ b/src/main/res/layout/activity_editprofile.xml
@@ -0,0 +1,127 @@
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="10dp">
+
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/toolbar" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:gravity="center"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/welcome"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:gravity="center"
+ android:text="Edit Account"
+ android:textAlignment="center"
+ android:textAllCaps="true"
+ android:textColor="@color/colorPrimary"
+ android:textStyle="bold|italic" />
+
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="60dp"
+ android:layout_height="80dp"
+ app:srcCompat="@drawable/userpic" />
+
+ <EditText
+ android:id="@+id/forename"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/name"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/surname"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/lastname"
+ android:inputType="text" />
+
+ <EditText
+ android:id="@+id/email"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_email"
+ android:inputType="textEmailAddress" />
+
+ <EditText
+ android:id="@+id/password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_password"
+ android:inputType="textPassword"
+ />
+
+ <EditText
+ android:id="@+id/age"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/prompt_age"
+ android:inputType="number" />
+ <CheckBox
+ android:id="@+id/checkBox_driver"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/driver_checkbox" /> <!-- Potentially temporary -->
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ 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/update"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginBottom="100dp"
+ android:background="@color/colorPrimary"
+ android:onClick="registerClick"
+ android:text="@string/update"
+ android:textAllCaps="true"
+ android:textColor="@color/ic_launcher_background"
+ android:textStyle="bold" />
+
+
+</LinearLayout>
+
+
+
diff --git a/src/main/res/layout/activity_feedback.xml b/src/main/res/layout/activity_feedback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..82d0734cb9859477dafd3fc478cd8df71e775da7
--- /dev/null
+++ b/src/main/res/layout/activity_feedback.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/common_google_signin_btn_text_dark_pressed"
+ android:orientation="vertical"
+ tools:context=".Main">
+
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/toolbar" />
+
+ <ImageView
+ android:id="@+id/mood"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ app:srcCompat="@drawable/moods" />
+
+ <TextView
+ android:id="@+id/feedback_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="20dp"
+ android:gravity="center"
+ android:text="Please rate the journey"
+ android:textSize="30sp" />
+
+ <EditText
+ android:id="@+id/comments"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="Comments Section"/>
+ <CheckBox
+ android:id="@+id/checkBox_student"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="Tick for successfull Payment " />
+
+ <Button
+ android:id="@+id/update"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginBottom="100dp"
+ android:background="@color/colorPrimary"
+ android:text="SUBMIT"
+ android:textAllCaps="true"
+ android:textColor="@color/ic_launcher_background"
+ android:textStyle="bold" />s
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_map.xml b/src/main/res/layout/activity_map.xml
index 3ee874c14b6eb2f5f7dc4daddac0060571862026..8c504b9293b15732a3063ad414513ff33fe68312 100644
--- a/src/main/res/layout/activity_map.xml
+++ b/src/main/res/layout/activity_map.xml
@@ -1,12 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
-
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="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" />
+ android:background="@color/common_google_signin_btn_text_dark_pressed"
+ android:orientation="vertical"
+ tools:context=".Main">
+
+ <include
+ android:id="@+id/toolbar"
+ layout="@layout/toolbar" />
+
+
+ <fragment xmlns:android="http://schemas.android.com/apk/res/android"
+ 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="629dp"
+ tools:context=".Map" />
+
+
+ <Switch
+ android:layout_width="185dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:text="Offline/Online" />
+ >
+
+ </LinearLayout>
+
+
+
+
+
diff --git a/src/main/res/layout/activity_profile.xml b/src/main/res/layout/activity_profile.xml
index 65c11cb653b99b2f4d2b248098064606116dc59d..9e594d18276a5a041167e17fcdd575b2476646ac 100644
--- a/src/main/res/layout/activity_profile.xml
+++ b/src/main/res/layout/activity_profile.xml
@@ -1,31 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- tools:context=".Profile">
+ android:padding="10dp">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar" />
- <TextView
- android:id="@+id/profile_text"
+ <LinearLayout
+
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="20dp"
+ android:layout_weight="2"
android:gravity="center"
- android:text="@string/profile"
- android:textSize="30sp" />
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="50mm"
+ android:layout_height="70mm"
+ app:srcCompat="@drawable/userpic" />
- <ImageView
- android:id="@+id/profile_image"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:contentDescription="@string/profile"
- android:layout_weight="1"
- app:srcCompat="@drawable/icon_users" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout></LinearLayout>
\ 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 19705ba7fe8a84526516164c63dbf425c2cc6bb6..c1a8be952fec5a30d051c12fa55080a29c3a719c 100644
--- a/src/main/res/layout/activity_register.xml
+++ b/src/main/res/layout/activity_register.xml
@@ -1,5 +1,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -12,6 +13,24 @@
android:gravity="center"
android:orientation="vertical">
+ <TextView
+ android:id="@+id/welcome"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="2"
+ android:gravity="center"
+ android:text="Registration"
+ android:textAlignment="center"
+ android:textAllCaps="true"
+ android:textColor="@color/colorPrimary"
+ android:textStyle="bold|italic" />
+
+ <ImageView
+ android:id="@+id/photo"
+ android:layout_width="100dp"
+ android:layout_height="150dp"
+ app:srcCompat="@drawable/userpic" />
+
<EditText
android:id="@+id/forename"
android:layout_width="match_parent"
diff --git a/src/main/res/menu/toolbar_menu.xml b/src/main/res/menu/toolbar_menu.xml
index 39e75e66a4b92f436991db68e250e35b236d3ad6..6b4d9eb3c3899b2157bb1a54be23f0f6fc8d12c2 100644
--- a/src/main/res/menu/toolbar_menu.xml
+++ b/src/main/res/menu/toolbar_menu.xml
@@ -32,5 +32,10 @@
android:title="@string/logout"
app:showAsAction="never" />
-
+ <item
+ android:id="@+id/editaccount"
+ android:contentDescription="@string/editaccount"
+ android:orderInCategory="4"
+ android:title="Edit Account"
+ app:showAsAction="never" />
</menu>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dfb93fc5b0e348fa980fab7059cdcaacf7bfc39e..e708cf216f19d462e155bf513ab134a29b41cfd6 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -22,8 +22,12 @@
</string>
<string name="name">First name</string>
<string name="lastname">Surname</string>
+ <string name="cartype">Car Model</string>
+ <string name="license">License Number</string>
<string name="prompt_age">Age</string>
<string name="sign">Sign up</string>
+ <string name="update">Update</string>
+ <string name="editaccount">Edit Account</string>
<string name="app_logo">App Logo</string>
<string name="tickbox_text">Tick the appropriate boxes:</string>
<string name="driver_checkbox">I am a driver</string> <!-- potentially temporary -->
diff --git a/src/release/res/values/google_maps_api.xml b/src/release/res/values/google_maps_api.xml
index 1ef79e9f2e292599818e1e59663e66cb62fe2ab5..cdda72f213b4b4a28ec1ed356f550e605d826ea1 100644
--- a/src/release/res/values/google_maps_api.xml
+++ b/src/release/res/values/google_maps_api.xml
@@ -16,5 +16,10 @@
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>
+
+
+ //google maps api key = "AIzaSyAaD5RquuI_dL8KFBqp4FSZj-Bdv-_I0XM"
+
+ //added the google maps api key = "AIzaSyAaD5RquuI_dL8KFBqp4FSZj-Bdv-_I0XM"
+ <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyAaD5RquuI_dL8KFBqp4FSZj-Bdv-_I0XM</string>
</resources>
diff --git a/unirides.iml b/unirides.iml
index c7b6d09f0ee3929137066dd6ac10ddcecbfc4177..daade27ccff22da78e00953d4cd34fef0c93c69e 100644
--- a/unirides.iml
+++ b/unirides.iml
@@ -90,6 +90,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
@@ -121,6 +122,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -149,6 +151,7 @@
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth:16.2.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:17.0.3@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-storage-common:16.0.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-api:16.4.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-location:16.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-database-collection:16.0.1@aar" level="project" />
@@ -179,6 +182,7 @@
<orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop:16.0.1@aar" level="project" />
+ <orderEntry type="library" name="Gradle: com.google.firebase:firebase-storage:16.0.1@aar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-impl:16.4.0@aar" level="project" />