Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android
This commit is contained in:
commit
2ca32ca356
34 changed files with 384 additions and 391 deletions
|
@ -1,13 +1,13 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="animated-vector-drawable-23.4.0">
|
<library name="animated-vector-drawable-23.4.0">
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$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:///opt/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>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/annotations.zip!/" />
|
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/annotations.zip!/" />
|
||||||
</ANNOTATIONS>
|
</ANNOTATIONS>
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$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:///opt/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>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/annotations.zip!/" />
|
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/design/23.4.0/annotations.zip!/" />
|
||||||
</ANNOTATIONS>
|
</ANNOTATIONS>
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$USER_HOME$/Library/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!/" />
|
<root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/design/23.4.0/design-23.4.0-sources.jar!/" />
|
||||||
</SOURCES>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-analytics-impl-9.2.0">
|
<library name="firebase-analytics-impl-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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" />
|
<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!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-auth-9.2.0">
|
<library name="firebase-auth-9.2.0">
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-auth-common-9.2.0">
|
<library name="firebase-auth-common-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-auth-module-9.2.0">
|
<library name="firebase-auth-module-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-config-9.2.0">
|
<library name="firebase-config-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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" />
|
<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!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-crash-9.2.0">
|
<library name="firebase-crash-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-database-9.2.0">
|
<library name="firebase-database-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-messaging-9.2.0">
|
<library name="firebase-messaging-9.2.0">
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-storage-9.2.0">
|
<library name="firebase-storage-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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" />
|
<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!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="firebase-storage-common-9.2.0">
|
<library name="firebase-storage-common-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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" />
|
<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!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
</ANNOTATIONS>
|
</ANNOTATIONS>
|
||||||
<CLASSES>
|
<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/libs/internal_impl-23.0.0.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!/" />
|
<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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$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:///opt/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>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-9.2.0">
|
<library name="play-services-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-appindexing-9.2.0">
|
<library name="play-services-appindexing-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-auth-base-9.2.0">
|
<library name="play-services-auth-base-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-basement-9.2.0">
|
<library name="play-services-basement-9.2.0">
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-cast-9.2.0">
|
<library name="play-services-cast-9.2.0">
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-contextmanager-9.2.0">
|
<library name="play-services-contextmanager-9.2.0">
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-location-9.2.0">
|
<library name="play-services-location-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-plus-9.2.0">
|
<library name="play-services-plus-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-tagmanager-api-9.2.0">
|
<library name="play-services-tagmanager-api-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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" />
|
<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!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-tasks-9.2.0">
|
<library name="play-services-tasks-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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" />
|
<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!/" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="play-services-vision-9.2.0">
|
<library name="play-services-vision-9.2.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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" />
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES />
|
<SOURCES />
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/annotations.zip!/" />
|
<root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.4.0/annotations.zip!/" />
|
||||||
</ANNOTATIONS>
|
</ANNOTATIONS>
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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" />
|
<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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$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:///opt/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>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="support-annotations-23.4.0">
|
<library name="support-annotations-23.4.0">
|
||||||
<CLASSES>
|
<CLASSES>
|
||||||
<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!/" />
|
<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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$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:///opt/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>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
</ANNOTATIONS>
|
</ANNOTATIONS>
|
||||||
<CLASSES>
|
<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="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="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" />
|
<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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$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:///opt/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>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
</CLASSES>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<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://$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://$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:///opt/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>
|
</SOURCES>
|
||||||
</library>
|
</library>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<component name="libraryTable">
|
<component name="libraryTable">
|
||||||
<library name="volley-1.0.0">
|
<library name="volley-1.0.0">
|
||||||
<CLASSES>
|
<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="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>
|
</CLASSES>
|
||||||
<JAVADOC />
|
<JAVADOC />
|
||||||
<SOURCES>
|
<SOURCES>
|
||||||
|
|
|
@ -31,377 +31,366 @@ import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple {@link Fragment} subclass.
|
* The Explore Fragment - See all public notes
|
||||||
*/
|
*/
|
||||||
public class ExploreFragment extends Fragment {
|
public class ExploreFragment extends Fragment {
|
||||||
|
|
||||||
private static final String TAG = "[TSN/Explore]";
|
private static final String TAG = "[TSN/Explore]";
|
||||||
// protected final User user = ((MainActivity) getActivity()).getUser();
|
protected User user;
|
||||||
protected User user;
|
protected MainActivity parent;
|
||||||
protected MainActivity parent;
|
private ListAdapter noteListAdapter;
|
||||||
private ListAdapter noteListAdapter;
|
private List<Note> notes;
|
||||||
private List<Note> notes;
|
protected ListView list_notes;
|
||||||
protected ListView list_notes;
|
private ImageButton dateFilter;
|
||||||
|
private ImageButton locationFilter;
|
||||||
|
private Button map_small_filter;
|
||||||
|
private Button map_medium_filter;
|
||||||
|
private Button map_large_filter;
|
||||||
|
private LinearLayout exploreFilters;
|
||||||
|
private boolean dateFilterIsVisible = false;
|
||||||
|
private boolean locationFilterIsVisible = false;
|
||||||
|
private Long dateFilterSelection;
|
||||||
|
private float locationFilterSelection;
|
||||||
|
private GPSUtils gpsUtils;
|
||||||
|
|
||||||
private ImageButton dateFilter;
|
public ExploreFragment() {
|
||||||
private ImageButton locationFilter;
|
// Required empty public constructor
|
||||||
// private ImageButton userFilter;
|
}
|
||||||
private Button map_small_filter;
|
|
||||||
private Button map_medium_filter;
|
|
||||||
private Button map_large_filter;
|
|
||||||
private LinearLayout exploreFilters;
|
|
||||||
private boolean dateFilterIsVisible = false;
|
|
||||||
private boolean locationFilterIsVisible = false;
|
|
||||||
private Long dateFilterSelection;
|
|
||||||
private float locationFilterSelection;
|
|
||||||
private GPSUtils gpsUtils;
|
|
||||||
|
|
||||||
public ExploreFragment() {
|
@Override
|
||||||
// Required empty public constructor
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
}
|
super.onCreate(savedInstanceState);
|
||||||
@Override
|
parent = (MainActivity) getActivity();
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
gpsUtils = parent.getGPSUtils();
|
||||||
super.onCreate(savedInstanceState);
|
user = parent.getUser();
|
||||||
parent = (MainActivity) getActivity();
|
|
||||||
gpsUtils = parent.getGPSUtils();
|
|
||||||
user = parent.getUser();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
Bundle savedInstanceState) {
|
Bundle savedInstanceState) {
|
||||||
// Inflate the layout for this fragment
|
// Inflate the layout for this fragment
|
||||||
View view = inflater.inflate(R.layout.fragment_explore, container, false);
|
View view = inflater.inflate(R.layout.fragment_explore, container, false);
|
||||||
|
|
||||||
|
|
||||||
notes = new ArrayList<>();
|
notes = new ArrayList<>();
|
||||||
//Get Views
|
//Get Views
|
||||||
list_notes = (ListView) view.findViewById(R.id.list_notes);
|
list_notes = (ListView) view.findViewById(R.id.list_notes);
|
||||||
noteListAdapter = new ListAdapter(parent, notes);
|
noteListAdapter = new ListAdapter(parent, notes);
|
||||||
list_notes.setOnItemClickListener(new ItemClickedListener());
|
list_notes.setOnItemClickListener(new ItemClickedListener());
|
||||||
dateFilterSelection = Utils.MONTH_MILI;
|
dateFilterSelection = Utils.MONTH_MILI;
|
||||||
locationFilterSelection = Utils.DISTANCE_LONG;
|
locationFilterSelection = Utils.DISTANCE_LONG;
|
||||||
|
dateFilter = (ImageButton) view.findViewById(R.id.explore_date_filter);
|
||||||
|
locationFilter = (ImageButton) view.findViewById(R.id.explore_location_filter);
|
||||||
|
map_small_filter = (Button) view.findViewById(R.id.explore_small_filter);
|
||||||
|
map_medium_filter = (Button) view.findViewById(R.id.explore_medium_filter);
|
||||||
|
map_large_filter = (Button) view.findViewById(R.id.explore_large_filter);
|
||||||
|
map_small_filter.setOnClickListener(button1ClickListener);
|
||||||
|
map_medium_filter.setOnClickListener(button2ClickListener);
|
||||||
|
map_large_filter.setOnClickListener(button3ClickListener);
|
||||||
|
|
||||||
|
exploreFilters = (LinearLayout) view.findViewById(R.id.explore_filter_options);
|
||||||
|
|
||||||
|
dateFilter.setOnClickListener(new View.OnClickListener() {
|
||||||
dateFilter = (ImageButton) view.findViewById(R.id.explore_date_filter);
|
@Override
|
||||||
locationFilter = (ImageButton) view.findViewById(R.id.explore_location_filter);
|
public void onClick(View v) {
|
||||||
|
|
||||||
map_small_filter = (Button) view.findViewById(R.id.explore_small_filter);
|
|
||||||
map_medium_filter = (Button) view.findViewById(R.id.explore_medium_filter);
|
|
||||||
map_large_filter = (Button) view.findViewById(R.id.explore_large_filter);
|
|
||||||
|
|
||||||
map_small_filter.setOnClickListener(button1ClickListener);
|
|
||||||
map_medium_filter.setOnClickListener(button2ClickListener);
|
|
||||||
map_large_filter.setOnClickListener(button3ClickListener);
|
|
||||||
|
|
||||||
exploreFilters = (LinearLayout) view.findViewById(R.id.explore_filter_options);
|
|
||||||
|
|
||||||
dateFilter.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
if (dateFilterIsVisible) {
|
|
||||||
dateFilterIsVisible = false;
|
|
||||||
exploreFilters.setVisibility(View.GONE);
|
|
||||||
} else {
|
|
||||||
exploreFilters.setVisibility(View.VISIBLE);
|
|
||||||
dateFilterIsVisible = true;
|
|
||||||
locationFilterIsVisible = false;
|
|
||||||
// userFilterIsVisible = false;
|
|
||||||
|
|
||||||
// set text button in the right filter string
|
|
||||||
map_small_filter.setText(R.string.day);
|
|
||||||
map_medium_filter.setText(R.string.week);
|
|
||||||
map_large_filter.setText(R.string.month);
|
|
||||||
}
|
|
||||||
setButtonsColor();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
locationFilter.setOnClickListener(new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
if (locationFilterIsVisible) {
|
|
||||||
locationFilterIsVisible = false;
|
|
||||||
exploreFilters.setVisibility(View.GONE);
|
|
||||||
} else {
|
|
||||||
exploreFilters.setVisibility(View.VISIBLE);
|
|
||||||
locationFilterIsVisible = true;
|
|
||||||
dateFilterIsVisible = false;
|
|
||||||
// userFilterIsVisible = false;
|
|
||||||
|
|
||||||
// set text button in the right filter string
|
|
||||||
map_small_filter.setText(R.string.shortDistance);
|
|
||||||
map_medium_filter.setText(R.string.mediumDistance);
|
|
||||||
map_large_filter.setText(R.string.longDistance);
|
|
||||||
}
|
|
||||||
setButtonsColor();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// TODO: choose a default filter for openning explore mode
|
|
||||||
|
|
||||||
try {
|
|
||||||
getAllNotes();
|
|
||||||
} catch (JSONException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void getAllNotes() throws JSONException {
|
|
||||||
Utils.showLoadingDialog(parent, "Exploring...", "Finding some new interesting notes just for you");
|
|
||||||
Log.d(TAG, "url: " + Utils.BASE_URL + "/note/getPublic");
|
|
||||||
String url = Utils.BASE_URL + "/note/getPublic";
|
|
||||||
JSONObject payload = new JSONObject();
|
|
||||||
payload.put("id", user.getId());
|
|
||||||
VolleyUtilSingleton.getInstance(getActivity()).post(url, payload, getNotesSuccessListener, Utils.genericErrorListener);
|
|
||||||
}
|
|
||||||
|
|
||||||
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");
|
|
||||||
parent.getUser().setNumber_of_notes(noteObjectsArray.length());
|
|
||||||
Date time = new Date();
|
|
||||||
for (int i = 0; i < noteObjectsArray.length(); i++) {
|
|
||||||
JSONObject noteObject = noteObjectsArray.getJSONObject(i);
|
|
||||||
time.setTime(noteObject.getLong("created_at"));
|
|
||||||
notes.add(Utils.getNoteFromJsonObj(noteObject, time));
|
|
||||||
}
|
|
||||||
// list_notes.setAdapter(noteListAdapter);
|
|
||||||
updateShowedNotes();
|
|
||||||
Utils.dismissLoadingDialog();
|
|
||||||
} catch (Exception e) {
|
|
||||||
Log.e(TAG, "newNoteSuccess:" + e.getMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// 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 = notes.get(position);
|
|
||||||
final MainActivity localParent = (MainActivity)getActivity();
|
|
||||||
final Dialog noteViewDialog = new Dialog(getActivity());
|
|
||||||
noteViewDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
|
||||||
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();
|
|
||||||
// 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 permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview);
|
|
||||||
final ImageButton likeBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton);
|
|
||||||
final ImageView avatar = (RoundAvatarImageView) noteViewDialog.findViewById(R.id.note_user_avatar);
|
|
||||||
final ImageView permission_image = (ImageView) noteViewDialog.findViewById(R.id.permission_image);
|
|
||||||
|
|
||||||
title.setText(note.getTitle());
|
|
||||||
body.setText(note.getBody());
|
|
||||||
date.setText(note.getDate());
|
|
||||||
time.setText(note.getTime());
|
|
||||||
location.setText(note.getAddress());
|
|
||||||
|
|
||||||
if (likes != null) {
|
|
||||||
likeBtn.setBackgroundResource(R.drawable.like_icon);
|
|
||||||
if (localParent.getUser().getLiked_notes().contains(note.getId())) {
|
|
||||||
likeBtn.setBackgroundResource(R.drawable.like_icon);
|
|
||||||
} else {
|
|
||||||
likeBtn.setBackgroundResource(R.drawable.unlike_icon);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
likes.setText("" + note.getLikes());
|
|
||||||
|
|
||||||
permission.setVisibility(View.GONE);
|
|
||||||
Utils.URLtoImageView(avatar, note.getAvatar());
|
|
||||||
permission_image.setVisibility(View.GONE);
|
|
||||||
|
|
||||||
likeBtn.setOnClickListener(new View.OnClickListener() {
|
|
||||||
public void onClick(View v) {
|
|
||||||
//add like only if user didnt like already
|
|
||||||
if (!user.getLiked_notes().contains(note.getId())) {
|
|
||||||
JSONObject jsonObj = new JSONObject();
|
|
||||||
try {
|
|
||||||
jsonObj.put("uid", localParent.getUserId());
|
|
||||||
jsonObj.put("nid", note.getId());
|
|
||||||
|
|
||||||
} catch (JSONException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
VolleyUtilSingleton.getInstance(getActivity()).post(Utils.BASE_URL + "/note/like", jsonObj, Utils.genericSuccessListener, Utils.genericErrorListener);
|
|
||||||
user.getLiked_notes().add(note.getId());
|
|
||||||
user.updateUser(localParent);
|
|
||||||
note.setLikes(note.getLikes()+1);
|
|
||||||
likes.setText("" + note.getLikes());
|
|
||||||
noteListAdapter.updateList(notes);
|
|
||||||
list_notes.setAdapter(noteListAdapter);
|
|
||||||
likeBtn.setBackgroundResource(R.drawable.like_icon);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//all buttons listener
|
|
||||||
public View.OnClickListener button1ClickListener = new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(final View v) {
|
|
||||||
|
|
||||||
//location filter
|
|
||||||
if (locationFilterIsVisible) {
|
|
||||||
locationFilterSelection = Utils.DISTANCE_SMALL;
|
|
||||||
}
|
|
||||||
|
|
||||||
//date filters
|
|
||||||
else {
|
|
||||||
dateFilterSelection = Utils.DAY_MILI;
|
|
||||||
|
|
||||||
}
|
|
||||||
//change colors of buttons and update visible notes
|
|
||||||
setButtonsColor();
|
|
||||||
updateShowedNotes();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
//all buttons listener
|
|
||||||
public View.OnClickListener button2ClickListener = new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(final View v) {
|
|
||||||
|
|
||||||
//location filter
|
|
||||||
if (locationFilterIsVisible) {
|
|
||||||
locationFilterSelection = Utils.DISTANCE_MEDIUM;
|
|
||||||
}
|
|
||||||
|
|
||||||
//date filters
|
|
||||||
else {
|
|
||||||
dateFilterSelection = Utils.WEEK_MILI;
|
|
||||||
}
|
|
||||||
//change colors of buttons and update visible notes
|
|
||||||
setButtonsColor();
|
|
||||||
updateShowedNotes();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
//all buttons listener
|
|
||||||
public View.OnClickListener button3ClickListener = new View.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(final View v) {
|
|
||||||
|
|
||||||
//location filter
|
|
||||||
if (locationFilterIsVisible) {
|
|
||||||
locationFilterSelection = Utils.DISTANCE_LONG;
|
|
||||||
}
|
|
||||||
|
|
||||||
//date filters
|
|
||||||
else {
|
|
||||||
dateFilterSelection = Utils.MONTH_MILI;
|
|
||||||
}
|
|
||||||
//change colors of buttons and update visible notes
|
|
||||||
setButtonsColor();
|
|
||||||
updateShowedNotes();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
//set main filter colors
|
|
||||||
private void setButtonsColor() {
|
|
||||||
|
|
||||||
Log.d(TAG, "setButtonsColor: start");
|
|
||||||
//set date filter colors
|
|
||||||
if (dateFilterIsVisible) {
|
if (dateFilterIsVisible) {
|
||||||
dateFilter.setBackgroundColor(Utils.filterColor);
|
dateFilterIsVisible = false;
|
||||||
if (dateFilterSelection == Utils.DAY_MILI) {
|
exploreFilters.setVisibility(View.GONE);
|
||||||
map_small_filter.setBackgroundColor(Utils.filterColor);
|
|
||||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
} else if (dateFilterSelection == Utils.WEEK_MILI) {
|
|
||||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_medium_filter.setBackgroundColor(Utils.filterColor);
|
|
||||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
} else {
|
|
||||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_large_filter.setBackgroundColor(Utils.filterColor);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
dateFilter.setBackgroundResource(android.R.drawable.btn_default);
|
exploreFilters.setVisibility(View.VISIBLE);
|
||||||
|
dateFilterIsVisible = true;
|
||||||
|
locationFilterIsVisible = false;
|
||||||
|
// set text button in the right filter string
|
||||||
|
map_small_filter.setText(R.string.day);
|
||||||
|
map_medium_filter.setText(R.string.week);
|
||||||
|
map_large_filter.setText(R.string.month);
|
||||||
}
|
}
|
||||||
|
setButtonsColor();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
//set distance filter colors
|
locationFilter.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
if (locationFilterIsVisible) {
|
if (locationFilterIsVisible) {
|
||||||
locationFilter.setBackgroundColor(Utils.filterColor);
|
locationFilterIsVisible = false;
|
||||||
if (locationFilterSelection == Utils.DISTANCE_SMALL) {
|
exploreFilters.setVisibility(View.GONE);
|
||||||
map_small_filter.setBackgroundColor(Utils.filterColor);
|
|
||||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
} else if (locationFilterSelection == Utils.DISTANCE_MEDIUM) {
|
|
||||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_medium_filter.setBackgroundColor(Utils.filterColor);
|
|
||||||
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
} else {
|
|
||||||
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
|
||||||
map_large_filter.setBackgroundColor(Utils.filterColor);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
locationFilter.setBackgroundResource(android.R.drawable.btn_default);
|
exploreFilters.setVisibility(View.VISIBLE);
|
||||||
|
locationFilterIsVisible = true;
|
||||||
|
dateFilterIsVisible = false;
|
||||||
|
// set text button in the right filter string
|
||||||
|
map_small_filter.setText(R.string.shortDistance);
|
||||||
|
map_medium_filter.setText(R.string.mediumDistance);
|
||||||
|
map_large_filter.setText(R.string.longDistance);
|
||||||
}
|
}
|
||||||
|
setButtonsColor();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
getAllNotes();
|
||||||
|
} catch (JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
public void updateShowedNotes() {
|
/**
|
||||||
List<Note> presentedNotes = new ArrayList<>();
|
* This function will retrieve all the Public Notes from our Server.
|
||||||
long timeDifference;
|
* And will throw JSON exception on error
|
||||||
float distance;
|
* @throws JSONException
|
||||||
//get current date and location
|
*/
|
||||||
Location currLocation = new Location(gpsUtils.getLocation());
|
public void getAllNotes() throws JSONException {
|
||||||
Date now = new Date();
|
Utils.showLoadingDialog(parent, "Exploring...", "Finding some new interesting notes just for you");
|
||||||
Location targetLocation = new Location("");//provider name is unecessary
|
Log.d(TAG, "url: " + Utils.BASE_URL + "/note/getPublic");
|
||||||
Date targetDate;
|
String url = Utils.BASE_URL + "/note/getPublic";
|
||||||
|
JSONObject payload = new JSONObject();
|
||||||
|
payload.put("id", user.getId());
|
||||||
|
VolleyUtilSingleton.getInstance(getActivity()).post(url, payload, getNotesSuccessListener, Utils.genericErrorListener);
|
||||||
|
}
|
||||||
|
|
||||||
for (Note note : notes) {
|
/**
|
||||||
// get note location and date
|
* The Success callback for our HTTP API call
|
||||||
targetLocation.setLatitude(note.getLat());//your coords of course
|
*/
|
||||||
targetLocation.setLongitude(note.getLon());
|
Response.Listener<JSONObject> getNotesSuccessListener = new Response.Listener<JSONObject>() {
|
||||||
targetDate = new Date(note.getTimestamp());
|
@Override
|
||||||
//get time and date differences
|
public void onResponse(JSONObject response) {
|
||||||
timeDifference = now.getTime() - targetDate.getTime();
|
Log.d(TAG, "getNotesSuccessListener: " + response.toString());
|
||||||
distance = currLocation.distanceTo(targetLocation);
|
Utils.dismissLoadingDialog();
|
||||||
//add to currently presented list according to filters.
|
try {
|
||||||
if (timeDifference <= dateFilterSelection
|
//need to get all notes and add to listOfNotes
|
||||||
&& distance <= locationFilterSelection){
|
JSONArray noteObjectsArray = response.getJSONArray("notes");
|
||||||
presentedNotes.add(note);
|
parent.getUser().setNumber_of_notes(noteObjectsArray.length());
|
||||||
|
Date time = new Date();
|
||||||
|
for (int i = 0; i < noteObjectsArray.length(); i++) {
|
||||||
|
JSONObject noteObject = noteObjectsArray.getJSONObject(i);
|
||||||
|
time.setTime(noteObject.getLong("created_at"));
|
||||||
|
notes.add(Utils.getNoteFromJsonObj(noteObject, time));
|
||||||
|
}
|
||||||
|
updateShowedNotes();
|
||||||
|
Utils.dismissLoadingDialog();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e(TAG, "newNoteSuccess:" + e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// 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 = notes.get(position);
|
||||||
|
final MainActivity localParent = (MainActivity) getActivity();
|
||||||
|
final Dialog noteViewDialog = new Dialog(getActivity());
|
||||||
|
noteViewDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
|
noteViewDialog.setContentView(R.layout.note_display_full);
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
//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 permission = (TextView) noteViewDialog.findViewById(R.id.ndf_permission_textview);
|
||||||
|
final ImageButton likeBtn = (ImageButton) noteViewDialog.findViewById(R.id.ndf_delete_imagebutton);
|
||||||
|
final ImageView avatar = (RoundAvatarImageView) noteViewDialog.findViewById(R.id.note_user_avatar);
|
||||||
|
final ImageView permission_image = (ImageView) noteViewDialog.findViewById(R.id.permission_image);
|
||||||
|
|
||||||
|
title.setText(note.getTitle());
|
||||||
|
body.setText(note.getBody());
|
||||||
|
date.setText(note.getDate());
|
||||||
|
time.setText(note.getTime());
|
||||||
|
location.setText(note.getAddress());
|
||||||
|
|
||||||
|
if (likes != null) {
|
||||||
|
likeBtn.setBackgroundResource(R.drawable.like_icon);
|
||||||
|
if (localParent.getUser().getLiked_notes().contains(note.getId())) {
|
||||||
|
likeBtn.setBackgroundResource(R.drawable.like_icon);
|
||||||
|
} else {
|
||||||
|
likeBtn.setBackgroundResource(R.drawable.unlike_icon);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
likes.setText("" + note.getLikes());
|
||||||
|
|
||||||
|
permission.setVisibility(View.GONE);
|
||||||
|
Utils.URLtoImageView(avatar, note.getAvatar());
|
||||||
|
permission_image.setVisibility(View.GONE);
|
||||||
|
|
||||||
|
likeBtn.setOnClickListener(new View.OnClickListener() {
|
||||||
|
public void onClick(View v) {
|
||||||
|
//add like only if user didnt like already
|
||||||
|
if (!user.getLiked_notes().contains(note.getId())) {
|
||||||
|
JSONObject jsonObj = new JSONObject();
|
||||||
|
try {
|
||||||
|
jsonObj.put("uid", localParent.getUserId());
|
||||||
|
jsonObj.put("nid", note.getId());
|
||||||
|
|
||||||
|
} catch (JSONException e) {
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
VolleyUtilSingleton.getInstance(getActivity()).post(Utils.BASE_URL + "/note/like", jsonObj, Utils.genericSuccessListener, Utils.genericErrorListener);
|
||||||
|
user.getLiked_notes().add(note.getId());
|
||||||
|
user.updateUser(localParent);
|
||||||
|
note.setLikes(note.getLikes() + 1);
|
||||||
|
likes.setText("" + note.getLikes());
|
||||||
|
noteListAdapter.updateList(notes);
|
||||||
|
list_notes.setAdapter(noteListAdapter);
|
||||||
|
likeBtn.setBackgroundResource(R.drawable.like_icon);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
noteListAdapter.updateList(presentedNotes);
|
|
||||||
list_notes.setAdapter(noteListAdapter);
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//all buttons listener
|
||||||
|
public View.OnClickListener button1ClickListener = new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(final View v) {
|
||||||
|
|
||||||
|
//location filter
|
||||||
|
if (locationFilterIsVisible) {
|
||||||
|
locationFilterSelection = Utils.DISTANCE_SMALL;
|
||||||
|
}
|
||||||
|
|
||||||
|
//date filters
|
||||||
|
else {
|
||||||
|
dateFilterSelection = Utils.DAY_MILI;
|
||||||
|
|
||||||
|
}
|
||||||
|
//change colors of buttons and update visible notes
|
||||||
|
setButtonsColor();
|
||||||
|
updateShowedNotes();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
//all buttons listener
|
||||||
|
public View.OnClickListener button2ClickListener = new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(final View v) {
|
||||||
|
|
||||||
|
//location filter
|
||||||
|
if (locationFilterIsVisible) {
|
||||||
|
locationFilterSelection = Utils.DISTANCE_MEDIUM;
|
||||||
|
}
|
||||||
|
|
||||||
|
//date filters
|
||||||
|
else {
|
||||||
|
dateFilterSelection = Utils.WEEK_MILI;
|
||||||
|
}
|
||||||
|
//change colors of buttons and update visible notes
|
||||||
|
setButtonsColor();
|
||||||
|
updateShowedNotes();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
//all buttons listener
|
||||||
|
public View.OnClickListener button3ClickListener = new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(final View v) {
|
||||||
|
|
||||||
|
//location filter
|
||||||
|
if (locationFilterIsVisible) {
|
||||||
|
locationFilterSelection = Utils.DISTANCE_LONG;
|
||||||
|
}
|
||||||
|
|
||||||
|
//date filters
|
||||||
|
else {
|
||||||
|
dateFilterSelection = Utils.MONTH_MILI;
|
||||||
|
}
|
||||||
|
//change colors of buttons and update visible notes
|
||||||
|
setButtonsColor();
|
||||||
|
updateShowedNotes();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
//set main filter colors
|
||||||
|
private void setButtonsColor() {
|
||||||
|
|
||||||
|
Log.d(TAG, "setButtonsColor: start");
|
||||||
|
//set date filter colors
|
||||||
|
if (dateFilterIsVisible) {
|
||||||
|
dateFilter.setBackgroundColor(Utils.filterColor);
|
||||||
|
if (dateFilterSelection == Utils.DAY_MILI) {
|
||||||
|
map_small_filter.setBackgroundColor(Utils.filterColor);
|
||||||
|
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
} else if (dateFilterSelection == Utils.WEEK_MILI) {
|
||||||
|
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_medium_filter.setBackgroundColor(Utils.filterColor);
|
||||||
|
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
} else {
|
||||||
|
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_large_filter.setBackgroundColor(Utils.filterColor);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
dateFilter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
}
|
||||||
|
|
||||||
|
//set distance filter colors
|
||||||
|
if (locationFilterIsVisible) {
|
||||||
|
locationFilter.setBackgroundColor(Utils.filterColor);
|
||||||
|
if (locationFilterSelection == Utils.DISTANCE_SMALL) {
|
||||||
|
map_small_filter.setBackgroundColor(Utils.filterColor);
|
||||||
|
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
} else if (locationFilterSelection == Utils.DISTANCE_MEDIUM) {
|
||||||
|
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_medium_filter.setBackgroundColor(Utils.filterColor);
|
||||||
|
map_large_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
} else {
|
||||||
|
map_small_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_medium_filter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
map_large_filter.setBackgroundColor(Utils.filterColor);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
locationFilter.setBackgroundResource(android.R.drawable.btn_default);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Will update the notes within the list view
|
||||||
|
*/
|
||||||
|
public void updateShowedNotes() {
|
||||||
|
List<Note> presentedNotes = new ArrayList<>();
|
||||||
|
long timeDifference;
|
||||||
|
float distance;
|
||||||
|
//get current date and location
|
||||||
|
Location currLocation = new Location(gpsUtils.getLocation());
|
||||||
|
Date now = new Date();
|
||||||
|
Location targetLocation = new Location("");//provider name is unecessary
|
||||||
|
Date targetDate;
|
||||||
|
|
||||||
|
for (Note note : notes) {
|
||||||
|
// get note location and date
|
||||||
|
targetLocation.setLatitude(note.getLat());//your coords of course
|
||||||
|
targetLocation.setLongitude(note.getLon());
|
||||||
|
targetDate = new Date(note.getTimestamp());
|
||||||
|
//get time and date differences
|
||||||
|
timeDifference = now.getTime() - targetDate.getTime();
|
||||||
|
distance = currLocation.distanceTo(targetLocation);
|
||||||
|
//add to currently presented list according to filters.
|
||||||
|
if (timeDifference <= dateFilterSelection
|
||||||
|
&& distance <= locationFilterSelection) {
|
||||||
|
presentedNotes.add(note);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
noteListAdapter.updateList(presentedNotes);
|
||||||
|
list_notes.setAdapter(noteListAdapter);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class GmapFragment extends Fragment implements OnMapReadyCallback {
|
||||||
private GoogleMap mMap;
|
private GoogleMap mMap;
|
||||||
private GPSUtils gpsUtils;
|
private GPSUtils gpsUtils;
|
||||||
private MainActivity mainActivity;
|
private MainActivity mainActivity;
|
||||||
private final int MAX_ZOOM = 16, MIN_ZOOM = 8, DEFAULT_ZOOM = 12;
|
private final int MAX_ZOOM = 16, MIN_ZOOM = 8, DEFAULT_ZOOM = 8;
|
||||||
private HashMap<Marker, Note> eventMarkerMap;
|
private HashMap<Marker, Note> eventMarkerMap;
|
||||||
private ImageButton dateFilter;
|
private ImageButton dateFilter;
|
||||||
private ImageButton locationFilter;
|
private ImageButton locationFilter;
|
||||||
|
|
|
@ -250,9 +250,8 @@ public class MainActivity extends AppCompatActivity
|
||||||
|
|
||||||
public void updateNavAvatar() {
|
public void updateNavAvatar() {
|
||||||
//Change The Avatar
|
//Change The Avatar
|
||||||
Log.d(TAG, "updateNavAvatar: PINPINPINPIN");
|
|
||||||
Utils.URLtoImageView(menu_avatar, user.getAvatar());
|
Utils.URLtoImageView(menu_avatar, user.getAvatar());
|
||||||
Toast.makeText(this, "Profile Updated!", Toast.LENGTH_LONG).show();
|
Toast.makeText(this, "Success "+("\ud83d\ude01")+" !", Toast.LENGTH_LONG).show();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -302,7 +302,7 @@ public class PersonalFragment extends Fragment {
|
||||||
Date time = new Date();
|
Date time = new Date();
|
||||||
JSONObject noteObject = response.getJSONObject("note");
|
JSONObject noteObject = response.getJSONObject("note");
|
||||||
time.setTime(noteObject.getLong("created_at"));
|
time.setTime(noteObject.getLong("created_at"));
|
||||||
addNoteFromJsonObj(noteObject, time);
|
addNoteFromJsonObj(noteObject, time,0);
|
||||||
updateShowedNotes();
|
updateShowedNotes();
|
||||||
|
|
||||||
// presentedNotes = listOfNotes;
|
// presentedNotes = listOfNotes;
|
||||||
|
@ -339,7 +339,7 @@ public class PersonalFragment extends Fragment {
|
||||||
JSONObject noteObject = noteObjectsArray.getJSONObject(i);
|
JSONObject noteObject = noteObjectsArray.getJSONObject(i);
|
||||||
time.setTime(noteObject.getLong("created_at"));
|
time.setTime(noteObject.getLong("created_at"));
|
||||||
|
|
||||||
addNoteFromJsonObj(noteObject, time);
|
addNoteFromJsonObj(noteObject, time,-1);
|
||||||
}
|
}
|
||||||
updateShowedNotes();
|
updateShowedNotes();
|
||||||
// presentedNotes = listOfNotes;
|
// presentedNotes = listOfNotes;
|
||||||
|
@ -365,7 +365,7 @@ public class PersonalFragment extends Fragment {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
|
private void addNoteFromJsonObj(JSONObject noteObject, Date time, int position) throws JSONException {
|
||||||
Note addNote = new Note(
|
Note addNote = new Note(
|
||||||
noteObject.getString("id"),
|
noteObject.getString("id"),
|
||||||
Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
|
Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
|
||||||
|
@ -380,7 +380,12 @@ public class PersonalFragment extends Fragment {
|
||||||
noteObject.getString("owner_id"),
|
noteObject.getString("owner_id"),
|
||||||
jsonArrayToStringArray(noteObject.getJSONArray("tags"))
|
jsonArrayToStringArray(noteObject.getJSONArray("tags"))
|
||||||
);
|
);
|
||||||
listOfNotes.add(addNote);
|
Log.d(TAG, "addNoteFromJsonObj: "+ addNote.getDate() + " " + addNote.getTime());
|
||||||
|
if (position != 0)
|
||||||
|
listOfNotes.add(addNote);
|
||||||
|
else
|
||||||
|
listOfNotes.add(position,addNote);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue