diff --git a/.idea/libraries/animated_vector_drawable_23_3_0.xml b/.idea/libraries/animated_vector_drawable_23_4_0.xml similarity index 50% rename from .idea/libraries/animated_vector_drawable_23_3_0.xml rename to .idea/libraries/animated_vector_drawable_23_4_0.xml index 1272933..99f4e11 100644 --- a/.idea/libraries/animated_vector_drawable_23_3_0.xml +++ b/.idea/libraries/animated_vector_drawable_23_4_0.xml @@ -1,13 +1,12 @@ - + - - + + - - + \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_3_0.xml b/.idea/libraries/appcompat_v7_23_3_0.xml deleted file mode 100644 index da3b5a3..0000000 --- a/.idea/libraries/appcompat_v7_23_3_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_4_0.xml b/.idea/libraries/appcompat_v7_23_4_0.xml new file mode 100644 index 0000000..f517f17 --- /dev/null +++ b/.idea/libraries/appcompat_v7_23_4_0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/design_23_3_0.xml b/.idea/libraries/design_23_3_0.xml deleted file mode 100644 index ffd6ab6..0000000 --- a/.idea/libraries/design_23_3_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/design_23_4_0.xml b/.idea/libraries/design_23_4_0.xml new file mode 100644 index 0000000..c536935 --- /dev/null +++ b/.idea/libraries/design_23_4_0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_analytics_9_2_0.xml b/.idea/libraries/firebase_analytics_9_2_0.xml new file mode 100644 index 0000000..a0c54d5 --- /dev/null +++ b/.idea/libraries/firebase_analytics_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_analytics_impl_9_2_0.xml b/.idea/libraries/firebase_analytics_impl_9_2_0.xml new file mode 100644 index 0000000..6e0d7e2 --- /dev/null +++ b/.idea/libraries/firebase_analytics_impl_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_auth_9_2_0.xml b/.idea/libraries/firebase_auth_9_2_0.xml new file mode 100644 index 0000000..7185ab6 --- /dev/null +++ b/.idea/libraries/firebase_auth_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_auth_common_9_2_0.xml b/.idea/libraries/firebase_auth_common_9_2_0.xml new file mode 100644 index 0000000..86f4201 --- /dev/null +++ b/.idea/libraries/firebase_auth_common_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_auth_module_9_2_0.xml b/.idea/libraries/firebase_auth_module_9_2_0.xml new file mode 100644 index 0000000..a45803b --- /dev/null +++ b/.idea/libraries/firebase_auth_module_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_common_9_2_0.xml b/.idea/libraries/firebase_common_9_2_0.xml new file mode 100644 index 0000000..317d346 --- /dev/null +++ b/.idea/libraries/firebase_common_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_config_9_2_0.xml b/.idea/libraries/firebase_config_9_2_0.xml new file mode 100644 index 0000000..d4a396e --- /dev/null +++ b/.idea/libraries/firebase_config_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_crash_9_2_0.xml b/.idea/libraries/firebase_crash_9_2_0.xml new file mode 100644 index 0000000..7b7a413 --- /dev/null +++ b/.idea/libraries/firebase_crash_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_database_9_2_0.xml b/.idea/libraries/firebase_database_9_2_0.xml new file mode 100644 index 0000000..4cf8d04 --- /dev/null +++ b/.idea/libraries/firebase_database_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_database_connection_9_2_0.xml b/.idea/libraries/firebase_database_connection_9_2_0.xml new file mode 100644 index 0000000..8f2cabd --- /dev/null +++ b/.idea/libraries/firebase_database_connection_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_iid_9_2_0.xml b/.idea/libraries/firebase_iid_9_2_0.xml new file mode 100644 index 0000000..f2a30ea --- /dev/null +++ b/.idea/libraries/firebase_iid_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_messaging_9_2_0.xml b/.idea/libraries/firebase_messaging_9_2_0.xml new file mode 100644 index 0000000..f28a963 --- /dev/null +++ b/.idea/libraries/firebase_messaging_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_storage_9_2_0.xml b/.idea/libraries/firebase_storage_9_2_0.xml new file mode 100644 index 0000000..111cccc --- /dev/null +++ b/.idea/libraries/firebase_storage_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/firebase_storage_common_9_2_0.xml b/.idea/libraries/firebase_storage_common_9_2_0.xml new file mode 100644 index 0000000..206dd0b --- /dev/null +++ b/.idea/libraries/firebase_storage_common_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/mediarouter_v7_23_0_0.xml b/.idea/libraries/mediarouter_v7_23_0_0.xml new file mode 100644 index 0000000..7ad6e7e --- /dev/null +++ b/.idea/libraries/mediarouter_v7_23_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_9_2_0.xml b/.idea/libraries/play_services_9_2_0.xml new file mode 100644 index 0000000..7460e35 --- /dev/null +++ b/.idea/libraries/play_services_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_ads_9_2_0.xml b/.idea/libraries/play_services_ads_9_2_0.xml new file mode 100644 index 0000000..612f716 --- /dev/null +++ b/.idea/libraries/play_services_ads_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_ads_lite_9_2_0.xml b/.idea/libraries/play_services_ads_lite_9_2_0.xml new file mode 100644 index 0000000..8674fb1 --- /dev/null +++ b/.idea/libraries/play_services_ads_lite_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_analytics_9_2_0.xml b/.idea/libraries/play_services_analytics_9_2_0.xml new file mode 100644 index 0000000..2b08c1c --- /dev/null +++ b/.idea/libraries/play_services_analytics_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_analytics_impl_9_2_0.xml b/.idea/libraries/play_services_analytics_impl_9_2_0.xml new file mode 100644 index 0000000..cf0ceda --- /dev/null +++ b/.idea/libraries/play_services_analytics_impl_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_appindexing_9_2_0.xml b/.idea/libraries/play_services_appindexing_9_2_0.xml new file mode 100644 index 0000000..1f748dc --- /dev/null +++ b/.idea/libraries/play_services_appindexing_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_appinvite_9_2_0.xml b/.idea/libraries/play_services_appinvite_9_2_0.xml new file mode 100644 index 0000000..6b9e8d2 --- /dev/null +++ b/.idea/libraries/play_services_appinvite_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_auth_9_2_0.xml b/.idea/libraries/play_services_auth_9_2_0.xml new file mode 100644 index 0000000..fa81c05 --- /dev/null +++ b/.idea/libraries/play_services_auth_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_auth_base_9_2_0.xml b/.idea/libraries/play_services_auth_base_9_2_0.xml new file mode 100644 index 0000000..a6522a6 --- /dev/null +++ b/.idea/libraries/play_services_auth_base_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_base_9_2_0.xml b/.idea/libraries/play_services_base_9_2_0.xml new file mode 100644 index 0000000..a1981fd --- /dev/null +++ b/.idea/libraries/play_services_base_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_basement_9_2_0.xml b/.idea/libraries/play_services_basement_9_2_0.xml new file mode 100644 index 0000000..0aec068 --- /dev/null +++ b/.idea/libraries/play_services_basement_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_cast_9_2_0.xml b/.idea/libraries/play_services_cast_9_2_0.xml new file mode 100644 index 0000000..984c4b1 --- /dev/null +++ b/.idea/libraries/play_services_cast_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_cast_framework_9_2_0.xml b/.idea/libraries/play_services_cast_framework_9_2_0.xml new file mode 100644 index 0000000..2f893d0 --- /dev/null +++ b/.idea/libraries/play_services_cast_framework_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_clearcut_9_2_0.xml b/.idea/libraries/play_services_clearcut_9_2_0.xml new file mode 100644 index 0000000..491f374 --- /dev/null +++ b/.idea/libraries/play_services_clearcut_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_contextmanager_9_2_0.xml b/.idea/libraries/play_services_contextmanager_9_2_0.xml new file mode 100644 index 0000000..f1795a0 --- /dev/null +++ b/.idea/libraries/play_services_contextmanager_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_drive_9_2_0.xml b/.idea/libraries/play_services_drive_9_2_0.xml new file mode 100644 index 0000000..d4461f8 --- /dev/null +++ b/.idea/libraries/play_services_drive_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_fitness_9_2_0.xml b/.idea/libraries/play_services_fitness_9_2_0.xml new file mode 100644 index 0000000..e78f832 --- /dev/null +++ b/.idea/libraries/play_services_fitness_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_games_9_2_0.xml b/.idea/libraries/play_services_games_9_2_0.xml new file mode 100644 index 0000000..6daf147 --- /dev/null +++ b/.idea/libraries/play_services_games_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_gass_9_2_0.xml b/.idea/libraries/play_services_gass_9_2_0.xml new file mode 100644 index 0000000..2cf9897 --- /dev/null +++ b/.idea/libraries/play_services_gass_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_gcm_9_2_0.xml b/.idea/libraries/play_services_gcm_9_2_0.xml new file mode 100644 index 0000000..842e61c --- /dev/null +++ b/.idea/libraries/play_services_gcm_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_identity_9_2_0.xml b/.idea/libraries/play_services_identity_9_2_0.xml new file mode 100644 index 0000000..7443980 --- /dev/null +++ b/.idea/libraries/play_services_identity_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_iid_9_2_0.xml b/.idea/libraries/play_services_iid_9_2_0.xml new file mode 100644 index 0000000..cc01008 --- /dev/null +++ b/.idea/libraries/play_services_iid_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_location_9_2_0.xml b/.idea/libraries/play_services_location_9_2_0.xml new file mode 100644 index 0000000..37fb730 --- /dev/null +++ b/.idea/libraries/play_services_location_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_maps_9_2_0.xml b/.idea/libraries/play_services_maps_9_2_0.xml new file mode 100644 index 0000000..25cc903 --- /dev/null +++ b/.idea/libraries/play_services_maps_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_nearby_9_2_0.xml b/.idea/libraries/play_services_nearby_9_2_0.xml new file mode 100644 index 0000000..78acec8 --- /dev/null +++ b/.idea/libraries/play_services_nearby_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_panorama_9_2_0.xml b/.idea/libraries/play_services_panorama_9_2_0.xml new file mode 100644 index 0000000..ed921cc --- /dev/null +++ b/.idea/libraries/play_services_panorama_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_places_9_2_0.xml b/.idea/libraries/play_services_places_9_2_0.xml new file mode 100644 index 0000000..2660453 --- /dev/null +++ b/.idea/libraries/play_services_places_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_plus_9_2_0.xml b/.idea/libraries/play_services_plus_9_2_0.xml new file mode 100644 index 0000000..13b2aef --- /dev/null +++ b/.idea/libraries/play_services_plus_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_safetynet_9_2_0.xml b/.idea/libraries/play_services_safetynet_9_2_0.xml new file mode 100644 index 0000000..9c5b023 --- /dev/null +++ b/.idea/libraries/play_services_safetynet_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_tagmanager_9_2_0.xml b/.idea/libraries/play_services_tagmanager_9_2_0.xml new file mode 100644 index 0000000..705e858 --- /dev/null +++ b/.idea/libraries/play_services_tagmanager_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_tagmanager_api_9_2_0.xml b/.idea/libraries/play_services_tagmanager_api_9_2_0.xml new file mode 100644 index 0000000..785dae0 --- /dev/null +++ b/.idea/libraries/play_services_tagmanager_api_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_tasks_9_2_0.xml b/.idea/libraries/play_services_tasks_9_2_0.xml new file mode 100644 index 0000000..255cf7b --- /dev/null +++ b/.idea/libraries/play_services_tasks_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_vision_9_2_0.xml b/.idea/libraries/play_services_vision_9_2_0.xml new file mode 100644 index 0000000..d05e55f --- /dev/null +++ b/.idea/libraries/play_services_vision_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_wallet_9_2_0.xml b/.idea/libraries/play_services_wallet_9_2_0.xml new file mode 100644 index 0000000..3e5373d --- /dev/null +++ b/.idea/libraries/play_services_wallet_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/play_services_wearable_9_2_0.xml b/.idea/libraries/play_services_wearable_9_2_0.xml new file mode 100644 index 0000000..7704163 --- /dev/null +++ b/.idea/libraries/play_services_wearable_9_2_0.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_23_3_0.xml b/.idea/libraries/recyclerview_v7_23_3_0.xml deleted file mode 100644 index e2d2128..0000000 --- a/.idea/libraries/recyclerview_v7_23_3_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_23_4_0.xml b/.idea/libraries/recyclerview_v7_23_4_0.xml new file mode 100644 index 0000000..5e214be --- /dev/null +++ b/.idea/libraries/recyclerview_v7_23_4_0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_3_0.xml b/.idea/libraries/support_annotations_23_4_0.xml similarity index 56% rename from .idea/libraries/support_annotations_23_3_0.xml rename to .idea/libraries/support_annotations_23_4_0.xml index a2f182e..87c058c 100644 --- a/.idea/libraries/support_annotations_23_3_0.xml +++ b/.idea/libraries/support_annotations_23_4_0.xml @@ -1,12 +1,11 @@ - + - + - - + \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_3_0.xml b/.idea/libraries/support_v4_23_3_0.xml deleted file mode 100644 index e75eec2..0000000 --- a/.idea/libraries/support_v4_23_3_0.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_4_0.xml b/.idea/libraries/support_v4_23_4_0.xml new file mode 100644 index 0000000..5ae14ad --- /dev/null +++ b/.idea/libraries/support_v4_23_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_23_3_0.xml b/.idea/libraries/support_vector_drawable_23_4_0.xml similarity index 50% rename from .idea/libraries/support_vector_drawable_23_3_0.xml rename to .idea/libraries/support_vector_drawable_23_4_0.xml index a47f58e..5d80f68 100644 --- a/.idea/libraries/support_vector_drawable_23_3_0.xml +++ b/.idea/libraries/support_vector_drawable_23_4_0.xml @@ -1,13 +1,12 @@ - + - - + + - - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6e84724..013c6bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,28 +1,29 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 23 + buildToolsVersion "23.0.3" - defaultConfig { - applicationId "com.android_app.matan.ara.sagi.thesocialnotework" - minSdkVersion 19 - targetSdkVersion 23 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + defaultConfig { + applicationId "com.android_app.matan.ara.sagi.thesocialnotework" + minSdkVersion 19 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } - } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.3.0' - compile 'com.android.support:design:23.3.0' - compile 'com.android.volley:volley:1.0.0' + compile fileTree(dir: 'libs', include: ['*.jar']) + testCompile 'junit:junit:4.12' + compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:design:23.4.0' + compile 'com.android.volley:volley:1.0.0' + compile 'com.google.android.gms:play-services:9.2.0' } diff --git a/app/src/debug/res/values/google_maps_api.xml b/app/src/debug/res/values/google_maps_api.xml new file mode 100644 index 0000000..7b9484b --- /dev/null +++ b/app/src/debug/res/values/google_maps_api.xml @@ -0,0 +1,21 @@ + + + + AIzaSyAh1zNJoLXlCF_MWXQLQyer4nADBVevIPo + + diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MapsActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MapsActivity.java new file mode 100644 index 0000000..6c202ad --- /dev/null +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MapsActivity.java @@ -0,0 +1,68 @@ +package com.android_app.matan.ara.sagi.thesocialnotework; + +import android.content.Intent; +import android.support.v4.app.FragmentActivity; +import android.os.Bundle; +import android.util.Log; +import android.widget.Toast; + +import com.google.android.gms.maps.CameraUpdateFactory; +import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.LatLng; +import com.google.android.gms.maps.model.MarkerOptions; + +import java.util.ArrayList; + +public class MapsActivity extends FragmentActivity implements OnMapReadyCallback { + + private GoogleMap mMap; + private ArrayList listOfNotes; + private float userLat, userLng; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_maps); + // Obtain the SupportMapFragment and get notified when the map is ready to be used. + SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() + .findFragmentById(R.id.map); + mapFragment.getMapAsync(this); + + Log.d("Tag","in maps create"); + listOfNotes = getIntent().getParcelableArrayListExtra("note_list"); + userLat = getIntent().getFloatExtra("user_lat", -34); + userLng = getIntent().getFloatExtra("user_lng", 151); + Toast.makeText(this, listOfNotes.get(1).title, Toast.LENGTH_LONG).show(); + } + + + /** + * Manipulates the map once available. + * This callback is triggered when the map is ready to be used. + * This is where we can add markers or lines, add listeners or move the camera. In this case, + * we just add a marker near Sydney, Australia. + * If Google Play services is not installed on the device, the user will be prompted to install + * it inside the SupportMapFragment. This method will only be triggered once the user has + * installed Google Play services and returned to the app. + */ + @Override + public void onMapReady(GoogleMap googleMap) { + mMap = googleMap; + + LatLng userLocation = new LatLng(userLat,userLng); + LatLng noteLocation = null; + + for (Note note :listOfNotes){ + noteLocation = new LatLng(note.getLat(),note.getLon()); + mMap.addMarker(new MarkerOptions().position(noteLocation).title(note.getTitle())); + } + // Add a marker in Sydney and move the camera +// LatLng sydney = new LatLng(-34, 151); +// mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney")); + mMap.addMarker(new MarkerOptions().position(userLocation).title("I Am Here!")); + + mMap.moveCamera(CameraUpdateFactory.newLatLng(userLocation)); + } +} diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java index 4d8bfeb..2fc2e2d 100644 --- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java @@ -1,11 +1,14 @@ package com.android_app.matan.ara.sagi.thesocialnotework; +import android.os.Parcel; +import android.os.Parcelable; + import java.util.ArrayList; /** * Created by JERLocal on 7/1/2016. */ -public class Note { +public class Note implements Parcelable{ protected int likes; protected ArrayList tags; @@ -15,6 +18,7 @@ public class Note { + public Note(String id, float lat, float lon, String address, String title, String body, String timestamp, boolean isPublic, int likes, ArrayList tags) { this.id = id; this.lat = lat; @@ -29,6 +33,31 @@ public class Note { this.tags = tags; } + protected Note(Parcel in) { + likes = in.readInt(); + tags = in.createStringArrayList(); + lat = in.readFloat(); + lon = in.readFloat(); + id = in.readString(); + address = in.readString(); + title = in.readString(); + body = in.readString(); + timestamp = in.readString(); + isPublic = in.readByte() != 0; + } + + public static final Creator CREATOR = new Creator() { + @Override + public Note createFromParcel(Parcel in) { + return new Note(in); + } + + @Override + public Note[] newArray(int size) { + return new Note[size]; + } + }; + @Override public String toString() { return "Note{" + @@ -126,6 +155,26 @@ public class Note { this.tags = tags; } + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(likes); + dest.writeList(tags); + dest.writeFloat(lat); + dest.writeFloat(lon); + dest.writeString(id); + dest.writeString(address); + dest.writeString(title); + dest.writeString(body); + dest.writeString(timestamp); + dest.writeByte((byte) (isPublic ? 1 : 0)); + } + + // public void save(SQLiteOpenHelper dbHelper, Context context){ // SQLiteDatabase db = dbHelper.getWritableDatabase(); // ContentValues values = new ContentValues(); diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java index f86ea97..3f9514e 100644 --- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java +++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java @@ -3,8 +3,11 @@ package com.android_app.matan.ara.sagi.thesocialnotework; import android.Manifest; import android.app.AlertDialog; import android.app.Dialog; +import android.app.FragmentTransaction; import android.content.DialogInterface; +import android.content.Intent; import android.content.pm.PackageManager; +import android.os.Parcelable; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; @@ -27,6 +30,7 @@ import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonArrayRequest; import com.android.volley.toolbox.JsonObjectRequest; +import com.google.android.gms.maps.MapFragment; import org.json.JSONArray; import org.json.JSONException; @@ -43,11 +47,14 @@ import java.util.Map; import java.util.TimeZone; +//TODO - change all "setOnClickListener to xml onClick +//TODO - + //http://thesocialnotework.appspot.com/api/status | http://localhost:8080/api/note/all?uid= public class PersonalSpaceActivity extends AppCompatActivity { protected ListView noteList; - protected Button addBtn; + protected Button addBtn, mapButton; private final String TAG = "Personal Space Activity"; private final int FINE_PERM = 0; private final String BASE_URL = "http://thesocialnotework-api.appspot.com/api"; @@ -56,6 +63,7 @@ public class PersonalSpaceActivity extends AppCompatActivity { private List listOfNotes; private ListAdapter noteListAdapter; private String userId; + private MapFragment mMapFragment; @Override @@ -74,6 +82,7 @@ public class PersonalSpaceActivity extends AppCompatActivity { this.noteList = (ListView) findViewById(R.id.ps_list_listview); addBtn = (Button) findViewById(R.id.ps_new_note_button); + mapButton = (Button) findViewById(R.id.ps_maps_btn); gpsUtils = new GPSUtils(this); gpsUtils.getLocation(); @@ -89,6 +98,30 @@ public class PersonalSpaceActivity extends AppCompatActivity { addBtn.setOnClickListener(addNewNoteDialog); + mapButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Log.d(TAG, "IN TESTS!!!!!!!!!!!!!!"); +// + Toast.makeText(PersonalSpaceActivity.this, "SUCCESS", Toast.LENGTH_LONG).show(); + + mMapFragment = MapFragment.newInstance(); + FragmentTransaction fragmentTransaction = + getFragmentManager().beginTransaction(); + fragmentTransaction.add(R.id.map, mMapFragment); + fragmentTransaction.commit(); + Intent mapsActivity = new Intent(PersonalSpaceActivity.this, MapsActivity.class); +// Bundle loginUserBundle = new Bundle(); + mapsActivity.putParcelableArrayListExtra("note_list", (ArrayList) listOfNotes); + mapsActivity.putExtra("user_lat", gpsUtils.getLatitude()); + mapsActivity.putExtra("user_lng", gpsUtils.getLongitude()); +// Log.d(TAG, "IN After!!!!!!!!!!!!!!"); +// + startActivity(mapsActivity); + Log.d(TAG, "FINIsh!!!"); + + } + }); + // click on listView item noteList.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override @@ -144,7 +177,7 @@ public class PersonalSpaceActivity extends AppCompatActivity { try { delNote.put("uid", userId); delNote.put("nid", note.getId()); - VolleyUtilSingleton.getInstance(PersonalSpaceActivity.this).post(BASE_URL + "/note/delete",delNote, deleteNoteSuccessListener, genericErrorListener); + VolleyUtilSingleton.getInstance(PersonalSpaceActivity.this).post(BASE_URL + "/note/delete", delNote, deleteNoteSuccessListener, genericErrorListener); listOfNotes.remove(position); } catch (JSONException e) { @@ -215,15 +248,13 @@ public class PersonalSpaceActivity extends AppCompatActivity { //title too short if (newTitle.getText().length() == 0) { - Toast toast = Toast.makeText(PersonalSpaceActivity.this, "Title too short.", Toast.LENGTH_LONG); - toast.show(); + Toast.makeText(PersonalSpaceActivity.this, "Title too short.", Toast.LENGTH_LONG).show(); return; } //title too long if (newTitle.getText().length() > 20) { - Toast toast = Toast.makeText(PersonalSpaceActivity.this, "Title too long.\n Use up to 20 notes.", Toast.LENGTH_LONG); - toast.show(); + Toast.makeText(PersonalSpaceActivity.this, "Title too long.\n Use up to 20 notes.", Toast.LENGTH_LONG).show(); return; } //volley post @@ -444,4 +475,17 @@ public class PersonalSpaceActivity extends AppCompatActivity { listOfNotes.add(addNote); } + +// public void goToMap(View v){ +// Log.d(TAG,"IN TESTS!!!!!!!!!!!!!!"); +// +// Toast.makeText(this,"SUCCESS",Toast.LENGTH_LONG).show(); +// Intent mapsActivity = new Intent(PersonalSpaceActivity.this, MapsActivity.class); +// Bundle loginUserBundle = new Bundle(); +// mapsActivity.putParcelableArrayListExtra("note_list", (ArrayList) listOfNotes); +// mapsActivity.putExtra("user_lat",gpsUtils.getLatitude()); +// mapsActivity.putExtra("user_lng",gpsUtils.getLongitude()); +// startActivity(mapsActivity); +// +// } } diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml new file mode 100644 index 0000000..4cb5c87 --- /dev/null +++ b/app/src/main/res/layout/activity_maps.xml @@ -0,0 +1,9 @@ + diff --git a/app/src/main/res/layout/activity_personal_space.xml b/app/src/main/res/layout/activity_personal_space.xml index 27d50fc..21995a8 100644 --- a/app/src/main/res/layout/activity_personal_space.xml +++ b/app/src/main/res/layout/activity_personal_space.xml @@ -26,16 +26,16 @@