JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android

Browse source 
# Conflicts:
#	app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
This commit is contained in:
Aran Zaiger 2016-07-08 03:21:29 +03:00
parent 867dc7d877
commit bd992f1beb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/GmapFragment.java
View file

@ -212,7 +212,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
time.setText(note.getTimestamp()); time.setText(note.getTimestamp());
location.setText("Address: " + note.getAddress()); location.setText("Address: " + note.getAddress());
likes.setText("Likes: " + note.getLikes()); likes.setText("Likes: " + note.getLikes());
tags.setText(note.getTags().toString()); tags.setText("Tags: "+note.getTags().toString());
Utils.URLtoImageView(avatar, note.getAvatar()); Utils.URLtoImageView(avatar, note.getAvatar());
if (isOwner) { if (isOwner) {
permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private")); permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));

2
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
View file

@ -347,7 +347,7 @@ public class PersonalFragment extends Fragment {
time.setText(note.getTimestamp()); time.setText(note.getTimestamp());
location.setText("Address: " + note.getAddress()); location.setText("Address: " + note.getAddress());
likes.setText("Likes: " + note.getLikes()); likes.setText("Likes: " + note.getLikes());
tags.setText(note.getTags().toString()); tags.setText("Tags: "+ note.getTags().toString());
permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private")); permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));
Utils.URLtoImageView(avatar, note.getAvatar()); Utils.URLtoImageView(avatar, note.getAvatar());