From 8c4b5fbd9b06f287e96c9705560281ffa23b4ed0 Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Sat, 9 Jul 2016 01:50:49 +0300
Subject: [PATCH 1/2] - note display full modified - added avatar image class
 and implemented on map on note display (personal and map views)

---
 .idea/inspectionProfiles/Project_Default.xml  |   1 +
 .idea/libraries/android_android_23.xml        |   9 --
 .../animated_vector_drawable_23_4_0.xml       |   3 +-
 .idea/libraries/appcompat_v7_23_4_0.xml       |   3 +-
 .idea/libraries/design_23_4_0.xml             |   3 +-
 .../firebase_analytics_impl_9_2_0.xml         |   2 +-
 .idea/libraries/firebase_auth_9_2_0.xml       |   2 +-
 .../libraries/firebase_auth_common_9_2_0.xml  |   2 +-
 .../libraries/firebase_auth_module_9_2_0.xml  |   2 +-
 .idea/libraries/firebase_config_9_2_0.xml     |   2 +-
 .idea/libraries/firebase_crash_9_2_0.xml      |   2 +-
 .idea/libraries/firebase_database_9_2_0.xml   |   2 +-
 .idea/libraries/firebase_messaging_9_2_0.xml  |   2 +-
 .idea/libraries/firebase_storage_9_2_0.xml    |   2 +-
 .../firebase_storage_common_9_2_0.xml         |   2 +-
 .idea/libraries/mediarouter_v7_23_0_0.xml     |   3 +-
 .idea/libraries/play_services_9_2_0.xml       |   2 +-
 .../play_services_appindexing_9_2_0.xml       |   2 +-
 .../play_services_auth_base_9_2_0.xml         |   2 +-
 .../play_services_basement_9_2_0.xml          |   2 +-
 .idea/libraries/play_services_cast_9_2_0.xml  |   2 +-
 .../play_services_contextmanager_9_2_0.xml    |   2 +-
 .../play_services_location_9_2_0.xml          |   2 +-
 .idea/libraries/play_services_plus_9_2_0.xml  |   2 +-
 .../play_services_tagmanager_api_9_2_0.xml    |   2 +-
 .idea/libraries/play_services_tasks_9_2_0.xml |   2 +-
 .../libraries/play_services_vision_9_2_0.xml  |   2 +-
 .idea/libraries/recyclerview_v7_23_4_0.xml    |   3 +-
 .../libraries/support_annotations_23_4_0.xml  |   3 +-
 .idea/libraries/support_v4_23_4_0.xml         |   3 +-
 .../support_vector_drawable_23_4_0.xml        |   1 +
 .idea/libraries/volley_1_0_0.xml              |   2 +-
 .../sagi/thesocialnotework/GmapFragment.java  |  29 ++--
 .../ara/sagi/thesocialnotework/Note.java      |   2 +-
 .../thesocialnotework/PersonalFragment.java   |  21 +--
 .../RoundAvatarImageView.java                 |  38 +++++
 .../ara/sagi/thesocialnotework/Utils.java     |  33 +++-
 app/src/main/res/drawable/frame.xml           |  11 ++
 app/src/main/res/layout/note_display_full.xml | 146 +++++++++++++-----
 app/src/main/res/values/colors.xml            |   1 +
 40 files changed, 260 insertions(+), 97 deletions(-)
 delete mode 100644 .idea/libraries/android_android_23.xml
 create mode 100644 app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/RoundAvatarImageView.java
 create mode 100644 app/src/main/res/drawable/frame.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index e95f22e..24cc524 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintButtonStyle" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintUseCompoundDrawables" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
diff --git a/.idea/libraries/android_android_23.xml b/.idea/libraries/android_android_23.xml
deleted file mode 100644
index a279d4a..0000000
--- a/.idea/libraries/android_android_23.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="android-android-23">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/platforms/android-23/android.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/animated_vector_drawable_23_4_0.xml b/.idea/libraries/animated_vector_drawable_23_4_0.xml
index 08d7899..4688c4a 100644
--- a/.idea/libraries/animated_vector_drawable_23_4_0.xml
+++ b/.idea/libraries/animated_vector_drawable_23_4_0.xml
@@ -1,11 +1,12 @@
 <component name="libraryTable">
   <library name="animated-vector-drawable-23.4.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.4.0/animated-vector-drawable-23.4.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.4.0/animated-vector-drawable-23.4.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.4.0/animated-vector-drawable-23.4.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/appcompat_v7_23_4_0.xml b/.idea/libraries/appcompat_v7_23_4_0.xml
index 6391448..215af43 100644
--- a/.idea/libraries/appcompat_v7_23_4_0.xml
+++ b/.idea/libraries/appcompat_v7_23_4_0.xml
@@ -4,11 +4,12 @@
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.4.0/appcompat-v7-23.4.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.4.0/appcompat-v7-23.4.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.4.0/appcompat-v7-23.4.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/design_23_4_0.xml b/.idea/libraries/design_23_4_0.xml
index 5d90be8..da6f2ae 100644
--- a/.idea/libraries/design_23_4_0.xml
+++ b/.idea/libraries/design_23_4_0.xml
@@ -4,11 +4,12 @@
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/design/23.4.0/design-23.4.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/design/23.4.0/design-23.4.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/design/23.4.0/design-23.4.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/firebase_analytics_impl_9_2_0.xml b/.idea/libraries/firebase_analytics_impl_9_2_0.xml
index 6e0d7e2..4993bce 100644
--- a/.idea/libraries/firebase_analytics_impl_9_2_0.xml
+++ b/.idea/libraries/firebase_analytics_impl_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-analytics-impl-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_auth_9_2_0.xml b/.idea/libraries/firebase_auth_9_2_0.xml
index 7185ab6..f4f9543 100644
--- a/.idea/libraries/firebase_auth_9_2_0.xml
+++ b/.idea/libraries/firebase_auth_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-auth-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_auth_common_9_2_0.xml b/.idea/libraries/firebase_auth_common_9_2_0.xml
index 86f4201..7a29d3c 100644
--- a/.idea/libraries/firebase_auth_common_9_2_0.xml
+++ b/.idea/libraries/firebase_auth_common_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-auth-common-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_auth_module_9_2_0.xml b/.idea/libraries/firebase_auth_module_9_2_0.xml
index a45803b..06c2d67 100644
--- a/.idea/libraries/firebase_auth_module_9_2_0.xml
+++ b/.idea/libraries/firebase_auth_module_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-auth-module-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_config_9_2_0.xml b/.idea/libraries/firebase_config_9_2_0.xml
index d4a396e..fc1bc23 100644
--- a/.idea/libraries/firebase_config_9_2_0.xml
+++ b/.idea/libraries/firebase_config_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-config-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_crash_9_2_0.xml b/.idea/libraries/firebase_crash_9_2_0.xml
index 7b7a413..5f6e0d0 100644
--- a/.idea/libraries/firebase_crash_9_2_0.xml
+++ b/.idea/libraries/firebase_crash_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-crash-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_database_9_2_0.xml b/.idea/libraries/firebase_database_9_2_0.xml
index 4cf8d04..2ce92c1 100644
--- a/.idea/libraries/firebase_database_9_2_0.xml
+++ b/.idea/libraries/firebase_database_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-database-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_messaging_9_2_0.xml b/.idea/libraries/firebase_messaging_9_2_0.xml
index f28a963..036d0ad 100644
--- a/.idea/libraries/firebase_messaging_9_2_0.xml
+++ b/.idea/libraries/firebase_messaging_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-messaging-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_storage_9_2_0.xml b/.idea/libraries/firebase_storage_9_2_0.xml
index 111cccc..d84dec2 100644
--- a/.idea/libraries/firebase_storage_9_2_0.xml
+++ b/.idea/libraries/firebase_storage_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-storage-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/firebase_storage_common_9_2_0.xml b/.idea/libraries/firebase_storage_common_9_2_0.xml
index 206dd0b..380abaf 100644
--- a/.idea/libraries/firebase_storage_common_9_2_0.xml
+++ b/.idea/libraries/firebase_storage_common_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="firebase-storage-common-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/mediarouter_v7_23_0_0.xml b/.idea/libraries/mediarouter_v7_23_0_0.xml
index 39b8fc6..9e4c862 100644
--- a/.idea/libraries/mediarouter_v7_23_0_0.xml
+++ b/.idea/libraries/mediarouter_v7_23_0_0.xml
@@ -5,11 +5,12 @@
     </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/jars/libs/internal_impl-23.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/mediarouter-v7/23.0.0/mediarouter-v7-23.0.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/mediarouter-v7/23.0.0/mediarouter-v7-23.0.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/mediarouter-v7/23.0.0/mediarouter-v7-23.0.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/play_services_9_2_0.xml b/.idea/libraries/play_services_9_2_0.xml
index 7460e35..c48c16f 100644
--- a/.idea/libraries/play_services_9_2_0.xml
+++ b/.idea/libraries/play_services_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_appindexing_9_2_0.xml b/.idea/libraries/play_services_appindexing_9_2_0.xml
index 1f748dc..972539a 100644
--- a/.idea/libraries/play_services_appindexing_9_2_0.xml
+++ b/.idea/libraries/play_services_appindexing_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-appindexing-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_auth_base_9_2_0.xml b/.idea/libraries/play_services_auth_base_9_2_0.xml
index a6522a6..992cc4d 100644
--- a/.idea/libraries/play_services_auth_base_9_2_0.xml
+++ b/.idea/libraries/play_services_auth_base_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-auth-base-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_basement_9_2_0.xml b/.idea/libraries/play_services_basement_9_2_0.xml
index 0aec068..d4ac257 100644
--- a/.idea/libraries/play_services_basement_9_2_0.xml
+++ b/.idea/libraries/play_services_basement_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-basement-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_cast_9_2_0.xml b/.idea/libraries/play_services_cast_9_2_0.xml
index 984c4b1..db48fce 100644
--- a/.idea/libraries/play_services_cast_9_2_0.xml
+++ b/.idea/libraries/play_services_cast_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-cast-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_contextmanager_9_2_0.xml b/.idea/libraries/play_services_contextmanager_9_2_0.xml
index f1795a0..0c01383 100644
--- a/.idea/libraries/play_services_contextmanager_9_2_0.xml
+++ b/.idea/libraries/play_services_contextmanager_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-contextmanager-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_location_9_2_0.xml b/.idea/libraries/play_services_location_9_2_0.xml
index 37fb730..53c7ebe 100644
--- a/.idea/libraries/play_services_location_9_2_0.xml
+++ b/.idea/libraries/play_services_location_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-location-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_plus_9_2_0.xml b/.idea/libraries/play_services_plus_9_2_0.xml
index 13b2aef..a1e9d21 100644
--- a/.idea/libraries/play_services_plus_9_2_0.xml
+++ b/.idea/libraries/play_services_plus_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-plus-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_tagmanager_api_9_2_0.xml b/.idea/libraries/play_services_tagmanager_api_9_2_0.xml
index 785dae0..0ccf9df 100644
--- a/.idea/libraries/play_services_tagmanager_api_9_2_0.xml
+++ b/.idea/libraries/play_services_tagmanager_api_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-tagmanager-api-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_tasks_9_2_0.xml b/.idea/libraries/play_services_tasks_9_2_0.xml
index 255cf7b..e7d0a1b 100644
--- a/.idea/libraries/play_services_tasks_9_2_0.xml
+++ b/.idea/libraries/play_services_tasks_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-tasks-9.2.0">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/play_services_vision_9_2_0.xml b/.idea/libraries/play_services_vision_9_2_0.xml
index d05e55f..02a9a1e 100644
--- a/.idea/libraries/play_services_vision_9_2_0.xml
+++ b/.idea/libraries/play_services_vision_9_2_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="play-services-vision-9.2.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.2.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.2.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/recyclerview_v7_23_4_0.xml b/.idea/libraries/recyclerview_v7_23_4_0.xml
index c26f835..0651040 100644
--- a/.idea/libraries/recyclerview_v7_23_4_0.xml
+++ b/.idea/libraries/recyclerview_v7_23_4_0.xml
@@ -4,11 +4,12 @@
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.4.0/recyclerview-v7-23.4.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.4.0/recyclerview-v7-23.4.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.4.0/recyclerview-v7-23.4.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/support_annotations_23_4_0.xml b/.idea/libraries/support_annotations_23_4_0.xml
index fbf30c6..4619479 100644
--- a/.idea/libraries/support_annotations_23_4_0.xml
+++ b/.idea/libraries/support_annotations_23_4_0.xml
@@ -1,10 +1,11 @@
 <component name="libraryTable">
   <library name="support-annotations-23.4.0">
     <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.jar!/" />
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/support_v4_23_4_0.xml b/.idea/libraries/support_v4_23_4_0.xml
index 027c10d..b9606c9 100644
--- a/.idea/libraries/support_v4_23_4_0.xml
+++ b/.idea/libraries/support_v4_23_4_0.xml
@@ -5,11 +5,12 @@
     </ANNOTATIONS>
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars/libs/internal_impl-23.4.0.jar!/" />
-      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/res" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.4.0/support-v4-23.4.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.4.0/support-v4-23.4.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-v4/23.4.0/support-v4-23.4.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/support_vector_drawable_23_4_0.xml b/.idea/libraries/support_vector_drawable_23_4_0.xml
index 4cdec89..c4f8c3a 100644
--- a/.idea/libraries/support_vector_drawable_23_4_0.xml
+++ b/.idea/libraries/support_vector_drawable_23_4_0.xml
@@ -6,6 +6,7 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
+      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.4.0/support-vector-drawable-23.4.0-sources.jar!/" />
       <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.4.0/support-vector-drawable-23.4.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.4.0/support-vector-drawable-23.4.0-sources.jar!/" />
     </SOURCES>
diff --git a/.idea/libraries/volley_1_0_0.xml b/.idea/libraries/volley_1_0_0.xml
index 81a83dd..8e317b7 100644
--- a/.idea/libraries/volley_1_0_0.xml
+++ b/.idea/libraries/volley_1_0_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="volley-1.0.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
index 1774054..d4f31a6 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
@@ -19,6 +19,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -176,14 +177,15 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
 
                     final Note note = eventMarkerMap.get(marker);
                     final Dialog noteViewDialog = new Dialog(getActivity());
+
+                    noteViewDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
                     noteViewDialog.setContentView(R.layout.note_display_full);
 
                     boolean isOwner = note.getOwnerId().equals(mainActivity.getUserId());
-                    if (isOwner)
-                        noteViewDialog.setTitle("You wrote...");
-                    else
-                        noteViewDialog.setTitle("Someone wrote...");
-
+//                    if (isOwner)
+//                        noteViewDialog.setTitle("You wrote...");
+//                    else
+//                        noteViewDialog.setTitle("Someone wrote...");
                     noteViewDialog.show();
 
 
@@ -191,24 +193,29 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
                     final TextView title = (TextView) noteViewDialog.findViewById(R.id.ndf_title_textview);
                     final TextView body = (TextView) noteViewDialog.findViewById(R.id.ndf_body_textview);
                     final TextView time = (TextView) noteViewDialog.findViewById(R.id.ndf_time_textview);
+                    final TextView date = (TextView) noteViewDialog.findViewById(R.id.ndf_date_textview);
                     final TextView location = (TextView) noteViewDialog.findViewById(R.id.ndf_address_textview);
                     final TextView likes = (TextView) noteViewDialog.findViewById(R.id.ndf_likes_textview);
-                    final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview);
+//                    final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview);
                     final TextView permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview);
                     final ImageView avatar = (ImageView) noteViewDialog.findViewById(R.id.note_user_avatar);
+                    final ImageView permissionImg = (ImageView) noteViewDialog.findViewById(R.id.permission_image);
                     final ImageButton deleteBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton);
 
 
                     title.setText(note.getTitle());
                     body.setText(note.getBody());
-                    time.setText(note.getTimestamp());
-                    location.setText("Address: " + note.getAddress());
-                    likes.setText("Likes: " + note.getLikes());
-                    tags.setText("Tags: " + note.getTags().toString());
+                    time.setText(note.getTime());
+                    date.setText(note.getDate());
+
+                    location.setText("" + note.getAddress());
+                    likes.setText("" + note.getLikes());
+//                    tags.setText("Tags: " + note.getTags().toString());
                     Utils.URLtoImageView(avatar, note.getAvatar());
                     if (isOwner) {
-                        permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));
+                        permission.setText("" + (note.isPublic() ? "Public" : "Private"));
                     } else {
+                        permissionImg.setVisibility(View.INVISIBLE);
                         permission.setText("");
                         deleteBtn.setBackgroundResource(R.drawable.like_icon);
                     }
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 13e645e..c43b66d 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
@@ -212,7 +212,7 @@ public class Note implements Parcelable {
     }
 
     public String getDate() {
-        Date d = new Date();
+        Date d = new Date(timestamp);
         DateFormat format = new SimpleDateFormat("dd MMM yyy");
         return format.format(d);
     }
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
index 53c49a3..b39bfc2 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
@@ -19,6 +19,7 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.Button;
@@ -316,36 +317,38 @@ public class PersonalFragment extends Fragment {
             //create and configure dialog
             final Note note = listOfNotes.get(position);
             final Dialog noteViewDialog = new Dialog(getActivity());
+            noteViewDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
             noteViewDialog.setContentView(R.layout.note_display_full);
-            noteViewDialog.setTitle("You wrote...");
+//            noteViewDialog.setTitle("You wrote...");
 
             WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
             lp.copyFrom(noteViewDialog.getWindow().getAttributes());
             lp.width = WindowManager.LayoutParams.MATCH_PARENT;
             lp.height = WindowManager.LayoutParams.MATCH_PARENT;
             noteViewDialog.show();
-//                dialog.getWindow().setAttributes(lp);
 
 
             //get note_view_full layout elements
             final TextView title = (TextView) noteViewDialog.findViewById(R.id.ndf_title_textview);
             final TextView body = (TextView) noteViewDialog.findViewById(R.id.ndf_body_textview);
             final TextView time = (TextView) noteViewDialog.findViewById(R.id.ndf_time_textview);
+            final TextView date = (TextView) noteViewDialog.findViewById(R.id.ndf_date_textview);
             final TextView location = (TextView) noteViewDialog.findViewById(R.id.ndf_address_textview);
             final TextView likes = (TextView) noteViewDialog.findViewById(R.id.ndf_likes_textview);
-            final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview);
+//            final TextView tags = (TextView) noteViewDialog.findViewById(R.id.ndf_tags_textview);
             final TextView permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview);
             final ImageButton deleteBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton);
-            final ImageView avatar = (ImageView) noteViewDialog.findViewById(R.id.note_user_avatar);
+            final ImageView avatar = (RoundAvatarImageView) noteViewDialog.findViewById(R.id.note_user_avatar);
 
 
             title.setText(note.getTitle());
             body.setText(note.getBody());
-            time.setText(note.getTimestamp());
-            location.setText("Address: " + note.getAddress());
-            likes.setText("Likes: " + note.getLikes());
-            tags.setText("Tags: "+ note.getTags().toString());
-            permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));
+            date.setText(note.getDate());
+            time.setText(note.getTime());
+            location.setText(note.getAddress());
+            if(likes !=null )likes.setText("" + note.getLikes());
+//            tags.setText("Tags: "+ note.getTags().toString());
+            permission.setText("" + (note.isPublic() ? "Public" : "Private"));
             Utils.URLtoImageView(avatar, note.getAvatar());
 
             deleteBtn.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/RoundAvatarImageView.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/RoundAvatarImageView.java
new file mode 100644
index 0000000..28aa2d8
--- /dev/null
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/RoundAvatarImageView.java
@@ -0,0 +1,38 @@
+package com.android_app.matan.ara.sagi.thesocialnotework;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+
+/**
+ * Created by matanbaryosef on 08/07/2016.
+ */
+public class RoundAvatarImageView extends ImageView {
+
+    public static float radius = 110.0f;
+
+    public RoundAvatarImageView(Context context) {
+        super(context);
+    }
+
+    public RoundAvatarImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RoundAvatarImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        //float radius = 36.0f;
+        Path clipPath = new Path();
+        RectF rect = new RectF(0, 0, this.getWidth(), this.getHeight());
+        clipPath.addRoundRect(rect, radius, radius, Path.Direction.CW);
+        canvas.clipPath(clipPath);
+        super.onDraw(canvas);
+    }
+}
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
index 00eedfe..8c16ba0 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
@@ -4,6 +4,12 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.AsyncTask;
 import android.util.Log;
 import android.widget.ImageView;
@@ -150,10 +156,33 @@ public class Utils {
 
     @Override
     protected void onPostExecute(Bitmap b){
-      iv.setImageBitmap(b);
+        iv.setImageBitmap(b);
+        //getRoundedCornerBitmap(b, 20);
+    }
+  }
+    public static Bitmap getRoundedCornerBitmap(Bitmap bitmap, int pixels) {
+        Log.d(TAG, "rounded bitmap");
+        Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap
+                .getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(output);
+
+        final int color = 0xff424242;
+        final Paint paint = new Paint();
+        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
+        final RectF rectF = new RectF(rect);
+        final float roundPx = pixels;
+
+        paint.setAntiAlias(true);
+        canvas.drawARGB(0, 0, 0, 0);
+        paint.setColor(color);
+        canvas.drawRoundRect(rectF, roundPx, roundPx, paint);
+
+        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas.drawBitmap(bitmap, rect, rect, paint);
+
+        return output;
     }
 
-  }
 
 
 }
diff --git a/app/src/main/res/drawable/frame.xml b/app/src/main/res/drawable/frame.xml
new file mode 100644
index 0000000..29572f8
--- /dev/null
+++ b/app/src/main/res/drawable/frame.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <padding
+        android:top="6dp"
+
+        android:bottom="6dp"/>
+
+    <corners android:radius="35dp" />
+    <stroke android:width="1dp" android:color="@android:color/transparent" />
+</shape> 
\ No newline at end of file
diff --git a/app/src/main/res/layout/note_display_full.xml b/app/src/main/res/layout/note_display_full.xml
index 3489609..28d3834 100644
--- a/app/src/main/res/layout/note_display_full.xml
+++ b/app/src/main/res/layout/note_display_full.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/cast_ic_notification_1">
 
-
-    <LinearLayout
+  <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="20dp"
@@ -15,10 +15,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ImageView
-          android:layout_width="70dp"
-          android:layout_height="70dp"
-          android:id="@+id/note_user_avatar" />
+
+          <com.android_app.matan.ara.sagi.thesocialnotework.RoundAvatarImageView
+              android:layout_width="70dp"
+              android:layout_height="70dp"
+              android:id="@+id/note_user_avatar"
+              android:layout_centerInParent="true"
+              android:scaleType="centerCrop" />
 
         <LinearLayout
           android:orientation="vertical"
@@ -30,49 +33,120 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Title"
-                android:textAppearance="?android:attr/textAppearanceLarge" />
+                android:textAppearance="?android:attr/textAppearanceLarge"
+              android:layout_gravity="center" />
 
           <TextView
                 android:id="@+id/ndf_body_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Body"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceMedium"
+              android:layout_gravity="center" />
         </LinearLayout>
       </LinearLayout>
 
-      <TextView
-            android:id="@+id/ndf_time_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="New Text" />
+      <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="10dp">
 
-        <TextView
-            android:id="@+id/ndf_address_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="New Text" />
+          <ImageView
+              android:layout_width="20dp"
+              android:layout_height="20dp"
+              android:id="@+id/imageView6"
+              android:src="@drawable/date_icon"
+              android:layout_gravity="center_vertical" />
 
-        <TextView
-            android:id="@+id/ndf_tags_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="New Text"
-            android:textAppearance="?android:attr/textAppearanceListItem" />
+          <TextView
+                android:id="@+id/ndf_date_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="New Text"
+              android:layout_marginLeft="10dp" />
 
-        <TextView
-            android:id="@+id/ndf_permission_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="New Text" />
+          <ImageView
+              android:layout_width="13dp"
+              android:layout_height="13dp"
+              android:id="@+id/imageView7"
+              android:scaleType="fitCenter"
+              android:src="@drawable/time_icon"
+              android:layout_marginLeft="10dp"
+              android:layout_gravity="center_vertical" />
 
-        <TextView
-            android:id="@+id/ndf_likes_textview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="New Text" />
+          <TextView
+              android:id="@+id/ndf_time_textview"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="New Text"
+              android:layout_marginLeft="10dp" />
+      </LinearLayout>
 
-        <ImageButton
+      <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="10dp">
+
+          <ImageView
+              android:layout_width="20dp"
+              android:layout_height="20dp"
+              android:id="@+id/imageView8"
+              android:src="@drawable/location_icon"
+              android:layout_gravity="center_vertical" />
+
+          <TextView
+                android:id="@+id/ndf_address_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="New Text"
+              android:layout_marginLeft="10dp" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:layout_marginTop="10dp">
+
+          <ImageView
+              android:layout_width="20dp"
+              android:layout_height="20dp"
+              android:id="@+id/permission_image"
+              android:src="@drawable/permission_icon"
+              android:layout_gravity="center_vertical" />
+
+          <TextView
+                android:id="@+id/ndf_permission_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="New Text"
+              android:layout_marginLeft="10dp" />
+      </LinearLayout>
+
+      <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:layout_marginTop="10dp">
+
+          <ImageView
+              android:layout_width="20dp"
+              android:layout_height="20dp"
+              android:id="@+id/imageView9"
+              android:src="@drawable/like_icon"
+              android:layout_gravity="center_vertical" />
+
+          <TextView
+                android:id="@+id/ndf_likes_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="New Text"
+              android:layout_marginLeft="10dp" />
+      </LinearLayout>
+
+      <ImageButton
             android:id="@+id/ndf_delete_imagebutton"
             android:layout_width="40dp"
             android:layout_height="40dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7285802..79dfdab 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
   <color name="colorPrimary">#246068</color>
   <color name="colorPrimaryDark">#012e34</color>
   <color name="colorAccent">#ffb073</color>
+  <color name="darkGrayNote">#d1d4d7</color>
 </resources>

From 92138f26bb74a3d2c85b0121424ec4ebdd2e98b2 Mon Sep 17 00:00:00 2001
From: Aran Zaiger <aranzaiger@gmail.com>
Date: Sat, 9 Jul 2016 02:24:32 +0300
Subject: [PATCH 2/2] added permissions checks and handling

---
 .../ara/sagi/thesocialnotework/GPSUtils.java  | 60 ++++++++--------
 .../sagi/thesocialnotework/GmapFragment.java  |  2 +-
 .../sagi/thesocialnotework/LoginActivity.java | 44 ++++++++++++
 .../sagi/thesocialnotework/MainActivity.java  | 71 +++++++++++++------
 .../thesocialnotework/PersonalFragment.java   | 27 ++++---
 .../thesocialnotework/SettingsFragment.java   | 18 ++++-
 .../ara/sagi/thesocialnotework/Utils.java     | 23 +++++-
 7 files changed, 178 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java
index 6188eb1..5f81794 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GPSUtils.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 public class GPSUtils extends Service implements LocationListener {
 
-    private static final String TAG ="GPSUtils" ;
+    private static final String TAG = "GPSUtils";
     private final Context mContext;
 
     // flag for GPS status
@@ -53,7 +53,7 @@ public class GPSUtils extends Service implements LocationListener {
         getLocation();
     }
 
-//    public Location getLocation() {
+    //    public Location getLocation() {
 //        LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
 //        if (locationManager != null) {
 //            Location lastKnownLocationGPS = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
@@ -69,14 +69,14 @@ public class GPSUtils extends Service implements LocationListener {
 //            return null;
 //        }
     public Location getLocation() {
-            try {
-                Log.d("TAG","in get location");
-                locationManager =
-                        (LocationManager) mContext
-                                .getSystemService(LOCATION_SERVICE);
+        try {
+            Log.d("TAG", "in get location");
+            locationManager =
+                    (LocationManager) mContext
+                            .getSystemService(LOCATION_SERVICE);
 
-                // getting GPS status
-                isGPSEnabled = locationManager
+            // getting GPS status
+            isGPSEnabled = locationManager
                     .isProviderEnabled(LocationManager.GPS_PROVIDER);
 
             // getting network status
@@ -91,10 +91,10 @@ public class GPSUtils extends Service implements LocationListener {
                 if (isNetworkEnabled) {
                     if (ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                         Log.e("TAG", "No Permissions");
-                        ((MainActivity)mContext).setLocationPermission(false);
+                        Utils.setLocationPermission(false);
                         return null;
-                    }else{
-                        ((MainActivity)mContext).setLocationPermission(true);
+                    } else {
+                        Utils.setLocationPermission(true);
                     }
                     Log.d(TAG, "Network");
                     if (locationManager != null) {
@@ -120,9 +120,8 @@ public class GPSUtils extends Service implements LocationListener {
                             }
                         }
                     }
-                }
-                else{
-                    location =  locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
+                } else {
+                    location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
                 }
             }
 
@@ -133,7 +132,7 @@ public class GPSUtils extends Service implements LocationListener {
         return location;
     }
 
-    public void showSettingsAlert(){
+    public void showSettingsAlert() {
         AlertDialog.Builder alertDialog = new AlertDialog.Builder(mContext);
 
         // Setting Dialog Title
@@ -144,7 +143,7 @@ public class GPSUtils extends Service implements LocationListener {
 
         // On pressing Settings button
         alertDialog.setPositiveButton("Settings", new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog,int which) {
+            public void onClick(DialogInterface dialog, int which) {
                 Intent intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
                 mContext.startActivity(intent);
             }
@@ -188,13 +187,13 @@ public class GPSUtils extends Service implements LocationListener {
         return null;
     }
 
-    public List<Address> getFromLocation(double latitude, double longitude, int maxResults){
+    public List<Address> getFromLocation(double latitude, double longitude, int maxResults) {
         try {
             List<Address> addresses;
 
             geocoder = new Geocoder(mContext);
             if (latitude != 0 || longitude != 0) {
-                addresses = geocoder.getFromLocation(latitude ,
+                addresses = geocoder.getFromLocation(latitude,
                         longitude, maxResults);
                 return addresses;
 
@@ -212,11 +211,11 @@ public class GPSUtils extends Service implements LocationListener {
 
     /**
      * Function to get latitude
-     * */
-    public double getLatitude(){
-        if(location != null){
+     */
+    public double getLatitude() {
+        if (location != null) {
             latitude = location.getLatitude();
-        }else{
+        } else {
             Log.d("Tag", "Got NULL");
         }
 
@@ -226,9 +225,9 @@ public class GPSUtils extends Service implements LocationListener {
 
     /**
      * Function to get longitude
-     * */
-    public double getLongitude(){
-        if(location != null){
+     */
+    public double getLongitude() {
+        if (location != null) {
             longitude = location.getLongitude();
         }
 
@@ -236,21 +235,20 @@ public class GPSUtils extends Service implements LocationListener {
         return longitude;
     }
 
-    public Location getLastKnownLocation(){
+    public Location getLastKnownLocation() {
         if (location == null)
             return getLocation();
         return location;
     }
 
     public String getAddress() {
-        String address="";
+        String address = "";
 
 
-
-        List<Address> listAddress = getFromLocation(getLatitude(),getLongitude(),1);
+        List<Address> listAddress = getFromLocation(getLatitude(), getLongitude(), 1);
         for (int i = 0; i <= listAddress.get(0).getMaxAddressLineIndex(); i++) {
             listAddress.get(0).getAddressLine(i);
-            address += listAddress.get(0).getAddressLine(i)+" ";
+            address += listAddress.get(0).getAddressLine(i) + " ";
         }
         return address;
     }
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
index 1774054..6eb62b0 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
@@ -315,7 +315,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
             }
         }
     };
-    
+
 
 
     private class getMarkersFromNotes extends AsyncTask<List<Note>, MarkerNoteStruct, Void> {
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
index 3d260c5..5ff7851 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
@@ -3,6 +3,8 @@ package com.android_app.matan.ara.sagi.thesocialnotework;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Editable;
@@ -40,6 +42,8 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
     private final String LOGIN_PATH = "/login";
     private LoginActivity self; //this
     protected LinearLayout layout;
+    private boolean permissionsReturend = false;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,6 +63,9 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
         this.mLoginButton.setOnClickListener(this);
         this.mLoginButton.setEnabled(false);
 
+        //check for permission
+//        while(!permissionsReturend);
+
     }
 
     private void removeFocuse() {
@@ -220,5 +227,42 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
     public void afterTextChanged(Editable editable) {
 
     }
+//    @Override
+//    public void onRequestPermissionsResult(int requestCode,
+//                                           String permissions[], int[] grantResults) {
+//        permissionsReturend = true;
+//        Log.d(TAG, "onRequestPermissionsResult: in func");
+//        switch (requestCode) {
+//            case FINE_PERM: {
+//                // If request is cancelled, the result arrays are empty.
+//                if (grantResults.length > 0
+//                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+//                    Log.d(TAG, "onRequestPermissionsResult: got permission for location");
+//                    Utils.setLocationPermission(true);
+//                    ActivityCompat.requestPermissions(LoginActivity.this, new String[]{android.Manifest.permission.CAMERA}, CAMERA_PERM);
+//                } else {
+//                    Log.d(TAG, "onRequestPermissionsResult:DIDNT  get permission for location");
+//
+//                    Toast.makeText(LoginActivity.this,"No Location Permissions granted.\n\"An App is nothing without its permissions\"",Toast.LENGTH_LONG);
+////                    System.exit(0);
+//                }
+//                return;
+//            }
+//            case CAMERA_PERM: {
+//                if (grantResults.length > 0
+//                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+//                    Log.d(TAG, "onRequestPermissionsResult: got permission for camera");
+//                    Utils.setCameraPermission(true);
+//
+//
+//                } else {
+//                    Log.d(TAG, "onRequestPermissionsResult: DIDNT get permission for camera");
+//                    Toast.makeText(LoginActivity.this,"No Camera Permissions granted.\n\"An App is nothing without its permissions\"",Toast.LENGTH_LONG);
+//                }
+//                return;
+//            }
+//        }
+//    }
+
 }
 
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MainActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MainActivity.java
index 407ca3a..b34b561 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MainActivity.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/MainActivity.java
@@ -1,9 +1,11 @@
 package com.android_app.matan.ara.sagi.thesocialnotework;
 
+import android.*;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
@@ -11,6 +13,7 @@ import android.os.Bundle;
 import android.os.StrictMode;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -24,6 +27,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
+import android.widget.Toast;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -44,15 +48,15 @@ public class MainActivity extends AppCompatActivity
     protected final String TAG = "[TSN / MainActivity]";
     protected User user;
     private GPSUtils gpsUtils;
-    private boolean locationPermission;
     private GmapFragment gmapFragment;
     private PersonalFragment personalFragment;
     private SettingsFragment settingsFragment;
     private Toolbar toolbar;
     public static final String BASE_URL = "http://thesocialnotework-api.appspot.com/api";
     private ImageView menu_avatar;
-  private MainActivity self;
-  private NavigationView nav_view;
+    private MainActivity self;
+    private NavigationView nav_view;
+    private final int FINE_PERM = 0, CAMERA_PERM = 1;
 
 
     @Override
@@ -60,6 +64,8 @@ public class MainActivity extends AppCompatActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         this.self = this;
+
+
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         toolbar.setTitle("Personal Notes");
         setSupportActionBar(toolbar);
@@ -69,11 +75,6 @@ public class MainActivity extends AppCompatActivity
         StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
         StrictMode.setThreadPolicy(policy);
 
-
-
-
-
-
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@@ -86,12 +87,12 @@ public class MainActivity extends AppCompatActivity
 
         //get Bundle data (UserString)
         Bundle b = getIntent().getExtras();
-        this.user  = new User(b.getString("UserData"));
+        this.user = new User(b.getString("UserData"));
 
         //Get The Nav_View Avatar View
         nav_view = (NavigationView) findViewById(R.id.nav_view);
         View header_v = nav_view.getHeaderView(0);
-        menu_avatar = (ImageView)header_v.findViewById(R.id.nav_user_avatar);
+        menu_avatar = (ImageView) header_v.findViewById(R.id.nav_user_avatar);
 
 
         //Change Layout
@@ -106,7 +107,7 @@ public class MainActivity extends AppCompatActivity
         gpsUtils.getLocation();
 
         //Change The Avatar
-       Utils.URLtoImageView(menu_avatar, user.getAvatar());
+        Utils.URLtoImageView(menu_avatar, user.getAvatar());
     }
 
     @Override
@@ -154,14 +155,14 @@ public class MainActivity extends AppCompatActivity
             setSupportActionBar(toolbar);
         } else if (id == R.id.nav_map) {
 
-            Log.d(TAG,"Before going to map");
+            Log.d(TAG, "Before going to map");
             toolbar.setTitle("Map");
             setSupportActionBar(toolbar);
             ft.replace(R.id.fragment_container, gmapFragment);
             ft.commit();
         } else if (id == R.id.nav_personal) {
 
-            Log.d(TAG,"Before going to personal");
+            Log.d(TAG, "Before going to personal");
             ft.replace(R.id.fragment_container, personalFragment);
             ft.commit();
         } else if (id == R.id.nav_settings) {
@@ -189,20 +190,44 @@ public class MainActivity extends AppCompatActivity
         return this.gpsUtils;
     }
 
-    public void setLocationPermission(boolean locationPermission) {
-        this.locationPermission = locationPermission;
+
+    public User getUser() {
+        return user;
     }
 
+    public String getUserId() {
+        return user.getId();
+    }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           String permissions[], int[] grantResults) {
+        Log.d(TAG, "onRequestPermissionsResult: in func");
+        switch (requestCode) {
+            case FINE_PERM: {
+                // If request is cancelled, the result arrays are empty.
+                if (grantResults.length > 1) {
+                    if (!(grantResults[0] == PackageManager.PERMISSION_GRANTED)){
+                        Log.d(TAG, "onRequestPermissionsResult: Did Not get permission for location");
+                        Toast.makeText(MainActivity.this, "No Location Permissions granted.\n\"An App is nothing without its permissions\"", Toast.LENGTH_LONG).show();
+                        System.exit(0);
 
+                    }
 
+                    if (!(grantResults[1] == PackageManager.PERMISSION_GRANTED)) {
+                        Log.d(TAG, "onRequestPermissionsResult:DIDNT  get permission for camera");
+                        Toast.makeText(MainActivity.this, "No Camera Permissions granted.\nyou will not be able to change avatar", Toast.LENGTH_LONG).show();
+                        Utils.setCameraPermission(false);
+                    } else {
+                        Utils.setCameraPermission(true);
+                    }
+                    return;
+                }
+            }
+        }
 
-
-
-  public User getUser(){
-    return user;
-  }
-
-    public String getUserId(){return user.getId();}
-
+    }
 }
+
+
+
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
index 53c49a3..9e30c96 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
@@ -51,7 +51,6 @@ import java.util.List;
 public class PersonalFragment extends Fragment {
 
     protected ListView noteList;
-    private final int FINE_PERM = 0;
     private final String BASE_URL = "http://thesocialnotework-api.appspot.com/api";
     private GPSUtils gpsUtils;
     private List<Note> listOfNotes;
@@ -59,6 +58,8 @@ public class PersonalFragment extends Fragment {
     private String userId;
     private final String TAG = "[TSN/PersonalFragment]";
     private MainActivity activity;
+    private final int FINE_PERM = 0, CAMERA_PERM = 1;
+
 
     public PersonalFragment() {
         // Required empty public constructor
@@ -74,8 +75,18 @@ public class PersonalFragment extends Fragment {
         Bundle bundle = getArguments();
         this.userId = activity.getUserId();
         Log.d(TAG, "onCreateView: userID: " + userId);
-        //check for permission
-        ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, FINE_PERM);
+
+        ActivityCompat.requestPermissions(activity, new String[]{
+                        android.Manifest.permission.ACCESS_FINE_LOCATION,
+                        android.Manifest.permission.CAMERA
+                },
+                FINE_PERM
+            );
+//        ActivityCompat.requestPermissions(activity, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION}, FINE_PERM);
+
+//        if (!Utils.arePermissionsGranted()) {
+//            Toast.makeText(getContext(), "Missing some Permissions...\nPlease go to app info and enable them", Toast.LENGTH_LONG).show();
+//        }
 
 
         this.noteList = (ListView) view.findViewById(R.id.ps_list_listview);
@@ -287,10 +298,7 @@ public class PersonalFragment extends Fragment {
     }
 
 
-
-
-
-            private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
+    private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
         Note addNote = new Note(
                 noteObject.getString("id"),
                 Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
@@ -344,7 +352,7 @@ public class PersonalFragment extends Fragment {
             time.setText(note.getTimestamp());
             location.setText("Address: " + note.getAddress());
             likes.setText("Likes: " + note.getLikes());
-            tags.setText("Tags: "+ note.getTags().toString());
+            tags.setText("Tags: " + note.getTags().toString());
             permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));
             Utils.URLtoImageView(avatar, note.getAvatar());
 
@@ -394,4 +402,7 @@ public class PersonalFragment extends Fragment {
 
     }
 
+
+
+
 }
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
index 88c9c79..b77b215 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/SettingsFragment.java
@@ -1,12 +1,16 @@
 package com.android_app.matan.ara.sagi.thesocialnotework;
 
+import android.*;
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
+import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -14,6 +18,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.Toast;
 
 public class SettingsFragment extends Fragment {
     private static final String ARG_PARAM1 = "param1";
@@ -105,10 +110,17 @@ public class SettingsFragment extends Fragment {
 
         public void onClick(View v)
         {
+            if (ActivityCompat.checkSelfPermission((MainActivity) getActivity(),
+                    Manifest.permission.CAMERA)
+                    == PackageManager.PERMISSION_GRANTED) {
+                Log.d(TAG, "in camera Button");
+                Intent intent = new Intent("android.media.action.IMAGE_CAPTURE");
+                startActivityForResult(intent, REQUEST_IMAGE_CAPTURE);
+            }
+            else{
+                Toast.makeText(getActivity(), "No Location Permissions granted.\n\"An App is nothing without its permissions\"", Toast.LENGTH_LONG).show();
 
-            Log.d(TAG, "in camera Button");
-            Intent intent = new Intent("android.media.action.IMAGE_CAPTURE");
-            startActivityForResult(intent, REQUEST_IMAGE_CAPTURE);
+            }
 
         }
 
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
index 00eedfe..691f22b 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Utils.java
@@ -34,7 +34,8 @@ public class Utils {
     public static final String BASE_URL = "http://thesocialnotework-api.appspot.com/api";
     public static ProgressDialog progress;
     private static HashMap<String, Bitmap> bitmapHash = new HashMap<>();
-
+    private static boolean mLocationPermission = false;
+    private static boolean mCameraPermission = false;
 
 
     public static Bitmap getBitmapFromURL(String url) {
@@ -156,4 +157,24 @@ public class Utils {
   }
 
 
+
+    public static void setLocationPermission(boolean locationPermission) {
+        mLocationPermission = locationPermission;
+    }
+    public static void setCameraPermission(boolean cameraPermission) {
+        mCameraPermission = cameraPermission;
+    }
+    public static boolean arePermissionsGranted() {
+        return (mLocationPermission && mCameraPermission);
+    }
+
+    public static boolean isCameraPermissionGranted(){
+        return mCameraPermission;
+    }
+    public static boolean isLocationPermissionGranted(){
+        return mLocationPermission;
+    }
+
+
+
 }