Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
# Conflicts: # app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalFragment.java
This commit is contained in:
parent
26c272fbe5
commit
867dc7d877
31 changed files with 339 additions and 313 deletions
|
@ -1,11 +1,12 @@
|
|||
<component name="libraryTable">
|
||||
<library name="animated-vector-drawable-23.4.0">
|
||||
<CLASSES>
|
||||
<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!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
<component name="libraryTable">
|
||||
<library name="appcompat-v7-23.4.0">
|
||||
<ANNOTATIONS>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/annotations.zip!/" />
|
||||
</ANNOTATIONS>
|
||||
<CLASSES>
|
||||
<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" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
<component name="libraryTable">
|
||||
<library name="design-23.4.0">
|
||||
<ANNOTATIONS>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/annotations.zip!/" />
|
||||
</ANNOTATIONS>
|
||||
<CLASSES>
|
||||
<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" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="firebase-auth-9.2.0">
|
||||
<CLASSES>
|
||||
<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" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="firebase-common-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-common/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-common/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-common/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="firebase-messaging-9.2.0">
|
||||
<CLASSES>
|
||||
<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" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,12 +1,16 @@
|
|||
<component name="libraryTable">
|
||||
<library name="mediarouter-v7-23.0.0">
|
||||
<ANNOTATIONS>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/23.0.0/annotations.zip!/" />
|
||||
</ANNOTATIONS>
|
||||
<CLASSES>
|
||||
<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/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" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-ads-lite-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads-lite/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads-lite/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads-lite/9.2.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-analytics-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/9.2.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-appinvite-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-base-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.2.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-basement-9.2.0">
|
||||
<CLASSES>
|
||||
<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" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-cast-9.2.0">
|
||||
<CLASSES>
|
||||
<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!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.2.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-clearcut-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-clearcut/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-clearcut/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-clearcut/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-contextmanager-9.2.0">
|
||||
<CLASSES>
|
||||
<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" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-contextmanager/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-drive-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-fitness-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-gcm-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/9.2.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-identity-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/9.2.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-panorama-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-safetynet-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/9.2.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="play-services-tagmanager-9.2.0">
|
||||
<CLASSES>
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager/9.2.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager/9.2.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager/9.2.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
<component name="libraryTable">
|
||||
<library name="recyclerview-v7-23.4.0">
|
||||
<ANNOTATIONS>
|
||||
<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!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
<component name="libraryTable">
|
||||
<library name="support-annotations-23.4.0">
|
||||
<CLASSES>
|
||||
<root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-annotations/23.4.0/support-annotations-23.4.0.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.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,12 +1,16 @@
|
|||
<component name="libraryTable">
|
||||
<library name="support-v4-23.4.0">
|
||||
<ANNOTATIONS>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/annotations.zip!/" />
|
||||
</ANNOTATIONS>
|
||||
<CLASSES>
|
||||
<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/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!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
<component name="libraryTable">
|
||||
<library name="support-vector-drawable-23.4.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars/classes.jar!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/res" />
|
||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars/classes.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<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>
|
||||
</library>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<component name="libraryTable">
|
||||
<library name="volley-1.0.0">
|
||||
<CLASSES>
|
||||
<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!/" />
|
||||
<root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/res" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<ConfirmationsSetting value="0" id="Add" />
|
||||
<ConfirmationsSetting value="0" id="Remove" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
|
|
@ -184,9 +184,9 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
final Dialog noteViewDialog = new Dialog(getActivity());
|
||||
noteViewDialog.setContentView(R.layout.note_display_full);
|
||||
|
||||
boolean isOwner = note.getOwnerId() == mainActivity.getUserId();
|
||||
boolean isOwner = note.getOwnerId().equals(mainActivity.getUserId());
|
||||
if (isOwner)
|
||||
noteViewDialog.setTitle("I wrote...");
|
||||
noteViewDialog.setTitle("You wrote...");
|
||||
else
|
||||
noteViewDialog.setTitle("Someone wrote...");
|
||||
|
||||
|
@ -210,14 +210,15 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
|||
title.setText(note.getTitle());
|
||||
body.setText(note.getBody());
|
||||
time.setText(note.getTimestamp());
|
||||
location.setText("Tags: " + note.getAddress());
|
||||
location.setText("Address: " + note.getAddress());
|
||||
likes.setText("Likes: " + note.getLikes());
|
||||
tags.setText(note.getTags().toString());
|
||||
// avatar.setImageBitmap();
|
||||
Utils.URLtoImageView(avatar, note.getAvatar());
|
||||
if (isOwner) {
|
||||
permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));
|
||||
}
|
||||
else{
|
||||
permission.setText("");
|
||||
deleteBtn.setBackgroundResource(R.drawable.like_icon);
|
||||
}
|
||||
|
||||
|
|
|
@ -50,173 +50,173 @@ 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;
|
||||
private ListAdapter noteListAdapter;
|
||||
private String userId;
|
||||
private final String TAG = "[TSN/PersonalFragment]";
|
||||
private MainActivity activity;
|
||||
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;
|
||||
private ListAdapter noteListAdapter;
|
||||
private String userId;
|
||||
private final String TAG = "[TSN/PersonalFragment]";
|
||||
private MainActivity activity;
|
||||
|
||||
public PersonalFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
public PersonalFragment() {
|
||||
// Required empty public constructor
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_personal, container, false);
|
||||
// Inflate the layout for this fragment
|
||||
activity = (MainActivity) getActivity();
|
||||
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);
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
View view = inflater.inflate(R.layout.fragment_personal, container, false);
|
||||
// Inflate the layout for this fragment
|
||||
activity = (MainActivity) getActivity();
|
||||
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);
|
||||
|
||||
|
||||
this.noteList = (ListView) view.findViewById(R.id.ps_list_listview);
|
||||
gpsUtils = activity.getGPSUtils();
|
||||
gpsUtils.getLocation();
|
||||
listOfNotes = new ArrayList<>();
|
||||
noteListAdapter = new ListAdapter(getContext(), listOfNotes);
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
noteList.setOnItemClickListener(new ItemClickedListener());
|
||||
Utils.showLoadingDialog(getActivity(), "Fetching..", "getting your notes");
|
||||
getAllNotes();
|
||||
this.noteList = (ListView) view.findViewById(R.id.ps_list_listview);
|
||||
gpsUtils = activity.getGPSUtils();
|
||||
gpsUtils.getLocation();
|
||||
listOfNotes = new ArrayList<>();
|
||||
noteListAdapter = new ListAdapter(getContext(), listOfNotes);
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
noteList.setOnItemClickListener(new ItemClickedListener());
|
||||
Utils.showLoadingDialog(getActivity(), "Fetching..", "getting your notes");
|
||||
getAllNotes();
|
||||
|
||||
//https://thesocialnotework-api.appspot.com/api/note/all?uid=<USER_ID>
|
||||
// The New "Add Button"
|
||||
FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.fab);
|
||||
fab.setOnClickListener(addNewNoteDialog);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void onAttach(Context context) {
|
||||
super.onAttach(context);
|
||||
Utils.dismissLoadingDialog();
|
||||
Log.d(TAG, "onAttach");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDetach() {
|
||||
super.onDetach();
|
||||
Utils.dismissLoadingDialog();
|
||||
}
|
||||
|
||||
public void getAllNotes() {
|
||||
Log.d(TAG, "url: " + BASE_URL + "/note/all?uid=" + userId);
|
||||
VolleyUtilSingleton.getInstance(getActivity()).get(BASE_URL + "/note/all?uid=" + userId, getNotesSuccessListener, Utils.genericErrorListener);
|
||||
}
|
||||
|
||||
private View.OnClickListener addNewNoteDialog = new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
|
||||
//create and configure dialog
|
||||
final Dialog dialog = new Dialog(getActivity());
|
||||
dialog.setContentView(R.layout.note_view_full);
|
||||
dialog.setTitle("New Note");
|
||||
WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
|
||||
lp.copyFrom(dialog.getWindow().getAttributes());
|
||||
lp.width = WindowManager.LayoutParams.MATCH_PARENT;
|
||||
lp.height = WindowManager.LayoutParams.MATCH_PARENT;
|
||||
dialog.setCancelable(false);
|
||||
dialog.show();
|
||||
dialog.getWindow().setAttributes(lp);
|
||||
|
||||
|
||||
//get note_view_full layout elements
|
||||
final Switch permissionSwitch = (Switch) dialog.findViewById(R.id.nvf_note_permission);
|
||||
final EditText newTitle = (EditText) dialog.findViewById(R.id.nvf_note_title);
|
||||
final EditText newBody = (EditText) dialog.findViewById(R.id.nvf_note_content);
|
||||
Button saveBtn = (Button) dialog.findViewById(R.id.nvf_note_submit_btn);
|
||||
Button cancelBtn = (Button) dialog.findViewById(R.id.nvf_note_cancel_btn);
|
||||
|
||||
cancelBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
saveBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
|
||||
//title too short
|
||||
if (newTitle.getText().length() == 0) {
|
||||
Toast toast = Toast.makeText(getActivity(), "Title too short.", Toast.LENGTH_LONG);
|
||||
toast.show();
|
||||
return;
|
||||
}
|
||||
|
||||
//title too long
|
||||
if (newTitle.getText().length() > 20) {
|
||||
Toast toast = Toast.makeText(getActivity(), "Title too long.\n Use up to 20 notes.", Toast.LENGTH_LONG);
|
||||
toast.show();
|
||||
return;
|
||||
}
|
||||
//volley post
|
||||
final JSONObject noteJson = new JSONObject();
|
||||
try {
|
||||
|
||||
//TODO need to get owner id from login screen
|
||||
noteJson.put("owner_id", userId);
|
||||
noteJson.put("title", newTitle.getText());
|
||||
noteJson.put("lat", gpsUtils.getLatitude());
|
||||
noteJson.put("lng", gpsUtils.getLongitude());
|
||||
noteJson.put("address", gpsUtils.getAddress());
|
||||
noteJson.put("body", newBody.getText());
|
||||
noteJson.put("is_public", permissionSwitch.isChecked());
|
||||
// noteJson.put("tags",);
|
||||
Log.d(TAG, "Json: " + noteJson.toString());
|
||||
|
||||
|
||||
} catch (Exception e) {
|
||||
Log.d(TAG, "saveBtn: " + e.toString());
|
||||
}
|
||||
|
||||
//send request and close dialog
|
||||
VolleyUtilSingleton.getInstance(getActivity()).post(BASE_URL + "/note/upsert", noteJson, newNoteSuccessListener, Utils.genericErrorListener);
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
//change text of switch according to state.
|
||||
permissionSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||
if (isChecked)
|
||||
permissionSwitch.setText(R.string.nvf_public_label);
|
||||
else
|
||||
permissionSwitch.setText(R.string.nvf_private_label);
|
||||
}
|
||||
});
|
||||
|
||||
// The New "Add Button"
|
||||
FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.fab);
|
||||
fab.setOnClickListener(addNewNoteDialog);
|
||||
|
||||
return view;
|
||||
}
|
||||
};
|
||||
|
||||
//response listener for adding new note
|
||||
Response.Listener<JSONObject> newNoteSuccessListener = new Response.Listener<JSONObject>() {
|
||||
|
||||
@Override
|
||||
public void onResponse(JSONObject response) {
|
||||
Log.d(TAG, "newNoteSuccess: response - " + response.toString());
|
||||
try {
|
||||
Date time = new Date();
|
||||
JSONObject noteObject = response.getJSONObject("note");
|
||||
time.setTime(noteObject.getLong("created_at"));
|
||||
addNoteFromJsonObj(noteObject, time);
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "newNoteSuccess:" + e.getMessage());
|
||||
}
|
||||
|
||||
public void onAttach(Context context) {
|
||||
super.onAttach(context);
|
||||
Utils.dismissLoadingDialog();
|
||||
Log.d(TAG, "onAttach");
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void onDetach() {
|
||||
super.onDetach();
|
||||
Utils.dismissLoadingDialog();
|
||||
}
|
||||
|
||||
public void getAllNotes() {
|
||||
Log.d(TAG, "url: " + BASE_URL + "/note/all?uid=" + userId);
|
||||
VolleyUtilSingleton.getInstance(getActivity()).get(BASE_URL + "/note/all?uid=" + userId, getNotesSuccessListener, Utils.genericErrorListener);
|
||||
}
|
||||
|
||||
private View.OnClickListener addNewNoteDialog = new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
|
||||
//create and configure dialog
|
||||
final Dialog dialog = new Dialog(getActivity());
|
||||
dialog.setContentView(R.layout.note_view_full);
|
||||
dialog.setTitle("New Note");
|
||||
WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
|
||||
lp.copyFrom(dialog.getWindow().getAttributes());
|
||||
lp.width = WindowManager.LayoutParams.MATCH_PARENT;
|
||||
lp.height = WindowManager.LayoutParams.MATCH_PARENT;
|
||||
dialog.setCancelable(false);
|
||||
dialog.show();
|
||||
dialog.getWindow().setAttributes(lp);
|
||||
|
||||
|
||||
//get note_view_full layout elements
|
||||
final Switch permissionSwitch = (Switch) dialog.findViewById(R.id.nvf_note_permission);
|
||||
final EditText newTitle = (EditText) dialog.findViewById(R.id.nvf_note_title);
|
||||
final EditText newBody = (EditText) dialog.findViewById(R.id.nvf_note_content);
|
||||
Button saveBtn = (Button) dialog.findViewById(R.id.nvf_note_submit_btn);
|
||||
Button cancelBtn = (Button) dialog.findViewById(R.id.nvf_note_cancel_btn);
|
||||
|
||||
cancelBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
saveBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
|
||||
//title too short
|
||||
if (newTitle.getText().length() == 0) {
|
||||
Toast toast = Toast.makeText(getActivity(), "Title too short.", Toast.LENGTH_LONG);
|
||||
toast.show();
|
||||
return;
|
||||
}
|
||||
|
||||
//title too long
|
||||
if (newTitle.getText().length() > 20) {
|
||||
Toast toast = Toast.makeText(getActivity(), "Title too long.\n Use up to 20 notes.", Toast.LENGTH_LONG);
|
||||
toast.show();
|
||||
return;
|
||||
}
|
||||
//volley post
|
||||
final JSONObject noteJson = new JSONObject();
|
||||
try {
|
||||
|
||||
//TODO need to get owner id from login screen
|
||||
noteJson.put("owner_id", userId);
|
||||
noteJson.put("title", newTitle.getText());
|
||||
noteJson.put("lat", gpsUtils.getLatitude());
|
||||
noteJson.put("lng", gpsUtils.getLongitude());
|
||||
noteJson.put("address", gpsUtils.getAddress());
|
||||
noteJson.put("body", newBody.getText());
|
||||
noteJson.put("is_public", permissionSwitch.isChecked());
|
||||
// noteJson.put("tags",);
|
||||
Log.d(TAG, "Json: " + noteJson.toString());
|
||||
|
||||
|
||||
} catch (Exception e) {
|
||||
Log.d(TAG, "saveBtn: " + e.toString());
|
||||
}
|
||||
|
||||
//send request and close dialog
|
||||
VolleyUtilSingleton.getInstance(getActivity()).post(BASE_URL + "/note/upsert", noteJson, newNoteSuccessListener, Utils.genericErrorListener);
|
||||
dialog.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
//change text of switch according to state.
|
||||
permissionSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||
if (isChecked)
|
||||
permissionSwitch.setText(R.string.nvf_public_label);
|
||||
else
|
||||
permissionSwitch.setText(R.string.nvf_private_label);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
//response listener for adding new note
|
||||
Response.Listener<JSONObject> newNoteSuccessListener = new Response.Listener<JSONObject>() {
|
||||
@Override
|
||||
public void onResponse(JSONObject response) {
|
||||
Log.d(TAG, "newNoteSuccess: response - " + response.toString());
|
||||
try {
|
||||
Date time = new Date();
|
||||
JSONObject noteObject = response.getJSONObject("note");
|
||||
time.setTime(noteObject.getLong("created_at"));
|
||||
addNoteFromJsonObj(noteObject, time);
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "newNoteSuccess:" + e.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// //response Error listener for adding new note
|
||||
|
@ -228,29 +228,29 @@ public class PersonalFragment extends Fragment {
|
|||
// };
|
||||
|
||||
|
||||
//response listener for getting all user notes
|
||||
Response.Listener<JSONObject> getNotesSuccessListener = new Response.Listener<JSONObject>() {
|
||||
@Override
|
||||
public void onResponse(JSONObject response) {
|
||||
Log.d(TAG, "getNotesSuccessListener: " + response.toString());
|
||||
Utils.dismissLoadingDialog();
|
||||
try {
|
||||
//need to get all notes and add to listOfNotes
|
||||
JSONArray noteObjectsArray = response.getJSONArray("notes");
|
||||
Date time = new Date();
|
||||
for (int i = 0; i < noteObjectsArray.length(); i++) {
|
||||
JSONObject noteObject = noteObjectsArray.getJSONObject(i);
|
||||
time.setTime(noteObject.getLong("created_at"));
|
||||
//response listener for getting all user notes
|
||||
Response.Listener<JSONObject> getNotesSuccessListener = new Response.Listener<JSONObject>() {
|
||||
@Override
|
||||
public void onResponse(JSONObject response) {
|
||||
Log.d(TAG, "getNotesSuccessListener: " + response.toString());
|
||||
Utils.dismissLoadingDialog();
|
||||
try {
|
||||
//need to get all notes and add to listOfNotes
|
||||
JSONArray noteObjectsArray = response.getJSONArray("notes");
|
||||
Date time = new Date();
|
||||
for (int i = 0; i < noteObjectsArray.length(); i++) {
|
||||
JSONObject noteObject = noteObjectsArray.getJSONObject(i);
|
||||
time.setTime(noteObject.getLong("created_at"));
|
||||
|
||||
addNoteFromJsonObj(noteObject, time);
|
||||
}
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "newNoteSuccess:" + e.getMessage());
|
||||
}
|
||||
|
||||
addNoteFromJsonObj(noteObject, time);
|
||||
}
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
} catch (Exception e) {
|
||||
Log.e(TAG, "newNoteSuccess:" + e.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
// //response ErrorListener for getting all user notes
|
||||
|
@ -273,127 +273,128 @@ public class PersonalFragment extends Fragment {
|
|||
// };
|
||||
|
||||
|
||||
private ArrayList<String> jsonArrayToStringArray(JSONArray jArray) {
|
||||
ArrayList<String> stringArray = new ArrayList<String>();
|
||||
for (int i = 0, count = jArray.length(); i < count; i++) {
|
||||
try {
|
||||
JSONObject jsonObject = jArray.getJSONObject(i);
|
||||
stringArray.add(jsonObject.toString());
|
||||
} catch (JSONException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
private ArrayList<String> jsonArrayToStringArray(JSONArray jArray) {
|
||||
ArrayList<String> stringArray = new ArrayList<String>();
|
||||
for (int i = 0, count = jArray.length(); i < count; i++) {
|
||||
try {
|
||||
JSONObject jsonObject = jArray.getJSONObject(i);
|
||||
stringArray.add(jsonObject.toString());
|
||||
} catch (JSONException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return stringArray;
|
||||
}
|
||||
return stringArray;
|
||||
}
|
||||
|
||||
Response.Listener<JSONObject> deleteNoteSuccessListener = new Response.Listener<JSONObject>() {
|
||||
@Override
|
||||
public void onResponse(JSONObject response) {
|
||||
Log.d(TAG, "deleteNoteSuccessListener: " + response.toString());
|
||||
Response.Listener<JSONObject> deleteNoteSuccessListener = new Response.Listener<JSONObject>() {
|
||||
@Override
|
||||
public void onResponse(JSONObject response) {
|
||||
Log.d(TAG, "deleteNoteSuccessListener: " + response.toString());
|
||||
}
|
||||
};
|
||||
|
||||
private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
|
||||
Note addNote = new Note(
|
||||
noteObject.getString("id"),
|
||||
Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
|
||||
Float.parseFloat(noteObject.getJSONObject("location").getString("lng")),
|
||||
noteObject.getJSONObject("location").getString("address"),
|
||||
noteObject.getString("title"),
|
||||
noteObject.getString("body"),
|
||||
time.toString(),
|
||||
noteObject.getBoolean("is_public"),
|
||||
noteObject.getInt("likes"),
|
||||
noteObject.getString("avatar"),
|
||||
noteObject.getString("owner_id"),
|
||||
jsonArrayToStringArray(noteObject.getJSONArray("tags"))
|
||||
);
|
||||
listOfNotes.add(addNote);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
|
||||
Note addNote = new Note(
|
||||
noteObject.getString("id"),
|
||||
Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
|
||||
Float.parseFloat(noteObject.getJSONObject("location").getString("lng")),
|
||||
noteObject.getJSONObject("location").getString("address"),
|
||||
noteObject.getString("title"),
|
||||
noteObject.getString("body"),
|
||||
time.toString(),
|
||||
noteObject.getBoolean("is_public"),
|
||||
noteObject.getInt("likes"),
|
||||
noteObject.getString("avatar"),
|
||||
jsonArrayToStringArray(noteObject.getJSONArray("tags"))
|
||||
);
|
||||
listOfNotes.add(addNote);
|
||||
// click on listView item
|
||||
class ItemClickedListener implements AdapterView.OnItemClickListener {
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, final int position, long id) {
|
||||
//create and configure dialog
|
||||
final Note note = listOfNotes.get(position);
|
||||
final Dialog noteViewDialog = new Dialog(getActivity());
|
||||
noteViewDialog.setContentView(R.layout.note_display_full);
|
||||
noteViewDialog.setTitle("You wrote...");
|
||||
|
||||
}
|
||||
|
||||
// click on listView item
|
||||
class ItemClickedListener implements AdapterView.OnItemClickListener {
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> parent, View view, final int position, long id) {
|
||||
//create and configure dialog
|
||||
final Note note = listOfNotes.get(position);
|
||||
final Dialog noteViewDialog = new Dialog(getActivity());
|
||||
noteViewDialog.setContentView(R.layout.note_display_full);
|
||||
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();
|
||||
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 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 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);
|
||||
//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 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 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);
|
||||
|
||||
|
||||
title.setText(note.getTitle());
|
||||
body.setText(note.getBody());
|
||||
time.setText(note.getTimestamp());
|
||||
location.setText("Tags: " + note.getAddress());
|
||||
likes.setText("Likes: " + note.getLikes());
|
||||
tags.setText(note.getTags().toString());
|
||||
permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));
|
||||
Utils.URLtoImageView(avatar, note.getAvatar());
|
||||
title.setText(note.getTitle());
|
||||
body.setText(note.getBody());
|
||||
time.setText(note.getTimestamp());
|
||||
location.setText("Address: " + note.getAddress());
|
||||
likes.setText("Likes: " + note.getLikes());
|
||||
tags.setText(note.getTags().toString());
|
||||
permission.setText("Permission: " + (note.isPublic() ? "Public" : "Private"));
|
||||
Utils.URLtoImageView(avatar, note.getAvatar());
|
||||
|
||||
deleteBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
//Put up the Yes/No message box
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
builder
|
||||
.setTitle("Delete Note")
|
||||
.setMessage("Are you sure you want to delete the note?")
|
||||
.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
//Yes button clicked, do something
|
||||
Toast.makeText(getActivity(), "Item Deleted!",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
//TODO send delete
|
||||
JSONObject delNote = new JSONObject();
|
||||
try {
|
||||
delNote.put("uid", userId);
|
||||
delNote.put("nid", note.getId());
|
||||
VolleyUtilSingleton.getInstance(getActivity()).post(BASE_URL + "/note/delete", delNote, deleteNoteSuccessListener, Utils.genericErrorListener);
|
||||
listOfNotes.remove(position);
|
||||
deleteBtn.setOnClickListener(new View.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
//Put up the Yes/No message box
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
|
||||
builder
|
||||
.setTitle("Delete Note")
|
||||
.setMessage("Are you sure you want to delete the note?")
|
||||
.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
//Yes button clicked, do something
|
||||
Toast.makeText(getActivity(), "Item Deleted!",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
//TODO send delete
|
||||
JSONObject delNote = new JSONObject();
|
||||
try {
|
||||
delNote.put("uid", userId);
|
||||
delNote.put("nid", note.getId());
|
||||
VolleyUtilSingleton.getInstance(getActivity()).post(BASE_URL + "/note/delete", delNote, deleteNoteSuccessListener, Utils.genericErrorListener);
|
||||
listOfNotes.remove(position);
|
||||
|
||||
} catch (JSONException e) {
|
||||
Toast.makeText(getActivity(), "Something went wrong.\n Failed to delete note...", Toast.LENGTH_LONG).show();
|
||||
e.printStackTrace();
|
||||
} catch (JSONException e) {
|
||||
Toast.makeText(getActivity(), "Something went wrong.\n Failed to delete note...", Toast.LENGTH_LONG).show();
|
||||
e.printStackTrace();
|
||||
}
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
noteViewDialog.dismiss();
|
||||
}
|
||||
})
|
||||
.setNegativeButton("No", new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
//Yes button clicked, do something
|
||||
Toast.makeText(getActivity(), "Canceled",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
noteViewDialog.dismiss();
|
||||
}
|
||||
}) //Do nothing on no
|
||||
.show();
|
||||
}
|
||||
noteList.setAdapter(noteListAdapter);
|
||||
noteViewDialog.dismiss();
|
||||
}
|
||||
})
|
||||
.setNegativeButton("No", new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
//Yes button clicked, do something
|
||||
Toast.makeText(getActivity(), "Canceled",
|
||||
Toast.LENGTH_SHORT).show();
|
||||
noteViewDialog.dismiss();
|
||||
}
|
||||
}) //Do nothing on no
|
||||
.show();
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -88,6 +88,7 @@ public class Utils {
|
|||
noteObject.getBoolean("is_public"),
|
||||
noteObject.getInt("likes"),
|
||||
noteObject.getString("avatar"),
|
||||
noteObject.getString("owner_id"),
|
||||
jsonArrayToStringArray(noteObject.getJSONArray("tags"))
|
||||
);
|
||||
return note;
|
||||
|
|
Loading…
Reference in a new issue