From bd992f1beb0821fc20621d20cc10135f9b3af269 Mon Sep 17 00:00:00 2001 From: Aran Zaiger Date: Fri, 8 Jul 2016 03:21:29 +0300 Subject: [PATCH] Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android # Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java --- .../matan/ara/sagi/thesocialnotework/GmapFragment.java | 2 +- .../matan/ara/sagi/thesocialnotework/PersonalFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 80af83a..bb097a7 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 @@ -212,7 +212,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback { time.setText(note.getTimestamp()); location.setText("Address: " + note.getAddress()); likes.setText("Likes: " + note.getLikes()); - tags.setText(note.getTags().toString()); + tags.setText("Tags: "+note.getTags().toString()); Utils.URLtoImageView(avatar, note.getAvatar()); if (isOwner) { permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private")); 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 52ee9a6..d09b42c 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 @@ -347,7 +347,7 @@ public class PersonalFragment extends Fragment { time.setText(note.getTimestamp()); location.setText("Address: " + note.getAddress()); likes.setText("Likes: " + note.getLikes()); - tags.setText(note.getTags().toString()); + tags.setText("Tags: "+ note.getTags().toString()); permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private")); Utils.URLtoImageView(avatar, note.getAvatar());